cfcohen
ad5eaaa705
Update the OpenMW Launcher so that it only writes changed values to
...
the user settings.cfg file. Add a helpful header to the top of new
settings.cfg files. Remove old code involve whitespace management
that didn't work correctly anayway, and doesn't matter since we're not
adding comments to the file. Remove "automatically generated"
comments.
9 years ago
cfcohen
67c4b17581
Commit files that I thought wre in the previous commit. :-[ I'm
...
accustomed to the hg behavior of commiting all modified files by
default.
9 years ago
cfcohen
18da95e4f8
Make openmw-launcher pass comments through settings.cfg, and reuse the
...
Settings::Manager code to do most of the work. Stop loading both the
global settings-default.cfg and the one in the current directory,
while continuing to prefer the latter one. Cleanup paths slightly and
remove what appears to have been debugging in the launcher settings.
9 years ago
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
9 years ago
Nikolay Kasyanov
4dcb1a1b17
OS X: remove QPlastiqueStyle usage
9 years ago
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
10 years ago
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
scrawl
c783b50a83
Fix config file priority in the launcher to match OpenMW
10 years ago
scrawl
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
scrawl
609e146a22
Build fixes for windows
10 years ago
scrawl
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
cc9cii
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
10 years ago
cc9cii
0efe8f5465
Fix broken launcher build for windows.
10 years ago
scrawl
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
.
Conflicts:
components/config/gamesettings.cpp
10 years ago
scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
.
10 years ago
scrawl
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
scrawl
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
scrawl
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
10 years ago
cc9cii
d3b7cf44d3
Remove user preference setting option.
10 years ago
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
10 years ago
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
Marc Zinnschlag
913caf96bd
Merge branch 'openmw-36'
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
Marc Zinnschlag
34f106749a
removed a redundant typedef
10 years ago
Nikolay Kasyanov
7d321e0fb7
Fix #2557
...
Don’t show main dialog right away if wizard is selected.
10 years ago
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
scrawl
cac288d5be
Remove OgreInit
10 years ago
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
10 years ago
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
10 years ago
dteviot
cc815c63f1
Fix: no longer loose changes when run install wizard or iniimport.
10 years ago
dteviot
84762c4eb8
Progress bar at 0% shows no text.
10 years ago
scrawl
5eadffd0c4
Make launcher's version label selectable so it can be copy-pasted into issue reports
10 years ago
dteviot
9708e8529f
Removed unneeded include.
10 years ago
dteviot
accc078e0e
Morrowind.ini import progress bar. ( Fixes #2344 )
...
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
10 years ago
scrawl
03257ecae5
QString encoding fix
10 years ago
Marc Zinnschlag
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
10 years ago
Marc Zinnschlag
ea21fbcbe6
Merge remote-tracking branch 'dteviot/master'
10 years ago
dteviot
cac250a90d
Fixed typo in comment.
10 years ago
dteviot
9d9cabf40d
Fix: Importer creates a single Content List ( Fixes #2345 )
10 years ago
scrawl
9825b68dfb
Fix SDL eating SIGINT signals in the launcher ( Fixes #2328 )
10 years ago
scrawl
0c6e2170db
Include cleanup
10 years ago
Marc Zinnschlag
82ff737c31
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
57a259c526
Remove references to no longer used font
10 years ago
scrawl
e0d0997409
Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter
10 years ago
dteviot
e298589e7f
Reorganised DataFilesPage.cpp code.
...
Removed some recursive calling of saveSettings() and loadSettings().
10 years ago
Alexander "Ace" Olofsson
942cf26eee
And the missing includes
10 years ago
Alexander "Ace" Olofsson
7a903b7100
Doing forward declaration instead
10 years ago
Alexander "Ace" Olofsson
0c1d762790
Fix build when using new boost with Ogre.
...
This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
10 years ago
dteviot
fcbf7d7deb
Fixed string formatting minor error found by Mingun.
10 years ago
dteviot
05b89be8bf
Launcher sets content list to match values in openmw.cfg ( Fixes #811 )
...
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
10 years ago
dteviot
063388e0eb
Change "Profile" to "Content List" in user visible strings in Launcher. ( Fixes #810 )
10 years ago
dteviot
9d6efcecff
Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
...
Fixed Conflict:
components/contentselector/model/contentmodel.cpp
10 years ago
Marco Schulze
6cd5b78ca7
Fix missing include in apps/launcher/main.cpp
10 years ago
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
dteviot
a62e15d93d
Read profile files from LauncherSettings in load order.
10 years ago
Marc Zinnschlag
2fa0764c89
Merge remote-tracking branch 'swick/master'
10 years ago
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
Sebastian Wick
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
10 years ago
MiroslavR
3cc32b641a
Fix some memory leaks
10 years ago
Sebastian Wick
639fbfad0b
make borderless setting available to the UI
10 years ago
scrawl
8ed376af5e
Launcher: fix changing active profile through the Play page
10 years ago
scrawl
1937ace1b7
Launcher: fix bugs deleting profiles ( Fixes #2188 )
10 years ago
scrawl
33019b93b4
Fix bug setting current launcher profile on startup (Bug #2188 )
10 years ago
scrawl
a4e32d23c6
Fix old profile content not being cleared correctly when saving content file selection ( Fixes #2173 )
10 years ago
scrawl
1e06f69d9e
Remove the "browse to existing installation" button, now replaced by the wizard
...
Clean up some debug spam
10 years ago
scrawl
c6558fe487
Fix Ogre being initialised twice
10 years ago
scrawl
4fa303d7c4
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/launcher/CMakeLists.txt
10 years ago
Nikolay Kasyanov
0dc08e2983
Properly add libunshiled include dir
10 years ago
Thoronador
f0d3fc73d5
fix uninitialized pointer fields in GraphicsPage class
10 years ago
cc9cii
6d12374ace
Move windows platform specific files into a common directory.
10 years ago
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
11 years ago
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
11 years ago
pvdk
fda25f385a
Fixed segfault when launcher tries to reload settings on pages not yet there
11 years ago
pvdk
0cc7c06262
Ensure the launcher is not shown when the wizard is run
11 years ago
pvdk
6348af586e
Fixed some problems with the launcher and the wizard
11 years ago
pvdk
a390dde818
Fixed importing configurations of existing installations
11 years ago
pvdk
5af12d193a
Cleaned up old wizard stuff from launcher
11 years ago
pvdk
38d825b004
Merge remote-tracking branch 'upstream/master' into wizard
...
Conflicts:
CMakeLists.txt
apps/launcher/maindialog.cpp
11 years ago
Kevin Poitra
beba58268c
Fix a typo within the launcher. Fixes bug #1058 .
11 years ago
greye
cb598f0455
the same for data-local entry
11 years ago
greye
28b59f4008
process paths as UTF-8 in launcher
11 years ago
greye
e02b04536f
fix most vexing parse issue
11 years ago
greye
a22ec223d8
open fstreams from boost::filesystem::path, vol.1
11 years ago
greye
cd990a665a
create QString from utf-8 when expected
11 years ago
Thoronador
f69d61976e
minor performance improvements in other apps subdirectories
11 years ago
pvdk
aa07a33906
Fixed most of the memory leaks and started working on correctly exiting the thread
11 years ago
pvdk
af883991e2
Reimplemented the old new profile dialog behaviour
11 years ago
pvdk
30c3c3e245
Working on importing content lists in the launcher
11 years ago
pvdk
f8bb797b8a
Settings tab is fully functional now
11 years ago
pvdk
21c406316f
Working on the Settings tab: start the importer/wizard
11 years ago
pvdk
cfe66abbc5
Started working on the settings tab
11 years ago
pvdk
bf6103a3a4
Merge branch 'wizardtab' into wizard
...
Conflicts:
files/ui/mainwindow.ui
11 years ago
pvdk
8fe837ae6e
Merge remote-tracking branch 'upstream/master' into wizard
11 years ago
pvdk
3792b301e9
Wizard now runs the ini-importer to import settings from Morrowind.ini
11 years ago
pvdk
c54217d008
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
11 years ago
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
11 years ago
pvdk
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
11 years ago
pvdk
802448b217
Added a settings page to the launcher
11 years ago
pvdk
19bef4fce8
Distinguish between release and development builds
11 years ago
pvdk
c354cd52be
Added compile date and time to the version info in the launcher
11 years ago
pvdk
fa186f5ec1
Added version information to the launcher
11 years ago
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
11 years ago
gus
828e5841d8
Windows SDL fix
11 years ago
Scott Howard
2f082ef796
remove unneeded libraries
11 years ago
scrawl
33389b9b63
XDG compliant paths
11 years ago
pvdk
095ff4e17a
Moved launcher settings stuff into components, so they can be reused in the wizard
11 years ago
pvdk
da9b67b6d2
Fix for Bug #922 : Launcher writing merged openmw.cfg files
11 years ago
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
pvdk
46973e8e82
Fix for Bug #982 : unchecking addons is now saved to profile
11 years ago
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
11 years ago
Nikolay Kasyanov
dfa900e4e3
OS X: Fixed “macro redefined” warning
11 years ago
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
11 years ago
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
11 years ago
graffy76
6d439d032f
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
11 years ago
graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
11 years ago
graffy76
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
11 years ago
Marc Zinnschlag
3ac58b387b
fixed wording of an error message
11 years ago
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
11 years ago
graffy76
973803eb2f
Fixed pathing issues in launcher
11 years ago
graffy76
8d12e2b99d
fixed merge conflicts
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/launcher/settings/gamesettings.hpp
components/contentselector/model/contentmodel.cpp
11 years ago
scrawl
636d399c7f
Refactored Ogre initialisation into a component
11 years ago
Lukasz Gromanowski
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
11 years ago
scrawl
8c9a5de26f
Fix an irritating error message
11 years ago
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
11 years ago
graffy76
1a23cccce3
Implemented Launcher namespace
11 years ago
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
11 years ago
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
.
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
components/contentselector/view/contentselector.cpp
components/contentselector/view/contentselector.hpp
11 years ago
graffy76
f9591ddda6
Reimplemented constentselector view class
11 years ago
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
11 years ago
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
11 years ago
graffy76
a5a0f61533
Fixed missing profiles combobox
11 years ago
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
11 years ago
graffy76
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
11 years ago
Tom Mason
dd0a416249
cleaned up bloodmoon_fix_ini
11 years ago
Tom Mason
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
11 years ago
Lukasz Gromanowski
ef617d408b
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
11 years ago
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
11 years ago
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
11 years ago
graffy76
0eb06ada39
Implemneting drag and drop
11 years ago
Tom Mason
7b9c5c75e7
silenced unshield
11 years ago
Tom Mason
2b50e34566
Fixed issue with copy_file
...
from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705
11 years ago
Alexander "Ace" Olofsson
5e42c73356
Better fix for unshield, comments on changes, no more commented out code.
11 years ago
Alexander "Ace" Olofsson
22a5f7198f
A few fixes to build on Windows
11 years ago
Nikolay Kasyanov
f9cfe654f2
Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154
...
(Qt redefines min OS X version and SDL in turn checks this version and
doesn't accept version set by Qt)
12 years ago
graffy76
e6fdc7e7fd
...
12 years ago
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
12 years ago
graffy76
24e38846da
Fixed broken profile actions
12 years ago
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
12 years ago
Tom Mason
7f0f9037be
fix for older versions of unshield
12 years ago
Tom Mason
06ff40eda7
only use unshield on not windows
12 years ago
Tom Mason
865a7c63df
cmake for system libunshield
12 years ago
Tom Mason
d3748cd5bb
Install uncompressed data files from cd
12 years ago
Tom Mason
9d1daf7dc2
enum was unnecessary
12 years ago
Tom Mason
641b7b0336
anonymous namespace
12 years ago
Tom Mason
454b64974d
filenames
12 years ago
Tom Mason
3264b5974e
fix invalid syntax
12 years ago
Tom Mason
90a892d304
unshield fixes
12 years ago
Tom Mason
ceb3317807
Integrate unshield with launcher
12 years ago
graffy76
f6217f9c6a
Moved esx selector classes out of global namespace
12 years ago
graffy76
a14e0b32d8
Restructured esxselector directory
...
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
12 years ago
graffy76
45277c0082
Minor changes
...
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
12 years ago
graffy76
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
12 years ago
graffy76
b24dd5c6ac
Continued migration of code to ContentSelector
12 years ago
graffy76
61602789e1
Began migrating code to ContentSelector base
12 years ago
graffy76
4c8c6d6971
Moved init code to master / plugin proxy classes
12 years ago
graffy76
7389507eb5
Created masterproxylist class
12 years ago
graffy76
2bc56d0b5c
Fixed missing item list in launcher combobox
12 years ago
graffy76
b850fe0289
Removed vertical headers from plugin view
12 years ago
graffy76
49c4e1bf9e
Removed master table widget
12 years ago
graffy76
84e5c2610a
Implemented combobox for game file selection
12 years ago
Marc Zinnschlag
8ffea60b72
some cleanup
12 years ago
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
12 years ago
Sebastian Wick
20e591fe18
use index instead of string manipulation
12 years ago
Sebastian Wick
357974a429
more minor stuff
12 years ago
Sebastian Wick
c97fac8116
use QMessageBox to show errors
12 years ago
Sebastian Wick
89dee80dcf
simpler remove of duplicates
12 years ago
Sebastian Wick
6abb5d5f75
small fixes
12 years ago
Sebastian Wick
dbfc39468b
better workaround
12 years ago
Marc Zinnschlag
0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
12 years ago
Sebastian Wick
6f7a7b4714
remove old code
12 years ago
Sebastian Wick
bb39a85f16
remove double entries
12 years ago
Sebastian Wick
14d074e3e7
select first screen if none is in the setting
12 years ago
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
12 years ago
Marc Zinnschlag
d61c12ccfc
minor cleanup
12 years ago
Sebastian Wick
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
Sebastian Wick
0e29286856
fix custom resolution maximum
12 years ago
graffy76
a73b97d125
Fixed broken references and other bugs
...
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
12 years ago
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
12 years ago
darkf
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
12 years ago
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
12 years ago
darkf
fd25616cab
launcher: Properly quit if settings write fails.
12 years ago
pvdk
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
12 years ago
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
12 years ago
graffy76
f6203cac2a
update for master
12 years ago
pvdk
d5d14c5147
Fixes issue with multiple spaces in plugin filename not being read correctly
12 years ago
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
12 years ago
Lukasz Gromanowski
98727d2fb6
Workaround for launcher compilation problems due to bug in Qt MOC compiler.
...
For details please see:
https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
12 years ago
pvdk
e76d03dcc4
Added a warning message to the importer dialog
12 years ago
Marc Zinnschlag
0092a2f437
Merge remote-tracking branch 'pvdk/firstrunfix'
12 years ago
pvdk
75be474005
Use the resolution QRegExp cap() instead of converting ints back and forth
12 years ago
pvdk
d1860f2d6c
Removed color information from Direct3D resolutions
12 years ago
pvdk
c15d920133
Fixed the first run dialog, makes sure Morrowind.ini is found
12 years ago
pvdk
110dd5d0ee
Possible fix for the resolutions not appearing with Direct3D Renderer
12 years ago
Marc Zinnschlag
ce67fbdfca
Merge remote-tracking branch 'pvdk/encoding'
12 years ago
pvdk
31ba332647
Moved Windows icon to files/launcher
12 years ago
pvdk
f574c37e93
Added encoding flag to ini importer arguments
12 years ago
pvdk
81604613b5
Narrowed down includes to improve compile time
12 years ago
Marc Zinnschlag
a0df25c631
Merge remote-tracking branch 'pvdk/uifix'
12 years ago
Pieter van der Kloet
b4d408af5d
Added actions to datafiles.ui and implemented them in the launcher
12 years ago
Pieter van der Kloet
fc1940257a
Fixed issue with new profile dialog being too small
12 years ago
Pieter van der Kloet
091c569fbe
Fixed issue with the combobox dropdown looking weird
12 years ago
pvdk
52e5dcc7f0
Some fixes to the way data paths are saved and settings are handled
12 years ago
Pieter van der Kloet
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
12 years ago
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
12 years ago
Pieter van der Kloet
c9859382bf
Made the launcher write the custom resolution to file, cleaned resolution parsing
12 years ago
Pieter van der Kloet
770d8af931
Forgot to add the DataFilesPage .ui
12 years ago
Pieter van der Kloet
75cf009101
Finished implementing the .ui file for the DataFilesPage
12 years ago
Pieter van der Kloet
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
12 years ago
Pieter van der Kloet
fb5213a754
Made the GraphicsPage use a .ui file and added support for custom res
12 years ago
Pieter van der Kloet
0a6e3701ab
Made the Play page use a .ui file too
12 years ago
Pieter van der Kloet
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
12 years ago
Pieter van der Kloet
2b6bb9657b
Added Qt Designer .ui files
12 years ago
Pieter van der Kloet
b209b6a0e6
Added missing includes
12 years ago
Pieter van der Kloet
9cd8dd39de
Make the launcher code conform to the coding standards and cleanup
12 years ago
Pieter van der Kloet
c4ebdc230c
Cleaned up strings and indentation
12 years ago
Pieter van der Kloet
a0007325ad
Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins
12 years ago
Pieter van der Kloet
17a0a201df
Various fixes and changes to the settings handling
12 years ago
Pieter van der Kloet
919d1ee572
Some fixes to the settings handlers
12 years ago
Pieter van der Kloet
4737b20e4c
Fixed a bug in the combobox popup font size, items overlapping
12 years ago
Pieter van der Kloet
be43fa334f
Added support for non-latin characters, fixes Bug #515
12 years ago
Pieter van der Kloet
9198afeefb
Improved context menu, added context menu for masters and added multi-selection support
12 years ago
Pieter van der Kloet
150d4a7a72
Added support for multiple ini files
12 years ago
Pieter van der Kloet
63a13cf9ca
Whoops, removed an include
12 years ago
Pieter van der Kloet
18d01cd65a
Implemented a first-run dialog to import Morrowind.ini settings
12 years ago
Pieter van der Kloet
2172fb4229
Added checkable message box class
12 years ago
Pieter van der Kloet
35b68a3c40
Fixed accidental profile deletion and added sorting by date
12 years ago
Pieter van der Kloet
bcf4f96209
Added writing masters/plugins to openmw.cfg
12 years ago
Pieter van der Kloet
178cf2154e
Made checking/unchecking work with the new datafiles model
12 years ago
Pieter van der Kloet
fd430dc5a9
Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
...
Conflicts:
apps/launcher/datafilespage.cpp
components/fileorderlist/datafileslist.cpp
12 years ago
Pieter van der Kloet
ee27e3bb58
Merge remote-tracking branch 'upstream/next' into settingsnext
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
apps/launcher/datafilespage.hpp
apps/launcher/graphicspage.cpp
components/fileorderlist/utils/filedialog.cpp
components/fileorderlist/utils/filedialog.hpp
12 years ago
Pieter van der Kloet
43e9ad8733
The text color of the profiles dialog now turns red on invalid names
12 years ago
Pieter van der Kloet
990895fd2b
Mainwindow size and position now gets saved/restored
12 years ago
Pieter van der Kloet
1b9cf8c23f
More work on integrating the settings parser, profiles are handled correctly
12 years ago