[Scummvm-cvs-logs] SF.net SVN: scummvm: [32814] scummvm/branches/gsoc2008-gui/gui
Tanoku at users.sourceforge.net
Tanoku at users.sourceforge.net
Fri Jun 27 01:15:35 CEST 2008
Revision: 32814
http://scummvm.svn.sourceforge.net/scummvm/?rev=32814&view=rev
Author: Tanoku
Date: 2008-06-26 16:15:34 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Bugfixes
Modified Paths:
--------------
scummvm/branches/gsoc2008-gui/gui/InterfaceManager.cpp
scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp
Modified: scummvm/branches/gsoc2008-gui/gui/InterfaceManager.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/InterfaceManager.cpp 2008-06-26 22:03:49 UTC (rev 32813)
+++ scummvm/branches/gsoc2008-gui/gui/InterfaceManager.cpp 2008-06-26 23:15:34 UTC (rev 32814)
@@ -257,7 +257,8 @@
int InterfaceManager::runGUI() {
Common::EventManager *eventMan = _system->getEventManager();
- loadTheme("modern_theme.xml");
+ if (!loadTheme("modern_theme.xml"))
+ return 0;
_system->showOverlay();
Modified: scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp 2008-06-26 22:03:49 UTC (rev 32813)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeDefaultXML.cpp 2008-06-26 23:15:34 UTC (rev 32814)
@@ -43,15 +43,21 @@
"<color name = 'green' rgb = '0, 255, 0' />"
"<color name = 'blue' rgb = '0, 0, 255' />"
"</palette>"
+
"<default fill = 'gradient' fg_color = '255, 255, 255' />"
+
"<drawdata id = 'mainmenu_bg' cache = false>"
"<drawstep func = 'fill' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' />"
"</drawdata>"
+
"<drawdata id = 'button_idle' cache = false>"
"<drawstep func = 'roundedsq' radius = '8' fill = 'gradient' gradient_start = '206, 121, 99' gradient_end = '173, 40, 8' size = 'auto' />"
"</drawdata>"
-"</render_info>";
+"</render_info>"
+"<layout_info>"
+"</layout_info>";
+
if (!parser()->loadBuffer(defaultXML, true))
return false;
Modified: scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp 2008-06-26 22:03:49 UTC (rev 32813)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeParser.cpp 2008-06-26 23:15:34 UTC (rev 32814)
@@ -233,8 +233,12 @@
if (id == -1)
return parserError("%s is not a valid DrawData set identifier.", drawdataNode->values["id"].c_str());
- if (drawdataNode->values.contains("cached") && drawdataNode->values["cached"] == "true") {
- cached = true;
+ if (drawdataNode->values.contains("cache")) {
+ if (drawdataNode->values["cache"] == "true")
+ cached = true;
+ else if (drawdataNode->values["cache"] == "false")
+ cached = false;
+ else return parserError("'Parsed' value must be either true or false.");
}
// Both Max and Johannes suggest using a non-platform specfic approach based on available
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