krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
19490 commits 35 branches 0 tags 65 MiB
Commit graph

1663 commits

Author SHA1 Message Date
cc9cii
998982b16a Keep physics engines until physics code is moved out of OEngine. 2014-11-01 21:04:53 +11:00
cc9cii
c6a2461fbd Delay removing physics until the document is closed. Also other general cleanup. 2014-11-01 20:51:04 +11:00
cc9cii
1ee64c7087 Add missing files for multi-document support. 2014-11-01 19:12:22 +11:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8 Fix Subview interface clutter by keeping a map of Scenewidgets. 2014-11-01 08:29:08 +11:00
cc9cii
e51d532795 Show drag movements of objects in multiple scene managers. 2014-11-01 07:39:58 +11:00
cc9cii
d6e67b248f Fix deleting objects and scenewidgets. 2014-11-01 07:29:16 +11:00
cc9cii
ade7f09203 Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell. 2014-11-01 00:03:09 +11:00
cc9cii
ac7acb2c22 Disable more debug code. 2014-10-31 22:21:24 +11:00
cc9cii
4f685092fb Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking 2014-10-31 22:05:24 +11:00
cc9cii
aa7b693a13 Remove debug settings and minor cleanup. 2014-10-31 22:04:10 +11:00
cc9cii
fbadaf55ee Multiple SceneManagers per physics engine now working. 2014-10-31 21:50:57 +11:00
cc9cii
a2ac4c7650 Allow multiple scene managers per physics engine. Compiles but does not work properly. 2014-10-31 08:18:15 +11:00
cc9cii
0515159b74 Fix typo. 2014-10-29 23:38:19 +11:00
cc9cii
1741043f20 Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little. 2014-10-29 23:02:38 +11:00
Alexander "Ace" Olofsson
c1ce570e37 Use the enum value from Qt::KeyboardModifiers 
This fixes the windows build at least
 2014-10-29 04:55:06 +01:00
cc9cii
792fbd119f Resolve incorrect merge issues. 2014-10-29 10:43:55 +11:00
cc9cii
c990ed4335 Merge branch 'mouse-picking-state' into mouse-picking 
Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
 2014-10-29 09:33:48 +11:00
cc9cii
6ca88dc541 Merge branch 'master' into mouse-picking 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
 2014-10-29 09:28:23 +11:00
cc9cii
8e2a0ea90a Implemented moving objects around x-y plane. 2014-10-29 08:13:13 +11:00
cc9cii
68b7532383 Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported. 2014-10-29 00:50:48 +11:00
cc9cii
5afaa0083f Minimise false detection of grab & drag operation. 2014-10-28 06:42:33 +11:00
cc9cii
a01a921644 Experimental mouse event state machine for 3d editing, starting with drag & drop objects. 2014-10-28 06:01:19 +11:00
Marc Zinnschlag
e604fcf282 Merge branch 'double' 2014-10-27 09:56:52 +01:00
Marc Zinnschlag
6f4b753750 replaced regular function call from SubView to View with signal-slot-connection 2014-10-27 09:51:55 +01:00
Marc Zinnschlag
1aef9304e9 replaced the signal/slot user settings update with a regular function call 2014-10-27 09:44:18 +01:00
Marc Zinnschlag
b0a7b457f7 made double click actions in tables configurable 2014-10-27 09:32:02 +01:00
cc9cii
815e832dbb Merge branch 'master' into mouse-picking-state 2014-10-27 18:57:42 +11:00
Marc Zinnschlag
275bf854ed added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window) 2014-10-27 08:57:18 +01:00
cc9cii
6c8320a638 More cleanup. 2014-10-27 12:09:20 +11:00
cc9cii
c2c33eac0f Minor cleanup. 2014-10-27 08:26:01 +11:00
cc9cii
0b63ba5727 Move debug rendering code out of PhysicsSystem. 2014-10-27 08:08:33 +11:00
cc9cii
dd2c067e17 Cleanup for better legibility. 2014-10-27 06:50:51 +11:00
cc9cii
fb0f85c8db Report terrain position on cursor position. 2014-10-26 21:15:47 +11:00
cc9cii
95683bc8c3 Add user interface for top level window status-bar setting (implementation already existed). For feature #854. 2014-10-26 15:04:52 +10:00
cc9cii
8b0dc88db8 Use the correct name for deleting objects. 2014-10-26 08:15:18 +11:00
cc9cii
b46df4034d Cleanup bullet objects in the destructors. 2014-10-26 07:56:51 +11:00
Marc Zinnschlag
aad13e6bff close view when closing last sub-view unless this view is the last view 2014-10-25 18:13:56 +02:00
Marc Zinnschlag
a9f5632afd extended double click functionality in tables 2014-10-25 16:27:36 +02:00
cc9cii
9337d6533a Add terrain collision. Support visibility mask for objects and terrain. 2014-10-25 22:09:19 +11:00
cc9cii
cc0acec64c Add settings to enable/disable debug rendering of mouse picking. 2014-10-25 21:02:40 +11:00
cc9cii
dd9208afeb Merge remote-tracking branch 'upstream/master' into mouse-picking 2014-10-25 10:59:17 +01:00
cc9cii
54a6897df8 Use QString rather than std::to_string 2014-10-24 20:43:29 +10:00
cc9cii
e5dd8d06a0 Store object reference id to RigidBody instead of scene node handles. 2014-10-24 21:18:29 +11:00
cc9cii
cb53e714f7 Convert PhysicsSystem to a singleton. 2014-10-24 19:14:02 +10:00
cc9cii
98ff3e7307 No physics or mouse picking for object preview. 2014-10-24 07:57:29 +11:00
Marc Zinnschlag
6ff41c6a00 intercept shift/ctrl double-clicks in tables 2014-10-23 11:28:58 +02:00
cc9cii
2f26fc1188 Avoid Ogre exceptions and null pointers. 2014-10-23 20:14:01 +11:00
cc9cii
39cd89a9af Make gcc happy. 2014-10-23 18:51:31 +11:00
cc9cii
4d86371ca3 Minor refactoring and cleanup. 2014-10-23 15:35:01 +11:00
cc9cii
cca6d0a024 Fixed issue with mouse picking accuracy. 2014-10-23 12:43:06 +11:00
cc9cii
fdee3fd919 Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance. 2014-10-23 06:59:14 +11:00
cc9cii
4b53b8658b Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate. 2014-10-22 07:11:04 +11:00
Marc Zinnschlag
94ae222f0e Merge branch 'settings' 2014-10-19 13:44:15 +02:00
Marc Zinnschlag
a5bbfff9e2 another layout correction 2014-10-19 13:43:40 +02:00
cc9cii
8bcd415cca Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working. 2014-10-19 07:25:54 +11:00
cc9cii
03a30c3f1d Experimental, compiles but does not work. 2014-10-18 06:16:48 +11:00
Marc Zinnschlag
2106893563 silenced a compiler warning regarding null pointer dereferencing 2014-10-17 15:47:31 +02:00
Marc Zinnschlag
49938182e8 silenced a compiler warning regarding null pointer dereferencing 2014-10-17 15:46:07 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +02:00
Marc Zinnschlag
994159fafd fixed broken iterator 2014-10-17 14:23:37 +02:00
Marc Zinnschlag
8a05c0e5c0 fixed overlay singleton 2014-10-17 14:23:27 +02:00
Marc Zinnschlag
ba46bcad40 Revert "Don't allow viewing non-existent cells from the regionmap." 
This reverts commit 7cdab41501.
 2014-10-17 13:52:21 +02:00
Marc Zinnschlag
4b921c3876 user settings cleanup 2014-10-17 13:49:33 +02:00
Marc Zinnschlag
ed44f3ec7d added tooltip support to user settings UI 2014-10-16 16:22:36 +02:00
scrawl
e413bebe99 Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980) 2014-10-16 15:07:51 +02:00
Marc Zinnschlag
f4894deff1 removed special value text from spin boxes (broken feature, not used anyway) 2014-10-16 14:47:55 +02:00
Marc Zinnschlag
c94c1adaf3 split off settings page label from internal section name 2014-10-16 13:48:07 +02:00
cc9cii
7cdab41501 Don't allow viewing non-existent cells from the regionmap. 2014-10-16 07:36:47 +11:00
cc9cii
094f046087 Convert OverlaySystem to a OpenCS style singleton. 2014-10-16 07:29:46 +11:00
Marc Zinnschlag
720ba2c0d8 split off settings label from internal settings name 2014-10-15 13:39:53 +02:00
Marc Zinnschlag
868fdfba51 reclaiming some unused space 2014-10-15 11:07:40 +02:00
Marc Zinnschlag
e20fa209cc user settings UI layout improvements 2014-10-15 11:02:41 +02:00
cc9cii
1d0ac3b4df Delete Ogre::OverlaySystem before Ogre::Root 2014-10-15 07:02:19 +11:00
cc9cii
8cebfc411b Minor visual improvements. 2014-10-14 17:34:10 +11:00
cc9cii
994420aa57 Singleton wrapper for Ogre OverlaySystem. 2014-10-14 13:21:43 +11:00
cc9cii
57b337d368 Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much. 2014-10-14 11:43:56 +11:00
Marc Zinnschlag
02acf60c0b added tooltips for scopes in creator bar 2014-10-13 14:24:27 +02:00
cc9cii
961867e39f Hide overlay if off screen. 2014-10-13 20:58:07 +11:00
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
cc9cii
43838ccf01 Remove override (c++11) 2014-10-13 16:42:50 +11:00
cc9cii
e58e5c2bf5 Update overlays independently from multiple viewports. 2014-10-13 15:57:01 +11:00
Thoronador
46496a35a1 fix uninitialized pointer variable in CSVDoc::SubView class 2014-10-12 23:42:44 +02:00
cc9cii
47c5bc9a19 Set bounding box on manual objects rather than creating meshes. 2014-10-13 07:42:43 +11:00
cc9cii
758ce0ed98 Various fixes as per feedback comments. 2014-10-12 21:15:50 +11:00
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
Thoronador
ab364c9440 fix some more uninitialized class member fields 2014-10-11 00:50:32 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
 2014-10-10 16:11:54 +02:00
cc9cii
3e5027abbb Incorporate terrain height to labels and camera. 2014-10-10 13:36:16 +11:00
cc9cii
bfd10a03c0 User configuration manager's resource directory. 2014-10-10 13:35:14 +11:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02:00
cc9cii
13f028e27b Avoid out of range exceptions. 2014-10-09 07:01:18 +11:00
cc9cii
b3ef7a71e2 Different implementation of update overlay fix. 2014-10-09 05:56:44 +11:00
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
cc9cii
5d8022bdc5 Update overlay upon control elements button signal. 2014-10-08 21:22:12 +11:00
cc9cii
e2560de05a Don't use windows path separator. 2014-10-08 08:08:03 +11:00
cc9cii
e1197e75bc Handle change of names or regions to dynamically update the overlay. 2014-10-08 07:54:22 +11:00
cc9cii
7836ee9ab6 Fixed crash exiting internal cells. Better starting camera position for external cells. 2014-10-07 21:18:32 +11:00
cc9cii
0cccdfd114 Added description below the cell id (name if exists, or region) 2014-10-07 19:35:28 +11:00
cc9cii
7640875f9d More cleanup. 2014-10-07 10:34:30 +11:00
cc9cii
f48f841d31 Add full path for Ogre Overlay headers (workaround for osx). 2014-10-07 06:40:28 +11:00
cc9cii
0197f7088f Remove extra frame rendering after enabling/disabling the label. 2014-10-07 06:04:13 +11:00
cc9cii
b3e09cce00 Remove mouse picking code. 2014-10-06 22:29:45 +11:00
cc9cii
972c789060 Add Ogre Overlay path to cmake. 2014-10-06 20:25:09 +11:00
cc9cii
cc6153eb8e Removed temporary key bindings. 2014-10-06 14:21:44 +11:00
cc9cii
6d687993b8 Remove C++11 stuff. 2014-10-06 14:08:35 +11:00
cc9cii
e38417e662 Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. 
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag.  No idea what is causing this.
 2014-10-06 13:55:36 +11:00
cc9cii
dbb2781817 Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default. 2014-10-06 08:20:09 +11:00
cc9cii
85d93807c5 Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented. 2014-10-05 19:25:37 +11:00
cc9cii
c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
 2014-10-04 06:20:10 +10:00
Marc Zinnschlag
9fd82212b3 Merge remote-tracking branch 'cc9cii/opencs-settings' 2014-10-03 13:11:05 +02:00
cc9cii
115841d31d Do not save window size on exit. 2014-10-03 05:59:24 +10:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00
Marc Zinnschlag
00073694c6 added pathgrid subview 2014-10-02 15:16:19 +02:00
cc9cii
517a797a3e Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux. 2014-10-02 07:00:15 +10:00
cc9cii
5ffb740120 Fix silly mistake (thanks scrawl for picking that up) 2014-10-01 07:19:15 +10:00
cc9cii
a9745cce1e Suppress some compiler warnings. 2014-09-30 21:02:31 +10:00
Marc Zinnschlag
ff530a2e19 added missing magic effect table columns 2014-09-30 12:33:48 +02:00
cc9cii
dee090355f Changes to compile on Ubuntu 14.04. 2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3 Revert some changes (mostly iostream adds) 2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571 Merge branch 'master' into QtOGre 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
 2014-09-30 10:52:04 +10:00
cc9cii
7675df60ba Fix far clip distance (again), workaround for broken settings minimum value. 2014-09-29 08:17:51 +10:00
cc9cii
54c77cf875 Silence clang warnings. 2014-09-29 06:39:44 +10:00
cc9cii
f0c739b763 Apply camera setting changes immediately. Remove current value check for shader setting changes. 2014-09-29 06:27:54 +10:00
cc9cii
6e8977348a Check the FSAA setting of windows rather than system value. 2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6 Update scenewidget when antialiasing settings change. 2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22 Update SceneWidget when relevant user settings change. 2014-09-28 14:08:14 +10:00
cc9cii
a25cffc242 Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights. 2014-09-28 10:17:54 +10:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
Marc Zinnschlag
23fd314294 added magic effects table 2014-09-26 13:12:17 +02:00
Marc Zinnschlag
33cd04b37d added missing sound gen table columns 2014-09-25 11:40:45 +02:00
cc9cii
127f9bb30d Fix reverting to wrong version. 2014-09-25 09:16:10 +10:00
cc9cii
61bab6b1f1 Sanitised version. Some settings are only accessible via manually editing the config file. 2014-09-25 08:15:07 +10:00
cc9cii
31fb160376 More cleanup. 2014-09-25 06:59:04 +10:00
cc9cii
66852d5392 Code cleanup and revert incorrect settings. 2014-09-24 22:41:49 +10:00
cc9cii
fdf375fb4d Reusing subviews implemented. 2014-09-24 13:49:19 +10:00
cc9cii
3f9b73812b Minor fixes and workarounds. 2014-09-24 11:55:22 +10:00
cc9cii
970f3609c9 Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments. 2014-09-24 09:33:19 +10:00
cc9cii
67503c93b2 Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed. 2014-09-23 22:33:49 +10:00
Marc Zinnschlag
7ab4881661 added sound gen table 2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5 Tweak the look of the recordfilterbox. Keep titlebar if floating. 2014-09-23 20:51:14 +10:00
cc9cii
ffae816aab Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar. 2014-09-23 17:01:08 +10:00
cc9cii
62406d5322 Use reasonable values for the spinbox. 2014-09-23 07:28:55 +10:00
cc9cii
437fb774c5 Re-implemented subview minimum size setting. 2014-09-23 07:16:07 +10:00
cc9cii
c8ae8f4a6d Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings. 2014-09-23 06:30:41 +10:00
cc9cii
c4f11785ec Added a window size change easter egg. 2014-09-22 21:12:26 +10:00
cc9cii
48f96df29d Fixed checkboxes saving invalid values. 2014-09-22 18:50:48 +10:00
Marc Zinnschlag
5c8ef842b6 Merge branch 'edit' 2014-09-22 09:54:44 +02:00
Marc Zinnschlag
51151bc43e minor fix 2014-09-22 09:53:07 +02:00
cc9cii
fc8d6da6a2 Added more shader settings. 2014-09-22 16:24:06 +10:00
cc9cii
71a3880884 Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout. 2014-09-22 12:19:18 +10:00
cc9cii
02f8f54192 Fixed checkbox behaviour. Added some shader settings. 2014-09-22 07:50:35 +10:00
cc9cii
17a74da650 Cleaned up comments and dead code. 2014-09-21 21:10:18 +10:00
cc9cii
dbd1ab05d3 Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating. 2014-09-21 20:55:52 +10:00
Marc Zinnschlag
9d316a8745 Merge branch 'records' 2014-09-20 13:59:45 +02:00
Marc Zinnschlag
8499ceb35d set default value for topic when cloning info records 2014-09-20 13:30:36 +02:00
Marc Zinnschlag
8ce87803c4 set default value for cell when cloning references 2014-09-20 12:54:25 +02:00
Marc Zinnschlag
b39cdb7645 fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI) 2014-09-20 12:48:51 +02:00
Marc Zinnschlag
90ad3f332a extending refnum functionality to cloning (and also enable cloning of references to a different cell) 2014-09-20 12:37:25 +02:00
cc9cii
5dfcd2ed01 Removed standard window size combobox. Rearranged widgets. 2014-09-19 08:29:06 +10:00
cc9cii
52354b14fc Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled. 2014-09-18 22:17:37 +10:00
Marc Zinnschlag
3add4bdf35 rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet) 2014-09-18 13:41:29 +02:00
Marc Zinnschlag
6fbffdb98f fixed reference creator error handling 2014-09-18 12:39:29 +02:00
Marc Zinnschlag
e93ab383ea set refnum and increment refnum counter when creating a new reference 2014-09-18 12:25:17 +02:00
cc9cii
575780ec0d Display format settings working. 2014-09-18 17:13:53 +10:00
cc9cii
d9b0c81299 Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later. 2014-09-18 16:05:32 +10:00
Stanislav
313bdf4e78 fix 2014-09-18 10:25:33 +06:00
cc9cii
86636bd960 Mouse events to disabled objects implemented via a signal filter. 2014-09-18 12:23:41 +10:00
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
U-NSFW-50TH\cc9c
ca80a2b856 Merge remote-tracking branch 'upstream/master' into opencs-settings 2014-09-17 21:00:22 +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
Stanislav
ebb223b2d3 Feature #1226: fixes 2014-09-17 09:03:02 +06: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
Marc Zinnschlag
70275350de rewrote command generation in GenericCreator 2014-09-16 13:28:11 +02:00
Marc Zinnschlag
b31c4e2bcd Merge remote-tracking branch 'cc9cii/Bug-No-1301' 2014-09-16 12:52:12 +02: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
Stanislav
8574d2330c Feature #1226: Request UniversalId editing from table column 2014-09-16 00:00:34 +06:00
cc9cii
e4b836608c Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows. 2014-09-15 06:08:56 +10:00
Marc Zinnschlag
d1d861e1be Merge branch 'run' 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
 2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
1254198d90 add debug profiles to scene subviews view drag and drop 2014-09-13 18:54:29 +02:00
Marc Zinnschlag
3ed2edb7cb rewrote run tool profile management 2014-09-13 18:53:35 +02:00
Marco Melletti
f212f0e4d2 subviews now get destroyed on close 2014-09-12 16:45:21 +02:00
Marc Zinnschlag
70ee899691 Merge remote-tracking branch 'cc9cii/Bug-No-1725' 
Conflicts:
	apps/opencs/model/tools/bodypartcheck.cpp
 2014-09-12 14:37:26 +02:00
Marc Zinnschlag
b8fdccdbff Merge remote-tracking branch 'cc9cii/Bug-No-1864' 2014-09-12 14:33:17 +02:00
Marc Zinnschlag
717c1b15f5 fixed drop implementation for unpaged worldspace (wasn't updating cell object) 2014-09-11 13:08:30 +02:00
Marc Zinnschlag
0db288ce07 generalising and cleaning up drop implementation of worldspace widget 2014-09-11 13:04:20 +02:00
Marc Zinnschlag
5a9376450b some cleanup of the scene view drop code 2014-09-11 11:27:56 +02:00
cc9cii
88cf2bd597 Deal with signal source being overloaded. Clear filename after creating a new addon. Enable "Open" button if a game file is already selected. 2014-09-11 07:27:48 +10:00
cc9cii
faac91472c Allow '-' and '_' in new addon name. Resolves Bug #1789. 2014-09-10 23:30:42 +10:00
cc9cii
85596322f3 Update status bar when record filter is changed. Should resolve Bug #1290. 2014-09-10 23:13:56 +10:00
cc9cii
ae0fb77e30 Move recordfilterbox label 2 pixels to right. Resolves Bug #1839. 2014-09-10 21:23:38 +10:00
cc9cii
227eb12295 Added document name to showModifiedDocumentMessageBox. 2014-09-10 20:29:47 +10:00
cc9cii
f7c1b169b3 Place the settings window on the center of window with keyboard focus. Should resolve Bug #1838. 2014-09-10 20:00:07 +10:00
cc9cii
89f7608022 Refactor for better legibility. 2014-09-10 14:40:41 +10:00
cc9cii
77171b788b Made popup messagebox non-modal. 2014-09-10 14:03:25 +10:00
cc9cii
3a5ed9c5bb Build objects and connections only once. 2014-09-10 07:14:01 +10:00
cc9cii
fdc20c595d Fix gcc compile error. 2014-09-09 21:24:54 +10:00
cc9cii
4471fe771e Fix logic errors. 2014-09-09 21:09:37 +10:00
cc9cii
84f5784575 Remove document when closing the last view. Should resolve Bug #1292. 2014-09-09 13:04:48 +10:00
cc9cii
ad8d722763 Close documents rather than views. 2014-09-09 10:05:06 +10:00
cc9cii
5675626482 Cleanup signals when finished. 2014-09-09 07:24:18 +10:00
cc9cii
724ed807c8 Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable. 2014-09-08 23:14:04 +10:00
cc9cii
988c8f9ebe Ignore duplicate connections. 2014-09-08 16:18:31 +10:00
Marc Zinnschlag
3f24593dba added profile selection panel 2014-09-07 14:40:50 +02:00
Marc Zinnschlag
4337d05126 added right-click handling support to SceneTool class 2014-09-07 13:35:30 +02:00
Marc Zinnschlag
f913d51e35 remove deleted debug profiles from run tool 2014-09-07 12:55:52 +02:00
cc9cii
cedf1171e3 Cleanup comments. 2014-09-07 18:37:33 +10:00
cc9cii
dba352fd6f Check all views before exiting. 2014-09-07 18:35:50 +10:00
cc9cii
4a8fe39b2c For bug #1710. Change the ID type of mime data for filterbox drop events to Referenceable rather than using the ID's native type. 2014-09-07 06:29:09 +10:00
Marc Zinnschlag
51128d2d57 added run button to scene subview toolbar 2014-09-06 16:11:06 +02:00
cc9cii
c78ac391a0 Made the Region field for Cell record in dialogue subview editable but not sure if this is the wanted behaviour. 
Also removed a duplicate UniversalId::Type_Class mappin in tablemimedata.cpp.
 2014-09-06 20:24:34 +10:00
Marc Zinnschlag
cf05d3c69f added run log 2014-09-05 13:49:34 +02:00
Marc Zinnschlag
a728d6d77a full implementation of global run menu item (replaces earlier placeholder implementation) 2014-09-04 17:45:43 +02:00
Marc Zinnschlag
67dfaa7f35 update actions in main menu when creating a new view 2014-09-04 10:47:30 +02:00
Marc Zinnschlag
bee36c9167 block saving while OpenMW process is running 2014-09-02 11:59:04 +02:00
Marc Zinnschlag
c88b3a1520 track state of OpenMW process and enable/disable run/stop actions accordingly 2014-09-02 11:56:35 +02:00
Marc Zinnschlag
1b4ab6e130 added OpenMW runner 2014-09-02 10:21:17 +02:00
Marc Zinnschlag
96cd46568b some cleanup 2014-09-01 11:15:59 +02:00
Marc Zinnschlag
bec6c4e726 fixed editor creation for Display_LongString 2014-09-01 10:56:38 +02:00
Marc Zinnschlag
7e653cebdf implement script editor via QPlainTextEdit instead of QTextEdit 2014-09-01 10:52:10 +02:00
Marc Zinnschlag
03c0cbc65a added owner global column to references table (Fixes #1695) 2014-08-30 10:13:34 +02:00
Marc Zinnschlag
ea4cd94c25 syntax highlighter modes 2014-08-24 17:56:20 +02:00
Marc Zinnschlag
5c536d571b added script column to debug profile table (dialogue only) 2014-08-24 13:15:18 +02:00
Marc Zinnschlag
30830d0693 make delegates use the whole document instead of the undo stack 2014-08-23 12:25:12 +02:00
Marc Zinnschlag
232c6c9ad3 Merge branch 'scriptedit' into run 2014-08-22 13:20:02 +02:00
Marc Zinnschlag
be61ed0f6a minor cleanup 2014-08-22 13:18:47 +02:00
Marc Zinnschlag
c2e3709d0f moved syntax highlighter from ScriptSubView to ScriptEdit 2014-08-22 12:49:34 +02:00
Marc Zinnschlag
d4981c3037 moved change lock from ScriptSubView to ScriptEdit 2014-08-21 14:50:13 +02:00
Marc Zinnschlag
2f08d44313 moved script widget configuration code from ScriptSubView to ScriptEdit 2014-08-17 15:25:22 +02:00
Marc Zinnschlag
06e1cfe613 added missing allowed drop types for script edit (script and region) 2014-08-15 14:41:34 +02:00
Marc Zinnschlag
58916a7731 fixed creator for filter dialogue subview 2014-08-15 13:37:37 +02:00
Marc Zinnschlag
6f97fa472e added dialgoue subview for debug profiles 2014-08-15 13:35:53 +02:00
Marc Zinnschlag
2b9395333a fixed error detection and improved error reporting in IdValidator 2014-08-15 13:11:55 +02:00
Marc Zinnschlag
605f71ecc0 added creator to debug profile table 2014-08-15 12:03:07 +02:00
Marc Zinnschlag
1bf177fe72 fixed double namespace in GenericCreator 2014-08-15 12:01:37 +02:00
Marc Zinnschlag
c66dfe67b1 integrated namespace widget into input field (GenericCreator) 2014-08-14 14:21:34 +02:00
gus
1ac220593d clean up 2014-08-12 21:32:07 +02:00
gus
11922dc53a code is shorter, thanks scrawl 2014-08-12 17:41:13 +02:00
gus
465914c77c more clean up 2014-08-12 17:20:02 +02:00
gus
321d385a5d clean up 2014-08-12 17:18:08 +02:00
gus
d4d8f07bf3 clean up 2014-08-12 13:32:56 +02:00
gus
e9cc1df69e use QPainter 2014-08-12 13:31:32 +02:00
Marc Zinnschlag
98fa789904 fixed mixed-up tooltip 2014-08-12 11:07:54 +02:00
Marc Zinnschlag
2df1079dd4 removed mScope field from Filter record (redundant now) 2014-08-10 20:49:14 +02:00
Marc Zinnschlag
a54efbcfa0 made FilterCreator redundant by generalising GenericCreator 2014-08-10 18:46:32 +02:00
Marc Zinnschlag
35803bc9b6 added scope configuration to creators 2014-08-07 09:32:49 +02:00
Marc Zinnschlag
4d49924025 added debug profile record table 2014-08-04 13:36:01 +02:00
Marc Zinnschlag
3f6a7e36d0 removed the (partial broken) return/enter shortcut for custom push buttons, since there is already a space shortcut) 2014-08-01 09:50:49 +02:00
Marc Zinnschlag
1e6d557089 Merge branch 'visibility' 2014-07-31 14:34:25 +02:00
Marc Zinnschlag
f381451ae0 added control element selector toolbar button 2014-07-31 14:33:38 +02:00
Marc Zinnschlag
612202a7a5 fixed several bugs in the layout algorithm of the toggle scene tool 2014-07-31 14:33:12 +02:00
Marc Zinnschlag
507e5c4f6e explicitly flag scene as modified when changing visibility mask 2014-07-31 14:29:52 +02:00
Marc Zinnschlag
439ba57d46 added visual element selector toolbar button 2014-07-31 14:06:04 +02:00
Marc Zinnschlag
a25758c3b1 fixed visibility flags setting 2014-07-31 14:02:55 +02:00
Marc Zinnschlag
b0a9d17dc3 use name as a tooltip if no tooltip is given for scene tool bar toggle buttons 2014-07-31 13:26:23 +02:00
Marc Zinnschlag
92d322cbd1 added visibility flags 2014-07-31 13:25:30 +02:00
Marc Zinnschlag
71ce78f949 added scene toolbar toggle widget 2014-07-31 13:05:08 +02:00
Marek Kochanowicz
13ee469b70 saving progress 2014-07-30 17:07:11 +02:00
Marc Zinnschlag
7a5f73de9e added navigation mode icons to buttons 2014-07-30 17:02:23 +02:00
Marc Zinnschlag
4421e7a5cc added lighting mode toolbar icons 2014-07-25 11:15:04 +02:00
Marek Kochanowicz
cdac934315 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-07-25 11:13:52 +02:00
gus
baf6cca051 modified tab to space 2014-07-22 13:32:15 +02:00
gus
195767db7f link back to OGre Wiki for some copied past code 2014-07-22 12:25:31 +02:00
gus
546b44a3be bugfixes 2014-07-22 12:10:58 +02:00
gus
875daed4ec Merge branch 'master' of https://github.com/OpenMW/openmw.git into QtOGre 2014-07-22 11:09:53 +02:00
gus
a5058625b3 clean up + toggle function for the billboard 2014-07-21 18:57:35 +02:00
gus
f8019b4a97 added a bilboard with the Cell coord. Can't be toggled off yet, and no clean up too. 2014-07-21 18:35:51 +02:00
Marc Zinnschlag
1a1f5dfc4a added tooltips to dialgoue subview buttons 2014-07-15 12:46:52 +02:00
Marc Zinnschlag
0430558c3c fixed focussed button in mode tool panel when panel is opened 2014-07-14 14:17:27 +02:00
Marc Zinnschlag
17fc570e38 new keyboard shortcut (T): move focus from toolbar to scene widget 2014-07-14 13:49:55 +02:00
Marc Zinnschlag
92af093856 new keyboard shortcut (T): move focus from scene widget to toolbar 2014-07-14 11:19:59 +02:00
Marc Zinnschlag
688d413b8c when scene toolbar gains focus, focus first button 2014-07-14 11:06:12 +02:00
Marc Zinnschlag
c2ea8f3f0a added self-adjusting tooltips to the top-level toolbar buttons 2014-07-13 14:21:50 +02:00
Marc Zinnschlag
26f87f5d23 added navigation mode button tooltips 2014-07-13 12:15:05 +02:00
Marek Kochanowicz
4b4a72c3b6 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 2014-07-13 10:52:39 +02:00
Marc Zinnschlag
e855e55318 added tooltip to user settings button on startup window 2014-07-13 10:52:33 +02:00
Marc Zinnschlag
490442cf62 added lighting mode tooltips 2014-07-10 13:18:24 +02:00
Marc Zinnschlag
61a02d8a40 replaced custom toolbutton push flag with type enum 2014-07-10 13:04:30 +02:00
Marc Zinnschlag
32e48edb83 toolbar tooltip system 2014-07-10 12:53:57 +02:00
Marc Zinnschlag
67ad7d5b0e fixed scene subview focus problem 2014-07-10 12:20:48 +02:00
Marc Zinnschlag
57b9b8d884 set focus when opening a toolbar panel 2014-07-10 12:13:27 +02:00
Marc Zinnschlag
d6c0b8d0ac use custom button on toolbar (top level) 2014-07-10 11:45:45 +02:00
Marc Zinnschlag
44b95bbd7b added push mode and icon-less push button constructor 2014-07-10 11:45:20 +02:00
Marc Zinnschlag
8b239df1b1 removed text argument from button constructor, because toolbar buttons will always be icon only 2014-07-10 11:34:09 +02:00
Marc Zinnschlag
365b721878 return/enter activate the selected button 2014-07-10 11:32:20 +02:00
Marc Zinnschlag
50ee815dd8 make buttons in mode panel act like radiobuttons 2014-07-10 11:23:48 +02:00
Marc Zinnschlag
dd0aa20390 custom push button 2014-07-10 11:03:55 +02:00
Marc Zinnschlag
930f782bc5 SceneWidget::setLighting was missing an update call 2014-07-10 10:09:21 +02:00
Marc Zinnschlag
03f67cd6bd moved low level widgets from CSVWorld into a separate namespace/directory 2014-07-08 12:39:12 +02:00
Marc Zinnschlag
1548f4670a drop part of resources drag and drop 2014-07-08 09:51:17 +02:00
Marc Zinnschlag
b6c5ee125d more refactoring 2014-07-08 09:24:05 +02:00
Marc Zinnschlag
9d5956585c added separate display type for colours 2014-07-08 09:08:01 +02:00
Marek Kochanowicz
d221486a14 Fixed problem in the idtable. 2014-07-07 12:16:53 +02:00
Marek Kochanowicz
3262f8d774 make dtor virtual 2014-07-07 10:27:48 +02:00
Marek Kochanowicz
acc8432705 fixed segfault 2014-07-07 10:23:40 +02:00
Marc Zinnschlag
19828df799 added subviews for resources tables 2014-07-05 15:51:17 +02:00
Marc Zinnschlag
42db9a5091 make modification column optional in table views 2014-07-05 15:50:17 +02:00
Marc Zinnschlag
e171babd2f added Feature_Constant to IdTable 2014-07-05 12:44:11 +02:00
Marc Zinnschlag
1b1f1bade3 injected new class IdTableBase between QAbstractItemModel and IdTable 2014-07-04 13:25:56 +02:00
Marek Kochanowicz
77afb754e5 adding new rows works 2014-07-02 13:13:03 +02:00
Marek Kochanowicz
c50cecdc64 Small cleanup 2014-07-01 21:13:27 +02:00
Marek Kochanowicz
fcd082c6a5 added option to add or remove rows 2014-07-01 20:52:27 +02:00
Marc Zinnschlag
37a2b48fa2 added missing type columns to body part table 2014-07-01 14:28:12 +02:00
Marc Zinnschlag
d96ed38d49 added body part table 2014-07-01 12:37:22 +02:00
Marc Zinnschlag
5649552f18 added other missing columns for enchantment table; fixed dialogue subviews for enchantment records 2014-07-01 09:50:43 +02:00
Marc Zinnschlag
ab8bee4d1a added enchantment type column to enchantment table 2014-07-01 09:42:56 +02:00
Marc Zinnschlag
395c45c88b Merge branch 'editorfixes' into tables 2014-06-30 20:49:41 +02:00
Marc Zinnschlag
e97fd35ae6 added enchantments table 2014-06-30 20:40:34 +02:00
Marek Kochanowicz
172f1a1301 Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields 2014-06-30 20:06:44 +02:00
Marek Kochanowicz
3ebc469f04 prepering for merge 2014-06-30 20:06:18 +02:00
Marc Zinnschlag
a25321f07e update paged scene view according to changes made to cell records 2014-06-30 17:57:38 +02:00
Marc Zinnschlag
5fb2e1a877 do not render deleted exterior cells in scene view 2014-06-30 17:33:03 +02:00
Marek Kochanowicz
6dc199743c store undoStack in the nestedtable 2014-06-30 16:03:38 +02:00
Marek Kochanowicz
c96d48fb91 Nested model supports editing now. 2014-06-30 14:12:57 +02:00
Marek Kochanowicz
5eac32e3d3 added nestedtable for displaying nested content. 2014-06-30 13:09:10 +02:00
Marek Kochanowicz
8c6a0d9a4f created new files 2014-06-29 21:12:31 +02:00
Marc Zinnschlag
2fe2def64c added cell rendering in paged worldspaces 2014-06-29 16:00:06 +02:00
Marc Zinnschlag
a6626b94c8 added cell rendering in unpaged worldspaces 2014-06-29 14:19:10 +02:00
Marc Zinnschlag
74ed9cbb2d added cell rendering class 2014-06-29 14:18:46 +02:00
Marc Zinnschlag
c35b87de95 various Object class fixes 2014-06-28 11:25:28 +02:00
Marc Zinnschlag
099c406226 Merge branch 'objects' 2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f make preview watch for changes in modification state of relevant records 2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024 disabled preview function for deleted records 2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09 fixed some function names 2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68 refactored object rendering into a separate class 2014-06-27 09:12:26 +02:00
scrawl
e19bbfd1b5 Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text (Fixes #1543) 2014-06-26 20:49:22 +02:00
Marc Zinnschlag
bd252d0aec display record count in loading window 2014-06-26 11:41:21 +02:00
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05:00
Marek Kochanowicz
873cfcf447 implemented basic headerData (still work in progress) 2014-06-18 17:34:21 +02:00
Marek Kochanowicz
b63f2f4cd5 Actually using new nestedmodel 2014-06-18 16:56:37 +02:00
Marek Kochanowicz
ce5e889015 Nested table sits inside it's own layout now. 2014-06-17 20:12:14 +02:00
Marek Kochanowicz
defd0b1754 Merge branch 'dialog-fix' into NonTableFields 
TODO stop failing epicly with git
 2014-06-17 14:08:59 +02:00
Marek Kochanowicz
bbe7854968 Corrected formatting to follow our standard better. 2014-06-17 10:46:54 +02:00
Marek Kochanowicz
d6288a8055 Remove unneded revert and delete slots 2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a refactoring dialogue subview 2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae Fixed complitaion. 2014-06-16 10:22:14 +02:00
scrawl
fd59a4a79e Fix some doxygen typos 2014-06-15 16:11:22 +02:00
Marc Zinnschlag
7d1ecea20c added extended versions of revert and delete 2014-06-11 11:43:38 +02:00
Marek Kochanowicz
8763309a1b reformatting to make code easier to read 2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9 check if index is valid before attempting to use it 2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac correcting problems 2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix 
Conflicts:
	CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/dialoguesubview.cpp
 2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3 subview does not store row number anymore 2014-06-09 11:37:48 +02:00
Marek Kochanowicz
29231b8fc9 starting new branch 2014-06-09 10:26:53 +02:00
Marc Zinnschlag
48468b7d0c some dialogue subview cleanup and start of command dispatching refactoring 2014-06-08 14:10:08 +02:00
Marc Zinnschlag
7ede6573eb removed more hardcoded column numbers 2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a fixed some proxy model problems related to column numbers 2014-06-07 14:32:12 +02:00
Marc Zinnschlag
85fca19fd9 replaced selection model in CommandDispatcher with a slightly slower but more robust implementation 2014-06-07 13:02:45 +02:00
Marc Zinnschlag
3e0c6ec732 some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have 2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb factored out command creation from table view into a separate class 2014-06-06 12:43:21 +02:00
Marc Zinnschlag
a28a2bc2fe simplified feature management for record tables 2014-06-05 10:28:10 +02:00
Marek Kochanowicz
55d451febe changes in the model (idtable) to support nested data 2014-06-02 20:41:37 +02:00
Marc Zinnschlag
7c149e98e0 Merge branch 'openmw-30' 2014-05-18 22:38:52 +02:00
cc9cii
8971db8962 SceneWidget windowHandle fix for Windows. 2014-05-17 23:53:33 +10:00
Marc Zinnschlag
d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
 2014-05-15 08:13:15 +02:00
slothlife
f33559fead Fixes for MSVC warnings, less overall changes 
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
 2014-05-14 20:12:52 -05:00
Marc Zinnschlag
c2ea92b93a Merge remote-tracking branch 'sirherrbatka/Feature#1274' 2014-05-14 14:41:04 +02:00
Marek Kochanowicz
3439900239 ignore all drops that will not create usefull filter 2014-05-14 11:56:23 +02:00
slothlife
c160a04ede Revert "Fixes for warnings when building with MSVC" 
This reverts commit 46eb20b98c.
 2014-05-14 00:03:30 -05:00
Marc Zinnschlag
804bf523ba removed two unused files 2014-05-10 17:35:11 +02:00
Marc Zinnschlag
79d59153c1 improved layout of loading window 2014-05-10 13:29:28 +02:00
Marc Zinnschlag
95d24492de display load error messages in loading window 2014-05-10 13:18:40 +02:00
Marc Zinnschlag
aadaf7827d added load error log 2014-05-10 12:04:36 +02:00
slothlife
46eb20b98c Fixes for warnings when building with MSVC 
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
 2014-05-09 08:32:52 -05: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
0e7d40de6a Merge branch 'master' of https://github.com/OpenMW/openmw 
upstream merge
 2014-05-07 22:00:08 -05:00
graffy76
cd7983adb5 Decoupled setting definitions from the Setting class. QSettings 
implementation is now fully responsible for managing user settings.
 2014-05-07 21:59:26 -05:00
Marc Zinnschlag
21142711f0 Merge remote-tracking branch 'graffy76/master' 2014-05-07 10:35:11 +02:00
graffy76
e47e3de3d2 Removed unneeded includes, cleaned up code, added comments 2014-05-06 21:58:50 -05:00
graffy76
8fb96e1be3 Removed error code for missing opencs.ini files. 2014-05-06 19:22:45 -05:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
Marc Zinnschlag
492620c8cf handle exceptions thrown during loading and report them to the user 2014-05-06 09:39:39 +02: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
df97a1b57f Merge remote-tracking branch 'sirherrbatka/Feature#1274' 2014-05-04 17:11:43 +02:00
Marek Kochanowicz
f51f826dad fixed compilation 2014-05-04 15:13:03 +02:00
Marc Zinnschlag
7f78c29bb5 Merge remote-tracking branch 'sirherrbatka/Feature#1274' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-05-04 14:03:56 +02:00
Marek Kochanowicz
4a502226e6 added flag to distingiush widgets 2014-05-04 12:41:06 +02:00
graffy76
4f876574c1 Implemented slider widget in rangeView class 2014-05-03 21:50:08 -05:00
graffy76
35d1502308 Merge branch 'master' of https://github.com/OpenMW/openmw 
merge
 2014-05-03 19:16:42 -05:00
graffy76
1c26741c56 Implemented rangeview with spinbox as only control. Simplified setting 
class constructor.
 2014-05-03 18:58:43 -05:00
graffy76
bc6197c552 Added custom spin box class 2014-05-03 18:57:34 -05:00
Marek Kochanowicz
00b21449a2 replaced type_cell with type_scene 2014-05-03 19:47:13 +02:00
Marc Zinnschlag
e9c2f24faa intercept close button clicks in loading window 2014-05-03 17:14:17 +02:00
Marc Zinnschlag
3fdd72f204 added cancel button to loading window 2014-05-03 16:44:50 +02:00
Marc Zinnschlag
6bc5869222 record loading progress bar 2014-05-03 15:33:35 +02:00
Marc Zinnschlag
0b309d9ef4 Merge branch 'master' into load 
Conflicts:
	apps/opencs/view/doc/viewmanager.cpp
 2014-05-03 14:36:06 +02:00
Marek Kochanowicz
5e99381019 Drag and drop works. 2014-05-03 14:00:30 +02:00
Marc Zinnschlag
e0e2ad8316 content file loading progress bar 2014-05-03 13:01:29 +02:00
Marek Kochanowicz
7f1df878f6 make getDropType static and public. 2014-05-02 20:28:28 +02:00
Marek Kochanowicz
c2b070f097 trying to do it right. 2014-05-01 19:17:33 +02:00
Marek Kochanowicz
ea1aaef8ca replace paged with unpaged (and vice versa) 2014-05-01 18:25:28 +02:00
Marek Kochanowicz
d00dbf47d5 working on worldspace drops 2014-05-01 15:09:47 +02:00
Marek Kochanowicz
57131332f4 fixing minor issues 2014-05-01 12:34:54 +02:00
Marek Kochanowicz
9e01a54d72 minor correction 2014-04-30 15:17:20 +02:00
Marek Kochanowicz
6aaa15b2e8 paged worldspace drop 2014-04-30 15:03:46 +02:00
Marek Kochanowicz
19dac9dc86 that would be it 2014-04-30 14:27:11 +02:00
Marek Kochanowicz
4d79f00e28 enable dragging on the region map cells 2014-04-30 13:32:54 +02:00
Marek Kochanowicz
eeb18b533e moved editlock to the dragrecordtable 2014-04-29 21:41:57 +02:00
Marek Kochanowicz
d376efe30b handle dragging not-existing records 2014-04-29 19:34:06 +02:00
cc9cii
7d990abd37 OpenCS changes to allow compilation with MSVC 11.0. 2014-04-29 22:46:55 +10:00
Marc Zinnschlag
8dc6ad5059 moved new flag from setupData function to Document constructor 2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6 added basic loading GUI 2014-04-29 14:17:25 +02:00
Marek Kochanowicz
18fc8acc71 able to drag existing cells from the regionmap 2014-04-29 12:27:26 +02:00
Marek Kochanowicz
853abb65c3 added new, later common, base for the regionmap and the table 2014-04-29 11:44:21 +02:00
Thoronador
f69d61976e minor performance improvements in other apps subdirectories 2014-04-27 23:25:02 +02:00
graffy76
985af15a12 removed qdebug references 2014-04-26 21:43:59 -05:00
graffy76
0d711e51b0 Converted SettingType enums to indicate widget type. 2014-04-26 21:32:36 -05:00
graffy76
ab33e78b67 Added RangeView class files 2014-04-26 09:40:58 -05:00
graffy76
2e06414b43 Fixed broken delegate display modes (Display Format settings). Moved 
UserSetting update functions to DataDisplayDelegate.
 2014-04-25 07:16:40 -05:00
graffy76
3f2ae950f5 Disabled view resize for open views when user setting changes. Fixed 
new view size issue to match existing user settings.
 2014-04-24 12:50:10 -05:00
graffy76
ce56669339 Fixed failed signal/slot connection between UserSettings and 
CSVWorld::SubView
 2014-04-23 17:02:37 -05:00
graffy76
4b607d658f Re-link user settings to editor main application 2014-04-22 22:19:53 -05:00
graffy76
e3384e3999 relocate support.hpp / remove support.cpp 2014-04-22 22:19:03 -05:00
graffy76
331df17b48 Added new framework files 2014-04-22 22:17:19 -05:00
graffy76
d3148555fa Delete old framework files 2014-04-22 22:16:14 -05:00
Marc Zinnschlag
65161c3e24 Merge remote-tracking branch 'sirherrbatka/less-signals' 2014-04-16 10:22:20 +02:00
Marc Zinnschlag
a7cece3d30 do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit 2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c removed signals 2014-04-15 20:39:19 +02:00
Marc Zinnschlag
d188e68227 added f-type hint to TableSubView 2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a added 'view in table' action to region map 2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd added view action to region map 2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833 added set/unset region actions to region map 2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f added create cell menu item to regionmap 2014-04-13 14:17:18 +02:00
Marc Zinnschlag
2f63eb7ca4 added missing edit lock for record reordering 2014-04-12 20:07:09 +02:00
Marc Zinnschlag
0516d95253 added context menu with selection functions to region map 2014-04-10 22:12:09 +02:00
Marc Zinnschlag
e0550ba336 allow multiple cell coordinates in c-type hint for scene subviews 2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883 replaced rectangular cell selection with a CellSelection object 2014-04-07 14:16:02 +02:00
Marc Zinnschlag
324b2743d4 removed grid button (discarding the first attempt at a cell selector) 2014-04-07 10:21:26 +02:00
Marc Zinnschlag
0fe67b586a increased scene toolbar button size 2014-04-05 13:16:13 +02:00
Marc Zinnschlag
baf30ba292 added grid tool (does not work yet) 2014-04-03 14:44:48 +02:00
Marc Zinnschlag
3a58da9ad7 size adjustment 2014-04-03 13:30:22 +02:00
Marc Zinnschlag
5d422fec8a fixed scene toolbar layout problems 2014-04-03 13:00:19 +02:00
Marc Zinnschlag
5b5069535e keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly 2014-04-01 10:04:14 +02:00
Marc Zinnschlag
ed524b2fd4 added bright lighting mode 2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32 added night lighting mode 2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27 added day lighting mode 2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8 added lighting switching 2014-03-23 15:14:26 +01:00
Marc Zinnschlag
205354ba30 some ambient light cleanup 2014-03-23 13:40:56 +01:00
Marc Zinnschlag
4d80bc009a Merge remote-tracking branch 'scrawl/master' 2014-03-22 09:54:42 +01:00
scrawl
0c207f7212 Fix build error 2014-03-22 02:08:09 +01:00
Alexander "Ace" Olofsson
317f1e0b63 Update dialoguesubview.cpp 
That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)
 2014-03-21 13:44:01 +01:00
Marc Zinnschlag
41fd94b160 compensated for different coordinate systems 2014-03-21 13:39:22 +01:00
Marc Zinnschlag
1e57d55717 update/close on deletion of reference/referenceable 2014-03-21 13:27:46 +01:00
Marc Zinnschlag
698fe8cce3 update preview title on changed referenceableID (preview for references only) 2014-03-21 12:52:46 +01:00
Marc Zinnschlag
58daf52a67 deal with empty and invalid referenceable ID fields 2014-03-21 12:44:06 +01:00
Marc Zinnschlag
1a9df4bc56 Merge branch 'preview' 2014-03-21 12:35:40 +01:00
Marek Kochanowicz
2a26ff2299 better fix 2014-03-21 12:13:54 +01:00
Marc Zinnschlag
fc8ae2b9b5 fixed encoding problems 2014-03-21 11:56:48 +01:00
Marc Zinnschlag
10ce47938b update preview on reference/referenceable changes 2014-03-21 11:22:43 +01:00
Marek Kochanowicz
fbb619db73 … 2014-03-20 21:41:11 +01:00
Marek Kochanowicz
a692ce99fa where was my mind… 2014-03-20 20:26:53 +01:00
Marek Kochanowicz
ccd5e549cd moved buttons down 2014-03-20 19:53:03 +01:00
Marek Kochanowicz
832a10b2ac solving problems 2014-03-20 18:40:10 +01:00
Marek Kochanowicz
5c34823bb0 added some placeholder icons 2014-03-20 13:59:00 +01:00
Marek Kochanowicz
ad2f9a69a1 prevent deleting already deleted record 2014-03-20 08:59:04 +01:00
Marek Kochanowicz
ea9b6fa37e view button 2014-03-19 12:01:36 +01:00
Marek Kochanowicz
8f3103ce65 added preview button 2014-03-19 11:43:25 +01:00
Marek Kochanowicz
6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
 2014-03-19 10:23:15 +01:00
Marek Kochanowicz
010160d047 missed those :/ 2014-03-18 20:56:55 +01:00
Marek Kochanowicz
c0b2b783cb use more proper creators 2014-03-18 20:53:21 +01:00
Marek Kochanowicz
db774b02d7 clone and create buttons work 2014-03-18 09:36:22 +01:00
Marek Kochanowicz
95afca0558 delete record button 2014-03-17 19:28:41 +01:00
Marek Kochanowicz
7296b09357 revert button 2014-03-17 19:18:18 +01:00
Marek Kochanowicz
09ba547630 use tool buttons with icons 2014-03-17 15:35:36 +01:00
Marc Zinnschlag
20ea859aac adjusted the far clip distance 2014-03-16 17:14:44 +01:00
sirherrbatka
3c8eeb8c48 added comment 2014-03-16 17:11:13 +01:00
Marc Zinnschlag
6b11265fbc consider scale and orientation when previewing reference 2014-03-16 17:06:45 +01:00
Marc Zinnschlag
48ea93d890 less random camera start position 2014-03-16 17:06:30 +01:00
sirherrbatka
4a0d1ba272 do not cast and check multiple times 2014-03-16 17:06:11 +01:00
Marc Zinnschlag
fa042a8aca use proper title for reference prewview subviews (avoid internal ID) 2014-03-16 13:22:32 +01:00
Marc Zinnschlag
c36dfef972 prewview subview 2014-03-16 12:44:01 +01:00
Marek Kochanowicz
4a623ace71 disabling works 2014-03-13 18:41:37 +01:00
Marek Kochanowicz
c97172d89c fixed segfault and prevent drops from other documents 2014-03-13 17:00:14 +01:00
Marek Kochanowicz
e1a4b64efb fixed segfault 2014-03-13 16:50:04 +01:00
Marek Kochanowicz
dd755a00e4 fix for the bug (?) 2014-03-13 08:52:37 +01:00
Marek Kochanowicz
cc1ceb35ce drag and drop works 2014-03-12 20:34:55 +01:00
Marek Kochanowicz
fd4829141d succesfully connected the signals 2014-03-12 19:55:51 +01:00
Marek Kochanowicz
1bf67e7390 added the new qlineedit subclass 2014-03-12 19:36:46 +01:00
Marek Kochanowicz
30a0c82e22 this code segfaults, but i don't know why 2014-03-12 16:28:10 +01:00
Marek Kochanowicz
919065db32 fixed segfault 2014-03-12 16:06:59 +01:00
Marek Kochanowicz
d1290ac556 skip deleled or erased records 2014-03-12 15:46:27 +01:00
Marek Kochanowicz
2278eb5e91 handle locking 2014-03-12 15:17:49 +01:00
Marek Kochanowicz
1a9d4204d2 correction 2014-03-12 15:07:17 +01:00
Marek Kochanowicz
2e226e63b6 change universalid of base subview after pressing next or prev 2014-03-12 13:04:40 +01:00
Marek Kochanowicz
cb9bcc3cc1 buttons are functional 2014-03-12 12:25:37 +01:00
Marek Kochanowicz
299b7a6ce6 Added buttons, they don't do anything. 2014-03-12 11:08:04 +01:00
Marek Kochanowicz
8d50af547a created editwidget 2014-03-12 10:39:28 +01:00
Marek Kochanowicz
865e6b52ae scroll area 2014-03-11 21:21:05 +01:00
Marek Kochanowicz
c422dc6eed Refactorisation. 2014-03-11 20:40:31 +01:00
Marek Kochanowicz
5ad572346b referencables also work now 2014-03-11 13:02:25 +01:00
Marek Kochanowicz
1edf5a4414 registered additional subviews. 2014-03-11 10:47:30 +01:00
Marek Kochanowicz
87286232d7 fixed bug, god bless overloading 2014-03-11 09:38:53 +01:00
Marek Kochanowicz
a25271f0b6 moving bloat away from the dispatcher 2014-03-11 09:14:13 +01:00
Marc Zinnschlag
ef1364878f moved test cube from SceneWidget to WorldspaceWidget 2014-03-10 18:35:49 +01:00
Marek Kochanowicz
17b521cec8 additional check 2014-03-10 17:57:40 +01:00
Marek Kochanowicz
f4614c2c63 use qlabels for not editable fields 2014-03-10 17:52:45 +01:00
Marek Kochanowicz
089732419a introduce longString 2014-03-10 17:18:29 +01:00
Marek Kochanowicz
cc96a38921 use qlinedit for the var 2014-03-10 13:27:52 +01:00
Marek Kochanowicz
874847c959 handle color 2014-03-10 13:25:01 +01:00
Marc Zinnschlag
7812427836 added Preview submenu item; fixed View issues regarding exterior cells 2014-03-10 12:44:34 +01:00
Marek Kochanowicz
73cb3ac0ed embelishing 2014-03-10 12:04:03 +01:00
Marek Kochanowicz
361bc55973 dont force trying display 2014-03-10 09:47:41 +01:00
Marek Kochanowicz
9ab920bd80 display id and other not editable data 2014-03-10 09:37:53 +01:00
Marek Kochanowicz
b2fdaa74b0 trying to set the size policy 2014-03-09 18:44:04 +01:00
Marek Kochanowicz
7eb10756d4 some extra views enabled 2014-03-09 08:58:24 +01:00
Marek Kochanowicz
0447be7e7a register extra views. do not display id 2014-03-08 17:24:00 +01:00
Marek Kochanowicz
1f1774b5e1 changing the enumdelegate seteditordata 2014-03-08 16:54:05 +01:00
Marek Kochanowicz
9612c6a6fd handle also bool boxes 2014-03-08 16:50:42 +01:00
Marek Kochanowicz
08ccae6b49 handle comboboxes 2014-03-08 16:21:49 +01:00
Marek Kochanowicz
a8b11829d4 disable not editable widgets 2014-03-08 15:18:40 +01:00
Marek Kochanowicz
3c60345d6b nest wrapper into the proxy class 2014-03-08 15:15:00 +01:00
Marek Kochanowicz
2e6b45dafb edit view, savind works 2014-03-07 22:17:40 +01:00
Marek Kochanowicz
020e3f8fc5 Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3 2014-03-07 17:16:38 +01:00
Marek Kochanowicz
f0a45fa15f just saved progress 2014-03-07 17:15:43 +01:00
Marek Kochanowicz
b0ae78e889 basicly enabled code 2014-03-06 20:10:13 +01:00
Marc Zinnschlag
f1353dc84f Merge branch 'scene' 2014-03-06 16:46:44 +01:00
Marc Zinnschlag
516a3b9abd close interior cell view when cell is deleted 2014-03-06 16:40:08 +01:00
Marc Zinnschlag
0254a209f6 some general cleanup 2014-03-06 13:51:21 +01:00
Marc Zinnschlag
f04348fb8e do not offer view action for cells flagged as deleted 2014-03-06 13:43:06 +01:00
Marc Zinnschlag
4a119c8f46 ambient lighting in interior cells 2014-03-06 13:02:21 +01:00
Marc Zinnschlag
7e0f0c8402 fixed SceneWidget destructor 2014-03-06 12:42:09 +01:00
Marc Zinnschlag
397921e457 specialising WorldspaceWdiget into paged and unpaged subclasses 2014-03-06 10:13:39 +01:00
Marc Zinnschlag
7386d3eb0b moved navigation into the WorldspaceWidget 2014-03-06 10:01:23 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
Marc Zinnschlag
a264e86e13 subclasses scene widget for worldspace scenes 2014-03-04 14:47:43 +01:00
Marc Zinnschlag
26c2f28879 replaced global world->scene menu item with individual view context menu items in cell and reference tables 2014-03-02 22:43:44 +01:00
Marc Zinnschlag
55195f819a changed edit requests from row index format to UniversalId/hint format 2014-03-02 22:34:41 +01:00
Marc Zinnschlag
797f5527ee added hint parameter for UniversalId viewing requests 2014-03-02 13:29:02 +01:00
Marc Zinnschlag
cb3994281c changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace) 2014-03-02 13:11:15 +01:00
Marc Zinnschlag
536a0e0ab0 added orbit navigation mode 2014-03-01 14:15:04 +01:00
Marc Zinnschlag
4d3abeedcb keep camera upright in 1st person mode 2014-02-28 13:37:01 +01:00
Marc Zinnschlag
ae637d6abc rolling 2014-02-28 11:58:03 +01:00
Marc Zinnschlag
4eea2c7a86 added free navigation mode 2014-02-27 15:42:59 +01:00
Marc Zinnschlag
c977b2a756 moved implementation of the 1st person camera into a separate file 2014-02-27 15:23:14 +01:00
Marc Zinnschlag
14c3bfcf62 added navigation class 2014-02-27 14:46:06 +01:00
Marc Zinnschlag
8f73cc9268 added navigation mode selection 2014-02-25 14:59:46 +01:00
Marc Zinnschlag
526d75df51 inverted ctrl key 2014-02-25 14:30:38 +01:00
Marc Zinnschlag
644f5cb8de fixed mouse button release detection 2014-02-25 14:28:55 +01:00
Marc Zinnschlag
e33bd4d508 camera rotation via ctrl-left button drag 2014-02-25 14:24:35 +01:00
Marc Zinnschlag
e987199949 getting rid of some magic numbers 2014-02-25 14:14:53 +01:00
Marc Zinnschlag
07d20a2013 camera panning via left button drag 2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0 mouse wheel zooming 2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5 moving the camera with A and D keys 2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259 use shift key to speed up camera movement 2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6 moving the camera with W and S keys 2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3 added navigation mode enum to SceneWidget 2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1 re-enabled OGRE in OpenCS; cleaned up startup 2014-02-25 11:58:32 +01:00
Nikolay Kasyanov
59508e914f Fixed OpenCS build on OS X 2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9 accept drops from filters table. Cool. ☺ 2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543 additional check on droping to prevent exception 2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0 Installing basic event filter 2014-02-21 12:48:39 +01:00
Marek Kochanowicz
55e9083570 refactorisation 2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf fixed bugs, added extra display_type 2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1 Features implemented. Time to debug. 2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92 try with the passing action 2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015 We can handle droping multiple records 2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c correcting 2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f Const correctness 2014-02-20 12:43:09 +01:00
Marek Kochanowicz
eb3cbaa4e1 Create filter on droping record. 2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa Propagate signal to the edit widget 2014-02-20 11:07:04 +01:00
Marek Kochanowicz
fca7701359 Column titles retrived and passed to the filterbox. 2014-02-19 16:15:51 +01:00
Marek Kochanowicz
d7a1abb30b emit signal with types (will be connected to the tablesubview) 2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c Accept drops on the filterbox 2014-02-19 12:32:48 +01:00
Marc Zinnschlag
02c6c65705 Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507 Improvements. 2014-02-17 08:58:55 +01:00
Marek Kochanowicz
e1a0f60041 allow _foo ids without qoute 2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e May only include alphanumeric characters and underscores and may not start with a number. 2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3 very basic, but safe putting down " " 2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3 Fixed build on OS X 2014-02-16 20:22:46 +04:00
Marek Kochanowicz
17af865a9f checking for the source of the drop, reject those from other files for now 2014-02-16 09:51:33 +01:00
Marek Kochanowicz
cbe1fe2f95 removed misplaced bracket 2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195 Put the id in the quote. 2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88 -journalinfo +topic 2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4 implemented whitelist of allowed types in the scripts 2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a allow drag and drop into the script edit window. 2014-02-15 19:52:40 +01:00
Marek Kochanowicz
97fe5465bf created new files 2014-02-15 17:55:18 +01:00
Marek Kochanowicz
4ee90c24e5 more readable code. 2014-02-15 13:22:14 +01:00
Marek Kochanowicz
b1f63947e8 Checking if the drop comes from same document. 2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e store const ref to the document in the table. 2014-02-15 12:22:32 +01:00
Marc Zinnschlag
7b8802588e Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3 Documentation, corrections. 2014-02-14 14:04:36 +01:00
Marek Kochanowicz
ae418f2538 nicer formatting 2014-02-14 12:51:50 +01:00
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Marek Kochanowicz
40cc108e54 drag and drop works. 2014-02-13 20:19:51 +01:00
Marek Kochanowicz
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +01:00
Marek Kochanowicz
09d3c7a446 Attempt to match types. Does not work at the moment. 2014-02-13 13:54:09 +01:00
Marek Kochanowicz
5f3f867a10 Implemented convertEnums function 2014-02-13 10:21:49 +01:00
Marek Kochanowicz
c142089bfe Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de added some iostream garbage. 2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07 Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop 
Conflicts:
	apps/opencs/view/world/table.cpp
 2014-02-12 12:12:53 +01:00
gus
6cf561f713 get index to where we are dropping 2014-02-12 11:32:01 +01:00
gus
2e33ab3a13 droping somewhat works 2014-02-12 11:16:12 +01:00
Marek Kochanowicz
53e2e8415d replaced start with exec 2014-02-11 12:25:21 +01:00
gus
df46218acc try droping 2014-02-10 16:48:04 +01:00
gus
b5006c5dbd compile fix 2014-02-09 15:33:00 +01:00
Marek Kochanowicz
3b8f04c0f3 Allow multi-item drag. 2014-02-05 11:44:08 +01:00
Marek Kochanowicz
8b799683c1 Display QPixMap with dragged object. 2014-02-04 18:48:18 +01:00
Marek Kochanowicz
423b2906be Yes, you can drag. But not drop. 2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55 Attempt to get basic tablemimedata subclass. 2014-02-04 09:13:40 +01:00
Marek Kochanowicz
d3000ce099 whitespaces removed again. 2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066 Cleared whitespaces. 2014-01-27 19:40:05 +01:00
Marek Kochanowicz
ed0ba906cf removed needless include 2014-01-27 15:05:29 +01:00
Marek Kochanowicz
6a0b5defd7 removed needless member value. 2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8 Removed pointless includes. 2014-01-27 13:36:01 +01:00
Marek Kochanowicz
71d6364754 Chaninging variables name to follow our policy. 2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3 removed needless argument for cloning 2014-01-27 13:08:14 +01:00
Marek Kochanowicz
032c542396 improving the cell cloning. 2014-01-24 20:34:33 +01:00
Marek Kochanowicz
01be9386d6 Id to the coordinates with the boost and explicit specialisations of template member functions. 2014-01-24 11:22:20 +01:00
Marek Kochanowicz
f390c7f4b0 Disable widgets in the cell creator. 2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d Disable reference creator widget when in the clone mode. 2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8 Disable not needed referencable creator widget when in cloning mode. 2014-01-23 16:00:44 +01:00
Marek Kochanowicz
4d9d31b25e refrences cloning does not work 2014-01-23 09:41:09 +01:00
Marek Kochanowicz
bc0130f8d8 do not double check if record is deleted 2014-01-21 10:35:08 +01:00
Marek Kochanowicz
7594bcf97a Small refactoring. 2014-01-21 08:27:29 +01:00
Marek Kochanowicz
92ee252eef Small correction. 2014-01-20 16:39:42 +01:00
Marek Kochanowicz
d82f272e05 Properly check if clone is deleted. 2014-01-20 16:17:49 +01:00
Marek Kochanowicz
5a52715701 implemented check for deletion. But it seems flawed. 2014-01-20 15:58:19 +01:00
Marek Kochanowicz
33620a001b Cloning works for single record type tables. Well, kinda. 2014-01-20 13:59:00 +01:00
Marek Kochanowicz
0ea2bb7c4c Working on commands 2014-01-19 16:49:39 +01:00
Marek Kochanowicz
b3e45c55bc progressing with the cloning 2014-01-19 11:44:47 +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
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
Marc Zinnschlag
b19b277f18 temporarily disable OGRE-integration in OpenCS (need to sort out path problem first) 2014-01-01 15:16: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
2fe135d85f journals subview was bound to the wrong universal ID type 2013-12-02 16:25:26 +01:00
Sebastian Wick
4a816b6c17 fix context menu 2013-11-16 23:08:03 +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
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
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
Marc Zinnschlag
a06aa881cb make sure case handling in info IDs is consistent 2013-11-08 12:03:03 +01:00
Marc Zinnschlag
0745a86039 added InfoCreator 2013-11-08 11:51:59 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
graffy76
12c06a5615 Fixed broken dependency check 2013-11-03 06:21:28 -06: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
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
767cb54e7c added missing columns to journal info table 2013-10-31 12:54:55 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
graffy76
b51bef0d98 fixed missing adjuster widget in file dialog open view 2013-10-27 20:21:19 -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
aa61948801 relaxed rules for new IDs when ID is also a user visible text 2013-10-22 11:08:37 +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
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
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
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
74cee66273 consolidated magic numbers for button size 2013-10-07 11:24:53 +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
31346dde58 fixed uninitialise scope value for filters 2013-09-27 13:55:28 +02:00
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05: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
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
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
9c751ae370 separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
Marc Zinnschlag
78f7f80fc3 configured script highlighting with extensions 2013-09-19 08:58:27 +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
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
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
Marc Zinnschlag
842a616909 more cleanup 2013-09-03 14:18:34 +02: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
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
aa935ff03d update tables on filter record changes 2013-08-26 12:49:13 +02:00
Marc Zinnschlag
d1516792ce made document data available to filter parser 2013-08-24 17:17:22 +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
cf58670c85 removed global filter scope (would have caused sync problems between projects) 2013-08-24 14:46:42 +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
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
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
ea8b9ce45b apply filter to table after filter text change 2013-08-18 16:53:28 +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
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
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
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
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
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
6a5ab34971 Merge branch 'region' 2013-07-14 12:19:02 +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
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
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
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
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
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
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
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