[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/icons
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2007-03-08 19:22:05
Message-ID: 1173381725.304555.14301.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 640665 by aseigo:

make oxygen the default icon theme


 M  +10 -6     kicontheme.cpp  


--- trunk/KDE/kdelibs/kdeui/icons/kicontheme.cpp #640664:640665
@@ -93,7 +93,7 @@
     // files are used..
 
     if (!appName.isEmpty() &&
-       ( name == "crystalsvg" || name== "hicolor" || name == "locolor" ) )
+       ( name == defaultThemeName() || name== "hicolor" || name == "locolor" ) )
     {
 	icnlibs = KGlobal::dirs()->resourceDirs("data");
 	for (it=icnlibs.begin(); it!=icnlibs.end(); ++it)
@@ -145,9 +145,13 @@
     mDesc = cfg.readEntry("Comment");
     mDepth = cfg.readEntry("DisplayDepth", 32);
     mInherits = cfg.readEntry("Inherits", QStringList());
-    if ( name != "crystalsvg" )
-      for ( QStringList::Iterator it = mInherits.begin(); it != mInherits.end(); ++it )
-         if ( *it == "default" || *it == "hicolor" ) *it="crystalsvg";
+    if ( name != defaultThemeName() ) {
+      for ( QStringList::Iterator it = mInherits.begin(); it != mInherits.end(); ++it ) {
+         if ( *it == "default" || *it == "hicolor" ) {
+             *it = defaultThemeName();
+         }
+      }
+    }
 
     d->hidden = cfg.readEntry("Hidden", false);
     d->example = cfg.readPathEntry("Example");
@@ -441,7 +445,7 @@
     themeStaticDeleter.setObject(_theme, new QString);
 
     KConfigGroup cg(KGlobal::config(), "Icons");
-    *_theme = cg.readEntry("Theme",defaultThemeName());
+    *_theme = cg.readEntry("Theme", defaultThemeName());
     if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
 /*    if (_theme->isEmpty())
     {
@@ -503,7 +507,7 @@
 // static
 QString KIconTheme::defaultThemeName()
 {
-    return QLatin1String("crystalsvg");
+    return QLatin1String("oxygen");
 }
 
 void KIconTheme::assignIconsToContextMenu( ContextMenus type,
[prev in list] [next in list] [prev in thread] [next in thread]