cc9cii
8e8da724f5
Remove unnecessary comment entry in the config file.
2015-06-10 08:23:38 +10: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
Marc Zinnschlag
f3e040b531
Merge remote-tracking branch 'cc9cii/filter-fix'
2015-06-08 10:42:16 +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
cc9cii
92ab61f72f
Merge branch 'master' into pathgrid-edit
2015-06-07 20:15:58 +10:00
Stanislav Bas
c9a8d53240
Merge remote-tracking branch 'upstream/master'
2015-06-07 13:14:50 +03:00
Marc Zinnschlag
211f6a39b8
Merge remote-tracking branch 'cc9cii/keep-comments'
2015-06-07 09:00:37 +02:00
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
2015-06-07 08:52:44 +02:00
cc9cii
d3b7cf44d3
Remove user preference setting option.
2015-06-07 13:29:45 +10:00
cc9cii
a439f49c4d
Fix loop where there was a potential for double entry.
2015-06-07 07:38:52 +10:00
cc9cii
4902c66792
Allow space characters in front of comments.
2015-06-07 07:21:15 +10:00
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
2015-06-06 15:41:25 +03:00
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
2015-06-06 20:35:55 +10:00
Stanislav Bas
49512a2b57
Correct the explanation for the Console::acceptCommand()
2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba
Add the explanation to Console::acceptCommand()
2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f
Reset Console editbox before command execution
2015-06-05 22:00:02 +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
Stanislav Bas
c40987338d
Scrollbars don't save their positions between openings
2015-06-04 23:09:40 +03: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
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
Marc Zinnschlag
67f04e0ba1
Merge remote-tracking branch 'origin/master'
2015-06-02 14:44:27 +02:00
Marc Zinnschlag
ee2763f2d4
Allow 5th parameter for PlaceAtMe (numeric value, ignored) ( Fixes #2591 )
2015-06-02 14:43:38 +02:00
scrawl
adc8e0b93e
Merge branch 'smbas-master'
2015-06-02 14:35:45 +02:00
Stanislav Bas
6cb221f8d0
Some minor changes to MWList
2015-06-02 11:55:09 +03:00
Stanislav Bas
2c4025ec72
Rename the method isCompleterExistFor() to hasCompleterFor()
2015-06-02 00:26:31 +03:00
Stanislav Bas
959fe3eb87
Reset the scrollbar position in the topic list when DialogueWindow is closed
2015-06-01 23:49:40 +03:00
Stanislav Bas
5350ce59ef
MWList doesn't scroll to the very bottom when it's shown for first time
2015-06-01 22:42:41 +03:00
Marc Zinnschlag
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
2015-06-01 16:49:28 +02:00
Stanislav Bas
5dc6cdeb99
Scroll to the top of the topic list when dialog is started
2015-06-01 01:14:11 +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
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
cc9cii
a02448f0ba
Merge branch 'master' into pathgrid-edit
...
Conflicts:
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
2015-05-31 11:12:39 +10:00
cc9cii
193873b829
Feature #1278 : Editor: Mouse picking in worldspace widget
...
- With the move to OSG (see: https://forum.openmw.org/viewtopic.php?f=7&t=2755&p=31850#p31839 ) all the work done so far will soon be removed from the master branch.
- The pathgrid editing and integration to the model, as well as other improvements made, are unlikely to be accepted to the master.
- These will be maintained here until they can be ported to OSG. It is easier to port when there is a working code base, anyway.
2015-05-31 10:28:45 +10: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
scrawl
7f2dd21c66
Fix for StartScript regression ( Fixes #2590 )
2015-05-30 17:20:49 +02: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
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
