[Scummvm-cvs-logs] SF.net SVN: scummvm:[43206] scummvm/trunk/gui
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Aug 10 16:05:14 CEST 2009
Revision: 43206
http://scummvm.svn.sourceforge.net/scummvm/?rev=43206&view=rev
Author: lordhoto
Date: 2009-08-10 14:05:14 +0000 (Mon, 10 Aug 2009)
Log Message:
-----------
Rename 'font_color' attribute for 'text' draw step to 'text_color'.
Modified Paths:
--------------
scummvm/trunk/gui/ThemeParser.cpp
scummvm/trunk/gui/ThemeParser.h
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx
scummvm/trunk/gui/themes/scummmodern.zip
Modified: scummvm/trunk/gui/ThemeParser.cpp
===================================================================
--- scummvm/trunk/gui/ThemeParser.cpp 2009-08-10 13:46:17 UTC (rev 43205)
+++ scummvm/trunk/gui/ThemeParser.cpp 2009-08-10 14:05:14 UTC (rev 43206)
@@ -249,7 +249,7 @@
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());
Modified: scummvm/trunk/gui/ThemeParser.h
===================================================================
--- scummvm/trunk/gui/ThemeParser.h 2009-08-10 13:46:17 UTC (rev 43205)
+++ scummvm/trunk/gui/ThemeParser.h 2009-08-10 14:05:14 UTC (rev 43206)
@@ -147,7 +147,7 @@
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()
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2009-08-10 13:46:17 UTC (rev 43205)
+++ scummvm/trunk/gui/themes/default.inc 2009-08-10 14:05:14 UTC (rev 43206)
@@ -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' "
"/> "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx 2009-08-10 13:46:17 UTC (rev 43205)
+++ scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx 2009-08-10 14:05:14 UTC (rev 43206)
@@ -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'
/>
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx 2009-08-10 13:46:17 UTC (rev 43205)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx 2009-08-10 14:05:14 UTC (rev 43206)
@@ -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'
/>
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list