Commit graph

83 commits

Author SHA1 Message Date
cc9cii
62d2811285 Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events. 2014-09-18 07:52:54 +10:00
cc9cii
9dc4af69c6 Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible. 2014-09-17 17:13:21 +10:00
cc9cii
cb15750e40 Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway. 2014-09-17 06:29:11 +10:00
cc9cii
e3da37567b Cleaned up and got some signals going. 2014-09-17 06:11:41 +10:00
cc9cii
d679e0e012 Made more progress. Grey out disabled settings. 2014-09-16 19:50:25 +10:00
cc9cii
ffaca7a875 GUI added, but not yet functional. 2014-09-16 07:44:07 +10:00
cc9cii
0ec20b23aa Initial working version. Video/rendering options supported. No GUI yet. 2014-09-15 06:08:55 +10:00
Marc Zinnschlag
10fa205ced fixed --data switch (was missing composing option) 2014-09-13 20:41:57 +02:00
Marc Zinnschlag
a9f9dec923 consider script blacklist in OpenCS verifier 2014-07-21 12:15:21 +02:00
Marc Zinnschlag
879ab49e9c added resources manager 2014-07-04 12:46:57 +02:00
Marc Zinnschlag
8279d307c4 text encoding configuration (was using hardcoded settings before) 2014-05-12 10:32:57 +02:00
Marc Zinnschlag
5b5bf6f37e removed a redundant (and unsufficiently configured) copy of ConfigurationManager 2014-05-10 17:46:10 +02:00
Marc Zinnschlag
6eff5ecaad Merge branch 'operations' into load
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
2014-05-08 13:17:24 +02:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
graffy76
475214ab62 Implmented QSettings for loading / saving file definitions. Also
renamed opencs.cfg to opencs.ini to follow Ini format standards
2014-05-05 05:56:03 -05:00
Marc Zinnschlag
0b309d9ef4 Merge branch 'master' into load
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
2014-05-03 14:36:06 +02:00
Marc Zinnschlag
2906ade531 string fix 2014-04-29 13:16:58 +02:00
Marc Zinnschlag
ddb0496dca replaced return value of removeDocument with a signal 2014-04-26 13:11:27 +02:00
graffy76
4b607d658f Re-link user settings to editor main application 2014-04-22 22:19:53 -05:00
Marc Zinnschlag
e324450118 replaced return value of DocumentManager::addDocument with a signal 2014-04-21 09:02:58 +02:00
Marc Zinnschlag
fc8ae2b9b5 fixed encoding problems 2014-03-21 11:56:48 +01:00
Marc Zinnschlag
c36dfef972 prewview subview 2014-03-16 12:44:01 +01:00
Marc Zinnschlag
2b17f5dde9 register resources locations on editor startup 2014-03-09 12:32:21 +01:00
Marc Zinnschlag
6ec86564d1 re-enabled OGRE in OpenCS; cleaned up startup 2014-02-25 11:58:32 +01:00
Marc Zinnschlag
7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 2014-01-08 20:16:39 +01:00
Marc Zinnschlag
b19b277f18 temporarily disable OGRE-integration in OpenCS (need to sort out path problem first) 2014-01-01 15:16:51 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
Nikolay Kasyanov
9fabae5198 OS X: force Cocoa API for Ogre windows in OpenCS 2013-12-25 00:26:15 +04:00
Marc Zinnschlag
b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
2013-11-10 11:49:48 +01:00
graffy76
dace904490 changed game/addon to content for writing to openmw.cfg from launcher 2013-11-03 16:45:18 -06:00
scrawl
e6960d915a Add simple Ogre widget 2013-11-02 02:51:38 +01:00
graffy76
0cb591e4f6 Fixed path problem with adjuster widget and local data path. 2013-10-31 18:12:13 -05:00
graffy76
ea7a8eb2a4 last commit 2013-10-26 23:04:39 -05:00
graffy76
9b483c3ae3 Fix for file path issues 2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e Fixed merge conflicts with saving branch 2013-10-25 19:23:03 -05:00
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
2013-10-25 14:44:22 -05:00
graffy76
2ca7f24731 Fixed filedialog new / edit content path issue 2013-10-24 17:33:28 -05:00
graffy76
b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 2013-10-23 17:39:17 -05:00
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
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
Marc Zinnschlag
3146af34d6 some fixes for the merged filter branch 2013-10-21 19:28:57 +02:00
Marek Kochanowicz
b23df42817 Removed old comment. Changed to set resources path correctly. 2013-10-21 16:06:16 +02:00
Marek Kochanowicz
184456892b Added check to load custom filters set when present. 2013-10-19 18:43:47 +02:00
Marek Kochanowicz
4e26a61db3 Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path. 2013-10-18 22:11:14 +02:00
Marek Kochanowicz
a7002e8a09 Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work. 2013-10-17 18:21:41 +02:00
Marek Kochanowicz
3000386443 failed attempt on switch adding. 2013-10-16 13:07:26 +02:00
graffy76
4c72a9ffdf Fixed non-loading files 2013-10-06 22:10:38 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
graffy76
24b167b755 Implemented ContentSelector as a singleton "charm" modifier for
FileDialog...
2013-09-29 12:19:07 -05:00
Marc Zinnschlag
6143ec33e0 giving Documents direct access to ConfigurationManager 2013-09-27 15:24:58 +02:00