mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 06:56:38 +00:00
Code Issues Releases Wiki Activity
12762 commits 115 branches 76 tags 128 MiB
Commit graph

1551 commits

Author SHA1 Message Date
Marek Kochanowicz
b3e45c55bc progressing with the cloning 2014-01-19 11:44:47 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
Marc Zinnschlag
bf1a37dc38 Merge remote-tracking branch 'sirherrbatka/referencables_verifer' 2014-01-15 14:29:54 +01:00
Marek Kochanowicz
6224344957 Being any idiot is hard. 2014-01-15 12:52:38 +01:00
Marek Kochanowicz
3d722ba104 Corrected brackets. 2014-01-15 11:59:11 +01:00
Marek Kochanowicz
fbcb1a14fc ooops, using search id 2014-01-15 11:12:56 +01:00
Marek Kochanowicz
89d4a90c06 Localised version of morrowind will no longer spam false positives. Don't check diff, please. 2014-01-15 10:30:43 +01:00
Marek Kochanowicz
344cae8f99 added new entry to the context menu 2014-01-14 15:44:04 +01:00
Marek Kochanowicz
6397d9d40e Added mCloneAction member 2014-01-14 13:12:15 +01:00
greye
15d946415e minor cleanup 
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
 2014-01-14 12:46:53 +04:00
Marek Kochanowicz
c981a2a6f8 Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P 2014-01-14 09:25:03 +01:00
Marek Kochanowicz
2c1ef610b9 Moving back to boost for case insensitive comparsion. 2014-01-14 09:16:59 +01:00
Marek Kochanowicz
e34cb9e931 changed according to the scrawl sugestion 2014-01-13 19:17:03 +01:00
Marek Kochanowicz
59de794e58 Creature check was not invoked. 2014-01-13 19:02:23 +01:00
Marek Kochanowicz
17cc6a695c fixed bug resposnsible for exception throwed. 2014-01-13 18:34:28 +01:00
Marek Kochanowicz
cb0d3794f7 Final check is not performed with just +1! Something is not right. 2014-01-10 11:01:29 +01:00
Marek Kochanowicz
688488de62 replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check. 2014-01-10 10:43:03 +01:00
Marek Kochanowicz
31c59db71c Splited another long line in the header. 2014-01-10 10:22:18 +01:00
Marek Kochanowicz
468b9d7340 camel case in the header 2014-01-10 09:50:56 +01:00
Marek Kochanowicz
e4d637fd64 splited long lines in the header. 2014-01-10 09:49:05 +01:00
Marek Kochanowicz
b98cdabe89 Shameful bug fixed. 2014-01-10 09:42:36 +01:00
scrawl
aa855e9524 Include some required Ogre headers explicitely 2014-01-09 20:56:24 +01:00
Marc Zinnschlag
7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 2014-01-08 20:16:39 +01:00
Marek Kochanowicz
b85fe2becf Changes according to the comment. 2014-01-06 23:37:18 +01:00
Marc Zinnschlag
fefaec5804 Merge remote-tracking branch 'scrawl/savedgame' into savedgame 2014-01-06 22:30:08 +01:00
Marek Kochanowicz
06f8537087 added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why. 2014-01-06 18:43:44 +01:00
Marc Zinnschlag
43dd3b8ef2 removed redundant deletion flag from CellRef 2014-01-06 13:53:20 +01:00
scrawl
62774fcc4a Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
 2014-01-06 00:23:17 +01:00
Marek Kochanowicz
c69814ed14 corrected one, additional name to follow policy 2014-01-05 18:00:49 +01:00
Marek Kochanowicz
4338706307 static is a keyword. renamed static to staticElement 2014-01-05 17:31:54 +01:00
Marek Kochanowicz
80d424591f npc instead of NPC. 2014-01-05 17:28:47 +01:00
Marek Kochanowicz
693c398204 forgot to save the file before comit -_-' 2014-01-05 17:05:57 +01:00
Marek Kochanowicz
873870c7ce Chainging names to comply our policy. 2014-01-05 17:04:57 +01:00
Marek Kochanowicz
c1f4a9cb0e Added proper id check. 2014-01-05 12:18:26 +01:00
Marek Kochanowicz
89d8ee62fa Removing name check from listCheck. Id can't be empty to be sure. 2014-01-05 12:12:36 +01:00
Marek Kochanowicz
220d92f865 changed ID check in leveled list to name. 2014-01-05 11:30:03 +01:00
scrawl
14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 2014-01-05 01:34:35 +01:00
Marek Kochanowicz
e860717105 replaced raw values with enums. 2014-01-04 15:28:08 +01:00
Marek Kochanowicz
558690b571 implemented list of magical bolts for skipping. 2014-01-04 15:19:17 +01:00
Marek Kochanowicz
dfd1058551 Various style corrections. 2014-01-04 14:49:01 +01:00
Marek Kochanowicz
aa05ffcf60 Splited some long argument lists to the multiple lines. 2014-01-04 13:05:19 +01:00
Marek Kochanowicz
1c3296fb64 Some changes in weapons check. 2014-01-03 18:25:06 +01:00
Marek Kochanowicz
7b63e1942c style corrections 2014-01-03 11:42:49 +01:00
Marek Kochanowicz
24f090ca98 Finishing stuff. 2014-01-03 11:31:54 +01:00
Marek Kochanowicz
8201c97abf Inventory item template. 2014-01-03 09:16:41 +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
Marek Kochanowicz
cb723710fe Corrected stupid typo. 2013-12-30 19:24:53 +01:00
Marek Kochanowicz
79bc149c73 reverting refidata.hpp 2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4 reverting refiddata.cpp 2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec correcting 2013-12-30 18:41:16 +01:00
Marek Kochanowicz
3758fe3834 reformatted 2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390 Check for head and hair. Correct faction check. 2013-12-30 11:39:03 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Marek Kochanowicz
842e26b8e5 added comment 2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166 Dynamic_casting, checking rank. Commented out faction check, since it will not work. 2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1 Added faction check. 2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc removing member size values, since this does not work properly. 2013-12-29 20:15:00 +01:00
Marek Kochanowicz
bf0383fe05 Last fixes. 2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3 small oops + added new variables to the constructor 2013-12-28 17:35:04 +01:00
Marek Kochanowicz
b9d1047ad6 Small fix for lights. 2013-12-28 16:18:16 +01:00
Marek Kochanowicz
be6e47bcb6 Corrections 2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd still working on npc check 2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a Code compiles now 2013-12-27 22:57:36 +01:00
Marek Kochanowicz
03235bf0a2 NPC. Still WIP. 2013-12-27 22:13:55 +01:00
scrawl
a3ff9e5be8 Change destruction order - fixes a shutdown crash discovered with mesa 2013-12-26 20:53:52 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
Marek Kochanowicz
f04a727af6 removed set sizes, consted sizes, added itemleveledlist check 2013-12-26 18:40:47 +01:00
Marek Kochanowicz
1da56e1790 checkin leveled items lists 2013-12-26 18:28:24 +01:00
Marek Kochanowicz
c2993909cf added creature leveled list check 2013-12-26 18:16:54 +01:00
Marek Kochanowicz
360a939aa0 Working on leveled lists now. 2013-12-26 15:35:58 +01:00
Marek Kochanowicz
6c95cea4c4 Added ingredient check 2013-12-26 15:24:52 +01:00
Marek Kochanowicz
c1715779fa Added door check with related methods. 2013-12-26 12:59:43 +01:00
Nikolay Kasyanov
9fabae5198 OS X: force Cocoa API for Ogre windows in OpenCS 2013-12-25 00:26:15 +04:00
Marek Kochanowicz
e4e7d50623 Added creatureCheck. I don't know meaning of all data fields here. 2013-12-23 12:32:35 +01:00
Marek Kochanowicz
94fcea4d4d added mCreaturesSize 2013-12-22 14:46:07 +01:00
Marek Kochanowicz
32046070d5 Added getCreatures 2013-12-22 14:44:22 +01:00
Marek Kochanowicz
16af9e6986 added container check 2013-12-22 14:42:17 +01:00
Marek Kochanowicz
1a7f023237 added mContainersSize. 2013-12-22 14:35:40 +01:00
Marek Kochanowicz
dc594da0de added getContainers 2013-12-22 14:34:29 +01:00
Marek Kochanowicz
bbcaef8e42 Added armor check and related stuff. 2013-12-22 14:32:42 +01:00
Marek Kochanowicz
97fc8acbdb Added armor check 2013-12-22 14:22:03 +01:00
Marek Kochanowicz
955fe3e8cf Added check for non-positive quality of alchemical apparatus 2013-12-22 10:00:04 +01:00
Marek Kochanowicz
1811f0a71b Works, but it seems that I miss something in referencables. I will write post on the forum. 2013-12-21 15:40:39 +01:00
Marek Kochanowicz
a27441720e Added enchantmnet check for books. 2013-12-21 12:07:40 +01:00
Marek Kochanowicz
ee5dfd1cc8 Adde potionCheck method 2013-12-21 11:15:46 +01:00
Marek Kochanowicz
21ee2a6d2e Getting size of potions. 2013-12-21 11:02:58 +01:00
Marek Kochanowicz
a6c36e2377 Small optimization. 2013-12-21 11:01:40 +01:00
Marek Kochanowicz
385824aee0 Renamed getActivator to getActivators. 2013-12-21 10:59:13 +01:00
Marek Kochanowicz
4842c56cb5 added getpotions 2013-12-21 10:58:05 +01:00
Marek Kochanowicz
f69465d7e0 Added aditional checks for books. Activator check. 2013-12-20 22:31:17 +01:00
Marek Kochanowicz
8085fcc792 Added Referencable checks class, added method to get refidcontainer, added method to get mBooks. 
Currently only books are checked, and only if name is present.
 2013-12-20 20:02:42 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
Marc Zinnschlag
2fe135d85f journals subview was bound to the wrong universal ID type 2013-12-02 16:25:26 +01:00
Marc Zinnschlag
16e2d67b1f added overloaded start/endRecord functions to ESMWriter 2013-12-01 13:32:11 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
Sebastian Wick
4a816b6c17 fix context menu 2013-11-16 23:08:03 +01:00
Marc Zinnschlag
1c020b74c8 hid ID column in info tables (not relevant for the user) 2013-11-14 13:14:37 +01:00
Marc Zinnschlag
2af7f60488 flag reordered records as modified 2013-11-14 12:21:10 +01:00
Marc Zinnschlag
a44fad4c59 disabled revert for info tables (no easy way to make this work) 2013-11-14 11:55:02 +01:00
Marc Zinnschlag
780ea3a41f added support for record reordering to model (only implemented in info collection) 2013-11-14 11:39:14 +01:00
Marc Zinnschlag
68598f9b63 fixed handling of user directory defaultfilters file; some cleanup 2013-11-13 14:56:04 +01:00
Marek Kochanowicz
821d0c5c2d Corrected filter template loading. 2013-11-13 11:38:29 +01:00
Marc Zinnschlag
2fff7fc843 save info records 2013-11-11 12:21:26 +01:00
Nikolay Kasyanov
05e19b37e3 Removed obsolete comment 2013-11-10 22:25:29 +04:00
Nikolay Kasyanov
dafe80874a Added empty line 2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
96714fc2c1 OpenCS: proper working dir & library path on OS X 2013-11-10 22:19:32 +04:00
Nikolay Kasyanov
fa13818360 OS X: OpenCS packaging 2013-11-10 22:04:13 +04:00
Nikolay Kasyanov
0494fa543f OpenCS: set current directory to bundle location on OS X, like in OpenMW binary 2013-11-10 20:39:35 +04:00
Nikolay Kasyanov
df5b52b45b OpenCS.app icon & bundle properties 2013-11-10 20:11:53 +04:00
Nikolay Kasyanov
04edd25add OpenCS as a separate app bundle 2013-11-10 19:09:05 +04:00
Marc Zinnschlag
8c4303399f Merge branch 'master' into dialogue 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
 2013-11-10 13:21:39 +01:00
Marc Zinnschlag
583f1ae9c2 fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection 2013-11-10 13:00:46 +01:00
Marc Zinnschlag
ec6018928c some fixes to info record sorting (doesn't address the main problem) 2013-11-10 12:09:49 +01:00
Marc Zinnschlag
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
Marc Zinnschlag
935d9241d8 first attempt at proper info record loading: partially incorrect and way too slow 2013-11-09 11:42:19 +01:00
Marc Zinnschlag
3d8da2b9e0 proper sorting for newly created records and some case smashing fixes 2013-11-08 12:16:41 +01:00
Marc Zinnschlag
a06aa881cb make sure case handling in info IDs is consistent 2013-11-08 12:03:03 +01:00
Marc Zinnschlag
982024a328 Topic range access in InfoCollection 2013-11-08 11:52:30 +01:00
Marc Zinnschlag
0745a86039 added InfoCreator 2013-11-08 11:51:59 +01:00
Bret Curtis
5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-08 09:08:56 +01:00
Bret Curtis
36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 2013-11-07 23:05:45 +01:00
Marc Zinnschlag
c545b3682a compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique) 2013-11-05 12:57:55 +01:00
Marc Zinnschlag
2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41: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
graffy76
12c06a5615 Fixed broken dependency check 2013-11-03 06:21:28 -06:00
Marc Zinnschlag
4724df7e9b added topic/journal column to info tables 2013-11-03 10:48:50 +01:00
graffy76
973803eb2f Fixed pathing issues in launcher 2013-11-03 00:02:46 -05:00
graffy76
cddece4f9e Another stab at fixing the pathing problem... 2013-11-01 21:47:26 -05:00
scrawl
e6960d915a Add simple Ogre widget 2013-11-02 02:51:38 +01:00
Marc Zinnschlag
15b7d3263c subclass ESM::DialInfo to keep track of parent topic 2013-11-01 17:43:45 +01:00
graffy76
0cb591e4f6 Fixed path problem with adjuster widget and local data path. 2013-10-31 18:12:13 -05:00
Marc Zinnschlag
ea0e8be0d3 disallow sorting (via column headers) in info tables 2013-10-31 13:40:14 +01:00
Marc Zinnschlag
90aa8f9db6 fixed dialogue record loading with multiple content files 2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c added missing columns to journal info table 2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be split info records between journal and topic info tables 2013-10-31 12:16:45 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc use result of getAppendIndex instead of always appending at the end 2013-10-29 09:27:23 +01:00
graffy76
b51bef0d98 fixed missing adjuster widget in file dialog open view 2013-10-27 20:21:19 -05:00
Marc Zinnschlag
9a80e11182 reimplemented add and appendBlankRecord via insertRecord 2013-10-27 14:13:10 +01:00
Marc Zinnschlag
525d6fadec added Collection insert function for arbitrary position and reimplemented appendRecord in via this function 2013-10-27 14:00:25 +01:00
graffy76
ea7a8eb2a4 last commit 2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52 Hide adjusterwidget for open files view 2013-10-26 22:57:22 -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
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -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
67bc0a0c70 additional modification to the IDValidator (restricting relaxed mode slightly more) 2013-10-22 11:32:10 +02:00
Marc Zinnschlag
dc473221e7 added ID-argument to CollectionBase::getAppendIndex (required for info record collection) 2013-10-22 11:21:12 +02:00
Marc Zinnschlag
aa61948801 relaxed rules for new IDs when ID is also a user visible text 2013-10-22 11:08:37 +02:00
Marc Zinnschlag
3146af34d6 some fixes for the merged filter branch 2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566 Merge remote-tracking branch 'sirherrbatka/filters' into saving 2013-10-21 18:59:12 +02:00
Marek Kochanowicz
70602c2c36 Removed changes in the unimplemented copy ctor. 2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b Corrected formatting in document.hpp 2013-10-21 18:15:26 +02:00
Marc Zinnschlag
88e09159c4 splitting off characters menu from mechanics menu (was getting too big) 2013-10-21 18:04:40 +02:00
Marc Zinnschlag
743c6ea5b1 save dialogue records 2013-10-21 16:47:32 +02:00
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
 2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b23df42817 Removed old comment. Changed to set resources path correctly. 2013-10-21 16:06:16 +02:00
Marc Zinnschlag
3b85d97087 handle deleted dialogue records 2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e add fixed dialogue records when creating a new omwgame file 2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431 disallow the deletion of non-topic, non-journal dialogue records 2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea set dialogue type for newly created dialogue records 2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7 added dialogue type column to topics table 2013-10-20 17:26:09 +02:00
Marc Zinnschlag
adf3a41a83 added topic and journal tables 2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912 some cleanup 2013-10-20 15:48:39 +02:00
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +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
Marc Zinnschlag
db7ea30483 allow float values in cell for value tests 2013-10-14 11:15:36 +02:00
Marc Zinnschlag
679754b305 corrected an error message 2013-10-14 11:06:59 +02:00
Marc Zinnschlag
9b0766b678 minor fix in ValueNode::toString 2013-10-14 10:58:11 +02:00
Marc Zinnschlag
4905f1c8ab make testing empty cells against an empty string yield true 2013-10-13 21:54:36 +02:00
Marc Zinnschlag
b8ae195a46 Merge branch 'scene' 2013-10-13 15:42:27 +02:00
Marc Zinnschlag
4624bed899 changed handling of scene toolbar button icons 2013-10-13 15:41:48 +02:00
Marc Zinnschlag
608d154ad7 Merge remote-tracking branch 'rainChu/master' 2013-10-12 20:31:33 +02:00
Marc Zinnschlag
b5d620a8dc fixed string filter on enum column when column is empty 2013-10-12 16:35:59 +02:00
Marc Zinnschlag
a29b8667ef fixed string filter on boolean columns when testing against the value false 2013-10-12 16:29:36 +02:00
Marc Zinnschlag
a77044cda4 fixed column numbering 2013-10-12 16:15:47 +02:00
graffy76
17950210fa Merge branch 'master' into esxSelector 2013-10-07 06:52:20 -05:00
Marc Zinnschlag
74cee66273 consolidated magic numbers for button size 2013-10-07 11:24:53 +02:00
Marc Zinnschlag
4d6c3cdf09 removed more garbage 2013-10-07 08:55:04 +02:00
graffy76
4c72a9ffdf Fixed non-loading files 2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4 Implemented profile function in launcher datafiles page 
Implemented dependency sorting to ensure dependent files appear latest
in the list.
 2013-10-06 21:13:47 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
Alex "rainChu" Haddad
4496244b14 Tabs to spaces 
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
 2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad
bffbfff41c My own fix to make it hackily compile 2013-09-30 00:32:06 -04:00
graffy76
24b167b755 Implemented ContentSelector as a singleton "charm" modifier for 
FileDialog...
 2013-09-29 12:19:07 -05:00
Marc Zinnschlag
7be1f1afc2 implemented SceneToolMode as a horizontal panel with radiobutton-type buttons 2013-09-28 13:10:42 +02:00
Marc Zinnschlag
0c5f07a65a added SceneToolMode class 2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4 added scene toolbar buttons (still not doing anything) 2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f added basic scene subview (no functionality yet) 2013-09-28 09:25:54 +02:00
Marc Zinnschlag
6143ec33e0 giving Documents direct access to ConfigurationManager 2013-09-27 15:24:58 +02:00
Marc Zinnschlag
e7c48cbe58 load project files 2013-09-27 15:04:30 +02:00
Marc Zinnschlag
62148b3247 moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase 2013-09-27 15:04:09 +02:00
Marc Zinnschlag
baae548106 added project scope filter saving 2013-09-27 13:56:40 +02:00
Marc Zinnschlag
6ac4dedfbe added missing column enum 2013-09-27 13:56:23 +02:00
Marc Zinnschlag
31346dde58 fixed uninitialise scope value for filters 2013-09-27 13:55:28 +02:00
Marc Zinnschlag
6f2c418a5c (slightly) improved error reporting during save operations 2013-09-27 13:54:51 +02:00
Marc Zinnschlag
23095ec3ec added missing scope column to filter table 2013-09-27 13:54:21 +02:00
Marc Zinnschlag
5779f799ab create project file when saving content file 2013-09-27 11:36:06 +02:00
Marc Zinnschlag
1363e86828 made verifier ignore deleted records 2013-09-27 10:08:09 +02:00
Marc Zinnschlag
96fd1c35bf preserve author/descriptin meta data 2013-09-24 17:17:01 +02:00
Marc Zinnschlag
830530bd06 set record count in TES3 header 2013-09-24 17:08:24 +02:00
Marc Zinnschlag
e4fdebc85b added saving for referenceable records 2013-09-24 13:53:19 +02:00
Marc Zinnschlag
c42e74dadf make 4 byte record type accessable from record struct 2013-09-24 13:17:28 +02:00
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05:00
Marek Kochanowicz
ae5e8b95ff Solving Issue912 2013-09-23 20:12:04 +02:00
graffy76
d7cff6361e Fixed filter issue (all addons for a gamefile are enabled for checking). 
Note:  Other dependencies are not yet automatically selected when an
addon is checked.
 2013-09-23 06:51:49 -05:00
Marc Zinnschlag
6d9ff39390 set dependencies when saving (requires further refinements) 2013-09-23 12:16:56 +02:00
Marc Zinnschlag
74d683b530 fixed save path for newly created addons 2013-09-23 11:58:11 +02:00
Marc Zinnschlag
63e0cf5154 fixed missing initialisation of adjuster widget in file dialogue 2013-09-23 11:26:29 +02:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
Marc Zinnschlag
a6ea670255 use IdTypeDelegate in report table 2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26 generalised RefIdTypeDelegate into IdTypeDelegate 2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c added missing position columns to reference table 2013-09-22 10:43:09 +02:00
graffy76
70ac14b8ba Merge branch 'master' into esxSelector 2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
Marc Zinnschlag
8d4f4e395f update syntax highlighting when ID list changes 2013-09-19 14:26:09 +02:00
Marc Zinnschlag
ba5e2a0330 changed ID listing to include deleted records by default 2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370 separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
Marc Zinnschlag
3d2281fe80 added signals and functions to Data for handling ID list changes 2013-09-19 12:11:27 +02:00
Marc Zinnschlag
78f7f80fc3 configured script highlighting with extensions 2013-09-19 08:58:27 +02:00
Marc Zinnschlag
acfd78c62a implemented saving for all supported record types except cells, referencables and references 2013-09-16 14:17:04 +02:00
Marc Zinnschlag
03054c8160 forgot to write record ID 2013-09-16 14:10:05 +02:00
Marc Zinnschlag
bf0fba68af added save stage for globals 2013-09-16 12:51:57 +02:00
Marc Zinnschlag
db70095148 write TES3 header 2013-09-15 15:31:44 +02:00
Marc Zinnschlag
231419028d minor fix 2013-09-15 15:03:17 +02:00
Marc Zinnschlag
fa25a068a8 basic saving (no data is written to file yet) 2013-09-15 15:00:41 +02:00
Marc Zinnschlag
8326ac9b6f replaced dummy save implementation with a threaded dummy save implementation 2013-09-15 12:53:59 +02:00
Marc Zinnschlag
d71d282952 more Operation enhancements in preparation for save operation 2013-09-15 12:03:36 +02:00
Marc Zinnschlag
414e6abb95 more signal cleanup 2013-09-15 11:35:12 +02:00
Marc Zinnschlag
a5aebfb760 minor cleanup 2013-09-15 09:32:20 +02:00
Marc Zinnschlag
b7bffc8a79 removed Verifier class (using Operation class without subclassing now) 2013-09-14 15:16:31 +02:00
Marc Zinnschlag
f4c03c6a29 added ordered-flag to Operation (currently ignored) 2013-09-14 15:12:24 +02:00
Marc Zinnschlag
077a157841 moved Operation and Stage from model/tools to model/doc 2013-09-14 14:56:23 +02:00
Marc Zinnschlag
c961abce96 added warning message to startup window 2013-09-14 14:00:07 +02:00
Marc Zinnschlag
07ff0a8de9 possible build fix for Windows 2013-09-12 20:52:05 +02:00
Marc Zinnschlag
554c44892a Merge branch 'newgame' 2013-09-10 16:45:09 +02:00
Marc Zinnschlag
e9f14449eb added AdjusterWidget 2013-09-10 16:45:01 +02:00
Marc Zinnschlag
2dc3c0ae4f integrated startup icons 2013-09-09 09:41:43 +02:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169 splitting new game and new addon functions (new game currently not working) 2013-09-08 12:06:28 +02:00
Marc Zinnschlag
f7940d7d1a focus load document button by default in startup window 2013-09-08 11:24:06 +02:00
Marc Zinnschlag
cae5eb424d cleaned up opening the settings dialogue from a view 2013-09-08 09:33:45 +02:00
Marc Zinnschlag
efdf2961f0 open user settings dialogue centered 2013-09-08 09:28:43 +02:00
Marc Zinnschlag
0e81fb32dd hooked up edit config signal from startup window 2013-09-08 09:26:43 +02:00
Marc Zinnschlag
17bf7e59a4 added proper startup dialogue (still missing icons) 2013-09-08 09:15:26 +02:00
graffy76
a6e7cf9a8c Implementing drag and drop 2013-09-07 15:57:40 -05:00
Marc Zinnschlag
3d66f7521e Merge remote-tracking branch 'marcrbouvier/master' 2013-09-06 08:44:59 +02:00
Marc Bouvier
784cba21f2 [Feature #881] Change Tabs to Spaces 
Some of the tabs were not made of spaces, so Git defaults tabs to the
length of 8 spaces. OpenMW uses 4 spaces per tab.
 2013-09-05 23:02:51 -05:00
Marc Zinnschlag
dc345dd43d Merge branch 'filter' 2013-09-05 15:47:52 +02:00
Marc Zinnschlag
8f0ab29a9f allow the use of keywords for strings without quotation marks 2013-09-05 15:47:38 +02:00
Marc Zinnschlag
645b50ef36 added support for half-sided intervals to filter parser 2013-09-05 15:38:28 +02:00
Marc Zinnschlag
f3ce9c22a1 rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half) 2013-09-05 15:22:14 +02:00
Marc Zinnschlag
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
Marc Zinnschlag
f2e86e860e allow the use of record types in string filters 2013-09-05 14:39:56 +02:00
Marc Zinnschlag
8bebe7179c some UniversalId fixes 2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson
5e42c73356 Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
Alexander "Ace" Olofsson
22a5f7198f A few fixes to build on Windows 2013-09-04 23:25:47 +02:00
Marc Zinnschlag
842a616909 more cleanup 2013-09-03 14:18:34 +02:00
Marc Zinnschlag
6cd7da6547 Merge remote-tracking branch 'marcrbouvier/master' 2013-09-03 13:47:07 +02:00
Marc Bouvier
6b11f59ed4 [Feature #881] Rename QLocalServer 
The server name should be more unique to the project so there isn't a
interprocess clash.
 2013-09-03 06:24:11 -05:00
Marc Zinnschlag
80f8024da7 allow specifying record modification status column enum via strings 2013-09-03 13:03:02 +02:00
Marc Zinnschlag
f80373a849 removed two unused files 2013-09-03 12:53:45 +02:00
Marc Zinnschlag
1744a64f77 in filters allow specifiying boolean columns as strings 2013-09-03 12:32:06 +02:00
Marc Bouvier
0ae2bb2fae [Feature #881] Code Formatting 
Code formatted to the OpenMW policy.
 2013-09-03 05:22:48 -05:00
Marc Bouvier
563bd0b430 [Feature #881] Raise OpenCS New Window After Re-execution 
The OpenCS startup window of the existing exist is raised when trying to
start a new instance. This is done by the new instance connection to the
existing instance's QLocalServer. Once the connection is established the
existing instance raises the startup window.
 2013-09-03 04:12:19 -05:00
Marc Bouvier
51332b86a1 [Feature #811] Only 1 Instance of OpenCS is Allowed 
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
 2013-09-03 01:44:21 -05:00
Marc Zinnschlag
9cb121bd04 allow specifying enums as text in filters 2013-09-02 12:23:19 +02:00
Marc Zinnschlag
649ef6f120 moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now) 2013-09-02 11:58:05 +02:00
Marc Zinnschlag
9f0b34eae0 fixed reference loading code (editor) 2013-08-29 13:27:54 +02:00
Marc Zinnschlag
26b3d93293 streamlined filter syntax 2013-08-27 18:58:23 +02:00
Marc Zinnschlag
2e9948e86a improved one-shot filter handling; allow empty pre-defined filters 2013-08-26 14:40:34 +02:00
Marc Zinnschlag
aa935ff03d update tables on filter record changes 2013-08-26 12:49:13 +02:00
Marc Zinnschlag
20bd0707dc avoid use of column number literals 2013-08-26 12:25:52 +02:00
Marc Zinnschlag
937f5b11a2 fixed broken record deletion 2013-08-26 12:25:19 +02:00
Marc Zinnschlag
d007d4dc9a allow colons in names (filter) 2013-08-24 19:12:47 +02:00
Marc Zinnschlag
7e02c9acf2 added filter text column to filter table 2013-08-24 18:53:11 +02:00
Marc Zinnschlag
25e6380884 implemented use of predefined filters 2013-08-24 17:40:00 +02:00
Marc Zinnschlag
d1516792ce made document data available to filter parser 2013-08-24 17:17:22 +02:00
Marc Zinnschlag
7aee1da5c6 fixed some columns 2013-08-24 16:51:49 +02:00
Marc Zinnschlag
51fbb0f3f4 fixed a segfault when opening views for tables that do not allow the creation of new records 2013-08-24 15:33:46 +02:00
Marc Zinnschlag
948cb0ef34 Merge remote-tracking branch 'marcrbouvier/master' 2013-08-24 15:13:07 +02:00
Marc Zinnschlag
78c7de440d simplified filter nodes even more 2013-08-24 14:49:05 +02:00
Marc Zinnschlag
cf58670c85 removed global filter scope (would have caused sync problems between projects) 2013-08-24 14:46:42 +02:00
Marc Zinnschlag
3cf60da5a7 added numeric value filter node 2013-08-24 14:43:38 +02:00
Marc Zinnschlag
537ab38985 fixed type in error message 2013-08-23 14:49:41 +02:00
Marc Zinnschlag
c56007cceb fixed a record counting bug (was using the wrong model) 2013-08-23 14:11:33 +02:00
Marc Zinnschlag
63b1df85e7 fixed string parsing 2013-08-22 15:22:39 +02:00
Marc Zinnschlag
f615a9397b made text node filter case-insensitive 2013-08-22 15:16:22 +02:00
Marc Zinnschlag
de956737fe added text filter node 2013-08-22 14:50:42 +02:00
Marc Zinnschlag
decd826208 fixed an include guard 2013-08-22 14:00:55 +02:00
Marc Zinnschlag
ba6edc55d4 added not filter node 2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888 added and and or filter nodes 2013-08-22 13:14:35 +02:00
Marc Zinnschlag
50041fc211 simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway) 2013-08-22 09:17:57 +02:00
Marc Bouvier
2e8b0cf502 Remove Directory Paths in Qt Classes Includes 
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
 2013-08-21 17:14:29 -05:00
graffy76
e6fdc7e7fd ... 2013-08-20 12:34:39 -05:00
Marc Zinnschlag
a61215dab1 some general filter parser cleanup 2013-08-20 16:04:06 +02:00
graffy76
6898321676 Reenabling features 
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
 2013-08-20 08:16:56 -05:00
graffy76
b52645bf2a Fixes to accommodate master/plugin loading 2013-08-20 03:23:32 -05:00
graffy76
e614ec3353 Fixing profile code in progress... 2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
Marc Zinnschlag
c87a279444 added error reporting in the filter edit widget (change the text colour for now) 2013-08-18 17:54:18 +02:00
Marc Zinnschlag
c7e97a83e1 automatically build column map on filter change 2013-08-18 17:28:04 +02:00
Marc Zinnschlag
ea8b9ce45b apply filter to table after filter text change 2013-08-18 16:53:28 +02:00
Marc Zinnschlag
470f890a9a fixed BooleanNode constructor 2013-08-18 16:52:51 +02:00
graffy76
a14e0b32d8 Restructured esxselector directory 
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
 2013-08-18 09:48:13 -05:00
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
 2013-08-18 09:34:33 -05:00
Marc Zinnschlag
c38860fa72 added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node) 2013-08-18 14:17:18 +02:00
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
b24dd5c6ac Continued migration of code to ContentSelector 2013-08-17 05:55:43 -05:00
graffy76
61602789e1 Began migrating code to ContentSelector base 2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971 Moved init code to master / plugin proxy classes 2013-08-16 21:20:48 -05:00
graffy76
7389507eb5 Created masterproxylist class 2013-08-16 21:12:30 -05:00
graffy76
49c4e1bf9e Removed master table widget 2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9 Changed filter mechanism for game / addons 
Filters by number of master references, regardless of extension
 2013-08-16 17:26:23 -05:00
Marc Zinnschlag
236dc9fc43 replaced binary filter node with a n-ary node 2013-08-16 14:18:31 +02:00
Marc Zinnschlag
528e047fd5 repalced std::auto_ptr with boost::shared_ptr in filter nodes 2013-08-16 13:57:54 +02:00
Marc Zinnschlag
789a66eaa7 added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now) 2013-08-11 20:39:21 +02:00
Marc Zinnschlag
f5b06d5d52 basic filter tree structure 2013-08-09 14:49:05 +02:00
Marc Zinnschlag
a95715b61d added description field to filter record 2013-08-09 13:45:50 +02:00
Marc Zinnschlag
f6226e4859 added Creator class for filters 2013-08-08 15:55:23 +02:00
Marc Zinnschlag
0944338c27 avoid the use of hardcoded column numbers 2013-08-08 12:49:30 +02:00
Marc Zinnschlag
76b9d3dbc1 columns are now identified via an enum instead the name string 2013-08-07 09:36:05 +02:00
Marc Zinnschlag
d2f96deb98 renamed columns.hpp to columimp.hpp 2013-08-02 10:42:52 +02:00
Marc Zinnschlag
adb05737ee Merge branch 'master' into filter 
Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp
 2013-07-30 15:55:50 +02:00
Marc Zinnschlag
434f97c95c fixed two missing icons 2013-07-30 12:55:02 +02:00
Marc Zinnschlag
102700a498 added specialised Creator for references 2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce added specialised Creator for referenceable records 2013-07-30 12:34:18 +02:00
Marc Zinnschlag
34c825ce52 added icons and type listing to UniversalId class 2013-07-29 16:21:42 +02:00
Marc Zinnschlag
661b290c49 automatically scroll table to the position of a newly created record 2013-07-29 15:00:41 +02:00
Marc Zinnschlag
82958e6514 added custom creator for cell records 2013-07-28 18:08:57 +02:00
Marc Zinnschlag
899e18b2cf report ID errors also via input field tool tips 2013-07-28 15:28:35 +02:00
Marc Zinnschlag
5ec9d370cb check if ID is already in use when creating new IDs 2013-07-28 15:27:15 +02:00
Marc Zinnschlag
124a70906f added creator edit lock 2013-07-28 14:51:47 +02:00
Marc Zinnschlag
32c697abc6 validate IDs entered by the user 2013-07-28 14:40:11 +02:00
Marc Zinnschlag
4f6e99c391 more compact layout for the bottom box 2013-07-28 14:00:26 +02:00
Marc Zinnschlag
00fcb79f08 moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one) 2013-07-28 13:43:16 +02:00
Marc Zinnschlag
2d46a1db2f changed CreateCommand to work directly on the model instead of the proxy 2013-07-28 13:39:33 +02:00
Marc Zinnschlag
f93af52486 handling down a reference to Data and the undo stack to the creators 2013-07-27 13:28:12 +02:00
Marc Zinnschlag
fee748d4b5 added creator bar UI and cancel button 2013-07-26 21:09:23 +02:00
Marc Zinnschlag
b8ac45defe added creator to bottom box layout and re-routed add record event to bottom box 2013-07-26 18:22:31 +02:00
Marc Zinnschlag
d899cbb449 removed some junk 2013-07-26 18:14:34 +02:00
Marc Zinnschlag
ed83e2e70a added creator to bottom box; more cleanup 2013-07-26 12:51:45 +02:00
Marc Zinnschlag
6c4bdc0101 minor cleanup; less pointer usage 2013-07-26 12:42:15 +02:00
Marc Zinnschlag
ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 2013-07-26 12:35:17 +02:00
Marc Zinnschlag
4327b81bc3 fixed column handling in table (had problems with filtered out columns before) 2013-07-25 14:38:53 +02:00
Marc Zinnschlag
55e7e71c11 added optional per-subview status bar 2013-07-25 14:29:56 +02:00
Marc Zinnschlag
a80e80dd94 added layout to table sub view 2013-07-23 21:59:02 +02:00
Marc Zinnschlag
7600d6c04b basic filter table 2013-07-22 21:18:47 +02:00
Marc Zinnschlag
66534a45da replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality 2013-07-21 17:53:39 +02:00
Marc Zinnschlag
0fad2e7f40 restructured main menu 2013-07-20 13:46:56 +02:00
Marc Zinnschlag
2497c18702 replaced settings change notifications for columns with a more robust implementation 2013-07-20 13:19:27 +02:00
Marc Zinnschlag
365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 2013-07-18 13:51:24 +02:00
graffy76
0ae254f6a8 Fixed segfault opening tables 2013-07-18 06:31:47 -05:00
graffy76
6486f342b5 Fixed setting synchronization issue 
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
 2013-07-17 20:19:01 -05:00
Marc Zinnschlag
47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 2013-07-16 12:08:35 +02:00
Marc Zinnschlag
6a5ab34971 Merge branch 'region' 2013-07-14 12:19:02 +02:00
Marc Zinnschlag
4cce466dc7 inverted region map y-axis 2013-07-13 16:34:10 +02:00
Marc Zinnschlag
c26a6f884f added region map tooltips 2013-07-12 12:55:14 +02:00
greye
29b7734b52 add qualifiers for names in templates to make gcc 4.7+ happy 2013-07-12 08:33:02 +04:00
Marc Zinnschlag
c808bf2b23 updating region map on changes to region and cell records 2013-07-11 15:05:28 +02:00
Marc Zinnschlag
b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2013-07-11 09:09:52 +02:00
graffy76
11178cc470 Repo permissions commit fix #3 2013-07-10 21:44:25 -05:00
graffy76
bb049806df Repo permissions commit fix #2 2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9 Fixing repo permissions commit #1 2013-07-10 17:29:07 -05:00
Marc Zinnschlag
d389b70ec4 added missing case folding 2013-07-09 14:22:58 +02:00
Marc Zinnschlag
121978a69e some cleanup; added handling of deleted cells (now displayed instead of ignored) 2013-07-09 14:20:28 +02:00
Marc Zinnschlag
116320cc0d dealing with invalid regions and cells without regions 2013-07-08 17:13:58 +02:00
Marc Zinnschlag
6159724b04 build region map from records (only initial build; updates not implemented yet) 2013-07-08 16:53:08 +02:00
Marc Zinnschlag
4f05f2bddf basic region map; non-interactive for now and working with dummy data instead of real cell/region records 2013-07-08 13:12:50 +02:00
Marc Zinnschlag
de5898c953 post merge fixes 2013-07-06 18:34:14 +02:00
Marc Zinnschlag
4986b7d65d Merge branch 'master' into ref 2013-07-06 17:54:19 +02:00
Marc Zinnschlag
1c4b70805b added missing reference table columns 2013-07-06 17:41:06 +02:00
Marc Zinnschlag
9a39f32c32 store ID of cell in reference struct 2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281 added references table 2013-07-06 17:03:18 +02:00
graffy76
9f6d250463 QDebug reference removal 2013-07-01 07:40:47 -05:00
graffy76
55b115935a Implemented RefRecordTypeDelegate 
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
 2013-06-30 07:43:58 -05:00
graffy76
9d95a38934 Implementing delegate for referenceables table Type column 
Added delegate skeleton class

Added delegate creation code in ViewManager

Added Display_RefRecordType enum to columnbase.hpp

Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp

modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
 2013-06-29 08:54:32 -05:00
Marc Zinnschlag
afb120d5ce Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-27 08:11:27 +02:00
graffy76
6deddf7229 Fixed code conventions in user settings, changed top-level page names 2013-06-26 21:18:21 -05:00
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
graffy76
f0f895ad10 Fixed settings file error message 
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
 2013-06-25 19:32:36 -05:00
Marc Zinnschlag
99508a6eaa minor cleanup 2013-06-23 22:52:02 +02:00
mckibbenta
5803726233 modified gmst addition during creation of new base file 2013-06-23 15:19:08 -04:00
mckibbenta
16a27e28f7 inluded gmsts with default values to creation of new base files 2013-06-22 21:01:27 -04:00
graffy76
62e164b2aa Fixed load file error if no file is found 2013-06-22 07:43:28 -05: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
graffy76
b3d185e421 Unsaved changes missed in previous commits 2013-06-20 18:08:53 -05:00
graffy76
f4a2cf64c2 Removed CSVSettings::SamplePage class files 2013-06-20 18:07:34 -05:00
graffy76
101c147217 Final changes for record status icon feature, incl. window size user 
preference

1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
 2013-06-20 18:06:25 -05:00
Marc Zinnschlag
94ec05c2c6 Revert "simplifying CSMWorld::CellRef" 
With the refactored collection class we can now handle the more complex load function

This reverts commit 97f421df8a.
 2013-06-18 11:27:05 +02:00
Marc Zinnschlag
5b3d2f5da1 gave Collection class its own header file and removed an unsed cpp file 2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c split IdCollection into Collection and IdCollection class 2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d rewrote IdCollection::load (not using private members of IdCollection anymore) 2013-06-17 13:49:32 +02:00
graffy76
f87eb67968 Fixed conflicts 
Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp
 2013-06-17 06:45:44 -05:00
Marc Zinnschlag
2968b96882 added a bit more documentation 2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4 moved IdCollection base into its own source file pair and renamed it to Collection 2013-06-17 11:42:02 +02:00
graffy76
700d55f1fb Fixed / implemented missing features for RecordStatusDelegate 
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.

Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.

Rewrote CSMSettings::UserSettings to retain last-loaded settings.

Adjusted icon position in Record Status column

Capitalized status text

Added delegate to referenceables table
 2013-06-15 06:40:18 -05:00
Glorf
548f4d683f Globalization of user settings 2013-06-12 12:36:35 +02:00
Glorf
10165d3c6b Feature #468 2013-06-09 00:34:27 +02:00
Marc Zinnschlag
97f421df8a simplifying CSMWorld::CellRef 2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6 Promoted references to a top level record internally. 
Note: This does not change the structure of the ESX format.
 2013-06-08 12:45:13 +02:00
graffy76
1d93cf09bc Cell formatting and code optimization changes 2013-05-29 21:55:19 -05:00
graffy76
35fb9b669a Final details implemented 
Png icons, alignments fixed.
 2013-05-29 06:38:35 -05:00
Marc Zinnschlag
6d0b8f7bc8 added missing include 2013-05-22 10:14:12 +02:00
Marc Zinnschlag
c626e2b257 Merge branch 'ref' 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9 added missing columns for weapon records 2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5 added missing columns for NPC records 2013-05-19 13:53:47 +02:00
Marc Zinnschlag
8d78bea4aa added missing column for misc record 2013-05-18 18:55:23 +02:00
Marc Zinnschlag
862e568f9b added missing columns for Light record 2013-05-18 18:46:41 +02:00
Marc Zinnschlag
749fd418b5 added missing columns for door record 2013-05-17 15:10:41 +02:00
Marc Zinnschlag
f8c675a638 Merge remote-tracking branch 'graffy76/usersettings' 2013-05-17 10:24:52 +02:00
graffy76
3ce35e691c Commented out sample editor settings page 2013-05-16 20:43:05 -05:00
Glorf
19ce233667 Workaround for MOC compiler problem 2013-05-16 19:46:04 +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
13242c2bd5 Eliminated code centering the initial view in the middle of the screen 2013-05-16 10:14:13 -05:00
Marc Zinnschlag
889a87982e added missing columns for creatures 2013-05-16 16:27:33 +02:00
Marc Zinnschlag
d794a62d19 added missing columns for container record 2013-05-15 17:02:34 +02:00
Marc Zinnschlag
28f2a7d2b4 added missing column for clothing records 2013-05-15 11:37:46 +02:00
Marc Zinnschlag
eba9d3e3ee added missing columns for book record 2013-05-14 14:40:06 +02:00
Marc Zinnschlag
fce9939f83 added missing columns for armor record 2013-05-14 14:33:34 +02:00
Marc Zinnschlag
7c57f2c221 added AI-related actor columns 2013-05-14 13:20:59 +02:00
Marc Zinnschlag
74d791e207 fixed auto calc column 2013-05-13 14:07:31 +02:00
Marc Zinnschlag
897e55391d added columns for tool IDs 2013-05-13 13:36:24 +02:00
Marc Zinnschlag
52d81dc9fa added columns for enchantments 2013-05-13 13:11:43 +02:00
Marc Zinnschlag
90bae2bead do not create editors for unused columns 2013-05-13 12:55:28 +02:00
Marc Zinnschlag
929b38ff6a added missing columns for apparati records 2013-05-13 12:51:27 +02:00
graffy76
c71d921f09 Moved signalUpdateEditorSettings from UserSettingsDialog to 
UserSettings.

UserSettings is now derived from QObject.
 2013-05-12 15:15:57 -05:00
graffy76
144be59735 Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
Marc Zinnschlag
7fd277b87a added missing column for potions 2013-05-12 15:50:29 +02:00
graffy76
88df3b980f Implemented UserSettings as a singleton. 2013-05-11 20:55:36 -05:00
Marc Zinnschlag
da92921387 added columns related to items in inventories 2013-05-11 19:21:16 +02:00
Marc Zinnschlag
ee2bc94698 added script column 2013-05-11 18:57:23 +02:00
Marc Zinnschlag
e24ecfd5d2 added name column 2013-05-11 18:43:16 +02:00
Marc Zinnschlag
318ebe0cb6 added model column 2013-05-11 18:35:48 +02:00
Marc Zinnschlag
8ef2d04007 added type column 2013-05-11 17:49:38 +02:00
Marc Zinnschlag
c22f773f72 load all types of referenceable IDs 2013-05-11 17:45:28 +02:00
Marc Zinnschlag
d715cf5431 replaced static adapter with a template 2013-05-11 17:34:18 +02:00
Marc Zinnschlag
9426eda47a small test with statics and two columns 2013-05-11 17:01:16 +02:00
Marc Zinnschlag
02ace69511 fixed RefID search 2013-05-11 16:55:10 +02:00
graffy76
d0b23a4786 Relocated "User Settings" to Edit->Preferences 
Removed <QDebug> reference from view.hpp
 2013-05-11 07:40:10 -05:00
graffy76
a8b45e0a13 Three primary changes: 
1.  Declared QStringPair::isEmpty() const
2.  Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3.  Declared several classes as _noqt in CMakeLists.txt for OpenCS
 2013-05-11 05:55:46 -05:00
graffy76
8d0f350446 New file structure separating view classes from model classes. Deleted 
.ui file.
 2013-05-10 10:00:58 -05:00
graffy76
cb9c82324c UserSettings system 2013-05-07 20:36:34 -05:00
graffy76
f6203cac2a update for master 2013-05-07 20:33:42 -05:00
Marc Zinnschlag
0f29ab8cf9 fixed the interface of the adapter class 2013-05-07 14:19:02 +02:00
Marc Zinnschlag
f7f56a1a1f added a RefIdCollection to Data 2013-05-07 11:23:18 +02:00
Marc Zinnschlag
e9f1aac7bd added data structures for referenceable records 2013-05-06 14:11:55 +02:00
Marc Zinnschlag
13e7abd7df added assign function to Record class 2013-05-03 12:52:45 +02:00
Marc Zinnschlag
1b84aeb5b9 fixed a problem with editing records that do not exist in base 2013-05-02 14:30:39 +02:00
Marc Zinnschlag
f8a331f173 fixed a bad cast 2013-05-01 16:49:34 +02:00
Marc Zinnschlag
236751ec45 some IdCollection and IdTable cleanup 2013-04-29 17:52:01 +02:00
Marc Zinnschlag
e7bf1d230c fixed an indexing problem in IdCollection 2013-04-27 16:22:04 +02:00
Marc Zinnschlag
a17d17c191 added additional type argument to IdCollection::load 2013-04-23 11:22:07 +02:00
Marc Zinnschlag
808718d967 added referenceable record types to UniversalId 2013-04-23 11:21:21 +02:00
Marc Zinnschlag
afe7b3c64c added additional type argument to IdCollection::appendBlankRecord 2013-04-23 10:56:55 +02:00
Marc Zinnschlag
518cb0e3b7 added another abstraction layer to ID access in IdCollection 2013-04-16 12:12:04 +02:00
Marc Zinnschlag
b2b953d2a8 added region column to cell table 2013-04-14 19:34:55 +02:00
Marc Zinnschlag
71148121a2 added flag columns to cell table 2013-04-14 17:10:37 +02:00
Marc Zinnschlag
0c33dd86d5 added basic cell table 2013-04-14 17:04:55 +02:00
Marc Zinnschlag
f17cebde0a syntax colouring for comments 2013-04-11 10:50:35 +02:00
Marc Zinnschlag
74145410f2 basic syntax highlighting in script subview 2013-04-10 22:49:22 +02:00
Marc Zinnschlag
3a87b12baf delete script subview on script deletion 2013-04-10 21:31:14 +02:00
Marc Zinnschlag
d61ec1063e added script editor 2013-04-10 20:14:10 +02:00
Marc Zinnschlag
cd33f40c8f re-enabled opening of record subviews via double click in table 2013-04-09 14:28:31 +02:00
Marc Zinnschlag
be4a01bdb4 added missing recrod type columns 2013-04-09 14:27:32 +02:00
Marc Zinnschlag
40bb772e34 added verifier for spell record 2013-04-09 12:44:49 +02:00
Marc Zinnschlag
ae0a7d5bcd added cost and type columns to spell table 2013-04-09 11:53:47 +02:00
Marc Zinnschlag
ec6dff38b1 added basic spell table 2013-04-09 11:40:36 +02:00
Marc Zinnschlag
43a5013690 added verifier for birthsign record 2013-04-07 23:25:35 +02:00
Marc Zinnschlag
baf8eaecb8 added texture column to birthsign table 2013-04-07 20:46:04 +02:00
Marc Zinnschlag
60cc95305d added basic birthsign table 2013-04-07 20:26:39 +02:00
Marc Zinnschlag
593646436e added verifier for region record 2013-04-07 19:39:13 +02:00
Marc Zinnschlag
c9424f577f added sleeplist column to region table 2013-04-07 19:29:15 +02:00
Marc Zinnschlag
f49a2a97c5 added map colour column to region table 2013-04-07 16:56:21 +02:00
Marc Zinnschlag
e25f5c6dfe added basic region table 2013-04-07 16:32:06 +02:00
Marc Zinnschlag
ff1d908af4 added script table 2013-04-07 15:17:35 +02:00
Marc Zinnschlag
e2c6458adb added verifier for sound records 2013-04-06 21:48:52 +02:00
Marc Zinnschlag
50b58b2ead added sound file column to sound table 2013-04-06 21:43:05 +02:00
Marc Zinnschlag
dd5940b395 added sound parameter columns to sonud table 2013-04-06 21:40:03 +02:00
Marc Zinnschlag
8bf569d58a added basic sound table 2013-04-06 21:21:10 +02:00
Marc Zinnschlag
98e7b3fd93 check for at least one playable race 2013-04-06 19:20:59 +02:00
Marc Zinnschlag
9bc3945f40 multiple fixes to UniversalId constructor 2013-04-06 19:20:46 +02:00
Marc Zinnschlag
0fb583e065 added verifier for race record 2013-04-06 17:35:36 +02:00
Marc Zinnschlag
35fe828108 added race table weight/height columns 2013-04-05 13:46:48 +02:00
Marc Zinnschlag
076831c9cc added flag columns to race table 2013-04-05 12:48:05 +02:00
Marc Zinnschlag
73da794d77 added basic race table 2013-04-04 14:34:39 +02:00
Marc Zinnschlag
7136ac0079 added missing attribute columns to faction table 2013-04-04 10:58:53 +02:00
Marc Zinnschlag
b5eaa464ad added faction record verifier 2013-04-04 10:39:43 +02:00
Marc Zinnschlag
06533b8d71 additional check for using the same attribute twice in a class 2013-04-04 10:31:10 +02:00
Marc Zinnschlag
fea44c05d4 added class record verifier 2013-04-04 10:10:58 +02:00
Marc Zinnschlag
676a92e2e0 moved Verify function from World menu to File menu 2013-04-02 15:47:25 +02:00
Marc Zinnschlag
9d009af2a1 simplified code for sub view factory creation 2013-04-02 15:33:28 +02:00
Marc Zinnschlag
82498f6cff added hidden flag column to faction table 2013-04-02 14:20:51 +02:00
Marc Zinnschlag
384c88182d dealing with unset attribute fields 2013-04-02 14:15:22 +02:00
Marc Zinnschlag
ec6bdbeb40 added skill columns to faction table 2013-04-02 14:04:13 +02:00
Marc Zinnschlag
c71edb613d added faction table 2013-04-02 12:00:45 +02:00
Lukasz Gromanowski
acae815cd2 Added workaround for OpenCS 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-03-31 18:00:46 +02:00
Marc Zinnschlag
82f1cee116 added is-playable column to class 2013-03-26 09:51:39 +01:00
Marc Zinnschlag
ea3b14f2d2 added skill columns to class 2013-03-26 09:43:13 +01:00
Marc Zinnschlag
65cda580db added attributes to class table 2013-03-25 14:31:46 +01:00
Marc Zinnschlag
c7275965b8 added basic class record table 2013-03-25 13:22:06 +01:00
Marc Zinnschlag
f2969e7143 fixed access to records flagged as deleted 2013-03-25 12:56:52 +01:00
Marc Zinnschlag
f39f694638 various global variable fixes in editor 2013-03-25 11:59:25 +01:00
Marc Zinnschlag
dc67ddf39b added verifier stage for skill records 2013-03-25 11:07:04 +01:00
Marc Zinnschlag
739e7e7298 improved record access from ID collection 2013-03-25 11:06:40 +01:00
Marc Zinnschlag
7450554ef1 fixed a broken UniversalId constructor 2013-03-25 11:04:41 +01:00
Marc Zinnschlag
10c5f29075 added attribute column to skills 2013-03-24 15:50:29 +01:00
Marc Zinnschlag
114f99ddbf add skill records when creating a new base file 2013-03-24 15:10:03 +01:00
Marc Zinnschlag
4208d52b1a added use value columns to skills 2013-03-24 14:51:48 +01:00
Marc Zinnschlag
0ce962e815 added specialisation column to skill table 2013-03-23 13:13:53 +01:00
Marc Zinnschlag
92f0098911 added new constructors for EnumDelegateFactory 2013-03-23 13:13:34 +01:00
Marc Zinnschlag
8e472cc624 added description column to skill table 2013-03-21 14:38:06 +01:00
Marc Zinnschlag
fefe061294 added basic support for skills to editor 2013-03-21 14:31:32 +01:00
Marc Zinnschlag
947ab6635b removed automatic detection of setting modified to the same value of base with subsequent setting modifiction state to base only (can cause problems with implicitly added records) 2013-03-21 14:29:31 +01:00
Marc Zinnschlag
a955068853 added universal IDs for skills 2013-03-21 13:40:55 +01:00
Marc Zinnschlag
9464f45d57 fixed an encoding problem. I hate you QString. I hate you so much 2013-03-21 12:47:22 +01:00
Marc Zinnschlag
cafbabde45 fixed broken loading of single files into the editor 2013-03-21 12:13:32 +01:00
Marc Zinnschlag
ebb1dab8e1 removed debugging leftovers 2013-03-21 10:19:07 +01:00
Marc Zinnschlag
d05508db52 switching editor id tables from QAbstractTableModel to QAbstractItemModel (in preparation for record types like containers) 2013-03-21 10:07:25 +01:00
Marc Zinnschlag
10fad47a81 some cleanup 2013-03-12 14:51:16 +01:00
graffy76
50abb22162 Fix to allow application closing from multiple views and a single view. 2013-03-12 06:28:13 -05:00
graffy76
96b62940b3 Fixes docked subviews becoming tabbed and application closure when 
closing one of several views.
 2013-03-11 06:38:27 -05:00
graffy76
ce91ef36ea Fix for warnings on close, leaves all views open until a decision is 
made
 2013-03-10 07:49:43 -05:00
graffy76
c17821e6c8 Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose 2013-03-08 20:08:56 -06:00
graffy76
03c7f18112 Fixes for save-on-close message boxes 2013-03-07 17:48:05 -06:00
Marc Zinnschlag
a994a23f4e file loading fixes 2013-03-07 07:56:29 +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
Marc Zinnschlag
46de45b9a2 added var type column to globals 2013-03-05 11:37:13 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Marc Zinnschlag
a1ac20c6f3 changed global variable records to new variant type 2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520 added variant class 2013-03-04 14:32:23 +01:00
graffy76
6911868f2a File->close and File->exit menu items added. Exit uses 
closeAllWindows() to ensure ViewManager::closeRequest is called on the
last open window.  Exit will close all open windows but the last one in
cases of active save operation or modified file.
 2013-03-03 15:58:26 -06:00
graffy76
eb90bd71ba Fixed triggering confirmation messages boxes when more than one view is 
open.
 2013-03-02 21:34:55 -06:00
graffy76
bf6c855e6d Final changes to implement save-on-close features 2013-03-02 12:49:26 -06:00
graffy76
9193ddc9d3 Merge branch 'master' into saveOnClose 2013-03-02 09:24:42 -06:00
graffy76
a2e36594c9 Completed "abort save on close" feature 2013-03-02 09:22:44 -06:00
graffy76
f85be6a744 80% complete save-on-close feature 2013-03-02 07:57:41 -06:00
Marc Zinnschlag
d98ec67671 Merge remote-tracking branch 'graffy76/recentfiles' 2013-02-23 18:53:33 +01:00
graffy76
89dace3cc3 Fix for operations widget - hides when no operations are running. 2013-02-23 09:07:13 -06:00
Marc Zinnschlag
868916a9a2 added add-on global variables in the same way add-on GMSTs were added 2013-02-23 12:51:45 +01:00
Marc Zinnschlag
6f5a772d02 fixed another case handling problem 2013-02-23 12:35:05 +01:00
Marc Zinnschlag
c9ca565462 removed a redundant function call 2013-02-23 12:05:09 +01:00
graffy76
6f89d453a5 Operations widget height fix and abort button feature. Successfully 
tested resizing of Operations QDockWidget for multiple concurrent
operations.
 2013-02-22 21:53:32 -06:00
Marc Zinnschlag
a50ff34774 better default value for string GMSTs 2013-02-18 09:23:14 +01:00
Marc Zinnschlag
475f4f9311 implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified 2013-02-17 20:03:39 +01:00
Marc Zinnschlag
abd307d70e Issue #567: workaround for crash with non-English ESX files 2013-02-17 19:26:01 +01:00
Marc Zinnschlag
9221c861c5 Merge remote-tracking branch 'graffy76/next' into next 
Conflicts:
	apps/opencs/CMakeLists.txt
 2013-02-17 17:38:33 +01:00
Marc Zinnschlag
bb990b96bf Merge branch 'globaltype' into next 2013-02-17 17:27:41 +01:00
Marc Zinnschlag
50d61a5b6e proper implementation of gmst type column 2013-02-17 17:27:25 +01:00
graffy76
ceefae81e8 fix for the opencs icon 2013-02-17 07:46:50 -06:00
Marc Zinnschlag
5e3529783d Merge remote-tracking branch 'ace/win-fixes' into next 2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson
0ae01794f1 Fixed build errors in OpenCS 2013-02-12 13:57:16 +01:00
Marc Zinnschlag
1fd7d8ed2a Merge remote-tracking branch 'graffy76/master' into next 2013-02-11 15:35:59 +01:00
graffy76
55dd17c27c Added setBarColor() function to CSVDoc::Operation. Created four color 
types for existing operations (save, verify, compile and search), with a
default for future / undefined ops.
 2013-02-11 04:30:16 -06:00
Marc Zinnschlag
eb6590f7d8 added delegate factory 2013-02-10 17:21:25 +01:00
Marc Zinnschlag
d40ee06897 fixed base/modified logic 2013-02-09 15:25:50 +01:00
Marc Zinnschlag
828695f295 added value column to gmst table 2013-02-08 14:48:38 +01:00
Marc Zinnschlag
cce2d63433 added type column to gmst table 2013-02-08 12:20:03 +01:00
Marc Zinnschlag
d5dd0640c7 basic gmst support 2013-02-08 09:58:19 +01:00
Marc Zinnschlag
dd2b7d5c63 handle deleted records 2013-02-07 13:26:00 +01:00
Marc Zinnschlag
c1cd8305bc a bit of cleanup for the previous commit 2013-02-07 13:13:06 +01:00
Marc Zinnschlag
21733e8181 hide startup dialogue when opening open dialogue 2013-02-07 13:11:41 +01:00
Marc Zinnschlag
adcaea464b basic globals record loading 2013-02-07 12:52:01 +01:00
Marc Zinnschlag
7d112e4d5c rewrote logic of content file loading 2013-02-07 11:33:08 +01:00
Michal Sciubidlo
347a734364 Move OpenDialog to editor and use it in startup dialogue. 
Remove debug output from DataFilesList.
 2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 2013-02-05 21:23:49 +01:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
Marc Zinnschlag
ba0d13fc12 moved code for creating new base content records into the Document class 2013-02-04 13:50:38 +01:00
Marc Zinnschlag
4c973a0f67 constructing documents from a file list instead of a single name 2013-02-04 13:46:54 +01:00
Marc Zinnschlag
3f0a49a2f6 Merge branch 'master' into startup 
Conflicts:
	apps/opencs/CMakeLists.txt
 2013-02-04 10:22:37 +01:00
Marc Zinnschlag
a4872e3217 rewrote the opencs cmake scripts (more compact and no more annoying warnings) 2013-02-03 13:30:40 +01:00
Michal Sciubidlo
155cca0c9a Upload missing files. 
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
 2013-02-02 18:36:01 +01:00
Marc Zinnschlag
67a1ec5166 added provisional startup dialogue 2013-02-02 16:14:58 +01:00
Michal Sciubidlo
492482de7f Add "open" option in opencs. 2013-02-01 00:42:03 +01:00
Marc Zinnschlag
90d05858ef disabling dialogue sub-views for now 2013-01-22 11:50:08 +01:00
Marc Zinnschlag
cd662af634 Merge branch 'globals' 2013-01-22 11:47:24 +01:00
Marc Zinnschlag
2d96f52864 select correct record when opening a dialogue sub view 2013-01-19 14:29:14 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Marc Zinnschlag
d4a9236ae5 hocking up dialogue sub view to a widget mapper 2013-01-08 14:59:40 +01:00
Marc Zinnschlag
b7b51f24d6 added new Role for table headers (Role_Display) 2013-01-03 11:20:25 +01:00
Marc Zinnschlag
714b1924a5 partial dialogue subview implementation 2012-12-30 14:01:52 +01:00
Marc Zinnschlag
8d4afe3bf5 post merge fix 2012-12-28 23:45:13 +01:00
Marc Zinnschlag
77852439ce moved ColumnBase and Column struct into a separate translation unit 2012-12-16 12:52:23 +01:00
Marc Zinnschlag
f95e72166c hide type column in non-mixed type tables 2012-12-13 15:03:35 +01:00
Marc Zinnschlag
faa5ef0874 rewrote column class 2012-12-13 14:53:16 +01:00
Marc Zinnschlag
640c218df3 made record state uneditable again 2012-12-13 13:52:26 +01:00
Marc Zinnschlag
3d4c8c5444 added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion 2012-12-13 13:35:08 +01:00
Marc Zinnschlag
02184526e6 moved two helper classes from view/world/table into a separate translation unit 2012-12-13 11:24:39 +01:00
Marc Zinnschlag
cc18b30e17 open sub view on double click in report view 2012-12-12 22:36:20 +01:00
Marc Zinnschlag
c75563c184 report model and view 2012-12-11 15:35:47 +01:00
Marc Zinnschlag
2db930a5cf rewrote subview factory system 2012-12-11 13:22:43 +01:00
Marc Zinnschlag
0ed378dfb2 changed sub view factory method signature 2012-12-11 11:24:30 +01:00
Marc Zinnschlag
832fc56d34 changed UniversalId to string conversion 2012-12-09 11:10:35 +01:00
Marc Zinnschlag
9fe7ff9690 added mandatory ID check stage 2012-12-08 23:27:59 +01:00
Marc Zinnschlag
72623652e4 addded messages interface for operations/stages 2012-12-08 18:38:36 +01:00
Marc Zinnschlag
89b4497331 added missing edit locks for create/revert/delete 2012-12-08 18:15:00 +01:00
Marc Zinnschlag
6c18be39f0 added stage class 2012-12-08 17:53:45 +01:00
Marc Zinnschlag
8b7f342641 removed last remains of old verify implementation 2012-12-08 17:00:58 +01:00
Marc Zinnschlag
af9b48f4d3 added operations base class 2012-12-08 15:25:50 +01:00
Marc Zinnschlag
a2b4f43176 moved document state enum to a separate file 2012-12-08 14:44:03 +01:00
Marc Zinnschlag
fdc7e93835 preliminary multi-threaded verify implementation (does not actually perfom any document verification yet) 2012-12-08 11:59:13 +01:00
Marc Zinnschlag
2b53cf6547 do not list actions in the pop up menu that do not apply to any of the selected records 2012-12-06 15:25:31 +01:00
Marc Zinnschlag
c12ee129f7 added delete command 2012-12-06 15:18:41 +01:00
Marc Zinnschlag
b41cc5e9e9 added revert command 2012-12-06 14:56:04 +01:00
Marc Zinnschlag
f07b7d17cd improved exception handling 2012-12-04 20:43:47 +01:00
Marc Zinnschlag
5cd2fe00ab initialise blank global records 2012-12-03 22:16:02 +01:00
Marc Zinnschlag
8e93bfa607 turned the global class into a general purpose table subview class 2012-12-03 22:03:02 +01:00
Marc Zinnschlag
0a8b7602d3 fixed edit lock 2012-12-03 21:51:42 +01:00
Marc Zinnschlag
49d6239004 added pop-up menu with create record action 2012-12-03 21:44:16 +01:00
Marc Zinnschlag
db29e411c4 added merge functions; temporarily merge on document creation 2012-12-03 13:56:02 +01:00
Marc Zinnschlag
bd5e364ac1 display record state in table 2012-12-01 13:42:12 +01:00
Marc Zinnschlag
ec1f957e54 edit lock for sub views 2012-11-30 13:58:10 +01:00
Marc Zinnschlag
8dd76b49af factored out table widget from globals sub view 2012-11-29 19:09:06 +01:00
Marc Zinnschlag
fd55c0cae2 record IDs are no longer handled as a special case 2012-11-29 18:56:28 +01:00
Marc Zinnschlag
4086b556d2 use commands for modifying globals 2012-11-29 16:05:28 +01:00
Marc Zinnschlag
8a09e03d5c global variable editing (no undo support yet) 2012-11-29 14:45:34 +01:00
Marc Zinnschlag
92f70635a2 improved selection behaviour 2012-11-27 10:42:46 +01:00
Marc Zinnschlag
ef9575498f basic (non-editable) subview for global variables 2012-11-26 12:29:22 +01:00
Marc Zinnschlag
eece4226c0 basic sub view system (very incomplete) 2012-11-24 13:30:43 +01:00
Marc Zinnschlag
4c0dcd46a1 added UniversalId class 2012-11-24 11:01:53 +01:00
Marc Zinnschlag
019146756f minor documentation changes regarding future improvements and additions 2012-11-24 10:14:43 +01:00
Marc Zinnschlag
303506d24b added new document function 2012-11-23 14:08:20 +01:00
Marc Zinnschlag
997386d873 implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface) 2012-11-23 13:15:45 +01:00
Marc Zinnschlag
2fc183d595 added operations progress bar 2012-11-23 12:20:35 +01:00
Marc Zinnschlag
eaa58e0530 preparations for multiple parallel progress-type operations 2012-11-23 10:52:46 +01:00
Marc Zinnschlag
04158d03b0 clean up properly after closing a top level window 2012-11-23 10:30:14 +01:00
Marc Zinnschlag
03aacd3263 added progress tracking 2012-11-23 10:25:34 +01:00
Marc Zinnschlag
931eb08114 implemented edit locking (used during saves) 2012-11-23 00:51:04 +01:00
Marc Zinnschlag
5838929371 implemented a dummy save function (does not actually save anything) 2012-11-23 00:36:01 +01:00
Marc Zinnschlag
d7c63d4c74 track document modification state and display it in the top level window title bar 2012-11-22 23:42:17 +01:00
Marc Zinnschlag
8e546ebd30 added test command 2012-11-22 16:00:23 +01:00
Marc Zinnschlag
ed3d8b8ca2 added undo stack and undo/redo actions 2012-11-22 15:54:31 +01:00
Marc Zinnschlag
1ddcea1f07 display view indices in title bar 2012-11-22 15:25:16 +01:00
Marc Zinnschlag
789cecb9df added main menu and implemented new view function 2012-11-22 14:51:38 +01:00
Marc Zinnschlag
758371d7e4 implemented view/document closing 2012-11-22 14:10:23 +01:00
Marc Zinnschlag
9834bb3ad5 basic document handling 2012-11-22 13:30:02 +01:00
Marc Zinnschlag
c3cd6e8a8a new attempt at the editor 2012-11-21 17:31:18 +01:00