Added Alignment, Defaultable and Scriptable types, needed some reflection tweaks for the last two.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@17 0fc631ac-6414-0410-93d0-97cfa31319b6

src/data/field/text.cpp

@@ -7,6 +7,7 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <data/field/text.hpp>
+#include <script/script.hpp>
 
 // ----------------------------------------------------------------------------- : TextField
 
@@ -37,8 +38,8 @@ String TextField::typeName() const {
 IMPLEMENT_REFLECTION(TextField) {
 	REFLECT_BASE(Field);
 	REFLECT(multi_line);
-//	REFLECT(script);
-//	REFLECT_N("default", default_script);
+	REFLECT(script);
+	REFLECT_N("default", default_script);
 	REFLECT(move_cursor_with_sort);
 	REFLECT(default_name);
 }
@@ -61,4 +62,5 @@ ValueP TextValue::clone() const {
 
 IMPLEMENT_REFLECTION(TextValue) {
 	REFLECT_BASE(Value);
+	REFLECT_NAMELESS(value);
 }

src/data/field/text.hpp

@@ -10,7 +10,9 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
+#include <util/defaultable.hpp>
 #include <data/field.hpp>
+#include <script/scriptable.hpp>
 
 // ----------------------------------------------------------------------------- : TextField
 
@@ -19,8 +21,8 @@ class TextField : public Field {
   public:
 	TextField();
 	
-//	Script script;
-//	Script default_script;
+	OptionalScript script;
+	OptionalScript default_script;
 	bool multi_line;			///< Are newlines allowed in the text?
 	bool move_cursor_with_sort;	///< When the text is reordered by a script should the cursor position be updated?
 	String default_name;		///< Name of "default" value
@@ -43,7 +45,7 @@ class TextStyle : public Style {
 //	SymbolFontInfo symbol_font;				///< Symbol font for symbols in the text
 	bool always_symbol;						///< Should everything be drawn as symbols?
 	bool allow_formatting;					///< Is formating (bold/italic/..) allowed?
-//	Alignment alignment;					///< Alignment inside the box
+	Alignment alignment;					///< Alignment inside the box
 	int angle;								///< Angle of the text inside the box
 	int padding_left,   padding_left_min;	///< Padding
 	int padding_right,  padding_right_min;	///< Padding
@@ -66,9 +68,9 @@ class TextStyle : public Style {
 /// The Value in a TextField
 class TextValue : public Value {
   public:	
-	virtual ValueP clone() const;
+	Defaultable<String> value;				///< The text of this value
 	
-	String value;
+	virtual ValueP clone() const;
   private:
 	DECLARE_REFLECTION();
 };