From be7d563ba1e0b20cfe397f2cf4da6f7e3df78d22 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 18 Oct 2012 14:37:36 +0300 Subject: Simplify reading values from config. --- src/gui/setup_theme.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/gui/setup_theme.cpp') diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index 5d34066e1..1886405be 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -163,7 +163,7 @@ Setup_Theme::Setup_Theme() : mThemeLabel(new Label(_("Gui theme"))), mThemesModel(new ThemesModel), mThemeDropDown(new DropDown(mThemesModel)), - mTheme(config.getValue("theme", config.getValue("selectedSkin", ""))), + mTheme(config.getStringValue("theme")), mFontsModel(new FontsModel), mFontLabel(new Label(_("Main Font"))), mFontDropDown(new DropDown(mFontsModel)), @@ -344,7 +344,7 @@ void Setup_Theme::action(const gcn::ActionEvent &event) void Setup_Theme::cancel() { - mTheme = config.getValue("theme", config.getValue("selectedSkin", "")); + mTheme = config.getStringValue("theme"); mLang = config.getStringValue("lang"); mFont = getFileName(config.getStringValue("font")); mBoldFont = getFileName(config.getStringValue("boldFont")); @@ -356,8 +356,7 @@ void Setup_Theme::cancel() void Setup_Theme::apply() { - if (config.getValue("theme", - config.getValue("selectedSkin", "")) != mTheme) + if (config.getStringValue("theme") != mTheme) { new OkDialog(_("Theme Changed"), _("Restart your client for " "the change to take effect.")); -- cgit v1.2.3-60-g2f50