Skip to content
Permalink
Browse files

use mesh layer icon in browser panel

  • Loading branch information
PeterPetrik authored and nyalldawson committed Sep 10, 2018
1 parent 0fb56ac commit d17912c8f767f7febe13f14919327a7bf6a14bb8
Showing with 242 additions and 51 deletions.
  1. +1 −0 images/images.qrc
  2. +239 −42 images/themes/default/mIconMeshLayer.svg
  3. +2 −9 src/core/qgsdataitem.cpp
@@ -450,6 +450,7 @@
<file>themes/default/mIconLineLayer.svg</file>
<file>themes/default/mIconListView.svg</file>
<file>themes/default/mIconLoading.gif</file>
<file>themes/default/mIconMeshLayer.svg</file>
<file>themes/default/mIconMssql.svg</file>
<file>themes/default/mIconNoPyramid.svg</file>
<file>themes/default/mIconOracle.svg</file>
@@ -5,27 +5,27 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="16"
width="16"
height="24"
width="24"
version="1.1"
id="svg10"
id="svg87"
sodipodi:docname="mIconMeshLayer.svg"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
<metadata
id="metadata16">
id="metadata91">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs14" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -35,44 +35,241 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1680"
inkscape:window-height="1021"
id="namedview12"
inkscape:window-width="1920"
inkscape:window-height="1015"
id="namedview89"
showgrid="false"
inkscape:zoom="14.75"
inkscape:cx="8"
inkscape:cy="8"
inkscape:zoom="9.8333333"
inkscape:cx="-23.084746"
inkscape:cy="12"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g8" />
<g
transform="translate(0.06779661,-15.457627)"
id="g8"
style="fill:#eeeeec;fill-rule:evenodd;stroke:#888a85;stroke-linecap:round;stroke-linejoin:round">
<rect
id="rect30"
width="5.9661016"
height="4.7457619"
x="1.6949153"
y="18.508474" />
<rect
id="rect32"
width="5.762712"
height="5.0847459"
x="1.7627119"
y="23.254236" />
<rect
id="rect34"
width="5.6949148"
height="4.7457619"
x="7.525424"
y="18.508474" />
<rect
id="rect36"
width="5.5593219"
height="5.0847468"
x="7.6610169"
y="23.254236" />
</g>
inkscape:current-layer="svg87" />
<defs
id="defs51">
<linearGradient
id="g">
<stop
stop-color="#aec7e2"
offset="0"
id="stop2" />
<stop
stop-color="#6e97c4"
offset="1"
id="stop4" />
</linearGradient>
<linearGradient
id="f">
<stop
stop-color="#aec7e2"
offset="0"
id="stop7" />
<stop
stop-color="#6e97c4"
offset="1"
id="stop9" />
</linearGradient>
<linearGradient
id="a">
<stop
stop-color="#6e97c4"
offset="0"
id="stop12" />
<stop
stop-color="#aec7e2"
offset="1"
id="stop14" />
</linearGradient>
<linearGradient
id="b">
<stop
stop-color="#6e97c4"
offset="0"
id="stop17" />
<stop
stop-color="#aec7e2"
offset="1"
id="stop19" />
</linearGradient>
<linearGradient
id="c">
<stop
stop-color="#6e97c4"
offset="0"
id="stop22" />
<stop
stop-color="#aec7e2"
offset="1"
id="stop24" />
</linearGradient>
<linearGradient
id="e">
<stop
stop-color="#6e97c4"
offset="0"
id="stop27" />
<stop
stop-color="#aec7e2"
offset="1"
id="stop29" />
</linearGradient>
<linearGradient
id="h">
<stop
offset="0"
stop-color="#e7eff5"
id="stop32" />
<stop
offset="1"
stop-color="#6e97c4"
id="stop34" />
</linearGradient>
<linearGradient
id="d">
<stop
offset="0"
stop-color="#6e97c4"
id="stop37" />
<stop
offset="1"
stop-color="#e7eff5"
id="stop39" />
</linearGradient>
<linearGradient
xlink:href="#a"
id="o"
x1="7.373"
y1="10"
x2="7.449"
y2="15"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#b"
id="n"
x1="1.729"
y1="15.458"
x2="7"
y2="15.458"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#c"
id="m"
x1="1.729"
y1="15.458"
x2="7"
y2="15.458"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#e"
id="l"
x1="18"
y1="14.322"
x2="16"
y2="13"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#d"
id="k"
x1="18"
y1="14.322"
x2="15.288"
y2="12"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#f"
id="i"
x1="4.53"
y1="22.364"
x2="4.458"
y2="25.133"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.3,0,0,5.8840015,-3.1000004,-127.94803)" />
<linearGradient
xlink:href="#g"
id="j"
x1="4.53"
y1="22.364"
x2="4.458"
y2="25.133"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#h"
id="q"
x1="4.53"
y1="22.364"
x2="4.458"
y2="25.133"
gradientUnits="userSpaceOnUse" />
<linearGradient
xlink:href="#h"
id="p"
gradientUnits="userSpaceOnUse"
x1="4.53"
y1="22.364"
x2="4.458"
y2="25.133"
gradientTransform="matrix(2.4000001,0,0,2.5217147,-29.130508,-67.998895)" />
<linearGradient
gradientTransform="translate(-0.07627119,-7.6949153)"
xlink:href="#h"
id="q-9"
x1="4.5300002"
y1="22.364"
x2="4.4580002"
y2="25.132999"
gradientUnits="userSpaceOnUse" />
</defs>
<path
d="m 1.5,1.5 v 21 H 13 v -21 z"
id="path53"
style="fill:url(#i);stroke-width:3.67875028"
inkscape:connector-curvature="0" />
<path
d="M 22.500001,30.347458 22,10 13.5,30.5 Z"
transform="translate(0,-8)"
id="path57"
inkscape:connector-curvature="0"
style="fill:url(#k)"
sodipodi:nodetypes="cccc" />
<path
d="M 14,10 13.79661,29.338983 22,10 Z"
transform="translate(0,-8)"
id="path59"
inkscape:connector-curvature="0"
style="fill:url(#l)"
sodipodi:nodetypes="cccc" />
<path
d="m 2,21 c -1.33333333,7.333333 -0.6666667,3.666667 0,0 z"
transform="translate(0,-8)"
id="path61"
inkscape:connector-curvature="0"
style="fill:url(#m)"
sodipodi:nodetypes="cc" />
<path
d="m 1.727,21 c -1.15133333,7.333333 -0.5756667,3.666667 0,0 z"
transform="translate(0,-8)"
id="path63"
inkscape:connector-curvature="0"
style="fill:url(#n)"
sodipodi:nodetypes="cc" />
<path
d="M 2,10 C 0.66666667,24.666667 1.3333333,17.333333 2,10 Z"
transform="translate(0,-8)"
id="path65"
inkscape:connector-curvature="0"
style="fill:url(#o)"
sodipodi:nodetypes="cc" />
<path
d="m 1.5,1.5 h 12 v 12 h -12 z"
id="path75"
inkscape:connector-curvature="0"
style="fill:none;stroke:#253e5b;stroke-linecap:round"
sodipodi:nodetypes="ccccc" />
<path
d="m 13.5,1.5 h 9 l 1e-6,20.847458 L 13.5,22.5 Z m -12,12 h 12 v 9 H 1.5 Z M 22,2 15.112535,18.610944 13.79661,21.338983"
id="path79"
inkscape:connector-curvature="0"
style="fill:none;stroke:#253e5b;stroke-linecap:round"
sodipodi:nodetypes="ccccccccccccc" />
</svg>
@@ -76,7 +76,7 @@ QIcon QgsLayerItem::iconRaster()

QIcon QgsLayerItem::iconMesh()
{
return QgsApplication::getThemeIcon( QStringLiteral( "/mIconPointLayer.svg" ) );
return QgsApplication::getThemeIcon( QStringLiteral( "/mIconMeshLayer.svg" ) );
}

QIcon QgsLayerItem::iconDefault()
@@ -626,29 +626,22 @@ QString QgsLayerItem::iconName( QgsLayerItem::LayerType layerType )
{
case Point:
return QStringLiteral( "/mIconPointLayer.svg" );
break;
case Line:
return QStringLiteral( "/mIconLineLayer.svg" );
break;
case Polygon:
return QStringLiteral( "/mIconPolygonLayer.svg" );
break;
// TODO add a new icon for generic Vector layers
case Vector :
return QStringLiteral( "/mIconPolygonLayer.svg" );
break;
case TableLayer:
case Table:
return QStringLiteral( "/mIconTableLayer.svg" );
break;
case Raster:
return QStringLiteral( "/mIconRaster.svg" );
break;
case Mesh:
//TODO add icon!
return QStringLiteral( "/mIconMeshLayer.svg" );
default:
return QStringLiteral( "/mIconLayer.png" );
break;
}
}

0 comments on commit d17912c

Please sign in to comment.
You can’t perform that action at this time.