mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 21:53:52 +00:00
Code Issues Releases Wiki Activity
30885 commits 108 branches 66 tags 133 MiB
Commit graph

170 commits

Author SHA1 Message Date
Stanislav Bas
27ece7f36a Rework DropLineEdit. Make it type-sensitive 2015-06-20 17:33:36 +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
Stanislav Bas
1e368de289 Adjust columns of nested tables when a dialog subview is opened 2015-06-16 21:47:27 +03:00
Stanislav Bas
eb5180ba86 Save selected color in a model when picking is finished 2015-06-12 18:33:55 +03: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
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
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
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
7494340b66 Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547. 2015-05-18 22:08:36 +10: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
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
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
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
befd6fe658 Convert magic effects Skills column in the nested tables to use enum delegates. 2015-04-18 07:15:40 +10:00
cc9cii
a2d824bfa6 Changes to support dialogue only items but in a list view via QDataWidgetMapper. 2015-04-17 01:27:36 +10:00
cc9cii
787cef1386 DialogueSubView layout update for dialogues with nested tables only. 2015-04-09 19:39:09 +10:00
cc9cii
745eae9c10 Tweak DialogueSubView layout for nested tables. 2015-04-03 12:44:32 +11:00
cc9cii
83bcc8d451 Reorganised class inheritance structure of collections, columns and idtable model. 2015-04-02 20:19:15 +11:00
cc9cii
619b5206cd More consistency nit pick. 2015-03-30 16:41:55 +11:00
cc9cii
3d280a6ba5 Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now. 2015-03-30 11:19:37 +11:00
cc9cii
5eefcd862f Merge branch 'master' into NonTableFields 
Conflicts:
	apps/opencs/model/tools/tools.cpp
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/idtable.hpp
	apps/opencs/model/world/refidadapter.cpp
	apps/opencs/model/world/refidadapter.hpp
	apps/opencs/view/world/dialoguesubview.hpp
 2015-03-16 10:30:54 +11:00
cc9cii
17e6244bd6 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
cc9cii
418025e0a2 Add missing editor type to the dialogue. Should resolve Bug #2437. 2015-03-12 13:10:25 +11:00
cc9cii
6d6ff8c6a4 Resolved compile issues, but not fully working. 2015-03-06 14:36:13 +11:00
cc9cii
fb2ba7610c Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/idtable.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
 2015-03-04 11:22:42 +11:00
Marc Zinnschlag
7615cbafce create modify commands through command dispatcher 2015-01-15 14:24:33 +01: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
Marc Zinnschlag
96cd46568b some cleanup 2014-09-01 11:15:59 +02:00
Marc Zinnschlag
30830d0693 make delegates use the whole document instead of the undo stack 2014-08-23 12:25:12 +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
Marc Zinnschlag
1a1f5dfc4a added tooltips to dialgoue subview buttons 2014-07-15 12:46:52 +02:00
Marek Kochanowicz
acc8432705 fixed segfault 2014-07-07 10:23:40 +02:00
Marek Kochanowicz
5eac32e3d3 added nestedtable for displaying nested content. 2014-06-30 13:09:10 +02: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
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
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
cc9cii
7d990abd37 OpenCS changes to allow compilation with MSVC 11.0. 2014-04-29 22:46:55 +10: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
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
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
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
sirherrbatka
3c8eeb8c48 added comment 2014-03-16 17:11:13 +01:00
sirherrbatka
4a0d1ba272 do not cast and check multiple times 2014-03-16 17:06:11 +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
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
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
a25271f0b6 moving bloat away from the dispatcher 2014-03-11 09:14:13 +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