Rename 'font_color' attribute for 'text' draw step to 'text_color'.

svn-id: r43206

7 files changed, 35 insertions, 35 deletions

diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 85ae052f36..e30e759e66 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -249,7 +249,7 @@ bool ThemeParser::parserCallback_text(ParserNode *node) {
 
 	Common::String id = getParentNode(node)->values["id"];
 	TextData textDataId = parseTextDataId(node->values["font"]);
-	TextColor textColorId = parseTextColorId(node->values["font_color"]);
+	TextColor textColorId = parseTextColorId(node->values["text_color"]);
 
 	if (!_theme->addTextData(id, textDataId, textColorId, alignH, alignV))
 		return parserError("Error adding Text Data for '%s'.", id.c_str());
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index 7cfe2abfd5..92734fa421 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -147,7 +147,7 @@ protected:
 
 				XML_KEY(text)
 					XML_PROP(font, true)
-					XML_PROP(font_color, true)
+					XML_PROP(text_color, true)
 					XML_PROP(vertical_align, true)
 					XML_PROP(horizontal_align, true)
 				KEY_END()
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index e9f42987e1..88ef801af5 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1652,7 +1652,7 @@
 "</drawdata> "
 "<drawdata id='tab_active' cache='false'> "
 "<text font='text_default' "
-"font_color='color_normal_hover' "
+"text_color='color_normal_hover' "
 "vertical_align='center' "
 "horizontal_align='center' "
 "/> "
@@ -1664,7 +1664,7 @@
 "</drawdata> "
 "<drawdata id='tab_inactive' cache='false'> "
 "<text font='text_default' "
-"font_color='color_normal' "
+"text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='center' "
 "/> "
@@ -1721,7 +1721,7 @@
 "orientation='bottom' "
 "/> "
 "<text font='text_default' "
-"font_color='color_normal' "
+"text_color='color_normal' "
 "vertical_align='center' "
 "horizontal_align='left' "
 "/> "
@@ -1741,7 +1741,7 @@
 "orientation='bottom' "
 "/> "
 "<text font='text_default' "
-"font_color='color_normal_disabled' "
+"text_color='color_normal_disabled' "
 "vertical_align='center' "
 "horizontal_align='left' "
 "/> "
@@ -1761,7 +1761,7 @@
 "orientation='bottom' "
 "/> "
 "<text font='text_default' "
-"font_color='color_normal_hover' "
+"text_color='color_normal_hover' "
 "vertical_align='center' "
 "horizontal_align='left' "
 "/> "
@@ -1790,7 +1790,7 @@
 "</drawdata> "
 "<drawdata id='button_idle' cache='false'> "
 "<text font='text_button' "
-"font_color='color_button' "
+"text_color='color_button' "
 "vertical_align='center' "
 "horizontal_align='center' "
 "/> "
@@ -1801,7 +1801,7 @@
 "</drawdata> "
 "<drawdata id='button_hover' cache='false'> "
 "<text font='text_button' "
-"font_color='color_button_hover' "
+"text_color='color_button_hover' "
 "vertical_align='center' "
 "horizontal_align='center' "
 "/> "
@@ -1812,7 +1812,7 @@
 "</drawdata> "
 "<drawdata id='button_disabled' cache='false'> "
 "<text font='text_button' "
-"font_color='color_button_disabled' "
+"text_color='color_button_disabled' "
 "vertical_align='center' "
 "horizontal_align='center' "
 "/> "
@@ -1823,7 +1823,7 @@
 "</drawdata> "
 "<drawdata id='checkbox_disabled' cache='false'> "
 "<text font='text_default' "
-"font_color='color_normal_disabled' "
+"text_color='color_normal_disabled' "
 "vertical_align='top' "
 "horizontal_align='left' "
 "/> "
@@ -1834,7 +1834,7 @@
 "</drawdata> "
 "<drawdata id='checkbox_selected' cache='false'> "
 "<text font='text_default' "
-"font_color='color_normal' "
+"text_color='color_normal' "
 "vertical_align='top' "
 "horizontal_align='left' "
 "/> "
@@ -1850,7 +1850,7 @@
 "</drawdata> "
 "<drawdata id='checkbox_default' cache='false'> "
 "<text font='text_default' "
-"font_color='color_normal' "
+"text_color='color_normal' "
 "vertical_align='top' "
 "horizontal_align='left' "
 "/> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index d734eeab93..c295002f9d 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index 38eae8fa54..ff2fadc577 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -190,7 +190,7 @@
 
 	<drawdata id = 'tab_active' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal_hover'
+				text_color = 'color_normal_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -203,7 +203,7 @@
 
 	<drawdata id = 'tab_inactive' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -267,7 +267,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -288,7 +288,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
-				font_color = 'color_normal_disabled'
+				text_color = 'color_normal_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -309,7 +309,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
-				font_color = 'color_normal_hover'
+				text_color = 'color_normal_hover'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -343,7 +343,7 @@
 
 	<drawdata id = 'button_idle' cache = 'false'>
 		<text	font = 'text_button'
-				font_color = 'color_button'
+				text_color = 'color_button'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -355,7 +355,7 @@
 
 	<drawdata id = 'button_hover' cache = 'false'>
 		<text	font = 'text_button'
-				font_color = 'color_button_hover'
+				text_color = 'color_button_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -367,7 +367,7 @@
 
 	<drawdata id = 'button_disabled' cache = 'false'>
 		<text	font = 'text_button'
-				font_color = 'color_button_disabled'
+				text_color = 'color_button_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -379,7 +379,7 @@
 
 	<drawdata id = 'checkbox_disabled' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal_disabled'
+				text_color = 'color_normal_disabled'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
@@ -391,7 +391,7 @@
 
 	<drawdata id = 'checkbox_selected' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
@@ -408,7 +408,7 @@
 
 	<drawdata id = 'checkbox_default' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 8be069bafd..beff0131f4 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 03e3a45a30..6a3ab0c233 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -288,7 +288,7 @@
 	<!-- Active tab in the tabs list -->
 	<drawdata id = 'tab_active' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -305,7 +305,7 @@
 	<!-- Inactive tab in the tabs list -->
 	<drawdata id = 'tab_inactive' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -397,7 +397,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -421,7 +421,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
-				font_color = 'color_normal_disabled'
+				text_color = 'color_normal_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -448,7 +448,7 @@
 					orientation = 'bottom'
 		/>
 		<text	font = 'text_default'
-				font_color = 'color_normal_hover'
+				text_color = 'color_normal_hover'
 				vertical_align = 'center'
 				horizontal_align = 'left'
 		/>
@@ -502,7 +502,7 @@
 	<!-- Idle button -->
 	<drawdata id = 'button_idle' cache = 'false'>
 		<text	font = 'text_button'
-				font_color = 'color_button'
+				text_color = 'color_button'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -522,7 +522,7 @@
 	<!-- Hovered button -->
 	<drawdata id = 'button_hover' cache = 'false'>
 		<text	font = 'text_button'
-				font_color = 'color_button_hover'
+				text_color = 'color_button_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -542,7 +542,7 @@
 	<!-- Disabled button -->
 	<drawdata id = 'button_disabled' cache = 'false'>
 		<text	font = 'text_button'
-				font_color = 'color_button_disabled'
+				text_color = 'color_button_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
@@ -562,7 +562,7 @@
 	<!-- Disabled checkbox -->
 	<drawdata id = 'checkbox_disabled' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal_disabled'
+				text_color = 'color_normal_disabled'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
@@ -574,7 +574,7 @@
 	<!-- Selected checkbox -->
 	<drawdata id = 'checkbox_selected' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
@@ -586,7 +586,7 @@
 	<!-- Idle checkbox -->
 	<drawdata id = 'checkbox_default' cache = 'false'>
 		<text	font = 'text_default'
-				font_color = 'color_normal'
+				text_color = 'color_normal'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>