Marc Zinnschlag
3eef192e4d
create merged document and open a view for it (document is still empty at this point)
...
(cherry picked from commit 1b663f01af
2015-11-01 13:31:28 +11:00
Marc Zinnschlag
9423603e94
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
...
(cherry picked from commit e2377396a7
2015-11-01 13:25:46 +11:00
Marc Zinnschlag
e4381c3ec8
added merge operation (doesn't do anything yet)
...
(cherry picked from commit 904ad94952
2015-11-01 13:25:34 +11:00
Marc Zinnschlag
c2ed475950
disable merge menu item when a merge is already in progress
...
(cherry picked from commit 708cacdec4
2015-11-01 13:23:09 +11:00
Marc Zinnschlag
a5a0990d3c
improved adjuster widget problem reporting
...
(cherry picked from commit 4fd3097c1c
2015-11-01 13:22:54 +11:00
Marc Zinnschlag
ef1e01639e
added UI for merge tool (merge tool itself is still missing)
...
(cherry picked from commit b83f9445a9
2015-11-01 13:22:42 +11:00
Marc Zinnschlag
6fb658daa4
replaced State_Compiling (not requried anymore) with State_Merging
...
(cherry picked from commit 6a9218ee07
2015-11-01 13:19:56 +11:00
Stanislav Bas
68013bd324
Columns with Display_Boolean use Combobox editor even for non-boolean values
2015-09-08 06:46:21 +10:00
Stanislav Bas
8c07d7f252
Remove enum names for AiWanderRepeat column
2015-09-08 06:46:10 +10:00
Stanislav Bas
29536751f5
Sort tables by ID in the ascending order initially
2015-09-08 06:45:45 +10:00
scrawl
402f1ff5d8
Fix the ESM::LandTexture NAME being discarded on loading
2015-09-08 06:42:45 +10:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
taras.kudryavtsev
0f2ea57648
#2730 and #2725
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 06:29:25 +10:00
Stanislav Bas
11f5a928db
Don't allow empty value of School field in Magic Effects table
2015-09-08 06:20:41 +10:00
Marc Zinnschlag
c3a31d13b1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
2015-09-08 06:16:22 +10:00
Stanislav Bas
c0d714adb6
Activate editing of nested table cells by a double click
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 05:49:39 +10:00
Stanislav Bas
7a927eec79
Close EditWidget when a proper row removed
2015-09-08 05:45:33 +10:00
cc9cii
b920e1bde7
Support MSVC 2015. Tested(*) with updated dependencies:
...
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763
(*) only tested compilation and startup of the each app
2015-08-12 06:50:22 +10:00
cc9cii
5538f822f4
Initial support for Land and LandTexture tables. Updates Features #936 and #933 .
2015-08-01 07:50:56 +10:00
cc9cii
870bb491af
Fix for issue #6 ( https://github.com/cc9cii/openmw/issues/6 ) where dialogue subview for editing an NPC fails with an "invalid ID" exception.
...
* NPC autocalc code was looking for non-existent values of race and class, this is now validated first.
* Also took the opportunity to grey out the spells table when auto-calculated. The template specialisation is a bit ugly, though.
2015-07-31 09:05:26 +10:00
cc9cii
7e7c028530
Fix formatting issues after cherry-picking commit ab0b5932f7
2015-07-30 10:41:18 +10:00
Stanislav Bas
9a936046f6
Add edit locking to ExtendedCommandConfigurator
2015-07-30 09:33:28 +10:00
Stanislav Bas
6033e67b4a
Close the extended configurator when all respective records were removed outside
2015-07-30 09:33:12 +10:00
Stanislav Bas
be1cf2fc80
ExtendedCommandConfigurator: layout changes
2015-07-30 09:31:48 +10:00
Stanislav Bas
194888e035
TableBottomBox: Creator/Configurator can be closed via Escape
2015-07-30 09:31:28 +10:00
Stanislav Bas
214a448ecf
Fix build error
2015-07-30 09:30:50 +10:00
Stanislav Bas
977f317eb9
ExtendedCommandConfigurator: the perform button is now the default for the widget
2015-07-30 09:27:26 +10:00
Stanislav Bas
09d867c9bf
ExtendedCommandConfigurator: the perform button takes the name of the command that is executed
2015-07-30 09:27:13 +10:00
Stanislav Bas
8eb677befb
The configuration panel gets a focus when opening
2015-07-30 09:26:56 +10:00
Stanislav Bas
bf3891e16f
ExtendedCommandConfigurator: disable the perform button when all tables are unchecked
2015-07-30 09:26:17 +10:00
Stanislav Bas
24eb9bddfb
TableBottomBox adjusts its size according to the current widget size
2015-07-30 09:26:03 +10:00
Stanislav Bas
6c51e13917
Rework widget layout of ExtendedCommandConfigurator
2015-07-30 09:25:48 +10:00
Stanislav Bas
94725f32d9
Add the ability to configure extended commands for tables
2015-07-30 09:25:34 +10:00
Stanislav Bas
297373f436
Add the configuration widget to the bottom box
...
Conflicts:
apps/opencs/view/world/tablebottombox.cpp
2015-07-30 09:24:28 +10:00
Stanislav Bas
b667500ae2
Add the configuration widget for extended commands
...
Conflicts:
apps/opencs/CMakeLists.txt
2015-07-30 09:20:05 +10:00
Stanislav Bas
6a82ce0d50
Rework Table to use rowAdded() signal of a proxy model
...
Conflicts:
apps/opencs/view/world/table.cpp
apps/opencs/view/world/table.hpp
2015-07-30 09:13:39 +10:00
Stanislav Bas
1041c3babb
IdTableProxyModel refreshes the filter when the source model data or rows changed
2015-07-27 15:23:31 +10:00
Rohit Nirmal
d037844d6e
Fix building OpenCS with Qt 5.
2015-07-27 15:23:14 +10:00
Marc Zinnschlag
833844f5a4
do not allow editing of deleted scripts
2015-07-27 15:20:39 +10:00
Marc Zinnschlag
25bb2983e2
make compilation delay configurable via a user setting
2015-07-27 15:20:38 +10:00
Marc Zinnschlag
7f89d3688f
put script compilation in script subview behind a timer
2015-07-27 15:20:36 +10:00
Marc Zinnschlag
9abc57d988
do not try to jump to source location for errors that do not have a source location
2015-07-27 15:20:34 +10:00
Marc Zinnschlag
527ab1aff7
consider column when jumping to error in source text
2015-07-27 15:20:32 +10:00
Marc Zinnschlag
757f7d895a
jump to line in source text when clicking on an error in error table
2015-07-27 15:20:30 +10:00
Marc Zinnschlag
6576ac34f6
made error table read only
2015-07-27 15:20:28 +10:00
Marc Zinnschlag
e86b8c96f5
improved error table layout
2015-07-27 15:20:27 +10:00
Marc Zinnschlag
446ac998d8
consider script warning settings for script subview
2015-07-27 15:20:26 +10:00
Marc Zinnschlag
092204bd82
refactored mapping from message severity enum to string
2015-07-27 15:20:24 +10:00
Marc Zinnschlag
3ea445cc67
improved error reporting
2015-07-27 15:20:22 +10:00
Marc Zinnschlag
c5eec822ae
display script errors in script subview
2015-07-27 15:20:21 +10:00
