From d30e0f7bc56ab030c194850c875cd489858aaac5 Mon Sep 17 00:00:00 2001 From: twanvl Date: Sun, 18 Mar 2007 14:50:44 +0000 Subject: [PATCH] Added support for informational headings in native look editor. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@212 0fc631ac-6414-0410-93d0-97cfa31319b6 --- Makefile.am | 3 + data/magic.mse-game/game | 6 ++ src/data/field.cpp | 2 + src/data/field/information.cpp | 77 ++++++++++++++++++++++ src/data/field/information.hpp | 79 ++++++++++++++++++++++ src/gui/control/native_look_editor.cpp | 35 ++++++---- src/gui/value/editor.cpp | 2 + src/gui/value/editor.hpp | 4 +- src/gui/value/information.cpp | 17 +++++ src/gui/value/information.hpp | 28 ++++++++ src/mse.vcproj | 90 ++++++++++++++++++++++++++ src/render/value/information.cpp | 36 +++++++++++ src/render/value/information.hpp | 29 +++++++++ src/render/value/viewer.cpp | 2 + 14 files changed, 395 insertions(+), 15 deletions(-) create mode 100644 src/data/field/information.cpp create mode 100644 src/data/field/information.hpp create mode 100644 src/gui/value/information.cpp create mode 100644 src/gui/value/information.hpp create mode 100644 src/render/value/information.cpp create mode 100644 src/render/value/information.hpp diff --git a/Makefile.am b/Makefile.am index 62208fbc..92ef2155 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,7 @@ magicseteditor_SOURCES += ./src/render/value/text.cpp magicseteditor_SOURCES += ./src/render/value/symbol.cpp magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp magicseteditor_SOURCES += ./src/render/value/choice.cpp +magicseteditor_SOURCES += ./src/render/value/information.cpp magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp magicseteditor_SOURCES += ./src/gfx/color.cpp magicseteditor_SOURCES += ./src/gfx/bezier.cpp @@ -73,6 +74,7 @@ magicseteditor_SOURCES += ./src/gui/value/symbol.cpp magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp magicseteditor_SOURCES += ./src/gui/value/editor.cpp magicseteditor_SOURCES += ./src/gui/value/choice.cpp +magicseteditor_SOURCES += ./src/gui/value/information.cpp magicseteditor_SOURCES += ./src/gui/util.cpp magicseteditor_SOURCES += ./src/gui/card_select_window.cpp magicseteditor_SOURCES += ./src/gui/about_window.cpp @@ -101,6 +103,7 @@ magicseteditor_SOURCES += ./src/data/field/text.cpp magicseteditor_SOURCES += ./src/data/field/symbol.cpp magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp magicseteditor_SOURCES += ./src/data/field/choice.cpp +magicseteditor_SOURCES += ./src/data/field/information.cpp magicseteditor_SOURCES += ./src/data/format/clipboard.cpp magicseteditor_SOURCES += ./src/data/format/image.cpp magicseteditor_SOURCES += ./src/data/format/html.cpp diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 2b03e5d0..a44389d7 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -227,6 +227,9 @@ init script: ############################################################## Set fields +set field: + type: info + name: Set Information set field: type: text name: title @@ -244,6 +247,9 @@ set field: type: symbol name: symbol description: The symbol for this set, double click to edit +set field: + type: info + name: Defaults and Automation set field: type: color name: border color diff --git a/src/data/field.cpp b/src/data/field.cpp index 6521e86d..a093acff 100644 --- a/src/data/field.cpp +++ b/src/data/field.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include // ----------------------------------------------------------------------------- : Field @@ -69,6 +70,7 @@ shared_ptr read_new(Reader& reader) { else if (type == _("image")) return new_shared(); else if (type == _("symbol")) return new_shared(); else if (type == _("color")) return new_shared(); + else if (type == _("info")) return new_shared(); else { throw ParseError(_("Unsupported field type: '") + type + _("'")); } diff --git a/src/data/field/information.cpp b/src/data/field/information.cpp new file mode 100644 index 00000000..81a1dae6 --- /dev/null +++ b/src/data/field/information.cpp @@ -0,0 +1,77 @@ +//+----------------------------------------------------------------------------+ +//| Description: Magic Set Editor - Program to make Magic (tm) cards | +//| Copyright: (C) 2001 - 2006 Twan van Laarhoven | +//| License: GNU General Public License 2 or later (see file COPYING) | +//+----------------------------------------------------------------------------+ + +// ----------------------------------------------------------------------------- : Includes + +#include +#include +#include