Stanislav Bas
650e37dba1
RegionMap uses proper colors
2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf
MapColourColumn::set() uses the correct color value
2015-06-12 22:03:47 +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
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0
Compile fix for old boost versions
2015-06-11 23:25:26 +02:00
Stanislav Bas
e257c915bf
Add color picker popup to choose color
2015-06-12 00:00:23 +03:00
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
2015-06-11 22:36:19 +02: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
Alexander "Ace" Olofsson
cd42448cd6
Windows build fixes and CMakeLists cleanup
...
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
2015-06-08 15:41:39 +02:00
cc9cii
893ad11be1
Fix missing columns in tables. Should resolve Bug #2624 .
...
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
2015-06-08 08:04:18 +10: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
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
2015-06-07 08:52:44 +02:00
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
2015-06-06 15:41:25 +03:00
cc9cii
5c37079f0c
Include only the columns that are visible for sorting. Should resolve Bug #2611 .
2015-06-05 12:19:21 +10:00
scrawl
958b34771a
Fix clang warnings about 'typename' outside of a template
2015-06-04 20:42:05 +02:00
scrawl
4bb3cbf0fb
Remove last remains of Ogre
2015-06-03 23:04:35 +02:00
scrawl
1ba3fa4169
Remove leftovers of the old OpenCS navigation
2015-06-03 18:11:34 +02:00
Stanislav Bas
bd46ddcf47
Correct the return type in IdTree::data() for Display_Role
2015-06-03 15:51:34 +03: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
4e759370de
Change Display_String to the proper display type where appropriate
2015-06-03 00:02:53 +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
Marc Zinnschlag
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
2015-06-01 16:49:28 +02: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
e943d17b29
Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes
2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91
Add ColumnId role to the IdTree data methods
2015-05-30 21:30:25 +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
Stanislav Bas
19cc6b83e5
Integrate the Id completion manager into the Document class
2015-05-30 15:40:23 +03:00
Stanislav Bas
87a1f9f9aa
Add ID completion manager
2015-05-30 15:31:44 +03:00
cc9cii
c4aa3d3ee3
Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.
2015-05-30 21:12:47 +10: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
cc9cii
01eba7b721
Extra check for thread affinity.
2015-05-30 19:17:42 +10:00
cc9cii
76196d815d
Update user preference setting value via an event message queue.
2015-05-30 18:58:33 +10: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
393cee406f
Use signals for user preference setting updates.
2015-05-29 19:28:25 +10:00
