Marek Kochanowicz
5eac32e3d3
added nestedtable for displaying nested content.
2014-06-30 13:09:10 +02:00
Marek Kochanowicz
8c6a0d9a4f
created new files
2014-06-29 21:12:31 +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
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
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
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
Marc Zinnschlag
302e2f8e9a
fixed some proxy model problems related to column numbers
2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709
removed some hardcoded column numbers
2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9
replaced selection model in CommandDispatcher with a slightly slower but more robust implementation
2014-06-07 13:02:45 +02:00
Marc Zinnschlag
f6ae967ba0
simplified Data constructor
2014-06-06 20:47:31 +02:00
Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
Marc Zinnschlag
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
2014-06-04 21:12:23 +02:00
Marek Kochanowicz
55d451febe
changes in the model (idtable) to support nested data
2014-06-02 20:41:37 +02:00
slothlife
20dabaead9
Fix CMake scripts to link static dependencies
...
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.
Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.
Modified launcher, openmw, and opencs to link the static Ogre plugins.
Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.
Fixed FindMyGUI.cmake to correctly look for static variants.
Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
2014-06-02 02:51:04 -05:00
Marc Zinnschlag
be7f344eca
Merge branch 'refs'
...
Conflicts:
apps/opencs/model/doc/savingstate.cpp
components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
Marc Zinnschlag
4778c27548
silenced two warnings
2014-05-30 10:18:05 +02:00
