diff options
author | Vicent Marti | 2008-08-18 19:11:15 +0000 |
---|---|---|
committer | Vicent Marti | 2008-08-18 19:11:15 +0000 |
commit | c6111785907a21de60ea13e4be0f2577d902630c (patch) | |
tree | 01d444366cfc309c6c520d595546d02156002ab3 /gui | |
parent | f6ee4117840ea084a0bedda9731108f79ef0e3c2 (diff) | |
download | scummvm-rg350-c6111785907a21de60ea13e4be0f2577d902630c.tar.gz scummvm-rg350-c6111785907a21de60ea13e4be0f2577d902630c.tar.bz2 scummvm-rg350-c6111785907a21de60ea13e4be0f2577d902630c.zip |
Fixed builtin theme.
Removed some legacy code.
svn-id: r34003
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ThemeRenderer.cpp | 11 | ||||
-rw-r--r-- | gui/themes/default.inc | 16 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 40156 -> 40156 bytes | |||
-rw-r--r-- | gui/themes/scummodern.zip | bin | 123105 -> 123105 bytes |
4 files changed, 9 insertions, 18 deletions
diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp index ab186101b1..43659eeb16 100644 --- a/gui/ThemeRenderer.cpp +++ b/gui/ThemeRenderer.cpp @@ -363,16 +363,7 @@ bool ThemeRenderer::addDrawData(const Common::String &data, bool cached) { 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 diff --git a/gui/themes/default.inc b/gui/themes/default.inc index ce7fc16cfc..71e655f5bc 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -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,12 +517,12 @@ "<widget name = 'mcFontButton' " "type = 'Button' " "/> " -"<widget name = 'mcFontClearButton' " +"<widget name = 'mcFontPath' " "height = 'Globals.Line.Height' " -"width = 'Globals.Line.Height' " "/> " -"<widget name = 'mcFontPath' " +"<widget name = 'mcFontClearButton' " "height = 'Globals.Line.Height' " +"width = 'Globals.Line.Height' " "/> " "</layout> " "<widget name = 'mcMixedCheckbox' " @@ -1054,12 +1054,12 @@ "<widget name = 'mcFontButton' " "type = 'Button' " "/> " -"<widget name = 'mcFontClearButton' " +"<widget name = 'mcFontPath' " "height = 'Globals.Line.Height' " -"width = 'Globals.Line.Height' " "/> " -"<widget name = 'mcFontPath' " +"<widget name = 'mcFontClearButton' " "height = 'Globals.Line.Height' " +"width = 'Globals.Line.Height' " "/> " "</layout> " "<widget name = 'mcMixedCheckbox' " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 768d02b7f6..22928d2a85 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip Binary files differindex db728c5169..d5030f8ecf 100644 --- a/gui/themes/scummodern.zip +++ b/gui/themes/scummodern.zip |