[layouts] use gray icons for the items panel

nirvn · nirvn · commit 3dc52117159f · 2017-12-21T10:33:24.000+07:00
diff --git a/images/images.qrc b/images/images.qrc
@@ -321,6 +321,7 @@
         <file>themes/default/mActionSharingExport.svg</file>
         <file>themes/default/mActionSharingImport.svg</file>
         <file>themes/default/mActionShowAllLayers.svg</file>
+        <file>themes/default/mActionShowAllLayersGray.svg</file>
         <file>themes/default/mActionShowBookmarks.svg</file>
         <file>themes/default/mActionShowHideLabels.svg</file>
         <file>themes/default/mActionShowPinnedLabels.svg</file>
diff --git a/images/themes/default/lockedGray.svg b/images/themes/default/lockedGray.svg
@@ -1,7 +1 @@
-<svg enable-background="new 0 0 24 24" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
-<g stroke-linecap="square" transform="translate(0 -16)">
-<path d="m4.4067695 22.865202c.118637-3.818452.9490726-5.54713 3.8198656-5.314294 2.8704699.232276 3.5159769 2.078983 3.3968089 5.897741" fill="none" stroke="#888a85" stroke-linejoin="round" stroke-width="3"/>
-<path d="m4.2757863 25l .1166762-2.134798c.118637-3.818452.9490726-5.591324 3.8198656-5.358488 2.8704699.232276 3.5159769 2.123177 3.3968089 5.941935l-.085506 1.551351" fill="none" stroke="#eeeeec" stroke-linejoin="round"/>
-<rect fill="#666" height="7" rx=".84615386" ry="1" stroke="#666" stroke-width=".99999994" width="11" x="2.5" y="24.5"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M4.407 7.888c.118-3.818.949-5.547 3.82-5.314 2.87.232 3.516 2.08 3.396 5.898" fill="none" stroke="#888a85" stroke-width="3" stroke-linecap="square" stroke-linejoin="round"/><path d="M4.276 10.023l.116-2.135c.12-3.818.95-5.59 3.82-5.358 2.87.232 3.516 2.123 3.397 5.942l-.085 1.551" fill="none" stroke="#eeeeec" stroke-linecap="square" stroke-linejoin="round"/><rect y="8.5" x="2.5" width="11" ry="1" rx=".846" height="7" fill="#666" stroke="#666" stroke-linecap="square"/></svg>
diff --git a/images/themes/default/mActionShowAllLayersGray.svg b/images/themes/default/mActionShowAllLayersGray.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><radialGradient id="a" cx="16.5" cy="-12.5" gradientTransform="matrix(.71393 1.06416 -.69303 .45911 -10.292 4.616)" gradientUnits="userSpaceOnUse" r="7"><stop offset="0" stop-color="#fffff4"/><stop offset="1" stop-color="#a0a0a0"/></radialGradient><g transform="translate(0 -8)"><path d="M23.92 22.589s-1.891-.277-2.87-1.367c-.627-.697-3.68-3.947-5.455-4.65-2.963-1.173-5.321-1.134-7.57-.547-2.09.547-3.53 1.338-4.903 2.646-.64.608-1.518 2.273-1.506 2.551-.019.23 1.215 2.153 2.868 3.326 1.508 1.07 3.592 2.337 5.903 2.733 2.795.48 3.821.38 6.48-.47 1.4-.447 3.889-2.57 3.889-2.57s.52-.35 1.333-.953c.7-.52 1.832-.699 1.832-.699z" fill="#eeeeec" fill-rule="evenodd"/><path d="M10.704 15.637c-.788.029-1.067.046-1.907.208a14.32 14.32 0 0 0-1.26.314c-.829.986-1.232 2.303-1.232 3.587 0 3.025 2.468 5.477 5.512 5.477 3.043 0 5.51-2.452 5.511-5.477-.002-.803.042-1.575-.302-2.301-.524-.4-1.16-.754-1.584-.918-1.87-.722-3.335-.942-4.738-.89z" fill="url(#a)" stroke="#424242" stroke-linecap="round" stroke-linejoin="round"/><ellipse cx="11.817" cy="19.659" rx="2.226" ry="2.212"/><path d="M1.143 15.424c5.006-1.495 8.554-2.062 10.993-2.286 5.222-.479 7.062.4 8.403 1.389 1.448 1.067 1.763 1.76 1.763 1.76" fill="none" stroke="#888a85"/><path d="M23.92 22.589s-1.891-.277-2.87-1.367c-.627-.697-3.68-3.947-5.455-4.65-2.963-1.173-5.321-1.134-7.57-.547-2.09.547-3.53 1.338-4.903 2.646-.64.608-1.518 2.273-1.506 2.551-.019.23 1.215 2.153 2.868 3.326 1.508 1.07 3.592 2.337 5.903 2.733 2.795.48 3.821.38 6.48-.47 1.4-.447 3.889-2.57 3.889-2.57s.52-.35 1.333-.953c.7-.52 1.832-.699 1.832-.699z" fill="none" stroke="#888a85"/><ellipse cx="11.17" cy="18.742" fill="#eeeeec" rx=".891" ry=".885"/></g></svg>
diff --git a/src/core/layout/qgslayoutmodel.cpp b/src/core/layout/qgslayoutmodel.cpp
@@ -248,11 +248,11 @@ QVariant QgsLayoutModel::headerData( int section, Qt::Orientation orientation, i
     {
       if ( section == Visibility )
       {
-        return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/mActionShowAllLayers.svg" ) ) );
+        return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/mActionShowAllLayersGray.svg" ) ) );
       }
       else if ( section == LockStatus )
       {
-        return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/locked.svg" ) ) );
+        return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/lockedGray.svg" ) ) );
       }
 
       return QVariant();

Original file line number	Diff line number	Diff line change
`@@ -248,11 +248,11 @@ QVariant QgsLayoutModel::headerData( int section, Qt::Orientation orientation, i`
`248`	`248`	`{`
`249`	`249`	`if ( section == Visibility )`
`250`	`250`	`{`
`251`		`- return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/mActionShowAllLayers.svg" ) ) );`
	`251`	`+ return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/mActionShowAllLayersGray.svg" ) ) );`
`252`	`252`	`}`
`253`	`253`	`else if ( section == LockStatus )`
`254`	`254`	`{`
`255`		`- return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/locked.svg" ) ) );`
	`255`	`+ return qVariantFromValue( QgsApplication::getThemeIcon( QStringLiteral( "/lockedGray.svg" ) ) );`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`return QVariant();`