Blob Blame History Raw
diff -ur kdelibs-3.93.0/kdeui/icons/kicontheme.cpp kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp
--- kdelibs-3.93.0/kdeui/icons/kicontheme.cpp	2007-07-26 12:43:19.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/icons/kicontheme.cpp	2007-09-10 06:13:41.000000000 +0200
@@ -504,7 +504,7 @@
         return *_theme;
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme", defaultThemeName());
+    *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
diff -ur kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.93.0/kdeui/kernel/kglobalsettings.cpp	2007-08-29 23:53:34.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kdeui/kernel/kglobalsettings.cpp	2007-09-10 06:10:35.000000000 +0200
@@ -856,7 +856,7 @@
 #ifdef Q_WS_X11
     KConfigGroup pConfig (KGlobal::config(), "General");
     QString defaultStyle = QLatin1String("plastique");// = KStyle::defaultStyle(); ### wait for KStyle4
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
 
     if (kde_overrideStyle.isEmpty()) {
         // ### add check whether we already use the correct style to return then
diff -ur kdelibs-3.93.0/kutils/kdeglobals.kcfg kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg
--- kdelibs-3.93.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.93.0-kde149705/kutils/kdeglobals.kcfg	2007-09-10 06:18:45.000000000 +0200
@@ -24,6 +24,10 @@
    <whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
    <default>keramik</default>
   </entry>
+  <entry key="widgetStyle4" type="String" >
+   <label>Widget style to use for KDE 4</label>
+   <whatsthis>The name of the widget style, for example &quot;oxygen&quot;. Without quotes. Defaults to widgetStyle.</whatsthis>
+  </entry>
   <entry key="windowBackground" type="String" />
   <entry key="windowForeground" type="String" />
   <entry key="UseSystemBell" type="Bool" >