[QGIS Commit] r9873 - branches/Version-1_0/src/plugins/grass

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2008-12-20 08:32:17 -0500 (Sat, 20 Dec 2008)
New Revision: 9873

Modified:
   branches/Version-1_0/src/plugins/grass/qgsgrassplugin.cpp
Log:
Support for themes in grass toolbox fix


Modified: branches/Version-1_0/src/plugins/grass/qgsgrassplugin.cpp
===================================================================
--- branches/Version-1_0/src/plugins/grass/qgsgrassplugin.cpp	2008-12-20 13:31:42 UTC (rev 9872)
+++ branches/Version-1_0/src/plugins/grass/qgsgrassplugin.cpp	2008-12-20 13:32:17 UTC (rev 9873)
@@ -37,6 +37,7 @@
 #include "qgsvectorlayer.h"
 
 #include <QAction>
+#include <QDir>
 #include <QFileInfo>
 #include <QMessageBox>
 #include <QSettings>
@@ -798,8 +799,8 @@
 // the GRASS plugin resource bundle [TS]
 QIcon QgsGrassPlugin::getThemeIcon( const QString theName )
 {
-  QString myPath = ":/" + QgsApplication::themeName() + "/grass/" + theName;
-  QString myDefaultPath = ":/default/grass/" + theName;
+  QString myPath = QgsApplication::activeThemePath() + QDir::separator() + "grass" + QDir::separator() + theName;
+  QString myDefaultPath = QgsApplication::defaultThemePath() + QDir::separator() + "grass" + QDir::separator() + theName;
   if ( QFile::exists( myPath ) )
   {
     return QIcon( myPath );