Move GPS icon to standard icons folder

qgis · Jul 30, 2021 · ff13047 · ff13047
1 parent f115db6
commit ff13047
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 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/mIconGps.svg</file>
         <file>themes/default/mActionNewGpx.svg</file>
     </qresource>
     <qresource prefix="/images/tips">

diff --git a/src/plugins/gps_importer/import_gpx.svg → images/themes/default/mIconGps.svg b/src/plugins/gps_importer/import_gpx.svg → images/themes/default/mIconGps.svg
diff --git a/src/plugins/gps_importer/qgsgps_plugin.qrc b/src/plugins/gps_importer/qgsgps_plugin.qrc
@@ -1,6 +1,5 @@
 <RCC>
-    <qresource prefix="/">
+    <qresource prefix="/" >
         <file>gps_importer.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
@@ -522,22 +522,7 @@ void QgsGpsPlugin::setCurrentTheme( const QString &themeName )
   QString myQrcPath = QStringLiteral( ":/" );
   if ( mQActionPointer )
   {
-    if ( QFile::exists( myCurThemePath ) )
-    {
-      mQActionPointer->setIcon( QIcon( myCurThemePath + "import_gpx.svg" ) );
-    }
-    else if ( QFile::exists( myDefThemePath ) )
-    {
-      mQActionPointer->setIcon( QIcon( myDefThemePath + "import_gpx.svg" ) );
-    }
-    else if ( QFile::exists( myQrcPath ) )
-    {
-      mQActionPointer->setIcon( QIcon( myQrcPath + "import_gpx.svg" ) );
-    }
-    else
-    {
-      mQActionPointer->setIcon( QIcon() );
-    }
+    mQActionPointer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mIconGps.svg" ) ) );
   }
 }