[layouts] improve lock item(s) / unlock all toolbar icons (#5929)

qgis · Dec 22, 2017 · 224dcd0 · 224dcd0
1 parent e02ff05
commit 224dcd0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -249,6 +249,7 @@
         <file>themes/default/mActionLabeling.svg</file>
         <file>themes/default/mActionLocalCumulativeCutStretch.svg</file>
         <file>themes/default/mActionLocalHistogramStretch.svg</file>
+        <file>themes/default/mActionLockItems.svg</file>
         <file>themes/default/mActionLowerItems.svg</file>
         <file>themes/default/mActionMapTips.svg</file>
         <file>themes/default/mActionMeasure.svg</file>
@@ -340,6 +341,7 @@
         <file>themes/default/mActionTracing.svg</file>
         <file>themes/default/mActionUndo.svg</file>
         <file>themes/default/mActionUngroupItems.svg</file>
+        <file>themes/default/mActionUnlockAll.svg</file>
         <file>themes/default/mActionSvgAnnotation.svg</file>
         <file>themes/default/mActionWhatsThis.svg</file>
         <file>themes/default/mActionZoomActual.svg</file>

diff --git a/images/themes/default/mActionLockItems.svg b/images/themes/default/mActionLockItems.svg
diff --git a/images/themes/default/mActionUnlockAll.svg b/images/themes/default/mActionUnlockAll.svg
diff --git a/src/ui/layout/qgslayoutdesignerbase.ui b/src/ui/layout/qgslayoutdesignerbase.ui
@@ -625,7 +625,7 @@
   <action name="mActionLockItems">
    <property name="icon">
     <iconset resource="../../../images/images.qrc">
-     <normaloff>:/images/themes/default/locked.svg</normaloff>:/images/themes/default/locked.svg</iconset>
+     <normaloff>:/images/themes/default/mActionLockItems.svg</normaloff>:/images/themes/default/mActionLockItems.svg</iconset>
    </property>
    <property name="text">
     <string>Loc&amp;k Selected Items</string>
@@ -637,7 +637,7 @@
   <action name="mActionUnlockAll">
    <property name="icon">
     <iconset resource="../../../images/images.qrc">
-     <normaloff>:/images/themes/default/unlocked.svg</normaloff>:/images/themes/default/unlocked.svg</iconset>
+     <normaloff>:/images/themes/default/mActionUnlockAll.svg</normaloff>:/images/themes/default/mActionUnlockAll.svg</iconset>
    </property>
    <property name="text">
     <string>Unl&amp;ock All</string>