cc9cii
|
727b68dd15
|
Reduce difference with the master branch where possible.
|
2015-03-06 19:20:50 +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 |
|
cc9cii
|
6731afc79c
|
Use float for setting skill use values. Should resolve bug #2183.
|
2014-12-05 03:59:16 +11:00 |
|
cc9cii
|
936094ae95
|
Set range of spinbox types in dialogsubview.
|
2014-11-26 08:08:28 +11:00 |
|
Marc Zinnschlag
|
d1d861e1be
|
Merge branch 'run'
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
|
2014-09-14 11:59:54 +02:00 |
|
cc9cii
|
c78ac391a0
|
Made the Region field for Cell record in dialogue subview editable but not sure if this is the wanted behaviour.
Also removed a duplicate UniversalId::Type_Class mappin in tablemimedata.cpp.
|
2014-09-06 20:24:34 +10:00 |
|
Marc Zinnschlag
|
bec6c4e726
|
fixed editor creation for Display_LongString
|
2014-09-01 10:56:38 +02:00 |
|
Marc Zinnschlag
|
03c0cbc65a
|
added owner global column to references table (Fixes #1695)
|
2014-08-30 10:13:34 +02:00 |
|
Marc Zinnschlag
|
ea4cd94c25
|
syntax highlighter modes
|
2014-08-24 17:56:20 +02:00 |
|
Marc Zinnschlag
|
5c536d571b
|
added script column to debug profile table (dialogue only)
|
2014-08-24 13:15:18 +02:00 |
|
Marc Zinnschlag
|
30830d0693
|
make delegates use the whole document instead of the undo stack
|
2014-08-23 12:25:12 +02:00 |
|
Marek Kochanowicz
|
4b4a72c3b6
|
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
|
2014-07-13 10:52:39 +02:00 |
|
Marc Zinnschlag
|
1548f4670a
|
drop part of resources drag and drop
|
2014-07-08 09:51:17 +02:00 |
|
Marc Zinnschlag
|
b6c5ee125d
|
more refactoring
|
2014-07-08 09:24:05 +02:00 |
|
Marc Zinnschlag
|
9d5956585c
|
added separate display type for colours
|
2014-07-08 09:08:01 +02:00 |
|
Marek Kochanowicz
|
172f1a1301
|
Merge remote-tracking branch 'refs/remotes/master/master' into NonTableFields
|
2014-06-30 20:06:44 +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 |
|
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
|
55d451febe
|
changes in the model (idtable) to support nested data
|
2014-06-02 20:41:37 +02:00 |
|
graffy76
|
3f2ae950f5
|
Disabled view resize for open views when user setting changes. Fixed
new view size issue to match existing user settings.
|
2014-04-24 12:50:10 -05:00 |
|
graffy76
|
4b607d658f
|
Re-link user settings to editor main application
|
2014-04-22 22:19:53 -05:00 |
|
Marc Zinnschlag
|
a7cece3d30
|
do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit
|
2014-04-15 22:34:15 +02:00 |
|
Marek Kochanowicz
|
832a10b2ac
|
solving problems
|
2014-03-20 18:40:10 +01:00 |
|
Marek Kochanowicz
|
c97172d89c
|
fixed segfault and prevent drops from other documents
|
2014-03-13 17:00:14 +01:00 |
|
Marek Kochanowicz
|
e1a4b64efb
|
fixed segfault
|
2014-03-13 16:50:04 +01:00 |
|
Marek Kochanowicz
|
1bf67e7390
|
added the new qlineedit subclass
|
2014-03-12 19:36:46 +01:00 |
|
Marek Kochanowicz
|
865e6b52ae
|
scroll area
|
2014-03-11 21:21:05 +01:00 |
|
Marek Kochanowicz
|
5ad572346b
|
referencables also work now
|
2014-03-11 13:02:25 +01:00 |
|
Marek Kochanowicz
|
a25271f0b6
|
moving bloat away from the dispatcher
|
2014-03-11 09:14:13 +01:00 |
|
Marek Kochanowicz
|
089732419a
|
introduce longString
|
2014-03-10 17:18:29 +01:00 |
|
Marek Kochanowicz
|
cc96a38921
|
use qlinedit for the var
|
2014-03-10 13:27:52 +01:00 |
|
Marek Kochanowicz
|
874847c959
|
handle color
|
2014-03-10 13:25:01 +01:00 |
|
Marek Kochanowicz
|
73cb3ac0ed
|
embelishing
|
2014-03-10 12:04:03 +01:00 |
|
Marek Kochanowicz
|
361bc55973
|
dont force trying display
|
2014-03-10 09:47:41 +01:00 |
|
Marek Kochanowicz
|
9ab920bd80
|
display id and other not editable data
|
2014-03-10 09:37:53 +01:00 |
|
Marc Zinnschlag
|
2497c18702
|
replaced settings change notifications for columns with a more robust implementation
|
2013-07-20 13:19:27 +02:00 |
|
Marc Zinnschlag
|
90bae2bead
|
do not create editors for unused columns
|
2013-05-13 12:55:28 +02:00 |
|
Marc Zinnschlag
|
50d61a5b6e
|
proper implementation of gmst type column
|
2013-02-17 17:27:25 +01:00 |
|
Marc Zinnschlag
|
eb6590f7d8
|
added delegate factory
|
2013-02-10 17:21:25 +01:00 |
|
Marc Zinnschlag
|
02184526e6
|
moved two helper classes from view/world/table into a separate translation unit
|
2012-12-13 11:24:39 +01:00 |
|