Skip to content

Commit

Permalink
Merge pull request #8305 from signedav/action-icon
Browse files Browse the repository at this point in the history
Different mAction icon, when action activated
  • Loading branch information
m-kuhn committed Oct 26, 2018
2 parents e797f7e + 37d0fb4 commit 04edcb7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions images/images.qrc
Expand Up @@ -724,6 +724,7 @@
<file>themes/default/mIconFolderLink.svg</file>
<file>themes/default/mIconFolderOpen.svg</file>
<file>themes/default/mIconFolderProject.svg</file>
<file>themes/default/mActionActive.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Expand Down
1 change: 1 addition & 0 deletions images/themes/default/mActionActive.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/app/qgisapp.cpp
Expand Up @@ -6837,6 +6837,8 @@ void QgisApp::updateDefaultFeatureAction( QAction *action )

if ( !qgsAction.icon().isNull() )
mActionFeatureAction->setIcon( qgsAction.icon() );
else
mActionFeatureAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionActive.svg" ) ) );
}
else
{
Expand All @@ -6853,6 +6855,8 @@ void QgisApp::updateDefaultFeatureAction( QAction *action )

if ( !mapLayerAction->icon().isNull() )
mActionFeatureAction->setIcon( mapLayerAction->icon() );
else
mActionFeatureAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionActive.svg" ) ) );
}
else
{
Expand Down

0 comments on commit 04edcb7

Please sign in to comment.