Add missing north arrow decoration icon & improve grid icon

qgis · Nov 15, 2018 · 767e9a5 · 767e9a5
1 parent f342f1c
commit 767e9a5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -155,6 +155,7 @@
         <file>themes/default/grass_mapset.svg</file>
         <file>themes/default/grass_mapset_open.svg</file>
         <file>themes/default/grass_mapset_search.svg</file>
+        <file>themes/default/grid.svg</file>
         <file>themes/default/histogram.svg</file>
         <file>themes/default/heatmap.svg</file>
         <file>themes/default/join_bevel.svg</file>

diff --git a/images/themes/default/grid.svg b/images/themes/default/grid.svg
diff --git a/images/themes/default/north_arrow.svg b/images/themes/default/north_arrow.svg
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3379,9 +3379,9 @@ void QgisApp::setTheme( const QString &themeName )
   mActionDiagramProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/diagram.svg" ) ) );
   mActionDecorationTitle->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/title_label.svg" ) ) );
   mActionDecorationCopyright->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/copyright_label.svg" ) ) );
-  mActionDecorationNorthArrow->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/north_arrow.png" ) ) );
+  mActionDecorationNorthArrow->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/north_arrow.svg" ) ) );
   mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionScaleBar.svg" ) ) );
-  mActionDecorationGrid->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/transformed.svg" ) ) );
+  mActionDecorationGrid->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/grid.svg" ) ) );
   mActionReverseLine->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionReverseLine.svg" ) ) );
 
   emit currentThemeChanged( themeName );

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -2109,7 +2109,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
   <action name="mActionDecorationGrid">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/transformed.svg</normaloff>:/images/themes/default/transformed.svg</iconset>
+     <normaloff>:/images/themes/default/grid.svg</normaloff>:/images/themes/default/grid.svg</iconset>
    </property>
    <property name="text">
     <string>&amp;Grid…</string>