Fixed default style for Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8278 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-05-20 00:05:47 +00:00
parent 69c1df7e2d
commit 98c6097767

View File

@ -100,6 +100,10 @@ RshareSettings::RshareSettings()
void RshareSettings::initSettings() void RshareSettings::initSettings()
{ {
#ifdef UBUNTU
// use GTK as default style on ubuntu
setDefault(SETTING_STYLE, "GTK+");
#else
#if defined(Q_WS_MAC) #if defined(Q_WS_MAC)
setDefault(SETTING_STYLE, "macintosh (aqua)"); setDefault(SETTING_STYLE, "macintosh (aqua)");
#else #else
@ -117,6 +121,7 @@ void RshareSettings::initSettings()
else else
setDefault(SETTING_STYLE, "plastique"); setDefault(SETTING_STYLE, "plastique");
} }
#endif
#endif #endif
setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode()); setDefault(SETTING_LANGUAGE, LanguageSupport::defaultLanguageCode());
@ -157,12 +162,7 @@ void RshareSettings::setLanguageCode(QString languageCode)
/** Gets the interface style key (e.g., "windows", "motif", etc.) */ /** Gets the interface style key (e.g., "windows", "motif", etc.) */
QString RshareSettings::getInterfaceStyle() QString RshareSettings::getInterfaceStyle()
{ {
// use GTK as default style on ubuntu return value(SETTING_STYLE).toString();
#ifdef UBUNTU
return value(SETTING_STYLE,QString("GTK+")).toString();
#else
return value(SETTING_STYLE,QString("Cleanlooks")).toString();
#endif
} }
/** Sets the interface style key. */ /** Sets the interface style key. */