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
fdf6645dbc
Merge remote-tracking branch 'smbas/fix-info-tables'
2015-06-26 18:47:16 +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
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
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
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
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
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
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
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
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
Stanislav Bas
d906a9d7d1
DataDisplayDelegate doesn't draw a text outside a table cell
2015-06-16 00:19:51 +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
e257c915bf
Add color picker popup to choose color
2015-06-12 00:00:23 +03: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
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
2015-06-06 15:41:25 +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
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
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
cc9cii
60f963382b
Feature #2532 . Global filter shortcuts for project::added and project::modified.
...
- Add a startup warning message if global filters are being used.
- Add tooltip messages for the checkbox shortcuts.
2015-05-14 19:36:39 +10:00
cc9cii
65a88aaedb
Feature #2532 . Global filter shortcuts for project::added and project::modified.
...
- Initial global filter shortcuts are set in the user preferences setting. These are applied when a table is first opened.
- Subsequent changes are done per table view via tickboxes next to the record filter box.
2015-05-12 23:47:36 +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
