[Scummvm-cvs-logs] SF.net SVN: scummvm: [24222] scummvm/trunk/gui
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Oct 8 21:24:40 CEST 2006
Revision: 24222
http://svn.sourceforge.net/scummvm/?rev=24222&view=rev
Author: lordhoto
Date: 2006-10-08 12:24:31 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
- reworked my commit for r24216, not 'Classic (Builtin)' uses the builtin classic theme and classic uses the classic.ini file
- save the chosen theme now
Modified Paths:
--------------
scummvm/trunk/gui/ThemeClassic.cpp
scummvm/trunk/gui/newgui.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/themebrowser.cpp
Modified: scummvm/trunk/gui/ThemeClassic.cpp
===================================================================
--- scummvm/trunk/gui/ThemeClassic.cpp 2006-10-08 19:23:08 UTC (rev 24221)
+++ scummvm/trunk/gui/ThemeClassic.cpp 2006-10-08 19:24:31 UTC (rev 24222)
@@ -39,7 +39,7 @@
// 'classic' is always the built in one, we force it and
// ignore all 'classic' named config files
- if (config.compareToIgnoreCase("classic") != 0) {
+ if (config.compareToIgnoreCase("classic (builtin)") != 0) {
if (cfg)
_configFile = *cfg;
else
Modified: scummvm/trunk/gui/newgui.cpp
===================================================================
--- scummvm/trunk/gui/newgui.cpp 2006-10-08 19:23:08 UTC (rev 24221)
+++ scummvm/trunk/gui/newgui.cpp 2006-10-08 19:24:31 UTC (rev 24222)
@@ -128,8 +128,8 @@
Common::String oldTheme = (_theme != 0) ? _theme->getStylefileName() : "";
delete _theme;
- if (style.compareToIgnoreCase("classic") == 0) {
- _theme = new ThemeClassic(_system);
+ if (style.compareToIgnoreCase("classic (builtin)") == 0) {
+ _theme = new ThemeClassic(_system, style);
} else {
if (Theme::themeConfigUseable(style, "", &styleType, &cfg)) {
if (0 == styleType.compareToIgnoreCase("classic"))
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2006-10-08 19:23:08 UTC (rev 24221)
+++ scummvm/trunk/gui/options.cpp 2006-10-08 19:24:31 UTC (rev 24222)
@@ -810,8 +810,10 @@
// User made his choice...
Common::String theme = browser.selected();
if (0 != theme.compareToIgnoreCase(g_gui.theme()->getStylefileName()))
- if (g_gui.loadNewTheme(theme))
+ if (g_gui.loadNewTheme(theme)) {
_curTheme->setLabel(theme);
+ ConfMan.set("gui_theme", theme, _domain);
+ }
draw();
}
break;
Modified: scummvm/trunk/gui/themebrowser.cpp
===================================================================
--- scummvm/trunk/gui/themebrowser.cpp 2006-10-08 19:23:08 UTC (rev 24221)
+++ scummvm/trunk/gui/themebrowser.cpp 2006-10-08 19:24:31 UTC (rev 24222)
@@ -85,9 +85,9 @@
// classic is always build in
Entry th;
- th.name = "classic";
- th.type = "classic";
- th.file = "classic";
+ th.name = "Classic (Builtin)";
+ th.type = "Classic";
+ th.file = "Classic (Builtin)";
_themes.push_back(th);
// we are using only the paths 'themepath', 'extrapath', DATA_PATH and '.'
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