Add missing north arrow decoration icon & improve grid icon

nirvn · nirvn · commit 767e9a51035d · 2018-11-15T12:42:40.000+07:00
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
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><g transform="matrix(.99986 0 0 1 1.993 1.99)" stroke="#d0d0d0" stroke-opacity=".996" fill="none"><rect x="1.51" y="1.51" width="20" height="20" rx=".728" ry=".728" stroke-linejoin="round"/><path d="M1.47 5.85h20.5M1.53 12.2l20.3.027M1.61 17.8l20.3-.027M5.5 1.5v20M11.5 1.5v20M17.5 1.5v20"/></g><g transform="matrix(.99986 0 0 1 1.993 1.99)" stroke="#000" fill="none"><rect x=".507" y=".507" width="20" height="20" rx=".728" ry=".728" stroke-linejoin="round"/><path d="M.473 4.85h20.5M.527 11.2l20.3.027M.609 16.8l20.3-.027M4.5.5v20M10.5.5v20M16.5.5v20"/></g><g transform="translate(-.615 -.615) scale(.76923)" stroke-width="1.067"><rect height="13" rx="2.789" ry="2.789" width="13" x="19" y="19" fill="#5a8c5a"/><path d="M21.6 25.5h7.8m-3.9 3.9v-7.8" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-width="2.773" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.3 25.5h10.4v-2.6c0-2.6-.65-2.6-5.2-2.6s-5.2 0-5.2 2.6z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g></svg>
diff --git a/images/themes/default/north_arrow.svg b/images/themes/default/north_arrow.svg
@@ -1 +1 @@
-<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><path d="m12 2.06-7.26 19.9 7.26-6.41l7.26 6.41z" fill="#6d97c4" stroke="#415a75" stroke-linejoin="round"/><path d="m14 15h-.834l-2.17-4.51v4.51h-1v-6h1.06l1.95 3.48v-3.48h1z" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 2.06l-7.26 19.9L12 15.55l7.26 6.41z" fill="#6d97c4" stroke="#415a75" stroke-linejoin="round"/><path d="M14 15h-.834l-2.17-4.51V15h-1V9h1.06l1.95 3.48V9h1z" fill="#fff"/><g transform="matrix(.76923 0 0 .76923 -.615 -.615)" stroke-width="1.067"><rect height="13" rx="2.789" ry="2.789" width="13" x="19" y="19" fill="#5a8c5a"/><path d="M21.6 25.5h7.8m-3.9 3.9v-7.8" overflow="visible" fill="#fff" fill-rule="evenodd" stroke="#fff" stroke-width="2.773" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.3 25.5h10.4v-2.6c0-2.6-.65-2.6-5.2-2.6s-5.2 0-5.2 2.6z" opacity=".3" fill="#fcffff" fill-rule="evenodd"/></g></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>
