From 98c60977675172fd26e74879e7e0fa68e2f4897c Mon Sep 17 00:00:00 2001 From: thunder2 Date: Wed, 20 May 2015 00:05:47 +0000 Subject: [PATCH] Fixed default style for Windows. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8278 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/settings/rsharesettings.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 4f00046df..a99147ea2 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -100,6 +100,10 @@ RshareSettings::RshareSettings() void RshareSettings::initSettings() { +#ifdef UBUNTU + // use GTK as default style on ubuntu + setDefault(SETTING_STYLE, "GTK+"); +#else #if defined(Q_WS_MAC) setDefault(SETTING_STYLE, "macintosh (aqua)"); #else @@ -117,6 +121,7 @@ void RshareSettings::initSettings() else setDefault(SETTING_STYLE, "plastique"); } +#endif #endif setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode()); @@ -157,12 +162,7 @@ void RshareSettings::setLanguageCode(QString languageCode) /** Gets the interface style key (e.g., "windows", "motif", etc.) */ QString RshareSettings::getInterfaceStyle() { - // use GTK as default style on ubuntu -#ifdef UBUNTU - return value(SETTING_STYLE,QString("GTK+")).toString(); -#else - return value(SETTING_STYLE,QString("Cleanlooks")).toString(); -#endif + return value(SETTING_STYLE).toString(); } /** Sets the interface style key. */