diff options
| author | Max Horn | 2006-04-14 13:20:39 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-14 13:20:39 +0000 |
| commit | 1eb526f71aa5967e010960842dd3f4b49a2e6324 (patch) | |
| tree | 06ef4ec25939ec75c877e088af9be943f5e094aa | |
| parent | 7a74eeda082ab0a842976194aadee85843cfa8fb (diff) | |
| download | scummvm-rg350-1eb526f71aa5967e010960842dd3f4b49a2e6324.tar.gz scummvm-rg350-1eb526f71aa5967e010960842dd3f4b49a2e6324.tar.bz2 scummvm-rg350-1eb526f71aa5967e010960842dd3f4b49a2e6324.zip | |
Instead of calling our main them 'default-theme', call it 'modern' and reserve the gui theme name 'default' to indicate, well, the *default* theme, whatever that is
svn-id: r21887
| -rw-r--r-- | gui/newgui.cpp | 6 | ||||
| -rw-r--r-- | gui/themes/modern.ini (renamed from gui/themes/default-theme.ini) | 0 | ||||
| -rw-r--r-- | gui/themes/modern.zip (renamed from gui/themes/default-theme.zip) | bin | 32709 -> 32709 bytes |
3 files changed, 5 insertions, 1 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 881b12766e..ea43be07b1 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -96,8 +96,12 @@ NewGui::NewGui() : _needRedraw(false), _currentKeyDown.keycode = 0; #ifndef DISABLE_FANCY_THEMES - ConfMan.registerDefault("gui_theme", "default-theme"); + ConfMan.registerDefault("gui_theme", "default"); Common::String style = ConfMan.get("gui_theme"); + // The default theme for now is the 'modern' theme. + if (scumm_stricmp(style.c_str(), "default") == 0) + style = "modern"; + if (scumm_stricmp(style.c_str(), "classic") == 0) { #endif _theme = new ThemeClassic(_system); diff --git a/gui/themes/default-theme.ini b/gui/themes/modern.ini index 21ecacc6c7..21ecacc6c7 100644 --- a/gui/themes/default-theme.ini +++ b/gui/themes/modern.ini diff --git a/gui/themes/default-theme.zip b/gui/themes/modern.zip Binary files differindex 8c44d3e16f..8c44d3e16f 100644 --- a/gui/themes/default-theme.zip +++ b/gui/themes/modern.zip |