From d540f09563b4950389ee8199eb7ec5e34eab1570 Mon Sep 17 00:00:00 2001
From: Larry Shaffer <larrys@dakotacarto.com>
Date: Sat, 6 Jul 2013 19:13:54 -0600
Subject: [PATCH] Default raster layer icon for when generation of raster
 legend layer icons is disabled

---
 images/images.qrc                           |   1 +
 images/theme_originals/mIconRasterLayer.svg |  50 ++++++++++++++++++++
 images/themes/default/mIconRasterLayer.png  | Bin 0 -> 268 bytes
 src/app/legend/qgslegendlayer.cpp           |   2 +-
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 images/theme_originals/mIconRasterLayer.svg
 create mode 100644 images/themes/default/mIconRasterLayer.png

diff --git a/images/images.qrc b/images/images.qrc
index d239b1e632c..d1f31f9118f 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -342,6 +342,7 @@
         <file>themes/default/mIconProperties.svg</file>
         <file>themes/default/mIconPyramid.png</file>
         <file>themes/default/mIconRaster.png</file>
+        <file>themes/default/mIconRasterLayer.png</file>
         <file>themes/default/mIconRenderingDisabled.png</file>
         <file>themes/default/mIconRenderingEnabled.png</file>
         <file>themes/default/mIconSelectAdd.svg</file>
diff --git a/images/theme_originals/mIconRasterLayer.svg b/images/theme_originals/mIconRasterLayer.svg
new file mode 100644
index 00000000000..5ca6aaa62c1
--- /dev/null
+++ b/images/theme_originals/mIconRasterLayer.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0"
+	 id="svg5692" sodipodi:docname="raster.svg" inkscape:version="0.47 r22583" inkscape:export-filename="/media/home1/robert/svn/graphics/trunk/toolbar-icons/32x32/raster.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px"
+	 viewBox="8 8 16 16" enable-background="new 8 8 16 16" xml:space="preserve">
+<title  id="title2829">GIS icon theme 0.2</title>
+<defs>
+	
+	
+		<inkscape:perspective  id="perspective3486" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" inkscape:persp3d-origin="16 : 10.666667 : 1">
+		</inkscape:perspective>
+	
+		<inkscape:perspective  id="perspective3496" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+		</inkscape:perspective>
+	
+		<inkscape:perspective  id="perspective3600" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+		</inkscape:perspective>
+	
+		<inkscape:perspective  id="perspective7871" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+		</inkscape:perspective>
+	
+		<inkscape:perspective  id="perspective8710" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+		</inkscape:perspective>
+	
+		<inkscape:perspective  id="perspective9811" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+		</inkscape:perspective>
+	
+		<inkscape:perspective  id="perspective5574" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1">
+		</inkscape:perspective>
+</defs>
+<sodipodi:namedview  id="base" inkscape:snap-global="true" inkscape:window-width="1280" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="20.810573" inkscape:cx="21.456737" inkscape:cy="16" inkscape:current-layer="layer2" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" borderlayer="false" inkscape:window-height="950" inkscape:window-x="0" inkscape:window-y="25" inkscape:window-maximized="1" pagecolor="#ffffff">
+	
+		<inkscape:grid  type="xygrid" originx="2.5px" id="grid5700" originy="2.5px" snapvisiblegridlinesonly="true" visible="true" enabled="true" dotted="true" empspacing="5">
+		</inkscape:grid>
+</sodipodi:namedview>
+<g id="layer2" inkscape:groupmode="layer" inkscape:label="Layer">
+	<g id="g2861" transform="translate(-20.5,-3.5)">
+		<rect id="rect4678" x="29.894" y="20.895" opacity="0.8" fill="#666666" enable-background="new    " width="4" height="3.999"/>
+		<rect id="rect10639" x="29.894" y="16.894" opacity="0.8" fill="#B2B2B2" enable-background="new    " width="4" height="4"/>
+		<rect id="rect2849" x="29.894" y="12.894" opacity="0.8" fill="#666666" enable-background="new    " width="4" height="4"/>
+		<rect id="rect2851" x="33.894" y="12.894" opacity="0.8" fill="#B2B2B2" enable-background="new    " width="4" height="4"/>
+		<rect id="rect2853" x="33.894" y="16.894" opacity="0.8" fill="#666666" enable-background="new    " width="4" height="4"/>
+		<rect id="rect2855" x="37.895" y="12.894" opacity="0.8" fill="#666666" enable-background="new    " width="3.999" height="4"/>
+		<rect id="rect2857" x="33.894" y="20.895" opacity="0.8" fill="#666666" enable-background="new    " width="4" height="3.999"/>
+		<rect id="rect2859" x="37.895" y="16.894" opacity="0.8" fill="#B2B2B2" enable-background="new    " width="3.999" height="4"/>
+	</g>
+</g>
+</svg>
diff --git a/images/themes/default/mIconRasterLayer.png b/images/themes/default/mIconRasterLayer.png
new file mode 100644
index 0000000000000000000000000000000000000000..024c600f5072b71ea40bff8d86045165cce0b62e
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X)_J-(hE&{2N?0IZ(A2SIi%FcqQZ```A)%ygn>PL8e!Rc>
zd*9C+8<XoNnx30w`dX(Wt?`rNtaPQ5#f%@#ZE6Gz7zKT%R5d0sABamxOiXOE66X2$
z|NnW;FXk~9zrVk4+4!*OHUmF@|NawoESYR<x6GF~q%yF*GM`n^XqEWk`FZ&%20wm(
z*H_=9lrW<pq0_B}(Yox-k8W4SIsgCt{heP|SEtr&%%fqJ@PN^wfsx^ct=Y*>zW@FM
PUC!X?>gTe~DWM4fTAgan

literal 0
HcmV?d00001

diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
index 4440e17d2b8..6a007c0d384 100644
--- a/src/app/legend/qgslegendlayer.cpp
+++ b/src/app/legend/qgslegendlayer.cpp
@@ -321,7 +321,7 @@ QPixmap QgsLegendLayer::getOriginalPixmap()
       }
       else
       {
-        return QPixmap();
+        return QgsApplication::getThemePixmap( "/mIconRasterLayer.png" );
       }
     }
   }