Remove mActionDiagramProperties.svg icon (#3910)

qgis · Dec 27, 2016 · 8ccc511 · 8ccc511
1 parent 792fcb5
commit 8ccc511
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -212,7 +212,6 @@
         <file>themes/default/mActionInvertSelection.svg</file>
         <file>themes/default/mActionLabel.svg</file>
         <file>themes/default/mActionLabeling.svg</file>
-        <file>themes/default/mActionDiagramProperties.svg</file>
         <file>themes/default/mActionLocalCumulativeCutStretch.svg</file>
         <file>themes/default/mActionLocalHistogramStretch.svg</file>
         <file>themes/default/mActionLowerItems.svg</file>

diff --git a/images/themes/default/mActionDiagramProperties.svg b/images/themes/default/mActionDiagramProperties.svg
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2726,7 +2726,7 @@ void QgisApp::setTheme( const QString& theThemeName )
   mActionMoveLabel->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionMoveLabel.svg" ) ) );
   mActionRotateLabel->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionRotateLabel.svg" ) ) );
   mActionChangeLabelProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionChangeLabelProperties.svg" ) ) );
-  mActionDiagramProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionDiagramProperties.svg" ) ) );
+  mActionDiagramProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/diagram.svg" ) ) );
   mActionDecorationCopyright->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/copyright_label.png" ) ) );
   mActionDecorationNorthArrow->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/north_arrow.png" ) ) );
   mActionDecorationScaleBar->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/scale_bar.png" ) ) );

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -2492,7 +2492,7 @@ Acts on currently active editable layer</string>
   <action name="mActionDiagramProperties">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionDiagramProperties.svg</normaloff>:/images/themes/default/mActionDiagramProperties.svg</iconset>
+     <normaloff>:/images/themes/default/propertyicons/diagram.svg</normaloff>:/images/themes/default/propertyicons/diagram.svg</iconset>
    </property>
    <property name="text">
     <string>Diagram Options</string>