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

List:       kde-commits
Subject:    kdebase/kcontrol/icons
From:       Piotr Szymanski <djurban () linuxpl ! org>
Date:       2004-06-05 16:28:16
Message-ID: 20040605162816.53B8C126EC () office ! kde ! org
[Download RAW message or body]

CVS commit by djurban: 

- my last fix for this was incorrect, now should work (and is faster than the idea \
with an extension independent KIconTheme::iconPath)


  M +14 -3     iconthemes.cpp   1.42


--- kdebase/kcontrol/icons/iconthemes.cpp  #1.41:1.42
@@ -343,13 +343,24 @@ void IconThemesConfig::themeSelected(QLi
   updateRemoveButton();
 
-  KIcon icon=icontheme.iconPath("exec",
+  KIcon icon=icontheme.iconPath("exec.png",
+        icontheme.defaultSize(KIcon::Desktop),KIcon::MatchBest);
+  if (!icon.isValid())
+          icon=icontheme.iconPath("exec.svg",
         icontheme.defaultSize(KIcon::Desktop),KIcon::MatchBest);
   kdDebug() << icon.path<< "\n";
   m_previewExec->setPixmap(QPixmap(icon.path));
-  icon=icontheme.iconPath("folder",
+
+  icon=icontheme.iconPath("folder.png",
+        icontheme.defaultSize(KIcon::Desktop),KIcon::MatchBest);
+  if (!icon.isValid())
+          icon=icontheme.iconPath("folder.svg",
         icontheme.defaultSize(KIcon::Desktop),KIcon::MatchBest);
   kdDebug() << icon.path<< "\n";
   m_previewFolder->setPixmap(QPixmap(icon.path));
-  icon=icontheme.iconPath("txt",
+
+  icon=icontheme.iconPath("txt.png",
+        icontheme.defaultSize(KIcon::Desktop),KIcon::MatchBest);
+  if (!icon.isValid())
+          icon=icontheme.iconPath("txt.svg",
         icontheme.defaultSize(KIcon::Desktop),KIcon::MatchBest);
   kdDebug() << icon.path<< "\n";


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