Merge pull request #2801 from nirvn/virtual_layer_icon

[ui] improve new memory layer icon
qgis · Feb 17, 2016 · 392a88a · 392a88a
2 parents d40d887 + 24a07de
commit 392a88a
Show file tree

Hide file tree

Showing 4 changed files with 326 additions and 2 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -177,6 +177,7 @@
         <file>themes/default/mActionContextHelp.png</file>
         <file>themes/default/mActionCopySelected.png</file>
         <file>themes/default/mActionCreateMemory.png</file>
+        <file>themes/default/mActionCreateMemory.svg</file>
         <file>themes/default/mActionCustomProjection.svg</file>
         <file>themes/default/mActionDecreaseBrightness.svg</file>
         <file>themes/default/mActionDecreaseContrast.svg</file>

diff --git a/images/themes/default/mActionCreateMemory.svg b/images/themes/default/mActionCreateMemory.svg
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2230,7 +2230,7 @@ void QgisApp::setTheme( const QString& theThemeName )
   mActionSetLayerCRS->setIcon( QgsApplication::getThemeIcon( "/mActionSetLayerCRS.png" ) );
   mActionSetProjectCRSFromLayer->setIcon( QgsApplication::getThemeIcon( "/mActionSetProjectCRSFromLayer.png" ) );
   mActionNewVectorLayer->setIcon( QgsApplication::getThemeIcon( "/mActionNewVectorLayer.svg" ) );
-  mActionNewMemoryLayer->setIcon( QgsApplication::getThemeIcon( "/mActionCreateMemory.png" ) );
+  mActionNewMemoryLayer->setIcon( QgsApplication::getThemeIcon( "/mActionCreateMemory.svg" ) );
   mActionAddAllToOverview->setIcon( QgsApplication::getThemeIcon( "/mActionAddAllToOverview.svg" ) );
   mActionHideAllLayers->setIcon( QgsApplication::getThemeIcon( "/mActionHideAllLayers.png" ) );
   mActionShowAllLayers->setIcon( QgsApplication::getThemeIcon( "/mActionShowAllLayers.png" ) );

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -2369,7 +2369,7 @@ Acts on currently active editable layer</string>
   <action name="mActionNewMemoryLayer">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionCreateMemory.png</normaloff>:/images/themes/default/mActionCreateMemory.png</iconset>
+     <normaloff>:/images/themes/default/mActionCreateMemory.svg</normaloff>:/images/themes/default/mActionCreateMemory.svg</iconset>
    </property>
    <property name="text">
     <string>New Temporary Scratch Layer...</string>