taras.kudryavtsev
0f2ea57648
#2730 and #2725
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 06:29:25 +10:00
Marc Zinnschlag
c3a31d13b1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
2015-09-08 06:16:22 +10:00
Stanislav Bas
c0d714adb6
Activate editing of nested table cells by a double click
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 05:49:39 +10:00
Stanislav Bas
7a927eec79
Close EditWidget when a proper row removed
2015-09-08 05:45:33 +10:00
cc9cii
7e7c028530
Fix formatting issues after cherry-picking commit ab0b5932f7
2015-07-30 10:41:18 +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
Stanislav Bas
27c9eaeffc
Add Edit 'ID' action for nested fields
2015-07-27 14:05:37 +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
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
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
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
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
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
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
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
7dcdd130bb
Rework Dialogue subview code according to DropLineEdit changes
2015-06-20 20:52:47 +03:00
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
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
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
