diff options
| author | Johannes Schickel | 2006-10-08 19:24:31 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-10-08 19:24:31 +0000 |
| commit | e11bfe5f495176156f9b3d2c855ce87cd35e9a3e (patch) | |
| tree | ac266cc55241e65be7f556292074e9b1d3effe52 | |
| parent | 4e22b8262a7db51a3926682f36c45b850a387670 (diff) | |
| download | scummvm-rg350-e11bfe5f495176156f9b3d2c855ce87cd35e9a3e.tar.gz scummvm-rg350-e11bfe5f495176156f9b3d2c855ce87cd35e9a3e.tar.bz2 scummvm-rg350-e11bfe5f495176156f9b3d2c855ce87cd35e9a3e.zip | |
- 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
svn-id: r24222
| -rw-r--r-- | gui/ThemeClassic.cpp | 2 | ||||
| -rw-r--r-- | gui/newgui.cpp | 4 | ||||
| -rw-r--r-- | gui/options.cpp | 4 | ||||
| -rw-r--r-- | gui/themebrowser.cpp | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp index 1485b7e5e7..af41f8ad05 100644 --- a/gui/ThemeClassic.cpp +++ b/gui/ThemeClassic.cpp @@ -39,7 +39,7 @@ ThemeClassic::ThemeClassic(OSystem *system, const Common::String &config, const // '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 diff --git a/gui/newgui.cpp b/gui/newgui.cpp index d8acabf477..dd2819fa57 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -128,8 +128,8 @@ bool NewGui::loadNewTheme(const Common::String &style) { 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")) diff --git a/gui/options.cpp b/gui/options.cpp index 007ef48f07..5afe669d35 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -810,8 +810,10 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3 // 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; diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp index 1ebe7eebde..c8beea392d 100644 --- a/gui/themebrowser.cpp +++ b/gui/themebrowser.cpp @@ -85,9 +85,9 @@ void ThemeBrowser::updateListing() { // 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 '.' |