Marc Zinnschlag
8ffea60b72
some cleanup
2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
2013-06-26 09:48:51 +02:00
Sebastian Wick
20e591fe18
use index instead of string manipulation
2013-06-23 21:56:27 +02:00
Sebastian Wick
357974a429
more minor stuff
2013-06-23 21:34:41 +02:00
Sebastian Wick
c97fac8116
use QMessageBox to show errors
2013-06-23 21:16:51 +02:00
Sebastian Wick
89dee80dcf
simpler remove of duplicates
2013-06-23 21:04:49 +02:00
Sebastian Wick
6abb5d5f75
small fixes
2013-06-23 20:53:50 +02:00
Sebastian Wick
dbfc39468b
better workaround
2013-06-23 20:45:24 +02:00
Marc Zinnschlag
0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
2013-06-23 08:34:35 +02:00
Sebastian Wick
6f7a7b4714
remove old code
2013-06-23 05:02:19 +02:00
Sebastian Wick
bb39a85f16
remove double entries
2013-06-23 04:43:34 +02:00
Sebastian Wick
14d074e3e7
select first screen if none is in the setting
2013-06-23 04:21:32 +02:00
Sebastian Wick
a1fea97c3b
use SDL for resolution -> multimonitor support
2013-06-23 03:49:30 +02:00
Marc Zinnschlag
d61c12ccfc
minor cleanup
2013-06-22 20:32:11 +02:00
Sebastian Wick
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-06-22 19:17:39 +02:00
Sebastian Wick
0e29286856
fix custom resolution maximum
2013-06-22 19:15:13 +02:00
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
2013-06-21 23:23:43 -05:00
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
2013-06-17 15:02:18 +02:00
darkf
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
2013-06-17 08:58:48 +00:00
darkf
fb462f1b1a
launcher: Throw error if no data files are selected
2013-06-11 20:28:38 -07:00
darkf
fd25616cab
launcher: Properly quit if settings write fails.
2013-06-11 20:28:36 -07:00
pvdk
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
2013-06-02 21:43:22 +02:00
Marc Zinnschlag
54f56b0515
Merge remote-tracking branch 'graffy76/usersettings'
...
Conflicts:
apps/opencs/view/doc/view.cpp
apps/opencs/view/doc/view.hpp
2013-05-16 18:04:55 +02:00
graffy76
f6203cac2a
update for master
2013-05-07 20:33:42 -05:00
pvdk
d5d14c5147
Fixes issue with multiple spaces in plugin filename not being read correctly
2013-04-25 11:04:12 +02:00
Bret Curtis
c1ec16986b
add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt
2013-04-17 12:04:05 +02:00
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>
2013-04-02 21:32:23 +02:00
pvdk
e76d03dcc4
Added a warning message to the importer dialog
2013-03-19 12:01:54 +01:00
Marc Zinnschlag
0092a2f437
Merge remote-tracking branch 'pvdk/firstrunfix'
2013-03-18 20:09:10 +01:00
pvdk
75be474005
Use the resolution QRegExp cap() instead of converting ints back and forth
2013-03-16 13:45:23 +01:00
pvdk
d1860f2d6c
Removed color information from Direct3D resolutions
2013-03-16 13:40:29 +01:00
pvdk
c15d920133
Fixed the first run dialog, makes sure Morrowind.ini is found
2013-03-16 01:46:28 +01:00
pvdk
110dd5d0ee
Possible fix for the resolutions not appearing with Direct3D Renderer
2013-03-15 01:56:39 +01:00
Marc Zinnschlag
ce67fbdfca
Merge remote-tracking branch 'pvdk/encoding'
2013-03-12 07:02:44 +01:00
pvdk
31ba332647
Moved Windows icon to files/launcher
2013-03-12 04:05:14 +01:00
pvdk
f574c37e93
Added encoding flag to ini importer arguments
2013-03-12 04:00:43 +01:00
pvdk
81604613b5
Narrowed down includes to improve compile time
2013-03-12 01:29:13 +01:00
Marc Zinnschlag
a0df25c631
Merge remote-tracking branch 'pvdk/uifix'
2013-03-11 10:10:48 +01:00
Pieter van der Kloet
b4d408af5d
Added actions to datafiles.ui and implemented them in the launcher
2013-03-11 01:48:01 +01:00
Pieter van der Kloet
fc1940257a
Fixed issue with new profile dialog being too small
2013-03-11 01:23:24 +01:00
Pieter van der Kloet
091c569fbe
Fixed issue with the combobox dropdown looking weird
2013-03-11 01:20:30 +01:00
pvdk
52e5dcc7f0
Some fixes to the way data paths are saved and settings are handled
2013-03-10 21:12:26 +01:00
Pieter van der Kloet
9145fb210b
Merge remote-tracking branch 'upstream/master' into opencsui
2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b
Implemented a file dialog for the editor using launcher .ui
2013-03-07 03:00:59 +01:00
Pieter van der Kloet
c9859382bf
Made the launcher write the custom resolution to file, cleaned resolution parsing
2013-03-06 01:35:32 +01:00
Pieter van der Kloet
770d8af931
Forgot to add the DataFilesPage .ui
2013-03-05 03:57:27 +01:00
Pieter van der Kloet
75cf009101
Finished implementing the .ui file for the DataFilesPage
2013-03-05 03:47:57 +01:00
Pieter van der Kloet
4c9d0563fe
WIP: Implementing the .ui for the DataFilesPage
2013-03-05 03:13:39 +01:00
Pieter van der Kloet
fb5213a754
Made the GraphicsPage use a .ui file and added support for custom res
2013-03-05 02:17:28 +01:00
Pieter van der Kloet
0a6e3701ab
Made the Play page use a .ui file too
2013-03-03 01:49:41 +01:00