mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 00:45:34 +00:00
Code Issues Releases Wiki Activity
14099 commits 38 branches 54 tags 122 MiB
Commit graph

2306 commits

Author SHA1 Message Date
Stanislav Bas
194888e035 TableBottomBox: Creator/Configurator can be closed via Escape 2015-07-30 09:31:28 +10:00
Stanislav Bas
214a448ecf Fix build error 2015-07-30 09:30:50 +10:00
Stanislav Bas
977f317eb9 ExtendedCommandConfigurator: the perform button is now the default for the widget 2015-07-30 09:27:26 +10:00
Stanislav Bas
09d867c9bf ExtendedCommandConfigurator: the perform button takes the name of the command that is executed 2015-07-30 09:27:13 +10:00
Stanislav Bas
8eb677befb The configuration panel gets a focus when opening 2015-07-30 09:26:56 +10:00
Stanislav Bas
bf3891e16f ExtendedCommandConfigurator: disable the perform button when all tables are unchecked 2015-07-30 09:26:17 +10:00
Stanislav Bas
24eb9bddfb TableBottomBox adjusts its size according to the current widget size 2015-07-30 09:26:03 +10:00
Stanislav Bas
6c51e13917 Rework widget layout of ExtendedCommandConfigurator 2015-07-30 09:25:48 +10:00
Stanislav Bas
94725f32d9 Add the ability to configure extended commands for tables 2015-07-30 09:25:34 +10:00
Stanislav Bas
832e910b6f Add the user setting for enabling the configuration of extended commands 2015-07-30 09:24:45 +10:00
Stanislav Bas
297373f436 Add the configuration widget to the bottom box 
Conflicts:
	apps/opencs/view/world/tablebottombox.cpp
 2015-07-30 09:24:28 +10:00
Stanislav Bas
b667500ae2 Add the configuration widget for extended commands 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-07-30 09:20:05 +10:00
Stanislav Bas
3280aade39 Don't inform about a nested row addition in proxy models for top-level tables 2015-07-30 09:14:03 +10:00
Stanislav Bas
6a82ce0d50 Rework Table to use rowAdded() signal of a proxy model 
Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
 2015-07-30 09:13:39 +10:00
Stanislav Bas
9461baa2ea Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-30 08:14:36 +10:00
Stanislav Bas
f24b293c13 Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-30 08:14:20 +10:00
scrawl
6c8862e542 Fix a typo 2015-07-27 17:39:23 +10:00
Stanislav Bas
77d5476d46 Proper index creation for nested data 2015-07-27 15:24:01 +10:00
Stanislav Bas
1041c3babb IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-27 15:23:31 +10:00
Stanislav Bas
ca67e4ea3a Proper sorting of columns with enum values 2015-07-27 15:23:30 +10:00
Rohit Nirmal
d037844d6e Fix building OpenCS with Qt 5. 2015-07-27 15:23:14 +10:00
Marc Zinnschlag
1d722fcdbc incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 2015-07-27 15:21:04 +10:00
Marc Zinnschlag
833844f5a4 do not allow editing of deleted scripts 2015-07-27 15:20:39 +10:00
Marc Zinnschlag
25bb2983e2 make compilation delay configurable via a user setting 2015-07-27 15:20:38 +10:00
Marc Zinnschlag
7f89d3688f put script compilation in script subview behind a timer 2015-07-27 15:20:36 +10:00
Marc Zinnschlag
9abc57d988 do not try to jump to source location for errors that do not have a source location 2015-07-27 15:20:34 +10:00
Marc Zinnschlag
527ab1aff7 consider column when jumping to error in source text 2015-07-27 15:20:32 +10:00
Marc Zinnschlag
757f7d895a jump to line in source text when clicking on an error in error table 2015-07-27 15:20:30 +10:00
Marc Zinnschlag
6576ac34f6 made error table read only 2015-07-27 15:20:28 +10:00
Marc Zinnschlag
e86b8c96f5 improved error table layout 2015-07-27 15:20:27 +10:00
Marc Zinnschlag
446ac998d8 consider script warning settings for script subview 2015-07-27 15:20:26 +10:00
Marc Zinnschlag
092204bd82 refactored mapping from message severity enum to string 2015-07-27 15:20:24 +10:00
Marc Zinnschlag
3ea445cc67 improved error reporting 2015-07-27 15:20:22 +10:00
Marc Zinnschlag
c5eec822ae display script errors in script subview 2015-07-27 15:20:21 +10:00
Marc Zinnschlag
ecbdd7d753 hooked up script subview buttons to bottom box (enables add and clone) 2015-07-27 15:20:19 +10:00
Marc Zinnschlag
2064a3979b fixed deleted button sensitivity state 2015-07-27 15:20:18 +10:00
Marc Zinnschlag
a658efe557 improving consistency of subview layouts 2015-07-27 15:20:16 +10:00
Marc Zinnschlag
286f1c8c5c replaced the script subview status bar with a bottom box (including a status bar) 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 15:20:14 +10:00
Marc Zinnschlag
ab0b5932f7 added user settings option to toggle toolbars in single-record subviews 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 15:15:05 +10:00
Marc Zinnschlag
05ed8ada11 renaming a few user settings categories 2015-07-27 15:13:51 +10:00
Marc Zinnschlag
ee85bbc0e6 added button bar to script subview 2015-07-27 15:13:27 +10:00
MiroslavR
5dc87e5008 Fix calculation of selected blocks in ScriptEdit 2015-07-27 14:26:38 +10:00
Stanislav Bas
fb395e4dc9 Count of nested columns can be retrieved for a collection with no records 2015-07-27 14:25:02 +10:00
Stanislav Bas
27c9eaeffc Add Edit 'ID' action for nested fields 2015-07-27 14:05:37 +10:00
Stanislav Bas
bcd0f0f4e4 TableEditIdAction: prevent creation of a UniversalId with Type_None 2015-07-27 14:05:18 +10:00
Stanislav Bas
09a95f276f Add Edit 'ID' action for nested tables 
Conflicts:
	apps/opencs/view/world/nestedtable.cpp
 2015-07-27 14:04:57 +10:00
Stanislav Bas
561c3bd553 Rework Table (view) code to use a TableEditIdAction 2015-07-27 13:44:22 +10:00
Stanislav Bas
110306f6b0 Create a separate class for Edit 'ID' action to use in tables' context menus 2015-07-27 13:44:07 +10:00
Stanislav Bas
ba68201593 IdContextMenu: don't add Edit action if it's already in the context menu 2015-07-27 13:43:54 +10:00
Stanislav Bas
bdb063a691 Prevent the Edit 'ID' action for the current ID of the dialogue subview 2015-07-27 13:43:40 +10:00
Stanislav Bas
d777c7a68a IdContextMenu: if the ID field is empty show the standard context menu (if available) 2015-07-27 13:43:25 +10:00
Stanislav Bas
814f2d3376 Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels) 2015-07-27 13:43:10 +10:00
Stanislav Bas
efed2556be Create a context menu handler for dialogue editors with ID information 2015-07-27 13:42:57 +10:00
Marc Zinnschlag
2cd62e19d8 implemented sorting in report views (Fixes #2540) 2015-07-27 13:42:41 +10:00
Stanislav Bas
8bf1b66ca2 Add the RecordType column to the MetaData table 2015-07-27 13:42:08 +10:00
Stanislav Bas
bec19fde97 Not accepted drag event must be ignored 2015-07-27 13:41:53 +10:00
Stanislav Bas
d7ce441b70 Deleted records can be cloned 2015-07-27 13:12:33 +10:00
Stanislav Bas
0809a738b8 Add the proper getErrors() method to CellCreator. 
Fix the impossibility of the Exterior Cell creation.
 2015-07-27 13:12:06 +10:00
Stanislav Bas
9ef3dced90 Close the creator when the original record is removed (in clone mode) 2015-07-27 13:11:54 +10:00
Stanislav Bas
3a6f708405 Cell type can be changed when cloning a cell 2015-07-27 13:11:34 +10:00
Stanislav Bas
1c9d36a368 Creating/cloning Cell sets the proper Interior flag 2015-07-27 13:11:21 +10:00
Stanislav Bas
0420f21462 Add the ability to add nested values to the Create command 2015-07-27 13:11:07 +10:00
Stanislav Bas
5602992b86 Add the ability to search a nested column index 
Conflicts:
	apps/opencs/model/world/idtree.cpp
	apps/opencs/model/world/idtree.hpp
 2015-07-27 13:10:52 +10:00
cc9cii
740c8bc6f1 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 10:53:39 +10: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
cc9cii
e4c6ac22ea Merge branch 'cc9cii' into npc-autocalc 2015-06-27 09:25:20 +10:00
cc9cii
6542ff111d Fix merge issues. 2015-06-27 08:50:53 +10:00
cc9cii
2612a91f8d Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.hpp
	apps/opencs/view/world/dialoguesubview.cpp
 2015-06-27 07:46:36 +10:00
Marc Zinnschlag
6d5823e8aa killed some tabs 2015-06-26 18:54:49 +02: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
a4c2c75d1f fixed overwriting of meta data when loading project file 2015-06-26 16:22:06 +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
Marc Zinnschlag
5a37530c1c added missing MetaData table UniversalId type 2015-06-26 15:17:18 +02:00
Marc Zinnschlag
1870b087e7 ported setting of meta data for saving to the new mechanism 2015-06-26 13:13:22 +02:00
Marc Zinnschlag
f3ff90e1fd moved meta data into a new single-row table 2015-06-26 13:01:25 +02:00
cc9cii
3e29bb8a86 Fix undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable. 2015-06-26 16:10:50 +10:00
cc9cii
78457a8234 Simplify npc data update and fix data copy when autocal flag changed. 2015-06-26 13:50:09 +10:00
cc9cii
8c39f2b376 Fix dereferencing a null pointer. 2015-06-26 08:52:39 +10:00
cc9cii
273ff1cccb Address review comments. 2015-06-26 07:48:48 +10:00
Stanislav Bas
ea97b0a20c Refine InfoTableProxyModel::getFirstInfoRow() code 2015-06-25 20:08:42 +03:00
Stanislav Bas
844e5c504d Fix conversion to QString 2015-06-25 19:41:26 +03:00
Stanislav Bas
867ce686ae Proper conversion to QString for DropLineEdit::dropEvent() 2015-06-25 19:30:53 +03:00
Marc Zinnschlag
8fbc799655 Merge remote-tracking branch 'cc9cii/master' 2015-06-25 14:06:22 +02: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
cc9cii
67b6c86a59 Fix initialisation order - properly this time. 2015-06-25 20:34:27 +10:00
cc9cii
c0f3d70f06 Use the new severity message attribute. 2015-06-25 20:23:43 +10:00
cc9cii
71f3b7ed4f Fix crash when user preference is missing. 2015-06-25 20:21:51 +10:00
Marc Zinnschlag
6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 2015-06-25 12:03:40 +02:00
cc9cii
705253e456 Fix initialisation order. 2015-06-25 19:54:07 +10:00
cc9cii
b1f07ba4fb Resolve merge issues and change the getSpells() interface. 2015-06-25 18:57:32 +10: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
cc9cii
66877cbfe7 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/util.cpp
 2015-06-25 13:39:59 +10:00
cc9cii
7af43a1155 Address review feedback. 2015-06-25 13:32:22 +10: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
Marc Zinnschlag
b0aad9c8cb Merge remote-tracking branch 'smbas/feature-improved-dragndrop' 2015-06-24 17:20:43 +02:00
Stanislav Bas
270c17faa7 Prevent drops on non-editable table cells 2015-06-24 16:36:09 +03:00
cc9cii
e5e4a04f8b Remove more c++11 dependencies. 2015-06-24 22:19:27 +10:00
Stanislav Bas
d1339a643a Fix for NestedTableProxyModel::forwardDataChanged() 2015-06-24 15:07:09 +03:00
cc9cii
0cf9832017 Add missing files for autocalc. Remove c++11 dependency. 2015-06-24 21:58:28 +10:00
cc9cii
18ec0d3e65 Add missing files for autocalc. 2015-06-24 21:21:35 +10:00
cc9cii
8af12788a4 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/util.cpp
 2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91 Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS. 
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
 2015-06-24 21:05:59 +10: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
dc37aea8eb Add missing mappings to TableMimeData 2015-06-20 21:00:15 +03:00
Stanislav Bas
7dcdd130bb Rework Dialogue subview code according to DropLineEdit changes 2015-06-20 20:52:47 +03:00
Marc Zinnschlag
c644f15167 calm down travis 2015-06-20 19:46:38 +02:00
Marc Zinnschlag
b9f6baf317 add normal script warnings mode (Fixes #2642) 2015-06-20 19:16:15 +02:00
Marc Zinnschlag
197b8ec731 added severity attribute for operation messages (Fixes #2717) 2015-06-20 19:08:31 +02:00
Marc Zinnschlag
8791832c86 standarised on the use of the Message struct when passing operations messages around 2015-06-20 17:56:42 +02:00
Stanislav Bas
64701b273d LineEdits for ID values accept drops with a proper type 2015-06-20 18:29:31 +03:00
Marc Zinnschlag
0e21c61297 replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct 2015-06-20 16:55:34 +02:00
Stanislav Bas
27ece7f36a Rework DropLineEdit. Make it type-sensitive 2015-06-20 17:33:36 +03:00
Marc Zinnschlag
9a102f81c8 added setting for controlling script compiler warnings 2015-06-20 16:21:04 +02:00
Marc Zinnschlag
1ee1934053 framework for accessing user settings in operation stages 2015-06-20 16:20:31 +02:00
Stanislav Bas
ced4e237a8 Fix the sorting of Info tables when new row are added 2015-06-20 12:43:53 +03:00
Marc Zinnschlag
8aba52170f fixed a build error 2015-06-20 11:34:32 +02:00
Stanislav Bas
f1a38ffe93 InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row 2015-06-20 11:29:15 +03:00
Stanislav Bas
170692b480 InfoTableProxyModel: invalidate first row cache after row insertion/deletion 2015-06-19 19:24:06 +03: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
cc9cii
3b27e643b8 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2015-06-19 07:49:18 +10: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
cc9cii
ccf840da2b Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-06-18 22:08:27 +10:00
cc9cii
ad04046243 Mimic vanilla CS behaviour with NPC stats auto calculations. Should resolve Bug #2663. 
- Currently does not auto-update when race, class or skills tables change.
 2015-06-18 22:02:08 +10: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
a6624ca576 Cache topic/journal first rows in InfoTableProxyModel 2015-06-17 23:46:51 +03:00
Stanislav Bas
2e40b68862 Add a custom proxy model for Info tables 2015-06-17 22:47:39 +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
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
Marc Zinnschlag
62c5f185d7 Merge remote-tracking branch 'cc9cii/master' 2015-06-16 12:30:21 +02:00
cc9cii
6a47ea9a67 fix typo 2015-06-16 13:09:44 +10: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
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30 Merge remote-tracking branch 'smbas/feature-soundgen-verifier' 2015-06-15 16:25:11 +02:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
Stanislav Bas
281088c93b Add check for an empty sound field to SoundGens verifier 2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c Add SoundGens verifier 2015-06-13 19:08:31 +03:00
cc9cii
5b6984d8d8 Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656. 2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2 Merge remote-tracking branch 'smbas/fix-regionmap-colors' 2015-06-13 11:33:12 +02:00
cc9cii
b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 2015-06-13 14:37:47 +10: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
650e37dba1 RegionMap uses proper colors 2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf MapColourColumn::set() uses the correct color value 2015-06-12 22:03:47 +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
cc9cii
610e659121 Fix physics model not being moved since commit ec80884. 2015-06-12 21:38:53 +10:00
Stanislav Bas
4096d2851c Remove outdated ColorEditButton files 2015-06-12 14:09:25 +03:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0 Compile fix for old boost versions 2015-06-11 23:25:26 +02:00
Stanislav Bas
e257c915bf Add color picker popup to choose color 2015-06-12 00:00:23 +03:00
scrawl
6051c47eef Fix for incorrect QString -> path conversion 2015-06-11 22:36:19 +02: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
cc9cii
f989bfcd42 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
 2015-06-09 19:42:37 +10:00
Stanislav Bas
d7fb497255 Color values are displayed as colored rectangles in tables 2015-06-08 21:33:23 +03:00
cc9cii
893ad11be1 Fix missing columns in tables. Should resolve Bug #2624. 
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
 2015-06-08 08:04:18 +10:00
cc9cii
92ab61f72f Merge branch 'master' into pathgrid-edit 2015-06-07 20:15:58 +10:00
Marc Zinnschlag
d90aff4303 Merge remote-tracking branch 'smbas/feature-id-completion' 2015-06-07 08:52:44 +02:00
Stanislav Bas
d63b01dde3 Checkboxes in the table view use a combobox editor 2015-06-06 15:41:25 +03:00
cc9cii
5c37079f0c Include only the columns that are visible for sorting. Should resolve Bug #2611. 2015-06-05 12:19:21 +10:00
Stanislav Bas
bd46ddcf47 Correct the return type in IdTree::data() for Display_Role 2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
Stanislav Bas
4e759370de Change Display_String to the proper display type where appropriate 2015-06-03 00:02:53 +03: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
Marc Zinnschlag
b866e11873 Merge remote-tracking branch 'cc9cii/pathgrid-check-extra' 2015-06-01 16:49:28 +02:00