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 |
|
Stanislav Bas
|
f3bb00e3d9
|
Add the ability to add nested values to the Create command
|
2015-06-26 22:16:12 +03:00 |
|
Stanislav Bas
|
a7f31988d1
|
Add the ability to search a nested column index
|
2015-06-26 22:14:11 +03:00 |
|
Marc Zinnschlag
|
6d5823e8aa
|
killed some tabs
|
2015-06-26 18:54:49 +02: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
|
a4c2c75d1f
|
fixed overwriting of meta data when loading project file
|
2015-06-26 16:22:06 +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 |
|
Marc Zinnschlag
|
5a37530c1c
|
added missing MetaData table UniversalId type
|
2015-06-26 15:17:18 +02:00 |
|
Marc Zinnschlag
|
1870b087e7
|
ported setting of meta data for saving to the new mechanism
|
2015-06-26 13:13:22 +02:00 |
|
Marc Zinnschlag
|
f3ff90e1fd
|
moved meta data into a new single-row table
|
2015-06-26 13:01:25 +02:00 |
|
Stanislav Bas
|
feeb9ea8b0
|
Merge remote-tracking branch 'upstream/master'
|
2015-06-26 12:10:51 +03:00 |
|
Stanislav Bas
|
ea97b0a20c
|
Refine InfoTableProxyModel::getFirstInfoRow() code
|
2015-06-25 20:08:42 +03:00 |
|
Stanislav Bas
|
844e5c504d
|
Fix conversion to QString
|
2015-06-25 19:41:26 +03:00 |
|
Stanislav Bas
|
867ce686ae
|
Proper conversion to QString for DropLineEdit::dropEvent()
|
2015-06-25 19:30:53 +03:00 |
|
Marc Zinnschlag
|
8fbc799655
|
Merge remote-tracking branch 'cc9cii/master'
|
2015-06-25 14:06:22 +02: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 |
|
cc9cii
|
c0f3d70f06
|
Use the new severity message attribute.
|
2015-06-25 20:23:43 +10:00 |
|
cc9cii
|
71f3b7ed4f
|
Fix crash when user preference is missing.
|
2015-06-25 20:21:51 +10: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 |
|
Marc Zinnschlag
|
b0aad9c8cb
|
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
|
2015-06-24 17:20:43 +02:00 |
|
Stanislav Bas
|
270c17faa7
|
Prevent drops on non-editable table cells
|
2015-06-24 16:36:09 +03:00 |
|
Stanislav Bas
|
d1339a643a
|
Fix for NestedTableProxyModel::forwardDataChanged()
|
2015-06-24 15:07: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
|
dc37aea8eb
|
Add missing mappings to TableMimeData
|
2015-06-20 21:00:15 +03:00 |
|
Stanislav Bas
|
7dcdd130bb
|
Rework Dialogue subview code according to DropLineEdit changes
|
2015-06-20 20:52:47 +03:00 |
|
Marc Zinnschlag
|
c644f15167
|
calm down travis
|
2015-06-20 19:46:38 +02:00 |
|
Marc Zinnschlag
|
b9f6baf317
|
add normal script warnings mode (Fixes #2642)
|
2015-06-20 19:16:15 +02:00 |
|
Marc Zinnschlag
|
197b8ec731
|
added severity attribute for operation messages (Fixes #2717)
|
2015-06-20 19:08:31 +02:00 |
|
Marc Zinnschlag
|
8791832c86
|
standarised on the use of the Message struct when passing operations messages around
|
2015-06-20 17:56:42 +02:00 |
|
Stanislav Bas
|
64701b273d
|
LineEdits for ID values accept drops with a proper type
|
2015-06-20 18:29:31 +03:00 |
|
Marc Zinnschlag
|
0e21c61297
|
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
|
2015-06-20 16:55:34 +02:00 |
|
Stanislav Bas
|
27ece7f36a
|
Rework DropLineEdit. Make it type-sensitive
|
2015-06-20 17:33:36 +03:00 |
|
Marc Zinnschlag
|
9a102f81c8
|
added setting for controlling script compiler warnings
|
2015-06-20 16:21:04 +02:00 |
|
Marc Zinnschlag
|
1ee1934053
|
framework for accessing user settings in operation stages
|
2015-06-20 16:20:31 +02:00 |
|
Stanislav Bas
|
ced4e237a8
|
Fix the sorting of Info tables when new row are added
|
2015-06-20 12:43:53 +03:00 |
|
Marc Zinnschlag
|
8aba52170f
|
fixed a build error
|
2015-06-20 11:34:32 +02:00 |
|
Stanislav Bas
|
f1a38ffe93
|
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
|
2015-06-20 11:29:15 +03:00 |
|
Stanislav Bas
|
170692b480
|
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
|
2015-06-19 19:24:06 +03: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
|
a6624ca576
|
Cache topic/journal first rows in InfoTableProxyModel
|
2015-06-17 23:46:51 +03:00 |
|
Stanislav Bas
|
2e40b68862
|
Add a custom proxy model for Info tables
|
2015-06-17 22:47:39 +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 |
|
Marc Zinnschlag
|
62c5f185d7
|
Merge remote-tracking branch 'cc9cii/master'
|
2015-06-16 12:30:21 +02:00 |
|
cc9cii
|
6a47ea9a67
|
fix typo
|
2015-06-16 13:09:44 +10: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
|
609e146a22
|
Build fixes for windows
|
2015-06-15 16:48:18 +02:00 |
|
Marc Zinnschlag
|
675884ba30
|
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
|
2015-06-15 16:25:11 +02:00 |
|
scrawl
|
412e001edb
|
Fix simulation time reset in OpenCS when opening a new view
|
2015-06-14 19:19:23 +02:00 |
|
scrawl
|
cad18969e3
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
|
2015-06-14 16:32:13 +02:00 |
|
Marc Zinnschlag
|
e17f7ac81a
|
Merge remote-tracking branch 'cc9cii/master'
|
2015-06-14 12:50:10 +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
|
281088c93b
|
Add check for an empty sound field to SoundGens verifier
|
2015-06-13 19:47:39 +03:00 |
|
Stanislav Bas
|
2c15ad5e0c
|
Add SoundGens verifier
|
2015-06-13 19:08:31 +03:00 |
|
cc9cii
|
5b6984d8d8
|
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656.
|
2015-06-13 22:24:22 +10:00 |
|
Marc Zinnschlag
|
c560f8b8a2
|
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
|
2015-06-13 11:33:12 +02:00 |
|
cc9cii
|
b81454d226
|
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668.
|
2015-06-13 14:37:47 +10:00 |
|
Stanislav Bas
|
a294e24a85
|
Reset ColorEditor checked state after the popup is hidden
|
2015-06-13 00:37:10 +03:00 |
|