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

List:       kde-commits
Subject:    extragear/sysadmin/muon/installer
From:       Jonathan Michael Thomas <echidnaman () kubuntu ! org>
Date:       2010-12-19 22:27:34
Message-ID: 20101219222734.D94ADAC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207837 by jmthomas:

Add the app-install-data icon directory to the KDE resource pool in a more global location


 M  +0 -3      ApplicationModel/ApplicationDelegate.cpp  
 M  +5 -1      main.cpp  


--- trunk/extragear/sysadmin/muon/installer/ApplicationModel/ApplicationDelegate.cpp #1207836:1207837
@@ -66,9 +66,6 @@
     width = qMax(width, button2.sizeHint().width());
     m_buttonSize.setWidth(width);
 
-    // For icons later
-    KGlobal::dirs()->addResourceDir("appicon", "/usr/share/app-install/icons/");
-
     m_ratingPainter = new KRatingPainter;
 }
 
--- trunk/extragear/sysadmin/muon/installer/main.cpp #1207836:1207837
@@ -20,9 +20,10 @@
 
 #include "ApplicationWindow.h"
 
-#include <KUniqueApplication>
 #include <KAboutData>
 #include <KCmdLineArgs>
+#include <KStandardDirs>
+#include <KUniqueApplication>
 
 #include <stdio.h>
 
@@ -46,8 +47,11 @@
     }
 
     KUniqueApplication app;
+    // Translations
     KGlobal::locale()->insertCatalog("app-install-data");
     KGlobal::locale()->insertCatalog("libmuon");
+    // Needed for KIcon compatibility w/ application icons from app-install-data
+    KGlobal::dirs()->addResourceDir("appicon", "/usr/share/app-install/icons/");
     app.disableSessionManagement();
 
     ApplicationWindow *mainWindow = new ApplicationWindow;
[prev in list] [next in list] [prev in thread] [next in thread]