Use QgsApplication::themPath() to find pyramid icons and use their new names

timlinux · timlinux · commit 2ee79cf56b58 · 2006-01-11T21:36:55.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4650 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsrasterlayerproperties.cpp b/src/gui/qgsrasterlayerproperties.cpp
@@ -16,6 +16,7 @@ email                : tim@linfiniti.com
  ***************************************************************************/
 
 
+#include "qgsapplication.h"
 #include "qgsrasterlayerproperties.h"
 #include "qgslayerprojectionselector.h"
 #include "qgsproject.h"
@@ -194,12 +195,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties(QgsMapLayer *lyr, QWidget *pa
     cboGray->insertItem(tr("Not Set"));
   }
 
-  //
-#if defined(WIN32) || defined(Q_OS_MACX)
-  QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
-#endif
-  QPixmap myPyramidPixmap(QString(PKGDATAPATH) + QString("/images/icons/pyramid.png"));
-  QPixmap myNoPyramidPixmap(QString(PKGDATAPATH) + QString("/images/icons/no_pyramid.png"));
+  QString myThemePath = QgsApplication::themePath();
+  QPixmap myPyramidPixmap(myThemePath + "/mIconPyramid.png");
+  QPixmap myNoPyramidPixmap(myThemePath + "/mIconNoPyramid.png");
 
   // Only do pyramids if dealing directly with GDAL.
   if (!(rasterLayer->usesProvider()))
@@ -458,11 +456,10 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
   // repopulate the pyramids list
   //
   lbxPyramidResolutions->clear();
-#if defined(WIN32) || defined(Q_OS_MACX)
-  QString PKGDATAPATH = qApp->applicationDirPath() + "/share/qgis";
-#endif
-  QPixmap myPyramidPixmap(QString(PKGDATAPATH) + QString("/images/icons/pyramid.png"));
-  QPixmap myNoPyramidPixmap(QString(PKGDATAPATH) + QString("/images/icons/no_pyramid.png"));
+  QString myThemePath = QgsApplication::themePath();
+  QPixmap myPyramidPixmap(myThemePath + "/mIconPyramid.png");
+  QPixmap myNoPyramidPixmap(myThemePath + "/mIconNoPyramid.png");
+
   QgsRasterLayer::RasterPyramidList::iterator myRasterPyramidIterator;
   for ( myRasterPyramidIterator=myPyramidList.begin();
           myRasterPyramidIterator != myPyramidList.end();
