Stanislav Bas
33e36ee922
Add the ID completion delegate
2015-05-30 15:51:33 +03:00
Marc Zinnschlag
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
2015-05-30 10:23:27 +02:00
cc9cii
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
2015-05-29 22:20:43 +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
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
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
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
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
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
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
cc9cii
49884f54f7
Fix loading moved references.
2015-04-28 08:07:01 +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
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
cc9cii
a2d824bfa6
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
2015-04-17 01:27:36 +10:00
cc9cii
ce7e2e06c1
Fix editor being created for a non-editable item.
2015-04-11 13:11:20 +10:00
cc9cii
787cef1386
DialogueSubView layout update for dialogues with nested tables only.
2015-04-09 19:39:09 +10:00
Marc Zinnschlag
3b408b6427
sorting out some Display enum mixup
2015-04-04 19:55:53 +02:00
cc9cii
745eae9c10
Tweak DialogueSubView layout for nested tables.
2015-04-03 12:44:32 +11:00
cc9cii
851effb0e3
Merge branch 'master' into NonTableFields
2015-04-02 20:43:48 +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
scrawl
6ff2523d8a
Fix for line focus when clicking on a verifier script error
...
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00