Blob Blame History Raw
diff -up kdelibs-3.95.0/kutils/kdeglobals.kcfg.kde149705 kdelibs-3.95.0/kutils/kdeglobals.kcfg
--- kdelibs-3.95.0/kutils/kdeglobals.kcfg.kde149705	2007-10-03 05:50:18.000000000 -0500
+++ kdelibs-3.95.0/kutils/kdeglobals.kcfg	2007-11-04 15:08:14.000000000 -0600
@@ -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" >
diff -up kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp.kde149705	2007-10-26 04:05:41.000000000 -0500
+++ kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp	2007-11-04 15:09:11.000000000 -0600
@@ -835,7 +835,8 @@ void KGlobalSettings::Private::applyGUIS
     QString defaultStyle; // Mac, Windows: no change for style by default
 #endif
     KConfigGroup pConfig (KGlobal::config(), "General");
-    QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+    QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
+
 
     if (kde_overrideStyle.isEmpty()) {
         if (styleStr.isEmpty())
diff -up kdelibs-3.95.0/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-3.95.0/kdeui/icons/kicontheme.cpp
--- kdelibs-3.95.0/kdeui/icons/kicontheme.cpp.kde149705	2007-10-25 04:34:48.000000000 -0500
+++ kdelibs-3.95.0/kdeui/icons/kicontheme.cpp	2007-11-04 15:08:14.000000000 -0600
@@ -515,7 +515,7 @@ QString KIconTheme::current()
         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())
     {