Move new gpx icon to standard location

qgis · Jul 30, 2021 · d0f3c26 · d0f3c26
1 parent aa68824
commit d0f3c26
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -925,6 +925,7 @@
         <file>themes/default/mActionMeshDigitizing.svg</file>
         <file>themes/default/mActionNewMeshLayer.svg</file>
         <file>themes/default/mIconGeometryCollectionLayer.svg</file>
+        <file>themes/default/mActionNewGpx.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/mActionNewGpx.svg b/images/themes/default/mActionNewGpx.svg
diff --git a/src/plugins/gps_importer/qgsgps_plugin.qrc b/src/plugins/gps_importer/qgsgps_plugin.qrc
@@ -1,7 +1,6 @@
 <RCC>
-    <qresource prefix="/" >
+    <qresource prefix="/">
         <file>gps_importer.svg</file>
-        <file>create_gpx.svg</file>
         <file>import_gpx.svg</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -671,17 +671,17 @@ void QgsGpsPlugin::setCurrentTheme( const QString &themeName )
     if ( QFile::exists( myCurThemePath ) )
     {
       mQActionPointer->setIcon( QIcon( myCurThemePath + "import_gpx.svg" ) );
-      mCreateGPXAction->setIcon( QIcon( myCurThemePath + "create_gpx.svg" ) );
+      mCreateGPXAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionNewGpx.svg" ) ) );
     }
     else if ( QFile::exists( myDefThemePath ) )
     {
       mQActionPointer->setIcon( QIcon( myDefThemePath + "import_gpx.svg" ) );
-      mCreateGPXAction->setIcon( QIcon( myDefThemePath + "create_gpx.svg" ) );
+      mCreateGPXAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionNewGpx.svg" ) ) );
     }
     else if ( QFile::exists( myQrcPath ) )
     {
       mQActionPointer->setIcon( QIcon( myQrcPath + "import_gpx.svg" ) );
-      mCreateGPXAction->setIcon( QIcon( myQrcPath + "create_gpx.svg" ) );
+      mCreateGPXAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mActionNewGpx.svg" ) ) );
     }
     else
     {