Marc Zinnschlag
|
9cf793c0b5
|
silenced a warning
|
2015-08-25 11:39:43 +02:00 |
|
Marc Zinnschlag
|
40753aa9a3
|
simplifying merge stage
|
2015-08-25 08:43:03 +02:00 |
|
Marc Zinnschlag
|
16dda281ce
|
made merge operation more fluent
|
2015-08-23 13:04:42 +02:00 |
|
Marc Zinnschlag
|
103073150e
|
added info tables and pathgrid table to merge operation
|
2015-08-23 12:58:49 +02:00 |
|
Marc Zinnschlag
|
c92898a5bc
|
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
|
2015-08-23 12:37:45 +02:00 |
|
Marc Zinnschlag
|
3902513e65
|
merge id collections
|
2015-08-21 14:02:32 +02:00 |
|
Marc Zinnschlag
|
47dd9505a9
|
copy meta data from game file when merging
|
2015-08-16 18:27:17 +02:00 |
|
Marc Zinnschlag
|
1b663f01af
|
create merged document and open a view for it (document is still empty at this point)
|
2015-08-16 15:24:48 +02:00 |
|
Marc Zinnschlag
|
d8655f2ff8
|
forgot to connect merge operation signals
|
2015-08-13 14:49:32 +02:00 |
|
Marc Zinnschlag
|
e2377396a7
|
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)
|
2015-08-13 12:53:00 +02:00 |
|
Marc Zinnschlag
|
904ad94952
|
added merge operation (doesn't do anything yet)
|
2015-08-13 12:03:20 +02:00 |
|
Marc Zinnschlag
|
708cacdec4
|
disable merge menu item when a merge is already in progress
|
2015-08-08 16:47:58 +02:00 |
|
Marc Zinnschlag
|
4fd3097c1c
|
improved adjuster widget problem reporting
|
2015-08-06 12:58:52 +02:00 |
|
Marc Zinnschlag
|
b83f9445a9
|
added UI for merge tool (merge tool itself is still missing)
|
2015-08-06 12:52:10 +02:00 |
|
Marc Zinnschlag
|
6a9218ee07
|
replaced State_Compiling (not requried anymore) with State_Merging
|
2015-07-30 11:49:24 +02:00 |
|
Marc Zinnschlag
|
2c1cee38b4
|
Merge remote-tracking branch 'smbas/feature-extended-configurator'
|
2015-07-28 07:56:12 +02:00 |
|
Stanislav Bas
|
03c2e11961
|
Update to upstream/master. Resolve merge conflicts
|
2015-07-27 13:54:13 +03:00 |
|
Marc Zinnschlag
|
420503d5fc
|
Merge remote-tracking branch 'smbas/fix-bug-2728'
|
2015-07-27 11:23:49 +02:00 |
|
Marc Zinnschlag
|
bafa86d3e9
|
Merge remote-tracking branch 'scrawl/master'
|
2015-07-27 11:10:16 +02:00 |
|
Stanislav Bas
|
812fffbadc
|
Don't inform about a nested row addition in proxy models for top-level tables
|
2015-07-26 20:25:46 +03:00 |
|
Stanislav Bas
|
2471e4d67a
|
Rework Table to use rowAdded() signal of a proxy model
|
2015-07-26 20:09:31 +03:00 |
|
Stanislav Bas
|
86b7d2a43d
|
Inform about a row addition after re-sorting in InfoTableProxyModel
|
2015-07-26 20:07:36 +03:00 |
|
Stanislav Bas
|
37fd733deb
|
Create a custom signal to inform about a row addition in IdTableProxyModel
|
2015-07-26 20:06:30 +03:00 |
|
Stanislav Bas
|
c088cd4fa9
|
Proper index creation for nested data
|
2015-07-25 18:32:13 +03:00 |
|
scrawl
|
b3f5ac5dbb
|
Include cleanup
|
2015-07-25 02:11:49 +02:00 |
|
Marc Zinnschlag
|
fcf9ae42f4
|
Merge remote-tracking branch 'smbas/fix-table-proxy-bugs'
|
2015-07-24 10:29:08 +02:00 |
|
Rohit Nirmal
|
6d2d32485f
|
Fix building OpenCS with Qt 5.
|
2015-07-23 22:22:22 -05:00 |
|
Stanislav Bas
|
f5b1447c92
|
IdTableProxyModel refreshes the filter when the source model data or rows changed
|
2015-07-23 21:05:00 +03:00 |
|
Stanislav Bas
|
a7b3248ee7
|
Proper sorting of columns with enum values
|
2015-07-23 20:35:16 +03:00 |
|
Marc Zinnschlag
|
cdfa3006a3
|
incorrect sBribe GMSTs for new omwgame files (Fixes #2785)
|
2015-07-18 17:47:50 +02:00 |
|
Marc Zinnschlag
|
b2ab0122ab
|
Merge branch 'scriptbuttons'
|
2015-07-18 17:37:43 +02:00 |
|
Marc Zinnschlag
|
f1ac440b78
|
do not allow editing of deleted scripts
|
2015-07-18 17:00:00 +02:00 |
|
Marc Zinnschlag
|
8763a3b3c3
|
make compilation delay configurable via a user setting
|
2015-07-18 15:32:38 +02:00 |
|
Marc Zinnschlag
|
73b6df8280
|
put script compilation in script subview behind a timer
|
2015-07-18 13:09:17 +02:00 |
|
scrawl
|
58720e6a28
|
Fix the OpenCS rendering crash on exit (Fixes #2735)
|
2015-07-18 03:52:48 +02:00 |
|
Marc Zinnschlag
|
5febb96012
|
do not try to jump to source location for errors that do not have a source location
|
2015-07-17 13:59:50 +02:00 |
|
Marc Zinnschlag
|
f665919046
|
consider column when jumping to error in source text
|
2015-07-17 13:53:22 +02:00 |
|
Marc Zinnschlag
|
0abd29a3b4
|
jump to line in source text when clicking on an error in error table
|
2015-07-17 13:42:25 +02:00 |
|
Marc Zinnschlag
|
100af80388
|
made error table read only
|
2015-07-17 13:06:51 +02:00 |
|
Marc Zinnschlag
|
56ed0926bd
|
improved error table layout
|
2015-07-17 12:45:08 +02:00 |
|
Marc Zinnschlag
|
eab1ec9160
|
consider script warning settings for script subview
|
2015-07-17 11:52:59 +02:00 |
|
Marc Zinnschlag
|
9b12b4f1e2
|
refactored mapping from message severity enum to string
|
2015-07-16 14:46:02 +02:00 |
|
Marc Zinnschlag
|
2d8a78726d
|
improved error reporting
|
2015-07-16 14:09:14 +02:00 |
|
Marc Zinnschlag
|
2016ff773f
|
display script errors in script subview
|
2015-07-16 12:36:20 +02:00 |
|
Marc Zinnschlag
|
df027b3498
|
hooked up script subview buttons to bottom box (enables add and clone)
|
2015-07-14 13:52:48 +02:00 |
|
Marc Zinnschlag
|
cf1fb76bb4
|
fixed deleted button sensitivity state
|
2015-07-14 13:34:13 +02:00 |
|
Marc Zinnschlag
|
0860c27b03
|
improving consistency of subview layouts
|
2015-07-14 11:49:41 +02:00 |
|
Marc Zinnschlag
|
2202973c24
|
replaced the script subview status bar with a bottom box (including a status bar)
|
2015-07-14 10:05:45 +02:00 |
|
Marc Zinnschlag
|
fc6c14614b
|
added user settings option to toggle toolbars in single-record subviews
|
2015-07-13 12:52:18 +02:00 |
|
Marc Zinnschlag
|
749eff5259
|
renaming a few user settings categories
|
2015-07-13 09:42:16 +02:00 |
|