cc9cii
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
2015-04-17 12:37:34 +10:00
Marc Zinnschlag
38ce074a62
Merge branch 'replace'
2015-04-16 20:11:25 +02:00
Marc Zinnschlag
b939fd440e
added replace all button
2015-04-16 20:11:14 +02:00
Marc Zinnschlag
36ce2d61f4
consider lock mode when replacing
2015-04-16 19:02:03 +02:00
Marc Zinnschlag
4951fc477c
added replace function
2015-04-16 18:50:22 +02:00
cc9cii
a2d824bfa6
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
2015-04-17 01:27:36 +10:00
cc9cii
ce7e2e06c1
Fix editor being created for a non-editable item.
2015-04-11 13:11:20 +10:00
cc9cii
7990fab708
Fix crash when exiting via window manager on some systems.
2015-04-10 18:09:33 +10:00
cc9cii
787cef1386
DialogueSubView layout update for dialogues with nested tables only.
2015-04-09 19:39:09 +10:00
Marc Zinnschlag
3b408b6427
sorting out some Display enum mixup
2015-04-04 19:55:53 +02:00
cc9cii
745eae9c10
Tweak DialogueSubView layout for nested tables.
2015-04-03 12:44:32 +11:00
cc9cii
851effb0e3
Merge branch 'master' into NonTableFields
2015-04-02 20:43:48 +11:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11:00
Marc Zinnschlag
a9a8b5ad47
improved performance of CSVRender::Cell::addObjects by bypassing Qt model
2015-03-31 14:25:27 +02:00
Marc Zinnschlag
cb6caf5e39
added search-related user settings
2015-03-30 22:30:33 +02:00
Marc Zinnschlag
4928e3705f
highlight (bold) search string in results
2015-03-30 12:52:08 +02:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
3d280a6ba5
Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now.
2015-03-30 11:19:37 +11:00
Marc Zinnschlag
6d165dabb6
improved layout of report table
2015-03-29 18:21:18 +02:00
Marc Zinnschlag
13a4fb3fdc
make return key press in search input trigger a new search
2015-03-28 13:05:18 +01:00
Marc Zinnschlag
8e9365741f
make search sub-views re-usable (clear before starting a new search)
2015-03-28 12:53:01 +01:00
Marc Zinnschlag
128ccd8151
improved search type naming
2015-03-28 11:54:32 +01:00
Marc Zinnschlag
23cf859fee
added search stages (cell table only for now)
2015-03-27 16:33:54 +01:00
Marc Zinnschlag
78c6268891
added search class and search box widget
2015-03-25 11:56:14 +01:00
Marc Zinnschlag
413b35de6c
moved search menu item from view to edit
2015-03-19 21:03:24 +01:00
Marc Zinnschlag
d053c62032
setting up global search operation and subview
2015-03-17 12:30:47 +01:00
scrawl
19e8280f45
OpenCS window title unicode fixes
2015-03-16 15:45:41 +01:00
Marc Zinnschlag
fc6c9d7ff2
Merge remote-tracking branch 'scrawl/opencs-hint-fix'
2015-03-16 08:41:36 +01:00
scrawl
6ff2523d8a
Fix for line focus when clicking on a verifier script error
...
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
scrawl
295ca86ac1
OpenCS FileDialog crash fix
...
The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.
2015-03-16 02:43:02 +01:00
cc9cii
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
2015-03-16 10:30:54 +11:00
cc9cii
15b9a628ac
Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods.
2015-03-14 19:41:55 +11:00
cc9cii
17e6244bd6
Yet more warnings suppressed.
2015-03-14 12:42:46 +11:00
Marc Zinnschlag
26955dc6d3
Merge remote-tracking branch 'cc9cii/editor-var-edit'
2015-03-12 10:44:55 +01:00
cc9cii
418025e0a2
Add missing editor type to the dialogue. Should resolve Bug #2437 .
2015-03-12 13:10:25 +11:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
cc9cii
727b68dd15
Reduce difference with the master branch where possible.
2015-03-06 19:20:50 +11:00
cc9cii
6d6ff8c6a4
Resolved compile issues, but not fully working.
2015-03-06 14:36:13 +11:00
cc9cii
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
2015-03-04 11:22:42 +11:00
Marc Zinnschlag
a148b851c0
added start script table
2015-03-03 14:32:12 +01:00
scrawl
f6509fe53e
Another crash fix for land record without data
2015-03-02 22:23:00 +01:00
cc9cii
1ee6153940
Remove unnecessary boolean passing between objects.
2015-03-02 06:51:31 +11:00
cc9cii
c4625b94e5
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
2015-03-01 12:52:43 +11:00
Bret Curtis
5672c86924
Rename window title for OpenMW-CS
2015-02-24 23:37:53 +01:00
cc9cii
e5c1c31648
Ignore case when detecting legacy extensions (.esm or .exp). Should resolve bug #2227 .
2015-02-16 14:27:25 +11:00
Alexander "Ace" Olofsson
62acb03735
More Ogre + recent Boost build fixes
2015-01-27 21:07:26 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23:38 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
640d473866
Merge remote-tracking branch 'scrawl/master'
2015-01-15 17:33:08 +01:00
scrawl
6146a3843c
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
2015-01-15 15:59:57 +01:00