Skip to content

Commit

Permalink
Add missing north arrow decoration icon & improve grid icon
Browse files Browse the repository at this point in the history
  • Loading branch information
nirvn committed Nov 15, 2018
1 parent f342f1c commit 767e9a5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions images/themes/default/grid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/themes/default/north_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgisapp.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 767e9a5

Please sign in to comment.