Stanislav Bas
|
e8e34f37dd
|
Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels)
|
2015-07-03 16:24:08 +03:00 |
|
Stanislav Bas
|
47b66b57ae
|
Create a context menu handler for dialogue editors with ID information
|
2015-07-03 15:37:10 +03:00 |
|
Marc Zinnschlag
|
382cdb8c60
|
implemented sorting in report views (Fixes #2540)
|
2015-07-03 10:45:08 +02:00 |
|
Stanislav Bas
|
12bf3694bd
|
Rework widget layout of ExtendedCommandConfigurator
|
2015-07-02 22:05:45 +03:00 |
|
Stanislav Bas
|
b8772c6902
|
Add the ability to configure extended commands for tables
|
2015-07-02 20:44:59 +03:00 |
|
Stanislav Bas
|
ba762ec1c1
|
Add the configuration widget to the bottom box
|
2015-07-02 17:21:47 +03:00 |
|
Stanislav Bas
|
1949fe4bf9
|
Add the configuration widget for extended commands
|
2015-07-02 15:47:12 +03:00 |
|
Stanislav Bas
|
51a2d4ef5a
|
Merge remote-tracking branch 'upstream/master'
|
2015-06-30 13:50:33 +03:00 |
|
Marc Zinnschlag
|
d3bcf0711c
|
Merge remote-tracking branch 'smbas/feature-cloning-enhancements'
|
2015-06-30 10:40:28 +02:00 |
|
Stanislav Bas
|
e2103287aa
|
Not accepted drag event must be ignored
|
2015-06-30 01:08:42 +03:00 |
|
scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
2015-06-28 00:38:39 +02:00 |
|
Stanislav Bas
|
e4d52ff9b0
|
Deleted records can be cloned
|
2015-06-28 00:31:41 +03:00 |
|
Stanislav Bas
|
9d274ee156
|
Merge branch 'master' into feature-cloning-enhancements
|
2015-06-27 22:02:31 +03:00 |
|
Stanislav Bas
|
81c7ce5b06
|
Add the proper getErrors() method to CellCreator.
Fix the impossibility of the Exterior Cell creation.
|
2015-06-27 21:59:16 +03: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 |
|
Stanislav Bas
|
cbb124ab4f
|
Close the creator when the original record is removed (in clone mode)
|
2015-06-27 12:26:19 +03:00 |
|
Stanislav Bas
|
cad4ce4e0f
|
Cell type can be changed when cloning a cell
|
2015-06-27 11:47:59 +03:00 |
|
Stanislav Bas
|
5761ec428d
|
Creating/cloning Cell sets the proper Interior flag
|
2015-06-26 23:38:20 +03: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
|
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 |
|
Stanislav Bas
|
feeb9ea8b0
|
Merge remote-tracking branch 'upstream/master'
|
2015-06-26 12:10:51 +03:00 |
|
Stanislav Bas
|
867ce686ae
|
Proper conversion to QString for DropLineEdit::dropEvent()
|
2015-06-25 19:30:53 +03: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 |
|
Marc Zinnschlag
|
6fbdbb11d5
|
added refrash menu item to report table (Fixes #2620)
|
2015-06-25 12:03:40 +02: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 |
|
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 |
|
scrawl
|
a5670b5133
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
|
2015-06-22 20:09:02 +02: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 |
|
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 |
|
scrawl
|
c719b7038e
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
|
2015-06-18 15:00:21 +02:00 |
|
scrawl
|
76799982a5
|
Add missing include
|
2015-06-18 14:56:43 +02: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
|
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 |
|
scrawl
|
3663511cdb
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
|
2015-06-16 19:53:41 +02: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 |
|
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
|
412e001edb
|
Fix simulation time reset in OpenCS when opening a new view
|
2015-06-14 19:19:23 +02:00 |
|
scrawl
|
f70250a296
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
|
2015-06-13 21:11:24 +02: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
|
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
|
4096d2851c
|
Remove outdated ColorEditButton files
|
2015-06-12 14:09:25 +03:00 |
|
Stanislav Bas
|
e257c915bf
|
Add color picker popup to choose color
|
2015-06-12 00:00:23 +03: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 |
|
Stanislav Bas
|
d7fb497255
|
Color values are displayed as colored rectangles in tables
|
2015-06-08 21:33:23 +03:00 |
|
scrawl
|
e66e9916db
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
|
2015-06-07 15:23:54 +02:00 |
|
Stanislav Bas
|
d63b01dde3
|
Checkboxes in the table view use a combobox editor
|
2015-06-06 15:41:25 +03:00 |
|
scrawl
|
1ba3fa4169
|
Remove leftovers of the old OpenCS navigation
|
2015-06-03 18:11:34 +02:00 |
|
Stanislav Bas
|
b25cc6bc55
|
IdCompletionManager uses Display type instread of ColumnId for creating completers
|
2015-06-03 12:01:13 +03:00 |
|
scrawl
|
974fda5bde
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
|
2015-06-03 03:18:29 +02:00 |
|
scrawl
|
cd47dff196
|
Minor cleanup
|
2015-06-03 03:03:16 +02:00 |
|
scrawl
|
cdd0623009
|
Terrain rendering
|
2015-06-03 01:35:41 +02: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
|
9e405b69fa
|
Create the custom completer popup to avoid the problem with the wrong height of the default popup
|
2015-05-31 16:43:28 +03:00 |
|
Stanislav Bas
|
994c6833bc
|
Add missing columns for the ID completion
|
2015-05-30 23:54:16 +03:00 |
|
Stanislav Bas
|
5e8718d8b2
|
Add the ID completion delegate factory to the delegate factory collection
|
2015-05-30 18:37:13 +03:00 |
|