Skip to content
Permalink
Browse files

Merge pull request #2119 from nirvn/browser_toolbar_improvement

[browser] slight re-ordering and icon improvements
  • Loading branch information
NathanW2 committed Jun 7, 2015
2 parents ea31c68 + 4075979 commit aa6db0eb8c341fb685af003a2706bffd31161859
Showing with 273 additions and 10 deletions.
  1. +1 −0 images/images.qrc
  2. +262 −0 images/themes/default/mActionAddLayer.svg
  3. +10 −10 src/ui/qgsbrowserdockwidgetbase.ui
@@ -102,6 +102,7 @@
<file>themes/default/mAction.svg</file>
<file>themes/default/mActionAdd.png</file>
<file>themes/default/mActionAdd.svg</file>
<file>themes/default/mActionAddLayer.svg</file>
<file>themes/default/mActionAddAllToOverview.svg</file>
<file>themes/default/mActionAddArrow.png</file>
<file>themes/default/mActionAddBasicShape.png</file>
@@ -0,0 +1,262 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg5692"
version="1.1"
inkscape:version="0.91+devel r"
sodipodi:docname="mActionAddLayer.svg"
inkscape:export-filename="/media/home1/robert/svn/graphics/trunk/toolbar-icons/32x32/layer-vector.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<title
id="title2829">GIS icon theme 0.2</title>
<defs
id="defs5694">
<inkscape:perspective
id="perspective3486"
inkscape:persp3d-origin="16 : 10.666667 : 1"
inkscape:vp_z="32 : 16 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 16 : 1"
sodipodi:type="inkscape:persp3d" />
<inkscape:perspective
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"
id="perspective3496" />
<inkscape:perspective
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"
id="perspective3600" />
<inkscape:perspective
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"
id="perspective7871" />
<inkscape:perspective
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"
id="perspective8710" />
<inkscape:perspective
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"
id="perspective9811" />
<inkscape:perspective
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"
id="perspective4762" />
<filter
color-interpolation-filters="sRGB"
id="filter4128"
inkscape:label="Drop shadow"
width="1.5"
height="1.5"
x="-0.25"
y="-0.25">
<feGaussianBlur
id="feGaussianBlur4130"
in="SourceAlpha"
stdDeviation="2.000000"
result="blur" />
<feColorMatrix
id="feColorMatrix4132"
result="bluralpha"
type="matrix"
values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.351000 0 " />
<feOffset
id="feOffset4134"
in="bluralpha"
dx="7.500000"
dy="7.500000"
result="offsetBlur" />
<feMerge
id="feMerge4136">
<feMergeNode
id="feMergeNode4138"
in="offsetBlur" />
<feMergeNode
id="feMergeNode4140"
in="SourceGraphic" />
</feMerge>
</filter>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 278.36438 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="540.08875 : 278.36438 : 1"
inkscape:persp3d-origin="270.04437 : 185.57625 : 1"
id="perspective2850" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 278.36438 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="540.08875 : 278.36438 : 1"
inkscape:persp3d-origin="270.04437 : 185.57625 : 1"
id="perspective2491" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6347573"
inkscape:cx="-23.837758"
inkscape:cy="-6.0626655"
inkscape:current-layer="layer2"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
borderlayer="false"
inkscape:window-width="1549"
inkscape:window-height="876"
inkscape:window-x="51"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:snap-global="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-grids="true"
fit-margin-left="0.1">
<inkscape:grid
type="xygrid"
id="grid5700"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
dotted="false"
originx="0"
originy="0" />
</sodipodi:namedview>
<metadata
id="metadata5697">
<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>GIS icon theme 0.2</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Robert Szczepanek</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>Robert Szczepanek</dc:title>
</cc:Agent>
</dc:rights>
<dc:subject>
<rdf:Bag>
<rdf:li>GIS icons</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:coverage>GIS icons</dc:coverage>
<dc:description>http://robert.szczepanek.pl/</dc:description>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Layer"
style="display:inline"
transform="translate(0,-16)">
<path
sodipodi:nodetypes="ccccc"
id="rect4012"
d="m 1.500134,17.500134 10.999732,0 0,10.999732 -10.999732,0 0,-10.999732 z"
style="display:inline;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:1.00026798;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
inkscape:connector-curvature="0" />
<g
id="orginal-6"
style="fill-rule:nonzero;stroke:#415a75;stroke-miterlimit:4;stroke-opacity:1"
transform="matrix(0.04360941,0,0,0.04360941,54.621337,-0.9870686)" />
<path
inkscape:connector-curvature="0"
id="path2484"
style="fill-rule:nonzero;stroke:#415a75;stroke-width:0.13082823;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
d="" />
<rect
rx="1.206892"
inkscape:export-filename="C:\Program Files\QGIS-Dev\themes\gis-0.1\mActionAddOgrLayer.png"
style="display:inline;fill:#5a8c5a;fill-opacity:1;stroke:#555753;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3563-1"
width="5.99999"
height="5.99999"
x="9.0000048"
y="26.000006"
inkscape:export-xdpi="120"
inkscape:export-ydpi="120"
ry="1.2068919" />
<g
id="g4255"
transform="translate(-7.0000007,1.0109993)">
<path
inkscape:connector-curvature="0"
style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99097151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
d="m 17.513543,28 2.972915,0"
id="path3807"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path3809"
d="m 19.000001,29.486458 0,-2.972915"
style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99097151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
sodipodi:nodetypes="cc" />
</g>
<path
style="display:inline;opacity:0.3;fill:#fcffff;fill-rule:evenodd;stroke:none;stroke-width:0.69230771;enable-background:new"
d="m 10,28.499998 4,0 c 0,0 0,0 0,-0.75 0,-0.75 -0.25,-0.75 -2,-0.75 -1.75,0 -2,0 -2,0.75 0,0.75 0,0.75 0,0.75 z"
id="path6992-3"
sodipodi:nodetypes="ccsssc"
inkscape:connector-curvature="0" />
</g>
</svg>
@@ -41,8 +41,8 @@
<property name="floatable">
<bool>false</bool>
</property>
<addaction name="mActionRefresh"/>
<addaction name="mActionAddLayers"/>
<addaction name="mActionRefresh"/>
<addaction name="mActionShowFilter"/>
<addaction name="mActionCollapse"/>
<addaction name="mActionPropertiesWidget"/>
@@ -190,25 +190,25 @@
</item>
</layout>
</widget>
<action name="mActionRefresh">
<action name="mActionAddLayers">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
<normaloff>:/images/themes/default/mActionAddLayer.svg</normaloff>:/images/themes/default/mActionAddLayer.svg</iconset>
</property>
<property name="text">
<string>Refresh</string>
<string>Add Layers</string>
</property>
<property name="toolTip">
<string>Add Selected Layers</string>
</property>
</action>
<action name="mActionAddLayers">
<action name="mActionRefresh">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionAdd.svg</normaloff>:/images/themes/default/mActionAdd.svg</iconset>
<normaloff>:/images/themes/default/mActionDraw.svg</normaloff>:/images/themes/default/mActionDraw.svg</iconset>
</property>
<property name="text">
<string>Add Layers</string>
</property>
<property name="toolTip">
<string>Add Selected Layers</string>
<string>Refresh</string>
</property>
</action>
<action name="mActionShowFilter">

0 comments on commit aa6db0e

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