Marc Zinnschlag
3541d03809
fixed deleting of referenceables (modification state column was incorrectly flagged as non-editable)
2014-06-27 12:29:23 +02:00
Marc Zinnschlag
099c406226
Merge branch 'objects'
2014-06-27 11:55:28 +02:00
Marc Zinnschlag
6020edf60f
make preview watch for changes in modification state of relevant records
2014-06-27 11:55:02 +02:00
Marc Zinnschlag
a2f514f024
disabled preview function for deleted records
2014-06-27 11:38:34 +02:00
Marc Zinnschlag
36c1170d09
fixed some function names
2014-06-27 10:35:00 +02:00
Marc Zinnschlag
0c1ad54e68
refactored object rendering into a separate class
2014-06-27 09:12:26 +02:00
scrawl
e19bbfd1b5
Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text ( Fixes #1543 )
2014-06-26 20:49:22 +02:00
Marc Zinnschlag
06e89d8bd3
reduced loading batch size (making the the loading progress bars a bit more responsive
2014-06-26 11:43:21 +02:00
Marc Zinnschlag
bd252d0aec
display record count in loading window
2014-06-26 11:41:21 +02:00
Marek Kochanowicz
a0146e2e28
Added undo for delete command
2014-06-24 19:34:02 +02:00
Marek Kochanowicz
d73f4cbd7b
added add nested command
2014-06-24 19:19:40 +02:00
Marek Kochanowicz
7b5bf637ab
Changes needed to add new nested row.
2014-06-24 19:03:29 +02:00
Marek Kochanowicz
befdeb1889
use beginRemovRow when removing nested row.
2014-06-24 12:42:49 +02:00
Marek Kochanowicz
7430e1e1bb
Added delete nested rows command (undo still needs to be done)
2014-06-24 12:35:26 +02:00
Marek Kochanowicz
c45061614b
Added code to delete nestedRows
2014-06-24 12:21:40 +02:00
Marek Kochanowicz
88c5288eaf
Create removeNestedRow (for deleting rows of nested columns)
2014-06-24 10:22:42 +02:00
slothlife
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
Marek Kochanowicz
894c98ee89
Added extra columnid type to use for ID of the inventory item
2014-06-20 14:22:40 +02:00
Marek Kochanowicz
a076798f8f
Quick and dirty prototype of actual nested header data implementation
2014-06-19 18:46:09 +02:00
Marek Kochanowicz
256b075914
getting rid of not needed abstract class
2014-06-19 16:11:31 +02:00
Marek Kochanowicz
873cfcf447
implemented basic headerData (still work in progress)
2014-06-18 17:34:21 +02:00
Marek Kochanowicz
b63f2f4cd5
Actually using new nestedmodel
2014-06-18 16:56:37 +02:00
Marek Kochanowicz
1fb18873cb
adding proxy model that is ment to be used by the dialoguesubview
2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c
Column is responsible for telling that it can nest columns now.
2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015
Nested table sits inside it's own layout now.
2014-06-17 20:12:14 +02:00
Marek Kochanowicz
5bee682bb3
modified: ../../view/world/dialoguesubview.cpp
2014-06-17 14:58:25 +02:00
Marek Kochanowicz
03980034a5
Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw
...
into NonTableFields
I have no idea what I'm doing
Conflicts:
apps/opencs/model/world/idtable.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/model/world/refidadapterimp.hpp
2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754
Merge branch 'dialog-fix' into NonTableFields
...
TODO stop failing epicly with git
2014-06-17 14:08:59 +02:00
Marek Kochanowicz
187fccc8cc
Merge branch 'dialog-fix' into NonTableFields
2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61
Trying to merge.
2014-06-17 11:14:12 +02:00
Marc Zinnschlag
073cc3f02c
fixed base flag in content file loader code
2014-06-17 11:01:17 +02:00
Marek Kochanowicz
bbe7854968
Corrected formatting to follow our standard better.
2014-06-17 10:46:54 +02:00
Marek Kochanowicz
d6288a8055
Remove unneded revert and delete slots
2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a
refactoring dialogue subview
2014-06-16 11:31:57 +02:00
Marek Kochanowicz
7eb82f74ae
Fixed complitaion.
2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb
Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix
2014-06-16 09:44:49 +02:00
scrawl
d5b97005ab
Make ESM::Faction skills optional ( Fixes #1508 )
...
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
fd59a4a79e
Fix some doxygen typos
2014-06-15 16:11:22 +02:00
Marc Zinnschlag
c23e9e03fd
Merge branch 'refs'
2014-06-11 11:44:43 +02:00
Marc Zinnschlag
7d1ecea20c
added extended versions of revert and delete
2014-06-11 11:43:38 +02:00
scrawl
3bf599248e
CMake cleanup: Remove distribution-specific install stuff (unused)
2014-06-10 15:03:27 +02:00
Marek Kochanowicz
8763309a1b
reformatting to make code easier to read
2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9
check if index is valid before attempting to use it
2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac
correcting problems
2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644
Merge remote-tracking branch 'master/refs' into dialog-fix
...
Conflicts:
CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/world/dialoguesubview.cpp
2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3
subview does not store row number anymore
2014-06-09 11:37:48 +02:00
Marek Kochanowicz
21a1f6f4ae
working on the issue
2014-06-09 10:35:39 +02:00
Marek Kochanowicz
29231b8fc9
starting new branch
2014-06-09 10:26:53 +02:00
Marc Zinnschlag
48468b7d0c
some dialogue subview cleanup and start of command dispatching refactoring
2014-06-08 14:10:08 +02:00
Marc Zinnschlag
7ede6573eb
removed more hardcoded column numbers
2014-06-07 14:39:34 +02:00
