different icons for GPS importer and Create new GPX layer (fix #6860)

qgis · Feb 21, 2013 · 64c9a4d · 64c9a4d
1 parent 51edf52
commit 64c9a4d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -412,7 +412,8 @@
         <file>themes/gis/plugins/copyright_label.png</file>
         <file>themes/gis/plugins/delimited_text.png</file>
         <file>themes/gis/plugins/dxf2shp_converter.png</file>
-        <file>themes/gis/plugins/gps_importer.png</file>
+        <file>themes/gis/plugins/gps_importer/create_gpx.png</file>
+        <file>themes/gis/plugins/gps_importer/import_gpx.png</file>
         <file>themes/gis/plugins/interpolation.png</file>
         <file>themes/gis/plugins/mapserver_export.png</file>
         <file>themes/gis/plugins/mGeorefRun.png</file>

diff --git a/images/themes/gis/plugins/CMakeLists.txt b/images/themes/gis/plugins/CMakeLists.txt
@@ -1,4 +1,5 @@
 ADD_SUBDIRECTORY(coordinate_capture)
+ADD_SUBDIRECTORY(gps_importer)
 
 FILE (GLOB IMAGES *.png)
 

diff --git a/images/themes/gis/plugins/gps_importer/CMakeLists.txt b/images/themes/gis/plugins/gps_importer/CMakeLists.txt
@@ -0,0 +1,4 @@
+FILE (GLOB IMAGES *.png)
+
+INSTALL (FILES ${IMAGES}
+         DESTINATION ${QGIS_DATA_DIR}/themes/gis/plugins/gps_importer)
diff --git a/images/themes/gis/plugins/gps_importer/create_gpx.png b/images/themes/gis/plugins/gps_importer/create_gpx.png
diff --git a/images/themes/gis/plugins/gps_importer/import_gpx.png b/images/themes/gis/plugins/gps_importer/import_gpx.png
diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -661,13 +661,13 @@ void QgsGPSPlugin::setupBabel()
 void QgsGPSPlugin::setCurrentTheme( QString theThemeName )
 {
   Q_UNUSED( theThemeName );
-  QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/gps_importer.png";
+  QString myCurThemePath = QgsApplication::activeThemePath() + "/plugins/gps_importer/";
   QString myDefThemePath = QgsApplication::defaultThemePath() + "/plugins/gps_importer.png";
   QString myQrcPath = ":/gps_importer.png";
   if ( QFile::exists( myCurThemePath ) )
   {
-    mQActionPointer->setIcon( QIcon( myCurThemePath ) );
-    mCreateGPXAction->setIcon( QIcon( myCurThemePath ) );
+    mQActionPointer->setIcon( QIcon( myCurThemePath + "import_gpx.png" ) );
+    mCreateGPXAction->setIcon( QIcon( myCurThemePath + "create_gpx.png" ) );
   }
   else if ( QFile::exists( myDefThemePath ) )
   {