|
Rex Dieter |
ecb23ae |
diff -up kdelibs-4.10.0/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.10.0/kdeui/icons/kicontheme.cpp
|
|
Rex Dieter |
ecb23ae |
--- kdelibs-4.10.0/kdeui/icons/kicontheme.cpp.kde149705 2013-01-23 15:44:19.000000000 -0600
|
|
Rex Dieter |
ecb23ae |
+++ kdelibs-4.10.0/kdeui/icons/kicontheme.cpp 2013-01-31 07:40:19.163166653 -0600
|
|
Rex Dieter |
ecb23ae |
@@ -527,7 +527,7 @@ QString KIconTheme::current()
|
|
|
67be42f |
}
|
|
Lorenzo Villani |
7e79889 |
|
|
Lorenzo Villani |
7e79889 |
KConfigGroup cg(KGlobal::config(), "Icons");
|
|
Lorenzo Villani |
7e79889 |
- *_theme = cg.readEntry("Theme", defaultThemeName());
|
|
Lorenzo Villani |
7e79889 |
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
|
|
|
67be42f |
if ( *_theme == QLatin1String("hicolor") ) {
|
|
|
67be42f |
*_theme = defaultThemeName();
|
|
|
67be42f |
}
|
|
Rex Dieter |
ecb23ae |
diff -up kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp
|
|
Rex Dieter |
ecb23ae |
--- kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp.kde149705 2013-01-23 15:44:19.000000000 -0600
|
|
Rex Dieter |
ecb23ae |
+++ kdelibs-4.10.0/kdeui/kernel/kglobalsettings.cpp 2013-01-31 07:40:19.163166653 -0600
|
|
Rex Dieter |
ecb23ae |
@@ -942,7 +942,7 @@ void KGlobalSettings::Private::applyGUIS
|
|
Lorenzo Villani |
7e79889 |
if (kde_overrideStyle.isEmpty()) {
|
|
Lorenzo Villani |
7e79889 |
const QString &defaultStyle = KStyle::defaultStyle();
|
|
Lorenzo Villani |
7e79889 |
const KConfigGroup pConfig(KGlobal::config(), "General");
|
|
Lorenzo Villani |
7e79889 |
- const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
|
|
|
85bf2b2 |
+ const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
|
|
Lorenzo Villani |
7e79889 |
|
|
Lorenzo Villani |
7e79889 |
if (styleStr.isEmpty() ||
|
|
Lorenzo Villani |
7e79889 |
// check whether we already use the correct style to return then
|
|
Rex Dieter |
ecb23ae |
diff -up kdelibs-4.10.0/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.10.0/kutils/kdeglobals.kcfg
|
|
Rex Dieter |
ecb23ae |
--- kdelibs-4.10.0/kutils/kdeglobals.kcfg.kde149705 2013-01-23 15:44:26.000000000 -0600
|
|
Rex Dieter |
ecb23ae |
+++ kdelibs-4.10.0/kutils/kdeglobals.kcfg 2013-01-31 07:40:19.164166641 -0600
|
|
Lorenzo Villani |
7e79889 |
@@ -24,6 +24,10 @@
|
|
Lorenzo Villani |
7e79889 |
<whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
|
|
Lorenzo Villani |
7e79889 |
<default>keramik</default>
|
|
Lorenzo Villani |
7e79889 |
</entry>
|
|
Lorenzo Villani |
7e79889 |
+ <entry key="widgetStyle4" type="String" >
|
|
Lorenzo Villani |
7e79889 |
+ <label>Widget style to use for KDE 4</label>
|
|
Lorenzo Villani |
7e79889 |
+ <whatsthis>The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.</whatsthis>
|
|
Lorenzo Villani |
7e79889 |
+ </entry>
|
|
Lorenzo Villani |
7e79889 |
<entry key="windowBackground" type="String" />
|
|
Lorenzo Villani |
7e79889 |
<entry key="windowForeground" type="String" />
|
|
Lorenzo Villani |
7e79889 |
<entry key="UseSystemBell" type="Bool" >
|