[Scummvm-cvs-logs] SF.net SVN: scummvm:[34003] scummvm/branches/gsoc2008-gui/gui

[Tanoku at users.sourceforge.net]

Revision: 34003
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34003&view=rev
Author:   Tanoku
Date:     2008-08-18 19:11:15 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
Fixed builtin theme.
Removed some legacy code.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/themes/default.inc
    scummvm/branches/gsoc2008-gui/gui/themes/scummclassic.zip
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.zip

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-18 19:06:58 UTC (rev 34002)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-18 19:11:15 UTC (rev 34003)
@@ -363,16 +363,7 @@
 bool ThemeRenderer::loadTheme(Common::String fileName) {
 	unloadTheme();
 
-	if (fileName != "builtin") {	
-		if (ConfMan.hasKey("themepath"))
-			Common::File::addDefaultDirectory(ConfMan.get("themepath"));
-
-#ifdef DATA_PATH
-		Common::File::addDefaultDirectoryRecursive(DATA_PATH);
-#endif
-		if (ConfMan.hasKey("extrapath"))
-			Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
-		
+	if (fileName != "builtin") {
 		if (fileName.hasSuffix(".zip"))
 			ImageMan.addArchive(fileName);
 		else 

Modified: scummvm/branches/gsoc2008-gui/gui/themes/default.inc
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/default.inc	2008-08-18 19:06:58 UTC (rev 34002)
+++ scummvm/branches/gsoc2008-gui/gui/themes/default.inc	2008-08-18 19:11:15 UTC (rev 34003)
@@ -189,7 +189,7 @@
 "/> "
 "<text font = 'text_default' "
 "vertical_align = 'center' "
-"horizontal_align = 'right' "
+"horizontal_align = 'left' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'popup_hover' cache = false> "
@@ -208,7 +208,7 @@
 "/> "
 "<text font = 'text_hover' "
 "vertical_align = 'center' "
-"horizontal_align = 'right' "
+"horizontal_align = 'left' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'widget_textedit' cache = false> "
@@ -517,13 +517,13 @@
 "<widget name = 'mcFontButton' "
 "type = 'Button' "
 "/> "
+"<widget name = 'mcFontPath' "
+"height = 'Globals.Line.Height' "
+"/> "
 "<widget name = 'mcFontClearButton' "
 "height = 'Globals.Line.Height' "
 "width = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'mcFontPath' "
-"height = 'Globals.Line.Height' "
-"/> "
 "</layout> "
 "<widget name = 'mcMixedCheckbox' "
 "type = 'Checkbox' "
@@ -1054,13 +1054,13 @@
 "<widget name = 'mcFontButton' "
 "type = 'Button' "
 "/> "
+"<widget name = 'mcFontPath' "
+"height = 'Globals.Line.Height' "
+"/> "
 "<widget name = 'mcFontClearButton' "
 "height = 'Globals.Line.Height' "
 "width = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'mcFontPath' "
-"height = 'Globals.Line.Height' "
-"/> "
 "</layout> "
 "<widget name = 'mcMixedCheckbox' "
 "type = 'Checkbox' "


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.