mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:49:58 +00:00
Code Issues Releases Wiki Activity
17245 commits 38 branches 54 tags 122 MiB
Commit graph

1601 commits

Author SHA1 Message Date
cc9cii
77471d1592 Re-add mistakenly removed line and fix a silly typo. 2015-10-28 20:52:07 +11:00
cc9cii
80869d9bae Disable context menu for fixed size sub-tables. Should resolve bug #2932. 2015-10-28 20:30:30 +11:00
cc9cii
972193c7eb Fix issue where mandatory effects field was allowed to be empty (and vice versa) 2015-10-28 11:49:24 +11:00
Marc Zinnschlag
843225996c get modifiers from event instead of from the application 2015-10-27 15:43:52 +01:00
Marc Zinnschlag
d2e92fd36f trigger mouse click actions on release instead of on press (avoids problems with dragging) 2015-10-27 15:30:51 +01:00
Marc Zinnschlag
f3ee3f5be1 Do not call base class event functions in WorldspaceWidget 
This avoids some event function being triggered twice. I do not fully understand why
calling the base class function causes this problem, which is more than a bit
disconcerting, but let's roll with it for now.
 2015-10-27 15:25:46 +01:00
Marc Zinnschlag
6c65081643 Merge branch 'marker' 2015-10-26 14:27:29 +01:00
Marc Zinnschlag
e34af4c4b5 handle primary and secondary edit button clicks on cell arrows 2015-10-25 15:16:22 +01:00
Marc Zinnschlag
8f0d7ec1ec Merge remote-tracking branch 'artemutin/longStringEditor' 2015-10-16 09:15:48 +02:00
artemutin@yandex.ru
eae36f8005 Fixed filter reapplication on Description column change and on State 
column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.
 2015-10-16 11:32:22 +10:00
Marc Zinnschlag
361634489e properly handle cells that don't exist 2015-10-15 14:46:08 +02:00
artemutin@yandex.ru
33e12a99fa If table dont use any filter, filter update now dont cause a reapply of empty filter 2015-10-14 21:22:28 +10:00
Marc Zinnschlag
773df6fd22 some OSG fixes 2015-10-13 16:53:40 +02:00
Marc Zinnschlag
68115c4e8a (somewhat) improved the colour scheme 2015-10-13 16:15:53 +02:00
Marc Zinnschlag
0b1d6bddc8 merged primitives arrays 2015-10-13 16:11:47 +02:00
Marc Zinnschlag
6e140c9cb1 proper shape for cell arrows (kinda) 2015-10-13 11:43:33 +02:00
Marc Zinnschlag
3f9db7ba3c more reliable method of obtaining the cell coordinates in CSVRender::Cell 2015-10-12 18:00:44 +02:00
Marc Zinnschlag
b81ee606c8 use CellCoordinates instead of a pair of ints for cell coordinates 2015-10-12 14:31:55 +02:00
Marc Zinnschlag
0d35938794 basic cell arrow rendering (shape is a placeholder) 2015-10-12 14:12:01 +02:00
Marc Zinnschlag
3b39572274 Merge remote-tracking branch 'artemutin/scriptSearchRedirect' 2015-10-09 17:15:11 +02:00
artemutin@yandex.ru
4ca7b26609 Stream error handling, and other minor changes. 2015-10-09 21:57:02 +10:00
cc9cii
64821b0785 Disable toolbar context menu. Should resolve bug #2953. 2015-10-09 06:29:50 +11:00
artemutin@yandex.ru
e7a3f059aa Implemented line and col calculations in scriptsubview 2015-10-09 00:29:18 +10:00
cc9cii
998348e606 Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
 2015-10-08 12:35:09 +11:00
Alexander "Ace" Olofsson
b4132faaea Update editmode.cpp 
Fixes builds on Windows
 2015-10-04 16:27:05 +02:00
Rohit Nirmal
0a8e2c0b21 Fix building OpenCS with Qt 5. 2015-10-03 00:07:08 -05:00
Marc Zinnschlag
6ef2319eb8 Merge branch 'sceneinput' 2015-10-02 15:07:01 +02:00
Marc Zinnschlag
4b0fa370e3 made WorldspaceWidget::getDocument public (EditModes will need the document later) 2015-10-02 15:06:42 +02:00
Marc Zinnschlag
323f8bb29f sensitivity settings 2015-10-01 13:42:21 +02:00
Marc Zinnschlag
1d4f8b2595 send mouse wheel input to active EditMode during drag operations 2015-10-01 13:19:48 +02:00
Marc Zinnschlag
0a5bfb2107 added framework for drag operations 2015-10-01 12:46:01 +02:00
artemutin@yandex.ru
ecce3a1975 Add StartScriptCreator to a factory manager. 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
903cd3322b add getIdValidatorResult method to GenericCreator, for use in subclass 
StartScriptCreator
 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
e672880f64 Fix namespace, add file to CMakeLists.txt 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
3f27c85630 Added StartScriptCreator class with redefined getErrors method. 2015-09-30 09:46:51 +10:00
Marc Zinnschlag
8e87b48866 handle context-sensitive select mode in instance editing 2015-09-29 16:07:14 +02:00
Marc Zinnschlag
2cb106f6ad added missing flagAsModified calls 2015-09-29 16:06:55 +02:00
Marc Zinnschlag
f28fa9fc16 clear instance selection on select click on nothing/something that isn't an instance 2015-09-29 13:53:47 +02:00
Marc Zinnschlag
319e3f24a3 on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet) 2015-09-29 13:48:04 +02:00
Marc Zinnschlag
981a8a2cc2 delegated editing and selection functions to mode objects 2015-09-27 16:18:22 +02:00
Marc Zinnschlag
9bf27c7e37 moved edit mode handling from SceneSubView to WorldspaceWidget 2015-09-27 14:38:12 +02:00
Marc Zinnschlag
5d9863aec1 removed a redundant check 2015-09-27 11:34:14 +02:00
Marc Zinnschlag
7bbc475bda apply button mapping 2015-09-26 18:01:49 +02:00
Marc Zinnschlag
501ae6372d factored out mouse picking into a separate function 2015-09-26 17:51:41 +02:00
Marc Zinnschlag
3844c94975 bit masking fix 2015-09-26 17:39:55 +02:00
Marc Zinnschlag
72bb33c2c4 filter mouse interaction by interaction mask 2015-09-26 12:24:41 +02:00
Marc Zinnschlag
71247a0186 inserted TagBase between ObjectTag and osg::Referenced 2015-09-26 12:18:18 +02:00
Marc Zinnschlag
748b13b45b renamed ObjectHolder into ObjectTag 2015-09-26 12:05:44 +02:00
Marc Zinnschlag
d46eeb04cd removed a left-over debugging statement 2015-09-25 14:16:41 +02:00
Marc Zinnschlag
5c34a02058 store mouse bindings in WorldspaceWidget 2015-09-25 13:11:40 +02:00
Marc Zinnschlag
62047b1868 Merge remote-tracking branch 'origin/master' into sceneinput 2015-09-24 16:07:39 +02:00
Marc Zinnschlag
3ada08af90 store lock state and pass it on to edit mode 2015-09-24 16:07:17 +02:00
Marc Zinnschlag
b2cb5f0374 pass on user settings updates to potentially interested parties within a scene subview 2015-09-24 15:51:16 +02:00
scrawl
12b8fcf0bf OpenCS: Fix camera position retrieval in WorldspaceWidget 2015-09-23 23:37:09 +02:00
Marc Zinnschlag
7bef97bf33 fixed local variable caching issue in automatic error checking (Fixes #2927) 2015-09-22 15:36:00 +02:00
scrawl
18d0cae801 OpenCS: Select objects with the right mouse button 2015-09-18 18:31:43 +02:00
scrawl
41ea76fd83 OpenCS: Add selection outline effect to CSVRender::Object 2015-09-18 18:31:05 +02:00
scrawl
dac3b33efb OpenCS: Pass events from the QGLWidget to the RenderWidget 2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b OpenCS: Remove margin around the render window 2015-09-18 18:29:22 +02:00
Marc Zinnschlag
1aa926c7e0 restored T-shortcut (focus toolbar) in scene widget 2015-09-17 12:41:56 +02:00
Marc Zinnschlag
659b87b25f more cleanup 2015-09-17 11:31:25 +02:00
Marc Zinnschlag
b3b4fb3efb removed some left-over signal slot stuff that shouldn't have been there in the first place 2015-09-17 11:27:55 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
cc9cii
c4a900ca2c Rationalise the use of ColumnIds 2015-09-12 09:33:11 +10:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
Marc Zinnschlag
85f6bb892b removed indirection in OpenMW-CS land record 2015-08-31 18:13:27 +02:00
Marc Zinnschlag
febf611c82 made return type of ESMTerrain::Storage::getLand const 2015-08-31 14:17:11 +02:00
Marc Zinnschlag
e76401d5ea Merge remote-tracking branch 'smbas/fix-opencs-bugs' 2015-08-23 12:15:19 +02:00
scrawl
32ad8c86bf Fix the ESM::LandTexture NAME being discarded on loading 2015-08-22 13:10:54 +02:00
Stanislav Bas
b7295e2632 Columns with Display_Boolean use Combobox editor even for non-boolean values 2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51 Remove enum names for AiWanderRepeat column 2015-08-21 22:05:40 +03:00
Stanislav Bas
d038ac2da0 Sort tables by ID in the ascending order initially 2015-08-21 21:38:28 +03:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
Marc Zinnschlag
1b663f01af create merged document and open a view for it (document is still empty at this point) 2015-08-16 15:24:48 +02:00
Marc Zinnschlag
e2377396a7 inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) 2015-08-13 12:53:00 +02:00
Marc Zinnschlag
904ad94952 added merge operation (doesn't do anything yet) 2015-08-13 12:03:20 +02:00
Marc Zinnschlag
708cacdec4 disable merge menu item when a merge is already in progress 2015-08-08 16:47:58 +02:00
Marc Zinnschlag
23ccee0124 Merge remote-tracking branch 'dieho/master' 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f Merge remote-tracking branch 'smbas/feature-mgef-verifier' 2015-08-08 10:50:38 +02:00
Marc Zinnschlag
4fd3097c1c improved adjuster widget problem reporting 2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9 added UI for merge tool (merge tool itself is still missing) 2015-08-06 12:52:10 +02:00
Marc Zinnschlag
469a896ca1 make non-editable fields in dialogue sub view selectable (Fixes #2818) 2015-08-06 08:45:38 +02:00
taras.kudryavtsev
8ae7c63c45 #2730 and #2725 2015-08-04 16:58:44 +03:00
Stanislav Bas
cbc8309289 Don't allow empty value of School field in Magic Effects table 2015-08-04 16:19:00 +03:00
Stanislav Bas
6b3de5c720 Activate editing of nested table cells by a double click 2015-08-02 22:53:40 +03:00
Stanislav Bas
1590a04d03 Close EditWidget when a proper row removed 2015-08-02 22:39:41 +03:00
Marc Zinnschlag
6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 2015-07-30 11:49:24 +02:00
Marc Zinnschlag
2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator' 2015-07-28 07:56:12 +02:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +03:00
Stanislav Bas
2471e4d67a Rework Table to use rowAdded() signal of a proxy model 2015-07-26 20:09:31 +03:00
Marc Zinnschlag
fcf9ae42f4 Merge remote-tracking branch 'smbas/fix-table-proxy-bugs' 2015-07-24 10:29:08 +02:00
Rohit Nirmal
6d2d32485f Fix building OpenCS with Qt 5. 2015-07-23 22:22:22 -05:00
Stanislav Bas
f5b1447c92 IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-23 21:05:00 +03:00
Marc Zinnschlag
b2ab0122ab Merge branch 'scriptbuttons' 2015-07-18 17:37:43 +02:00
Marc Zinnschlag
f1ac440b78 do not allow editing of deleted scripts 2015-07-18 17:00:00 +02:00
Marc Zinnschlag
8763a3b3c3 make compilation delay configurable via a user setting 2015-07-18 15:32:38 +02:00
Marc Zinnschlag
73b6df8280 put script compilation in script subview behind a timer 2015-07-18 13:09:17 +02:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
Marc Zinnschlag
5febb96012 do not try to jump to source location for errors that do not have a source location 2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046 consider column when jumping to error in source text 2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4 jump to line in source text when clicking on an error in error table 2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388 made error table read only 2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd improved error table layout 2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160 consider script warning settings for script subview 2015-07-17 11:52:59 +02:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +02:00
Marc Zinnschlag
2d8a78726d improved error reporting 2015-07-16 14:09:14 +02:00
Marc Zinnschlag
2016ff773f display script errors in script subview 2015-07-16 12:36:20 +02:00
Marc Zinnschlag
df027b3498 hooked up script subview buttons to bottom box (enables add and clone) 2015-07-14 13:52:48 +02:00
Marc Zinnschlag
cf1fb76bb4 fixed deleted button sensitivity state 2015-07-14 13:34:13 +02:00
Marc Zinnschlag
0860c27b03 improving consistency of subview layouts 2015-07-14 11:49:41 +02:00
Marc Zinnschlag
2202973c24 replaced the script subview status bar with a bottom box (including a status bar) 2015-07-14 10:05:45 +02:00
Marc Zinnschlag
fc6c14614b added user settings option to toggle toolbars in single-record subviews 2015-07-13 12:52:18 +02:00
Marc Zinnschlag
b97a4cee44 added button bar to script subview 2015-07-11 16:09:13 +02:00
MiroslavR
13f289d1a5 Fix calculation of selected blocks in ScriptEdit 2015-07-06 16:35:45 +02:00
Stanislav Bas
47d21ff4b3 Add edit locking to ExtendedCommandConfigurator 2015-07-05 22:49:48 +03:00
Stanislav Bas
3c6bc74062 Close the extended configurator when all respective records were removed outside 2015-07-05 22:10:37 +03:00
Stanislav Bas
6162a46fbe Update to upstream/master. Resolve the merge conflict 2015-07-05 16:15:48 +03:00
Marc Zinnschlag
ea1ddb5c9f Merge remote-tracking branch 'smbas/feature-dialogue-edit-id' 2015-07-05 14:44:33 +02:00
Stanislav Bas
4fbd24206b ExtendedCommandConfigurator: layout changes 2015-07-04 20:47:10 +03:00
Stanislav Bas
880bc31ddf TableBottomBox: Creator/Configurator can be closed via Escape 2015-07-04 20:30:02 +03:00
Stanislav Bas
c1b06538dc Add Edit 'ID' action for nested fields 2015-07-04 19:55:48 +03:00
Stanislav Bas
30fd711a47 TableEditIdAction: prevent creation of a UniversalId with Type_None 2015-07-04 19:39:53 +03:00
Stanislav Bas
86dc5a2c67 Add Edit 'ID' action for nested tables 2015-07-04 19:27:59 +03:00
Stanislav Bas
464e674a81 Rework Table (view) code to use a TableEditIdAction 2015-07-04 18:51:39 +03:00
Stanislav Bas
6b34845168 Create a separate class for Edit 'ID' action to use in tables' context menus 2015-07-04 18:49:32 +03:00
Stanislav Bas
1f826476ff Fix build error 2015-07-04 02:02:22 +03:00
Stanislav Bas
ff3c9a6fb2 ExtendedCommandConfigurator: the perform button is now the default for the widget 2015-07-03 23:35:00 +03:00
Stanislav Bas
e664ef7578 ExtendedCommandConfigurator: the perform button takes the name of the command that is executed 2015-07-03 23:15:26 +03:00
Stanislav Bas
05cc130212 The configuration panel gets a focus when opening 2015-07-03 22:31:38 +03:00
Stanislav Bas
95d16b24c0 ExtendedCommandConfigurator: disable the perform button when all tables are unchecked 2015-07-03 22:25:56 +03:00
Stanislav Bas
260f6f22ae TableBottomBox adjusts its size according to the current widget size 2015-07-03 22:07:37 +03:00
Stanislav Bas
d73fd471c3 IdContextMenu: don't add Edit action if it's already in the context menu 2015-07-03 19:07:44 +03:00
Stanislav Bas
61ab0ba482 Prevent the Edit 'ID' action for the current ID of the dialogue subview 2015-07-03 18:48:13 +03:00
Stanislav Bas
149cb9d004 IdContextMenu: if the ID field is empty show the standard context menu (if available) 2015-07-03 16:51:47 +03:00
Stanislav Bas
e8e34f37dd Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels) 2015-07-03 16:24:08 +03:00
Stanislav Bas
47b66b57ae Create a context menu handler for dialogue editors with ID information 2015-07-03 15:37:10 +03:00
Marc Zinnschlag
382cdb8c60 implemented sorting in report views (Fixes #2540) 2015-07-03 10:45:08 +02:00
Stanislav Bas
12bf3694bd Rework widget layout of ExtendedCommandConfigurator 2015-07-02 22:05:45 +03:00
Stanislav Bas
b8772c6902 Add the ability to configure extended commands for tables 2015-07-02 20:44:59 +03:00
Stanislav Bas
ba762ec1c1 Add the configuration widget to the bottom box 2015-07-02 17:21:47 +03:00
Stanislav Bas
1949fe4bf9 Add the configuration widget for extended commands 2015-07-02 15:47:12 +03:00
Stanislav Bas
51a2d4ef5a Merge remote-tracking branch 'upstream/master' 2015-06-30 13:50:33 +03:00
Marc Zinnschlag
d3bcf0711c Merge remote-tracking branch 'smbas/feature-cloning-enhancements' 2015-06-30 10:40:28 +02:00
Stanislav Bas
e2103287aa Not accepted drag event must be ignored 2015-06-30 01:08:42 +03:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
Stanislav Bas
e4d52ff9b0 Deleted records can be cloned 2015-06-28 00:31:41 +03:00
Stanislav Bas
9d274ee156 Merge branch 'master' into feature-cloning-enhancements 2015-06-27 22:02:31 +03:00
Stanislav Bas
81c7ce5b06 Add the proper getErrors() method to CellCreator. 
Fix the impossibility of the Exterior Cell creation.
 2015-06-27 21:59:16 +03:00
Marc Zinnschlag
15bb2855a9 disable prev/next buttons if there is no previous/next record 2015-06-27 16:57:45 +02:00
Marc Zinnschlag
e27a75bd10 added user setting for cyclic prev/next 2015-06-27 15:56:41 +02:00
Marc Zinnschlag
95522fcad2 more general cleanup 2015-06-27 15:29:54 +02:00
Marc Zinnschlag
9aa153984a fixed inconsistent handling of deleted records in dialogue; general cleanup 2015-06-27 15:02:50 +02:00
Marc Zinnschlag
a8c26ec0c1 moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar 2015-06-27 14:42:22 +02:00
Marc Zinnschlag
d5e6d8a58b disable dialogue subview buttons while document is locked 2015-06-27 14:25:48 +02:00
Marc Zinnschlag
6769479358 moved code for initiating record cloning from DialogueSubView to RecordButtonBar 2015-06-27 13:47:07 +02:00
Marc Zinnschlag
7f1129df3b cleaned up DialogueSubView constructor; moved bottom box below button bar 2015-06-27 12:53:46 +02:00
Marc Zinnschlag
49dc30683f refactored dialogue subview button bar into a new class 2015-06-27 12:49:56 +02:00
Stanislav Bas
cbb124ab4f Close the creator when the original record is removed (in clone mode) 2015-06-27 12:26:19 +03:00
Stanislav Bas
cad4ce4e0f Cell type can be changed when cloning a cell 2015-06-27 11:47:59 +03:00
Stanislav Bas
5761ec428d Creating/cloning Cell sets the proper Interior flag 2015-06-26 23:38:20 +03:00
Marc Zinnschlag
fdf6645dbc Merge remote-tracking branch 'smbas/fix-info-tables' 2015-06-26 18:47:16 +02:00
Marc Zinnschlag
654e7428aa Merge remote-tracking branch 'smbas/master' 2015-06-26 18:39:40 +02:00
Marc Zinnschlag
2dada1a162 Merge branch 'meta' 2015-06-26 18:37:39 +02:00
Marc Zinnschlag
4487bda702 size limits for meta data strings 2015-06-26 18:19:00 +02:00
Marc Zinnschlag
1e033fa8fe added meta data dialogue sub view 2015-06-26 16:11:00 +02:00
Marc Zinnschlag
57015f3666 fixed handling of numeric read-only fields in dialogue sub views 2015-06-26 15:50:36 +02:00
Marc Zinnschlag
10fbe6aada split DialogueSubView in SimpleDialogueSubView and DialogueSubView 2015-06-26 15:17:47 +02:00
Stanislav Bas
feeb9ea8b0 Merge remote-tracking branch 'upstream/master' 2015-06-26 12:10:51 +03:00
Stanislav Bas
867ce686ae Proper conversion to QString for DropLineEdit::dropEvent() 2015-06-25 19:30:53 +03:00
Marc Zinnschlag
69db0179ca update refresh menu item on stateChanged signal instead of when opening the menu 2015-06-25 13:05:57 +02:00
Marc Zinnschlag
6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 2015-06-25 12:03:40 +02:00
Stanislav Bas
d282bead23 InfoCreator accepts drops of Topic/Journal ID 2015-06-25 11:24:19 +03:00
Stanislav Bas
5b82b9d9d0 ReferenceCreator accepts drops of Cell ID 2015-06-25 11:20:35 +03:00
Stanislav Bas
21f0b586ec Rows with the same topic but in different letter case can be reordered 2015-06-24 20:01:29 +03:00
Marc Zinnschlag
e29d9bcc8e use a namespace instead of a class with only static functions 2015-06-24 17:29:47 +02:00
Stanislav Bas
270c17faa7 Prevent drops on non-editable table cells 2015-06-24 16:36:09 +03:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02:00
Stanislav Bas
d606b62688 Nested tables accept drops 2015-06-21 21:35:00 +03:00
Stanislav Bas
b9882eb59a DragRecordTable checks drag type before accepting it 2015-06-21 18:40:13 +03:00
Stanislav Bas
a23de394f8 Refine DropLineEdit code 2015-06-21 17:16:13 +03:00
Stanislav Bas
2565452052 Add some drag'n'drop utils to work with TableMimeData 2015-06-21 17:08:10 +03:00
Stanislav Bas
7dcdd130bb Rework Dialogue subview code according to DropLineEdit changes 2015-06-20 20:52:47 +03:00
Stanislav Bas
64701b273d LineEdits for ID values accept drops with a proper type 2015-06-20 18:29:31 +03:00
Stanislav Bas
27ece7f36a Rework DropLineEdit. Make it type-sensitive 2015-06-20 17:33:36 +03:00
Marc Zinnschlag
8aba52170f fixed a build error 2015-06-20 11:34:32 +02:00
Stanislav Bas
e212414bc7 Use an ID parent type as the collection ID in GenericCreator. 
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
 2015-06-19 13:49:48 +03:00
Stanislav Bas
581ba55db9 Add Topic/Journal Id completion to InfoCreator 2015-06-19 12:51:50 +03:00
Stanislav Bas
a6734a0ea4 Add Cell Id completion to ReferenceCreator 2015-06-19 11:50:02 +03:00
Stanislav Bas
36271f25ec Rework creator factories to accept Document as a parameter 2015-06-18 22:59:40 +03:00
Marc Zinnschlag
d5bc561d17 Merge remote-tracking branch 'smbas/feature-color-picking' 2015-06-18 16:37:49 +02:00
Marc Zinnschlag
88d1f158d0 made double click behaviour in report tables configurable (Fixes #2622) 2015-06-18 16:36:27 +02:00
scrawl
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02:00
scrawl
76799982a5 Add missing include 2015-06-18 14:56:43 +02:00
Stanislav Bas
cf487581f7 Show the pop-up of ColorEditor immediately after the editor creation in tables 2015-06-18 12:50:46 +03:00
Marc Zinnschlag
12e0873446 Merge remote-tracking branch 'smbas/feature-info-tables-sorting' 2015-06-18 10:31:44 +02:00
Marc Zinnschlag
63d46f7e66 removed an unused variable 2015-06-18 10:26:35 +02:00
Marc Zinnschlag
0b32b24d60 Merge remote-tracking branch 'smbas/fix-enumdelegates' 2015-06-18 10:21:27 +02:00
Stanislav Bas
c60fed89ac Enable sorting for Info tables 2015-06-17 23:50:18 +03:00
Stanislav Bas
ed09424223 Correct the position of the colored rectangle in ColorEditor and ColorDelegate 2015-06-17 00:45:43 +03:00
Stanislav Bas
850f612c8b Merge branch 'master' into feature-color-picking 2015-06-16 22:39:12 +03:00
Stanislav Bas
1e368de289 Adjust columns of nested tables when a dialog subview is opened 2015-06-16 21:47:27 +03:00
Stanislav Bas
6cfee630aa Proper size hint for DataDisplayDelegate 2015-06-16 21:25:06 +03:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
Stanislav Bas
2c1ca33a20 Refactor Enum- and DataDisplayDelegate code 2015-06-16 15:39:54 +03:00
Stanislav Bas
0ffb2bc6bc Proper size hint for EnumDelegate 2015-06-16 14:18:47 +03:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
Stanislav Bas
d906a9d7d1 DataDisplayDelegate doesn't draw a text outside a table cell 2015-06-16 00:19:51 +03:00
scrawl
412e001edb Fix simulation time reset in OpenCS when opening a new view 2015-06-14 19:19:23 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
Stanislav Bas
a294e24a85 Reset ColorEditor checked state after the popup is hidden 2015-06-13 00:37:10 +03:00
Stanislav Bas
b06d1f008f Redraw the color editor immediately after the color is updated 2015-06-12 23:34:08 +03:00
Stanislav Bas
f19d07b404 Rename ColorPickerDelegate to ColorDelegate 2015-06-12 23:09:31 +03:00
Stanislav Bas
caeba1b887 Draw the frame around rect in ColorEditor and ColorPickerDelegate 2015-06-12 20:34:35 +03:00
Stanislav Bas
eb5180ba86 Save selected color in a model when picking is finished 2015-06-12 18:33:55 +03:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
Stanislav Bas
4096d2851c Remove outdated ColorEditButton files 2015-06-12 14:09:25 +03:00
Stanislav Bas
e257c915bf Add color picker popup to choose color 2015-06-12 00:00:23 +03:00
Marc Zinnschlag
8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 2015-06-10 18:51:14 +02:00
Stanislav Bas
ef88b28c26 Create a custom item editor for color columns 2015-06-09 15:20:50 +03:00
Stanislav Bas
d7fb497255 Color values are displayed as colored rectangles in tables 2015-06-08 21:33:23 +03:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
Stanislav Bas
d63b01dde3 Checkboxes in the table view use a combobox editor 2015-06-06 15:41:25 +03:00
scrawl
1ba3fa4169 Remove leftovers of the old OpenCS navigation 2015-06-03 18:11:34 +02:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cd47dff196 Minor cleanup 2015-06-03 03:03:16 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
Stanislav Bas
f84c36b500 CommandDelegate: extract a display type from a model if it isn't specified 2015-06-03 00:00:39 +03:00
Stanislav Bas
2c4025ec72 Rename the method isCompleterExistFor() to hasCompleterFor() 2015-06-02 00:26:31 +03:00
Stanislav Bas
dbe61115b2 Fix the mistyping header guard in the idcompletiondelegate.hpp 2015-05-31 18:22:43 +03:00
Stanislav Bas
e636101725 Add missing new lines at the ends of files 2015-05-31 18:18:49 +03:00
Stanislav Bas
9e405b69fa Create the custom completer popup to avoid the problem with the wrong height of the default popup 2015-05-31 16:43:28 +03:00
Stanislav Bas
994c6833bc Add missing columns for the ID completion 2015-05-30 23:54:16 +03:00
Stanislav Bas
5e8718d8b2 Add the ID completion delegate factory to the delegate factory collection 2015-05-30 18:37:13 +03:00
Stanislav Bas
33e36ee922 Add the ID completion delegate 2015-05-30 15:51:33 +03:00
Marc Zinnschlag
88d5aed62d removed code that interfered with the default window size on Linux (Fixes #2568) 2015-05-30 12:05:35 +02:00
Marc Zinnschlag
17747a2dd9 Merge remote-tracking branch 'cc9cii/highlight-colours' 2015-05-30 10:23:27 +02:00
cc9cii
0aaac59cc3 Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588. 2015-05-30 08:37:58 +10:00
cc9cii
9cbda0ffad Allow users to select syntax highlighting colours. Should resolve Feature #2507. 2015-05-29 22:20:43 +10:00
cc9cii
ce421b230b Move scrollbar to newly opened subview. Should resolve Bug #2576. 2015-05-29 14:07:41 +10:00
cc9cii
9ad69d9085 Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585. 2015-05-29 05:44:35 +10:00
cc9cii
6821cb4133 Use the tree model rather than a nested proxy for the dialogue only listing (i.e. non table) items. Should resolve Bug #2586. 
- QDataWidgetMapper requires the rootindex to be set, which was not possible with the nested proxy model.
 2015-05-29 05:40:20 +10:00
Marc Zinnschlag
99dbd82a44 Merge remote-tracking branch 'cc9cii/fix-dialogue-subview-crash' 2015-05-26 14:37:50 +02:00
cc9cii
ec808843c3 Do not rebuild the dialogue subview unless required. Should resolve Bug #2581. 
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview.  Changes in this commit include:

- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
 2015-05-26 13:35:10 +10:00
cc9cii
95f740ec40 Give CSVWorld::EditWidget::mMainWidget a chance to clean up its children. Should resolve Bug #2578. 2015-05-25 22:28:41 +10:00
cc9cii
e6d2821b78 Refresh table filters when the model is updated. Should resolve Bug #2579. 2015-05-25 09:15:07 +10:00
Marc Zinnschlag
6402b82823 Merge remote-tracking branch 'cc9cii/master' 2015-05-24 21:15:36 +02:00
cc9cii
22420c3a83 Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575. 
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
 2015-05-24 23:19:06 +10:00
cc9cii
c721e340d8 Merge branch 'master' into npc-additional-data 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-05-24 19:24:27 +10:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
cc9cii
2fc964ca73 Grey out disabled entries rather than hiding them. 2015-05-21 13:11:07 +10:00
scrawl
820f4a2688 Fix light direction 2015-05-20 02:07:18 +02:00
cc9cii
aeec1be8b3 Fix occasional crash with DialogueSubView, e.g. when deleting a row of a subtable. 2015-05-19 19:19:52 +10:00
cc9cii
0ecfd9119f Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546. 2015-05-19 06:56:38 +10:00
Marc Zinnschlag
5176e3d84b Merge remote-tracking branch 'cc9cii/mainwindow-scrollbar' 2015-05-18 16:46:03 +02:00
cc9cii
7494340b66 Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547. 2015-05-18 22:08:36 +10:00
cc9cii
cfcfb17320 Updates to optional horizontal scrollbar. 
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
 2015-05-18 07:12:02 +10:00
Marc Zinnschlag
7b207a7954 added shortcut for closing subviews (Fixes #2558) 2015-05-17 14:31:53 +02:00
Marc Zinnschlag
93c3bb3716 fixed subview-closing related crash (Fixes #2564) 2015-05-17 14:27:17 +02:00
cc9cii
e9ca022162 Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549. 
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
  Grow Only: No change to current, except the use of size hints
  Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
  Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
 2015-05-17 20:45:13 +10:00
Marc Zinnschlag
60a835c16d stop script editor from eating undo/redo shortcuts (Fixes #2506) 2015-05-16 10:18:11 +02:00
cc9cii
28617c8beb Update table size status for removed rows. 2015-05-15 12:33:31 +10:00
cc9cii
f92d801faf Jump to the added/cloned record (or undeleted record in case of undo). Should resolve Feature #2541. Controlled by radio buttons on user preferences settings. 2015-05-15 12:32:29 +10:00
Marc Zinnschlag
c9d519f36c focus search input field when opening search subview (Fixes #2534) 2015-05-14 14:48:29 +02:00
scrawl
c31b416ba1 Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
cc9cii
0c461f4424 Add TopicInfos special conditions table. 2015-05-09 21:21:16 +10:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
Marc Zinnschlag
048d7be87c Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516) 2015-05-03 16:35:10 +02:00
Marc Zinnschlag
d873c2c603 focus main input widget when bringing up creator bar (Fixes #2514) 2015-05-02 13:20:42 +02:00
Marc Zinnschlag
0bf28a6eab Merge remote-tracking branch 'cc9cii/leveled-list-edit' 2015-05-01 18:44:14 +02:00
Marc Zinnschlag
efde061c7c Merge remote-tracking branch 'cc9cii/script-dialog' 2015-05-01 09:12:39 +02:00
cc9cii
b04aeb6aad Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview. 2015-05-01 12:14:09 +10:00
cc9cii
081f3ed263 Make font setting selection immediate. 2015-05-01 06:08:04 +10:00
cc9cii
7b4a9f1ea1 Moved script editor settings to its own section. 2015-04-30 06:32:03 +10:00
cc9cii
8e49ccc2f4 Added user setting options. 2015-04-29 20:24:17 +10:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
cc9cii
28048c0bf3 Simple line numbering and fixed-width fonts for the script dialogue. Based on Qt examples. Should resolve Bugs #2505 and #2512. 2015-04-28 23:07:42 +10:00
Marc Zinnschlag
f1c0847897 Merge remote-tracking branch 'cc9cii/moveref' 2015-04-28 14:07:18 +02:00
cc9cii
49884f54f7 Fix loading moved references. 2015-04-28 08:07:01 +10:00
Marc Zinnschlag
ae5de0cb2b implemented additional check before performing replace (make sure data hasn't been changed since the search) 2015-04-27 22:43:09 +02:00
Marc Zinnschlag
6fac4c5dd9 made user settings handling in search sub view more consistent 2015-04-26 13:31:35 +02:00
Marc Zinnschlag
dab650a3d5 remove rows from result table after a successful replace (configurable via user settings) 2015-04-26 13:26:20 +02:00
cc9cii
acb800b8f9 Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
cc9cii
f1a58994c6 Merge branch 'master' into moveref 
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
 2015-04-25 06:52:53 +10:00
cc9cii
f326b14604 Allow Qt to cleanup its signals. 2015-04-21 10:25:19 +10:00
cc9cii
a836446d22 Fix assert() triggering due to bad index being passed. 2015-04-19 21:07:45 +10:00
cc9cii
cb3396643b Back to the old layout of dialoguesubview. 2015-04-19 10:32:06 +10:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
cc9cii
7561b195ab Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes. 2015-04-18 15:28:34 +10:00
cc9cii
48a6006202 Prevent enum delegates from auto expanding when opening a dialogue subview. 2015-04-18 14:16:55 +10:00
cc9cii
5e84858c0b Change the cell edit selection behaviour of the nested tables. Also auto-expand the enum delegate selections (both main table as well as nested table in the dialogue subview) 2015-04-18 10:07:53 +10:00
cc9cii
f88be67556 Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate 2015-04-18 09:37:19 +10:00
cc9cii
e241fb0104 Convert clothing/armour part reference type column in the nested tables to use enum delegates. 2015-04-18 08:31:08 +10:00
cc9cii
e00d7f72ac Convert magic effects ID and Range columns in the nested tables to use enum delegate 2015-04-18 08:09:14 +10:00
cc9cii
befd6fe658 Convert magic effects Skills column in the nested tables to use enum delegates. 2015-04-18 07:15:40 +10:00
cc9cii
0aff188d8d Fix enum delegate from adding a command to the undo stack when the value has not changed. 2015-04-18 07:13:02 +10:00
cc9cii
47d5eac290 Merge branch 'master' into NonTableFields 
Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp
 2015-04-17 12:37:34 +10:00
Marc Zinnschlag
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00