Skip to content
Permalink
Browse files

Switch custom projection icon to SVG and from 'magic wand' to variati…

…on of new CRS icon
  • Loading branch information
dakcarto committed Jul 7, 2013
1 parent 4cac348 commit 0fb0bc994143ef9e32fceb36434f1354564824f1
Showing with 71 additions and 3 deletions.
  1. +1 −1 images/images.qrc
  2. +68 −0 images/themes/default/mActionCustomProjection.svg
  3. +1 −1 src/app/qgisapp.cpp
  4. +1 −1 src/ui/qgisapp.ui
@@ -161,7 +161,7 @@
<file>themes/default/mActionComposerManager.png</file>
<file>themes/default/mActionContextHelp.png</file>
<file>themes/default/mActionCopySelected.png</file>
<file>themes/default/mActionCustomProjection.png</file>
<file>themes/default/mActionCustomProjection.svg</file>
<file>themes/default/mActionDecreaseBrightness.svg</file>
<file>themes/default/mActionDecreaseContrast.svg</file>
<file>themes/default/mActionDeleteAttribute.png</file>
@@ -0,0 +1,68 @@
<?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="projection.svg" inkscape:version="0.47 r22583" inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/projection.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="24px" height="24px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g id="layer8" inkscape:groupmode="layer" inkscape:label="main">
<linearGradient id="path6995-2_1_" gradientUnits="userSpaceOnUse" x1="3.0864" y1="14.0254" x2="20.9115" y2="10.8823">
<stop offset="0" style="stop-color:#C8E6FA"/>
<stop offset="0.2857" style="stop-color:#B7DDF6"/>
<stop offset="0.8515" style="stop-color:#8AC7EB"/>
<stop offset="1" style="stop-color:#7DC1E8"/>
</linearGradient>

<path id="path6995-2" sodipodi:ry="10.5" sodipodi:rx="10.5" sodipodi:cy="12.5" sodipodi:cx="12.5" sodipodi:type="arc" fill="url(#path6995-2_1_)" stroke="#4774B4" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" d="
M21.049,12.457c0,4.987-4.054,9.039-9.049,9.039c-4.998,0-9.049-4.052-9.049-9.039c0-4.995,4.052-9.046,9.049-9.046
C16.995,3.411,21.049,7.462,21.049,12.457z"/>

<path id="path7011-1" sodipodi:nodetypes="cc" fill="none" stroke="#4774B4" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" d="
M12,3.887c4.762,4.763,4.762,12.37,0,17.135"/>

<path id="path7009-4" sodipodi:nodetypes="cc" fill="none" stroke="#4774B4" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" d="
M12,3.887c-4.763,4.763-4.763,12.37,0,17.135"/>

<path id="path7013-8" sodipodi:nodetypes="cc" fill="none" stroke="#4774B4" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" d="
M3.427,12.457c1.905,0,15.24,0,17.146,0"/>

<path id="path5341" sodipodi:nodetypes="cc" fill="none" stroke="#4774B4" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" d="
M18.667,6.745c-2.675,1.918-10.309,2.067-13.335,0"/>

<path id="path5343" sodipodi:nodetypes="cc" fill="none" stroke="#4774B4" stroke-width="0.75" stroke-linecap="round" stroke-linejoin="round" d="
M18.667,18.163c-3.447-1.867-9.708-1.995-13.335,0"/>
</g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.9834" y1="6.6646" x2="23.6108" y2="8.6442">
<stop offset="0" style="stop-color:#F5F5F5"/>
<stop offset="0.2503" style="stop-color:#E4E4E4"/>
<stop offset="0.7217" style="stop-color:#C9C9C9"/>
<stop offset="1" style="stop-color:#BFBFBF"/>
</linearGradient>
<path fill="url(#SVGID_1_)" fill-opacity="0.8" stroke="#404040" stroke-width="0.5" stroke-linecap="round" d="M23.4,11.046
c0,0-4.453,2.013-11.4,2.013c-6.948,0-11.4-2.013-11.4-2.013l8.479-8.729c0,0,1.75,0.425,2.921,0.425s2.922-0.425,2.922-0.425
L23.4,11.046z"/>
<polyline fill="none" stroke="#404040" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" points="12,13.059
12,7.312 12,2.741 "/>
<path fill="none" stroke="#404040" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" d="M20.41,8.064
c0,0-3.283,1.375-8.41,1.375c-5.126,0-8.41-1.375-8.41-1.375"/>
<path fill="none" stroke="#404040" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" d="M17.561,4.997
c0,0-2.17,0.802-5.561,0.802c-3.39,0-5.562-0.802-5.562-0.802"/>

<line fill="none" stroke="#404040" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" x1="13.266" y1="2.632" x2="18.076" y2="12.535"/>

<line fill="none" stroke="#404040" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" x1="10.736" y1="2.632" x2="5.923" y2="12.535"/>
</g>
<g>
<path id="rect2730" inkscape:export-xdpi="120" inkscape:export-ydpi="120" fill="#C4A000" d="M15.012,13h6.977
C23.1,13,24,13.9,24,15.012v6.977C24,23.1,23.1,24,21.988,24h-6.977C13.9,24,13,23.1,13,21.988v-6.977C13,13.9,13.9,13,15.012,13z"
/>
<path id="rect3812" fill="#FCFFFF" d="M18,14v2.062c-0.537,0.111-1.024,0.383-1.375,0.781l-1.781-1.031l-0.5,0.875l1.781,1.031
C16.043,17.967,16,18.225,16,18.5s0.043,0.533,0.125,0.781l-1.781,1.031l0.5,0.875l1.781-1.031c0.353,0.4,0.832,0.67,1.375,0.781
V23h1v-2.062c0.537-0.111,1.024-0.383,1.375-0.781l1.781,1.031l0.5-0.875l-1.781-1.031C20.957,19.033,21,18.775,21,18.5
s-0.043-0.533-0.125-0.781l1.781-1.031l-0.5-0.875l-1.781,1.031c-0.353-0.4-0.832-0.67-1.375-0.781V14H18z M18.5,17.5
c0.552,0,1,0.448,1,1s-0.448,1-1,1s-1-0.448-1-1S17.948,17.5,18.5,17.5z"/>
<path id="path4133" sodipodi:nodetypes="ccsssc" opacity="0.3" fill="#FCFFFF" enable-background="new " d="M14,19l9-0.01
c0,0,0,0,0-2C23,14,22,14,18.5,14S14,14,14,17C14,19,14,19,14,19z"/>
</g>
</svg>
@@ -1768,7 +1768,7 @@ void QgisApp::setTheme( QString theThemeName )
mActionMapTips->setIcon( QgsApplication::getThemeIcon( "/mActionMapTips.png" ) );
mActionShowBookmarks->setIcon( QgsApplication::getThemeIcon( "/mActionShowBookmarks.png" ) );
mActionNewBookmark->setIcon( QgsApplication::getThemeIcon( "/mActionNewBookmark.png" ) );
mActionCustomProjection->setIcon( QgsApplication::getThemeIcon( "/mActionCustomProjection.png" ) );
mActionCustomProjection->setIcon( QgsApplication::getThemeIcon( "/mActionCustomProjection.svg" ) );
mActionAddWmsLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddWmsLayer.png" ) );
mActionAddWcsLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddWcsLayer.png" ) );
mActionAddWfsLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddWfsLayer.png" ) );
@@ -1419,7 +1419,7 @@
<action name="mActionCustomProjection">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionCustomProjection.png</normaloff>:/images/themes/default/mActionCustomProjection.png</iconset>
<normaloff>:/images/themes/default/mActionCustomProjection.svg</normaloff>:/images/themes/default/mActionCustomProjection.svg</iconset>
</property>
<property name="text">
<string>Custom CRS...</string>

0 comments on commit 0fb0bc9

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