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
Stanislav Bas
33e36ee922
Add the ID completion delegate
2015-05-30 15:51:33 +03:00
Marc Zinnschlag
88d5aed62d
removed code that interfered with the default window size on Linux ( Fixes #2568 )
2015-05-30 12:05:35 +02:00
Marc Zinnschlag
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
2015-05-30 10:23:27 +02:00
cc9cii
0aaac59cc3
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588 .
2015-05-30 08:37:58 +10:00
cc9cii
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
2015-05-29 22:20:43 +10:00
cc9cii
ce421b230b
Move scrollbar to newly opened subview. Should resolve Bug #2576 .
2015-05-29 14:07:41 +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
