[QGIS Commit] r15460 - in trunk/qgis: images images/themes/default
images/themes/gis python/core src/app src/app/legend
src/core/raster src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Mar 13 07:51:40 EDT 2011
Author: timlinux
Date: 2011-03-13 04:51:40 -0700 (Sun, 13 Mar 2011)
New Revision: 15460
Added:
trunk/qgis/images/themes/default/mActionFullHistogramStretch.svg
trunk/qgis/images/themes/default/mActionZoomActual.png
trunk/qgis/images/themes/gis/mActionZoomActual.png
trunk/qgis/images/themes/gis/mActionZoomActual.svg
Modified:
trunk/qgis/images/images.qrc
trunk/qgis/images/themes/default/mActionFullHistogramStretch.png
trunk/qgis/python/core/qgsrasterlayer.sip
trunk/qgis/src/app/legend/qgslegend.cpp
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/core/raster/qgsrasterlayer.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.h
trunk/qgis/src/ui/qgisapp.ui
Log:
Added zoom 1:1 to zoom bar, icon updates from robert. Disallow hist stretch for wms layers
Modified: trunk/qgis/images/images.qrc
===================================================================
--- trunk/qgis/images/images.qrc 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/images/images.qrc 2011-03-13 11:51:40 UTC (rev 15460)
@@ -144,6 +144,7 @@
<file>themes/default/mActionUndo.png</file>
<file>themes/default/mActionUngroupItems.png</file>
<file>themes/default/mActionUnselectAttributes.png</file>
+ <file>themes/default/mActionZoomActual.png</file>
<file>themes/default/mActionZoomFullExtent.png</file>
<file>themes/default/mActionZoomIn.png</file>
<file>themes/default/mActionZoomLast.png</file>
@@ -309,6 +310,7 @@
<file>themes/gis/mActionUndo.png</file>
<file>themes/gis/mActionUngroupItems.png</file>
<file>themes/gis/mActionUnselectAttributes.png</file>
+ <file>themes/gis/mActionZoomActual.png</file>
<file>themes/gis/mActionZoomFullExtent.png</file>
<file>themes/gis/mActionZoomIn.png</file>
<file>themes/gis/mActionZoomLast.png</file>
Modified: trunk/qgis/images/themes/default/mActionFullHistogramStretch.png
===================================================================
--- trunk/qgis/images/themes/default/mActionFullHistogramStretch.png 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/images/themes/default/mActionFullHistogramStretch.png 2011-03-13 11:51:40 UTC (rev 15460)
@@ -1,14 +1,20 @@
‰PNG
-IHDR àw=ø sRGB ®Î é bKGD ÿ ÿ ÿ ½§“ pHYs
+IHDR àw=ø sBIT|dˆ pHYs
×
-×B(›x tIMEÛ #3/k€à 6IDATHǵ–Ë‹ UÆ¿so=ºº*UÕ]Sž™t MFNp ‘` Ú 2“7ñµ04:ã&"¸hpÑ•`"´ ‘€H. Yw
-êÆ? \8!2Muß[ÇŤ'Ý“ÎLÒ8\¸ðýÎùν·Š˜kFgQmÚ¾ç„?ÐO ÿÞøì»·“ß;{_œ>9¥µâwkÓŸ?, at t^&˜Ú·ýÐö—w¼U+
-=òók³…:{>œÏçëO»˜†=¾!ªÈrñq:ºçá8}oò\8±HÑsÏî |×=>0€9Ý ¸ùNɘ|¾ùÙÜÉjÓ~LJ‘ ƒ¦i>Q¯×½ Ê Í-(N@‚ñÒÓG×{Nð%$ ”J¥¬ã˜Ï @*NÐæŠ($ý<âpdŒI[ 0<<8®³À îˆwåÎ'÷Ç)µ|fF!. at Hã… _¿úWå®ðí%€›uABH5 CB€Š‹
-ß?ˆˆ{ §Ï~Ê z*_²Š[0-Sh¡µF.Ÿ3Nœøxëj•w4‰™{ˆÿg03 ¬q pêÌ Ž½ù>.\›s
-†FŠÌ)tÂhý8Ž];ö`03.^ºøGíØÔæ•fpêÌÌÝ\Ò –Ï “-ÕèÌ@k
-ß÷F£Q^©òwÞ˜¦îSÔ¾ßú÷½N t‚Z«;©1¼~$¶ óàJÞ/?¦išF¿”nCÑÕBåHtäaîoZÒìÐZèµHJ –mõzÝzP@ M‘Y.ÞæÛPZ–Y¤µF ̹âåæ„9i’µ$Ú
-R
-à^‹´Ö(ä†iȨ :xÖÙµ*À²Ím†M}O‘N–´z,JS
-Ïs‘O+vÖr/¼r.ûújíÍúV¯0·ÁHa̱ΠïG×÷›ˆP ÃSÞD”‹×ÍLÌzßT›¶} Ú´·IEHµ$ÚsiæcxžÛ·ºBT@öfcÆ‹a¹R:`eÌ+“³Þù_eŽT›ö& ÃçýãåGG6„‘w½ŸˆûÛžÝ7Ž¦÷pˆæ®þßWÿlÿòëüÜBqþÚÂÐÍë·¥ô·´Ö¿-ÿý×Z½Ûœd IEND®B`‚
\ No newline at end of file
+×B(›x tEXtSoftware www.inkscape.org›î< tEXtTitle histogram equalizationÖsß„ tEXtAuthor Robert Szczepanek_V± tEXtCreation Time 2011-02-19«®ŽÊ RtEXtCopyright CC Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/3.0/^ƒZ¼ õIDATH‰µ–khTGÇÿ3÷Þ½½Ù»o“˜ÕtMhb}US´ÕRlR´¨1/m}|°âƒ‚‚ ²ô‹-mi‘V!ÕÄ
+i|Ò~êKZ‹–ŠZµFc¢Ô$šÙìƽ»wîôƒY›hðÀ0à øÿÎ9s†Â9dz41³(¯“]ºêþ‚œ=èûüÔzóFÆ÷å¾½[³øæMÛ¾ø¿ šY花õ+g¼={ݦ¿ð\UcpWÆGÀ+¼^odÏ'{^ 3@åéy¾!œýYSºÓ 0ÆoYÑà^þ@}s_™g¸œÎ cpnçNo&d¬xu“Ï¥yö–×É“*nÃ
+I’¦F"}L ¢ Œ§`q„r,ž³fœ®û ˆ ¡PHSUéå1 XÜÄ¥ó¸|î6,˜p»¼¸s‹8a ÈÉÉ5T§º`4¡µë×l®®Üð” ´þÚ‰kgû½“€ÅMXÜļi 6I¹8ç‚ ‚8ÔH©0[×õHumå¶QöõçöÅ$æÌ-
+öàÔœ ”
+Œ1ˆ¢
+’ý0áÇ£´lþ}ǽ½ªfÕÎÌ® Õµ•;ü9ÓÝ‹ªâþ@ƒñ$Ú[ïA "¦©ÐØ@ Š,CVdyãû–ÞëÞ f†¦i~UÓXumÕ`ý†íU5«„ÃM ’ÊêŠ] ¯çƒ•5ïde
+Mñ$®_»¨Ãm¤»
+ÌœZEQpù¯ËV{Ç£ª¦uqÎ}œsçÜMÉ*yi–)Š¢'‘Hø hâñE˲v/Z´PPUÅæà çŒ$añ$ ˜.Ȳ JB¡˜0ùÅÅE¿ èàà6ÃétÚ‹¿¥7~sx·`Ù±c'ê+j–¾lL3…ÖÖVÉ•9¨hCˆZÈËŽÃ!IˆÇp«ãÖó 7;
+9ç Û¶Ý6³
+B©«´t>S5=Ý=·ÍG ª„?[/]=|jÿ›7:—N*ÓDb Wn_€6¹Ü EZî‡ÝíC8T2t´]Ý]ƒW¯\û¨íû;ÿÜù««ëL,›1abÈŸJ§ÕC
+NÓ4k››ZNŠ `Îþñ¼i±Ó§5Ϭ’!* zžÎm¤ã ªJ UUQ8©Ðkš©)_mÙ÷i¦[Ömxocoo¯|âøI-™L®nnj91¼M
+=ÿ[Ö þѦKƒR
+ÆØаàóyˆ ’ÊÇú”üüÓ™¬x<±6#> à’ ‚dLJc\Ù=hùñG Æ, `\HM‰D"ŽŒcìx"1¸º¹©å»áÔÌ{`U,nBŸhe`Ãæ Œ‰ „ 888çø‚Òߤ¾Ø½ ê j~òò
+e@)õqXÜDš'ÿ+7aYÀG–ˆ1† '‡øÅ‚•Kª¯&<à¥)¢LF
+gJd8LjÙ6ƒ®;áµ dÍá<¶¬A{÷© ešË1R˜§ÁaCŒf#KuƒsÃßoBÂã‹0S_îó²>[Þ¨7—×Éò€ò:ù9*lÖ#ÑáF¢èºsÔ肾 ´þ‰oºÃ¡%Ej[Ѩ YòµRY^'O Rqĵ#\œ›çöé½£‰8/–¾>aÂx{4 €ÒÓ>è£íééçöIJ£wcþþÞ„aY¬…<ëoË¿xÀAÇ#¢'b IEND®B`‚
\ No newline at end of file
Added: trunk/qgis/images/themes/default/mActionFullHistogramStretch.svg
===================================================================
--- trunk/qgis/images/themes/default/mActionFullHistogramStretch.svg (rev 0)
+++ trunk/qgis/images/themes/default/mActionFullHistogramStretch.svg 2011-03-13 11:51:40 UTC (rev 15460)
@@ -0,0 +1,377 @@
+<?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: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"
+ width="24"
+ height="24"
+ id="svg5692"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="histogram-equalize-max.svg"
+ inkscape:export-filename="/media/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/histogram-equalize-max.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ style="display:inline">
+ <title
+ id="title2835">histogram equalization</title>
+ <defs
+ id="defs5694">
+ <linearGradient
+ id="linearGradient7624">
+ <stop
+ style="stop-color:#555753;stop-opacity:1;"
+ offset="0"
+ id="stop7626" />
+ <stop
+ id="stop7634"
+ offset="0.40000001"
+ style="stop-color:#555753;stop-opacity:0.39215687;" />
+ <stop
+ style="stop-color:#555753;stop-opacity:0;"
+ offset="0.5"
+ id="stop7640" />
+ <stop
+ id="stop7632"
+ offset="0.60000002"
+ style="stop-color:#555753;stop-opacity:0.39215687;" />
+ <stop
+ style="stop-color:#555753;stop-opacity:1;"
+ offset="1"
+ id="stop7628" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient7614">
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:1;"
+ offset="0"
+ id="stop7616" />
+ <stop
+ id="stop7636"
+ offset="0.40000001"
+ style="stop-color:#d3d7cf;stop-opacity:0.38666666;" />
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:0;"
+ offset="0.5"
+ id="stop7638" />
+ <stop
+ id="stop7622"
+ offset="0.60000002"
+ style="stop-color:#d3d7cf;stop-opacity:0.39215687;" />
+ <stop
+ style="stop-color:#d3d7cf;stop-opacity:1;"
+ offset="1"
+ id="stop7618" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2843">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop2845" />
+ <stop
+ style="stop-color:#c8c8c2;stop-opacity:1;"
+ offset="1"
+ id="stop2847" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2835">
+ <stop
+ style="stop-color:#ccf2a6;stop-opacity:1;"
+ offset="0"
+ id="stop2837" />
+ <stop
+ style="stop-color:#8ae234;stop-opacity:1;"
+ offset="1"
+ id="stop2839" />
+ </linearGradient>
+ <inkscape:perspective
+ 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"
+ id="perspective3257" />
+ <inkscape:perspective
+ id="perspective6979"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7934"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8023"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8057"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8095"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8219"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8279"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3803"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3869"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3929"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3968"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4002"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4032"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4053"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2905"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2979"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2842"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2978"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2835"
+ id="linearGradient2841"
+ x1="3.6536312"
+ y1="12.927374"
+ x2="8.5"
+ y2="27.5"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2843"
+ id="linearGradient2849"
+ x1="9.5865917"
+ y1="15.5419"
+ x2="12.5"
+ y2="27.5"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:perspective
+ id="perspective6803"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7614"
+ id="linearGradient7620"
+ x1="1.5"
+ y1="-5.5"
+ x2="22.5"
+ y2="-5.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7624"
+ id="linearGradient7630"
+ x1="1.5"
+ y1="-6.5"
+ x2="22.5"
+ y2="-5.5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="29.833333"
+ inkscape:cx="12"
+ inkscape:cy="12"
+ inkscape:current-layer="layer4"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ borderlayer="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="950"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-bbox="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5700"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="true"
+ originx="2.5px"
+ originy="2.5px" />
+ </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>histogram equalization</dc:title>
+ <dc:date>2011-02-19</dc:date>
+ <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>icon</rdf:li>
+ <rdf:li>gis</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:coverage>GIS icons 0.2</dc:coverage>
+ <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="layer4"
+ inkscape:label="1"
+ style="display:inline"
+ transform="translate(0,-8)">
+ <path
+ sodipodi:nodetypes="css"
+ id="path3640"
+ d="m 0.5,30.5 c 3,0 1,-21 3,-21 7,0 8,21 20,21"
+ style="fill:url(#linearGradient2841);stroke:#4e9a06;stroke-width:0.75000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
+ <path
+ style="fill:url(#linearGradient2849);stroke:#888a85;stroke-width:0.75000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+ d="m 8.5,30.5 c 1.304348,0 0.434784,-21 1.304348,-21 3.043478,0 3.47826,21 8.695652,21"
+ id="path3648"
+ sodipodi:nodetypes="css" />
+ <path
+ style="fill:url(#linearGradient7620);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient7630);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+ d="m 5.25,14.46875 -4.9375,4.9375 4.9375,4.96875 0,-3.53125 9.25,0 4.25,0 0,3.53125 4.9375,-4.96875 -4.9375,-4.9375 0,3.53125 -4.25,0 -5,0 -4.25,0 0,-3.53125 z"
+ id="path2852"
+ sodipodi:nodetypes="cccccccccccccc" />
+ </g>
+</svg>
Added: trunk/qgis/images/themes/default/mActionZoomActual.png
===================================================================
--- trunk/qgis/images/themes/default/mActionZoomActual.png (rev 0)
+++ trunk/qgis/images/themes/default/mActionZoomActual.png 2011-03-13 11:51:40 UTC (rev 15460)
@@ -0,0 +1,15 @@
+‰PNG
+
+
+IHDR szzô sRGB ®Î é bKGD ÿ ÿ ÿ ½§“ pHYs @ @Oåš tIMEÛ
+
+ À§~ "IDATX×{PT× Ç¿çÜ»»—eY@@ˆEMT,Ti'Î' ¡i›iãLiSëLªQC;ÓI›Nl›é$¡¶ >ÚŠŒã¨Ø e:¡“&¢TÚ+ >–÷kŸ÷Þ½÷žÓ?xˆq™ø›9óÛó»çîùü¾ç÷»w—`+((ˆÓ8Í!œ-–õV›ÍfH‘;5äå —.uâ Y(¸qSA…Ù,í3›ÍQ‰Ž•$)5‹.OIGÐçÁ@ïM övs¿o’ÇÆÆt)ßî–––á——— X¤Ÿ‰¢T¼å‰ ¦â'Êo@¬Í€C 1øÁ÷§7p¦özÇôؘèWêëÿö… rs‹c-Vz2!Ù‘ôôÎhQÞZd$D Bƒ¦óY? a̧CUU´œC[kÖ=¼¶©úÍ׺T aæCjFê/–'¦ä~ÿÀaZö•UHŒ¶@g !CÕÙ”×|Š€b€1Q±f].(¥ho{UÕK‡|çÎûh) òó 7›Ì=ùÝ´0{9$‘BÑ (!yŽ ñ†0âQ¡h „ %(Á£eÛ‘”œ†Ö}ð“ .$, ´´Ô"Z,
+¿¶Í¼)g=¢"Ý3F}ª:½éÜa|ë{?‚{ _øÏ•Žê%ø|J6¥tYAéב¼Ì%Äf³Ÿñ^Y‡2f7gý ÒÒ3°æ‘\ ®mkkÛ6 §<;2ÊN““’ ™(Až“yP5 «Æ¼¬q×|(-# }î~NÙ6 ²“Ó2i„E¸'{Y‚¡‹l< *ó¡‡0>1A&'½¹áˆ’Õº~…# fq*{͘ªxmºå((! dŠ–2Ïß¹žž¾##Ã9a+ EH>¿gŒñ»²×t¶¨ä‹Å¼ã 8bccbhX
+„d¥ÃÝ{«@g L#ÐtÀ$л²›ïŠÝîé†$Iˆ‹‹*++ca‚Š“ rEQ‰$I0‰‹o<#ÿB±Þžn$'¯à„gØG @ÿ„1ƒu¹®|N-Vù˜í ]SárvÀ‘’ ¸Âhoo u¤¤ü÷ô_B úÃ:ë…FCí_ PRRL9çÎ%=Š#,¦ snè§Þy ¯åæί|
+Mï6¢tk ëw»]µµµ®%¿
+wïÙóìUWçÁ'+žAÅŽoB…9woËÍøî7ð›Ã¯ :Ê
+UVÀÁ!
+¢²:f¼ë@óyòl¯÷¾
+ @õoÔn-.¾Ø|þ4~ùóýtÏ9ï{ÕàÌÀɺwpàŽˆ”,˜ ÇƼ¨ªªB~~¾t¥Ï´AÑÄZ^ãˆþ\"÷¦TR³p”N‹ÂÖ¡M½þ~_hKÉW‘™µ
+YYYX™‘ Ïä8š¯4KG\oÈ~¢ël’¥;ã>+ÊÛl”W”Ãf³áØу×ðZIýBÆsdWŸgÁ6µÖH‡`€øzu1mKÚKŽñ¤½×oÜŒ¼ôáû4”A)ç ~›L&ÖŽ›bÓ%&I1螤ªj㛋6# õ½V´_¾ŒcuO&þ‘¨ÏdZ¼ý'xcçBât!p1’êŒq@<ÞYçlªhx´¤xË·9ç¹£££9ƒö({&->~Øõºa‹ðʆ T˜éõxÉÕ®¢§§—/¶cß~+âã? èS0mk þ3OgÙ0¸ ±ïK}ŽF{¶bŒÏ'º!cïwý×à‘#øÌâšÜ?åìj~!¦Oëÿ³=[ ›^Ÿäø»4ÂTˆµ‹xå`
+ -à&Ä KÌk 7Ásº’Eo‰:» ‚.åÇCaa¡³×ëÎÛG¾3Ì÷—{Q”®CS ŒÉ cù÷ LGty=0%dANÌ-LŠ`EæSŠ* ¬??Æ›‡AÇdÐi:<ýæ@CÜö“Ô#ÆgNêw Äû}¹ëy' ¢Å¥œ/Í–pü݉_3Å ÛŠ¢ÀM¸™¾è¾]× Ebe½ÐWW™©©ã'xcçQ`ÆZ»”ó#^ýÐÛÿðð³ïM‚ŽÉÆ”)E†úÁ.~„‹HÙöª0¡ðÌ~?;t_æa8jüû¦Öøå #ÿôÿŠ1íùVÕ xÝà-;@¬1ðÊ ²ÁG ¨3vùSí܈Ϩz³ÅÇOµÏ©YxÆq½£ = õjD à ÑLë¸ÁA0+8Yô†ÿõjg N1‘ß7{_f äV €³7„f—Ì줺²zÒ%œ©.ý·)5jµÅd78 Q]øÌÛ0M¯ ¡&ÑXâš[;³*Á„ß6y_ öDV9ïÔ I½Øà{뇋ý;~ЖºL¨Xn§ûìÂÇ63?ÞèT?œ¹öd4ŠÂ&_ IEND®B`‚
\ No newline at end of file
Added: trunk/qgis/images/themes/gis/mActionZoomActual.png
===================================================================
--- trunk/qgis/images/themes/gis/mActionZoomActual.png (rev 0)
+++ trunk/qgis/images/themes/gis/mActionZoomActual.png 2011-03-13 11:51:40 UTC (rev 15460)
@@ -0,0 +1,11 @@
+‰PNG
+
+
+IHDR àw=ø sBIT|dˆ pHYs
+×
+×B(›x tEXtSoftware www.inkscape.org›î< tEXtTitle zoom 1 to 1B!Ç tEXtAuthor Robert Szczepanek_V± tEXtCreation Time 2011-03-11 Éa RtEXtCopyright CC Attribution-ShareAlike http://creativecommons.org/licenses/by-sa/3.0/^ƒZ¼ ÚIDATH‰µ•OH wÇ¿ãÌÎìªíj £ucSÁ,õPiÒ¸€$E Ëj¡hBK-xÈ¥ ½y(´´ÒTØBˆnT¨±ÐcÁ4h ®ZÍF’N«ÆY'™ýÍþf~½¸Ô¦ëvÓÚ¿9Ìï½ÏãûÞ›7 c ÿ§ ù:†B!‘RÚ&IRÇq~Bˆ,I’Ê›!„L
+‚0‹Å̧ã¸|ƒÁ£‚ ôÖÕÕ 8yêTy}}½»°°kkkÚÜì¬177g,--%)¥=ƒƒƒ³Ï” ««ë<Ïóïtww»N47Ë‚ÃáÞ}ŸÜÚºgYV: #–e}ÕßßÿM^ ‚ÁàQI’®D"W…,—KNg) ضm™¦©›©TÒ²,’ñ×u ‘HÄ „\È()Ø
+…DAzÃá°Ëãñ83ð´iêÛš–0 ?þ}7 Š‹‹‡]‚ ô†B!1gJi›Ïç+illÄúæfùͱ1‡E©¡ooÿjÛ¶•-æÛÑ›e••¢Ïç+¡”¶9¦H’¤¦ç< Ï'Ÿ~vðÇÉ©2¹â }2x ·o»c7†]zïbâ…ÚÚÔ—_÷UÍÌκ—–‹kª«ü~¿see¥ Àðž
+8Žó¿züø“ž?X×4Ç!S’Ÿ¦ãî» î¥å_\ ðî[o>8\Scdb½^/8ŽóçT@‘eY/ŽÌ;Û¶í ðõÓ§7j{I¶XY–A‘ =$IUU”Ò4 €ýùL&·ùŸ !\¶XUU!I’šScl&‘HT•”–R Ð’I–2ͧ(ÚÑk×'›is¥µu“1†ä¶. ÀúƦCÛÚclæŸJ49qëÖ™å•UOÇÙö‡ p½ â\Wçoo¼vf1†ÇŽ%`àÆ`EuuUª£ºýáj"á|°v_ „L9>´9þ¾½½½¬¥¥ÅÈê”Åâñ8úúúTÛ¶;b±˜¹g,ËzÛ0Œæú©©©â|ຮ#”ÒžÌâËZ"EQΧÓéÏ'&&2M¬ëìì\È¥d÷.Ú½ðþ–@Q”@é×M3wO722²1??Ï544¸¼^/dY†ªªH$È{›*Šx¾ªlüò…—Š´{#¸|U‚I9&Šâû<Ï_ý7ÿ!\fcx”Öáp=a\ÁÅ¡¡¡Ìú Þ9y›
+>¿¼…¯ËºI Z‡‡‡xàÓÆOOO<%®ñ.½üx*ýßá 8E+zö•µ¢JÃÝUº¯p à¼Øpgþ¾3$
+Düb´|_áÀÎ)ŠpŠV4eòÝû €? —‚$µDµ> IEND®B`‚
\ No newline at end of file
Added: trunk/qgis/images/themes/gis/mActionZoomActual.svg
===================================================================
--- trunk/qgis/images/themes/gis/mActionZoomActual.svg (rev 0)
+++ trunk/qgis/images/themes/gis/mActionZoomActual.svg 2011-03-13 11:51:40 UTC (rev 15460)
@@ -0,0 +1,539 @@
+<?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: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"
+ width="24"
+ height="24"
+ id="svg5692"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="zoom-1to1.svg"
+ inkscape:export-filename="/media/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/zoom-1to1.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ style="display:inline">
+ <title
+ id="title2901">zoom 1 to 1</title>
+ <defs
+ id="defs5694">
+ <linearGradient
+ id="linearGradient3657">
+ <stop
+ style="stop-color:#fce94f;stop-opacity:1;"
+ offset="0"
+ id="stop3659" />
+ <stop
+ style="stop-color:#e7ce04;stop-opacity:1;"
+ offset="1"
+ id="stop3661" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2877">
+ <stop
+ style="stop-color:#edd400;stop-opacity:1;"
+ offset="0"
+ id="stop2879" />
+ <stop
+ style="stop-color:#c2ad00;stop-opacity:1;"
+ offset="1"
+ id="stop2881" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4042">
+ <stop
+ style="stop-color:#f2d6a9;stop-opacity:1;"
+ offset="0"
+ id="stop4044" />
+ <stop
+ style="stop-color:#e9b96e;stop-opacity:1;"
+ offset="1"
+ id="stop4046" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2843">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop2845" />
+ <stop
+ style="stop-color:#c8c8c2;stop-opacity:1;"
+ offset="1"
+ id="stop2847" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2835">
+ <stop
+ style="stop-color:#ccf2a6;stop-opacity:1;"
+ offset="0"
+ id="stop2837" />
+ <stop
+ style="stop-color:#8ae234;stop-opacity:1;"
+ offset="1"
+ id="stop2839" />
+ </linearGradient>
+ <inkscape:perspective
+ 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"
+ id="perspective3257" />
+ <inkscape:perspective
+ id="perspective6979"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective7934"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8023"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8057"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8095"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8219"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8279"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3803"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3869"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3929"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3968"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4002"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4032"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective4053"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2905"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2979"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2842"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2978"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3238"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042"
+ id="radialGradient4048"
+ cx="0.5"
+ cy="17.838446"
+ fx="0.5"
+ fy="17.838446"
+ r="6.158739"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:perspective
+ id="perspective4058"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042-2"
+ id="radialGradient4048-2"
+ cx="8.5770311"
+ cy="3.8663561"
+ fx="8.5770311"
+ fy="3.8663561"
+ r="6.1587391"
+ gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4042-2">
+ <stop
+ style="stop-color:#f2d6a9;stop-opacity:1;"
+ offset="0"
+ id="stop4044-8" />
+ <stop
+ style="stop-color:#e9b96e;stop-opacity:1;"
+ offset="1"
+ id="stop4046-4" />
+ </linearGradient>
+ <radialGradient
+ r="6.1587391"
+ fy="17.838446"
+ fx="0.5"
+ cy="17.838446"
+ cx="0.5"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-8.4170292)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient4067"
+ xlink:href="#linearGradient4042-2"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042-2"
+ id="radialGradient4094"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
+ cx="8.5770311"
+ cy="3.8663561"
+ fx="8.5770311"
+ fy="3.8663561"
+ r="6.1587391" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042-2"
+ id="radialGradient4097"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
+ cx="8.5770311"
+ cy="3.8663561"
+ fx="8.5770311"
+ fy="3.8663561"
+ r="6.1587391" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042-2"
+ id="radialGradient4100"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
+ cx="8.5770311"
+ cy="3.8663561"
+ fx="8.5770311"
+ fy="3.8663561"
+ r="6.1587391" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042-2"
+ id="radialGradient4103"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
+ cx="8.5770311"
+ cy="3.8663561"
+ fx="8.5770311"
+ fy="3.8663561"
+ r="6.1587391" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042"
+ id="radialGradient4106"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
+ cx="0.5"
+ cy="17.838446"
+ fx="0.5"
+ fy="17.838446"
+ r="6.158739" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042"
+ id="radialGradient4109"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
+ cx="0.5"
+ cy="17.838446"
+ fx="0.5"
+ fy="17.838446"
+ r="6.158739" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042"
+ id="radialGradient4112"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
+ cx="0.5"
+ cy="17.838446"
+ fx="0.5"
+ fy="17.838446"
+ r="6.158739" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042"
+ id="radialGradient4115"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
+ cx="0.5"
+ cy="17.838446"
+ fx="0.5"
+ fy="17.838446"
+ r="6.158739" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4042"
+ id="radialGradient4118"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
+ cx="0.5"
+ cy="17.838446"
+ fx="0.5"
+ fy="17.838446"
+ r="6.158739" />
+ <inkscape:perspective
+ id="perspective8198"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3657"
+ id="linearGradient3663"
+ x1="10.5"
+ y1="10.5"
+ x2="13.5"
+ y2="18.5"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3657"
+ id="linearGradient3669"
+ gradientUnits="userSpaceOnUse"
+ x1="10.5"
+ y1="10.5"
+ x2="13.5"
+ y2="18.5"
+ gradientTransform="translate(0,-3)" />
+ <inkscape:perspective
+ id="perspective4821"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="29.833333"
+ inkscape:cx="12"
+ inkscape:cy="12"
+ inkscape:current-layer="layer4"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ borderlayer="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="950"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:snap-bbox="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5700"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ dotted="true"
+ originx="2.5px"
+ originy="2.5px" />
+ </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>zoom 1 to 1</dc:title>
+ <dc:date>2011-03-11</dc:date>
+ <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>icon</rdf:li>
+ <rdf:li>gis</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:coverage>GIS icons 0.2</dc:coverage>
+ <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="layer4"
+ inkscape:label="1"
+ style="display:inline"
+ transform="translate(0,-8)">
+ <g
+ transform="translate(0,8)"
+ style="display:inline;enable-background:new"
+ id="g4806">
+ <path
+ style="fill:#ffcc30;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 7.5000001,14.5 c 0,2 2,2 2,2 0,0 -7,7 -7,7 l -2.00000001,-2 7.00000001,-7 z"
+ id="path3832"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.8;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#505050;stroke-width:0.75218332;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:7"
+ id="path3834"
+ sodipodi:cx="12"
+ sodipodi:cy="7"
+ sodipodi:rx="5.9612203"
+ sodipodi:ry="6.0742435"
+ d="m 17.96122,7 c 0,3.354712 -2.668929,6.074244 -5.96122,6.074244 C 8.707709,13.074244 6.0387797,10.354712 6.0387797,7 6.0387797,3.6452879 8.707709,0.92575645 12,0.92575645 c 3.292291,0 5.96122,2.71953145 5.96122,6.07424355 z"
+ transform="matrix(1.3420071,0,0,1.3170365,-1.6040853,0.2791092)" />
+ <path
+ style="fill:#000000;fill-rule:evenodd;stroke:#505050;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 6.0000001,16 2,-2 L 10,16 l -1.9999999,2 -2,-2 z"
+ id="path3836"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="opacity:0.7;fill:#fcffff;fill-rule:evenodd;stroke:none;display:inline"
+ d="m 10,5 c 2,-3 4.442248,-3.398055 6,-2 1.557752,1.398055 -2,1 -4,3 -2,2 0,6 -2,6 -1.9999999,0 -1.9999999,-4 0,-7 z"
+ id="path3838"
+ sodipodi:nodetypes="czzzz" />
+ <path
+ style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#fcffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m 2.0000001,21 4,-4"
+ id="path2832" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:11px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2e3436;fill-opacity:1;stroke:none;font-family:Georgia;-inkscape-font-specification:Georgia Bold"
+ x="6.9873047"
+ y="20.445801"
+ id="text4850"
+ sodipodi:linespacing="100%"><tspan
+ sodipodi:role="line"
+ id="tspan4852"
+ x="6.9873047"
+ y="20.445801">1:1</tspan></text>
+ </g>
+</svg>
Modified: trunk/qgis/python/core/qgsrasterlayer.sip
===================================================================
--- trunk/qgis/python/core/qgsrasterlayer.sip 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/python/core/qgsrasterlayer.sip 2011-03-13 11:51:40 UTC (rev 15460)
@@ -376,7 +376,7 @@
QPixmap paletteAsPixmap( int theBand = 1 );
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
- QString providerKey();
+ QString providerKey() const;
/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();
Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/src/app/legend/qgslegend.cpp 2011-03-13 11:51:40 UTC (rev 15460)
@@ -1792,10 +1792,10 @@
QgsDebugMsg( "Raster units per pixel : " + QString::number( layer->rasterUnitsPerPixel() ) );
QgsDebugMsg( "MapUnitsPerPixel before : " + QString::number( mMapCanvas->mapUnitsPerPixel() ) );
- mMapCanvas->zoomByFactor( qAbs( layer->rasterUnitsPerPixel() / mMapCanvas->mapUnitsPerPixel() ) );
- mMapCanvas->refresh();
-
- QgsDebugMsg( "MapUnitsPerPixel after : " + QString::number( mMapCanvas->mapUnitsPerPixel() ) );
+ layer->setCacheImage( NULL );
+ mMapCanvas->zoomByFactor( qAbs( layer->rasterUnitsPerPixel() / mMapCanvas->mapUnitsPerPixel() ) );
+ mMapCanvas->refresh();
+ QgsDebugMsg( "MapUnitsPerPixel after : " + QString::number( mMapCanvas->mapUnitsPerPixel() ) );
}
}
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/src/app/qgisapp.cpp 2011-03-13 11:51:40 UTC (rev 15460)
@@ -1358,6 +1358,7 @@
mActionHelpContents->setIcon( getThemeIcon( "/mActionHelpContents.png" ) );
mActionLocalHistogramStretch->setIcon( getThemeIcon( "/mActionLocalHistogramStretch.png" ) );
mActionFullHistogramStretch->setIcon( getThemeIcon( "/mActionFullHistogramStretch.png" ) );
+ mActionZoomActualSize->setIcon( getThemeIcon( "/mActionZoomNative.png" ) );
mActionQgisHomePage->setIcon( getThemeIcon( "/mActionQgisHomePage.png" ) );
mActionAbout->setIcon( getThemeIcon( "/mActionHelpAbout.png" ) );
mActionSponsors->setIcon( getThemeIcon( "/mActionHelpSponsors.png" ) );
@@ -1398,6 +1399,7 @@
mActionZoomLast->setIcon( getThemeIcon( "/mActionZoomLast.png" ) );
mActionZoomNext->setIcon( getThemeIcon( "/mActionZoomNext.png" ) );
mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.png" ) );
+ mActionZoomActualSize->setIcon( getThemeIcon( "/mActionZoomActual.png" ) );
mActionIdentify->setIcon( getThemeIcon( "/mActionIdentify.png" ) );
mActionSelect->setIcon( getThemeIcon( "/mActionSelect.png" ) );
mActionSelectRectangle->setIcon( getThemeIcon( "/mActionSelectRectangle.png" ) );
@@ -4858,6 +4860,10 @@
tr( "To perform a full histogram stretch, you need to have a raster layer selected." ) );
return;
}
+ if ( rlayer->providerKey() == "wms" )
+ {
+ return;
+ }
if ( rlayer->drawingStyle() == QgsRasterLayer::SingleBandGray ||
rlayer->drawingStyle() == QgsRasterLayer::MultiBandSingleBandGray ||
rlayer->drawingStyle() == QgsRasterLayer::MultiBandColor
@@ -4924,6 +4930,7 @@
}
}
+
void QgisApp::helpContents()
{
openURL( "index.html" );
@@ -5675,7 +5682,6 @@
mActionSelectFreehand->setEnabled( false );
mActionSelectRadius->setEnabled( false );
mActionIdentify->setEnabled( QSettings().value( "/Map/identifyMode", 0 ).toInt() != 0 );
- mActionZoomActualSize->setEnabled( false );
mActionOpenTable->setEnabled( false );
mActionToggleEditing->setEnabled( false );
mActionSaveEdits->setEnabled( false );
@@ -5718,7 +5724,7 @@
mActionLocalHistogramStretch->setEnabled( false );
mActionFullHistogramStretch->setEnabled( false );
-
+ mActionZoomActualSize->setEnabled( false );
return;
}
@@ -5734,6 +5740,7 @@
mActionLocalHistogramStretch->setEnabled( false );
mActionFullHistogramStretch->setEnabled( false );
+ mActionZoomActualSize->setEnabled( false );
mActionSelect->setEnabled( true );
mActionSelectRectangle->setEnabled( true );
@@ -5741,7 +5748,6 @@
mActionSelectFreehand->setEnabled( true );
mActionSelectRadius->setEnabled( true );
mActionIdentify->setEnabled( true );
- mActionZoomActualSize->setEnabled( false );
mActionOpenTable->setEnabled( true );
mActionLayerSaveAs->setEnabled( true );
mActionLayerSelectionSaveAs->setEnabled( true );
@@ -5962,8 +5968,17 @@
/*************Raster layers*************/
else if ( layer->type() == QgsMapLayer::RasterLayer )
{
- mActionLocalHistogramStretch->setEnabled( true );
- mActionFullHistogramStretch->setEnabled( true );
+ const QgsRasterLayer *rlayer = qobject_cast<const QgsRasterLayer *>( layer );
+ if ( rlayer->providerKey() == "wms" )
+ {
+ mActionLocalHistogramStretch->setEnabled( false );
+ mActionFullHistogramStretch->setEnabled( false );
+ }
+ else
+ {
+ mActionLocalHistogramStretch->setEnabled( true );
+ mActionFullHistogramStretch->setEnabled( true );
+ }
mActionLayerSubsetString->setEnabled( false );
mActionSelect->setEnabled( false );
mActionSelectRectangle->setEnabled( false );
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/src/app/qgisapp.h 2011-03-13 11:51:40 UTC (rev 15460)
@@ -493,9 +493,15 @@
void zoomToLayerExtent();
//! zoom to actual size of raster layer
void zoomActualSize();
- //! perform a local histogram stretch on the active raster layer (stretch based on pixel values in view extent)
+ /** Perform a local histogram stretch on the active raster layer
+ * (stretch based on pixel values in view extent).
+ * Valid for non wms raster layers only.
+ * @note Added in QGIS 1.7 */
void localHistogramStretch();
- //! perform a full histogram stretch on the active raster layer (stretch based on pixels values in full dataset)
+ /** perform a full histogram stretch on the active raster layer
+ * (stretch based on pixels values in full dataset)
+ * Valid for non wms raster layers only.
+ * @note Added in QGIS 1.7 */
void fullHistogramStretch();
//! plugin manager
void showPluginManager();
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2011-03-13 11:51:40 UTC (rev 15460)
@@ -2055,7 +2055,7 @@
mDataProvider->populateHistogram( theBandNo, myRasterBandStats, theBinCount, theIgnoreOutOfRangeFlag, theHistogramEstimatedFlag );
}
-QString QgsRasterLayer::providerKey()
+QString QgsRasterLayer::providerKey() const
{
if ( mProviderKey.isEmpty() )
{
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.h
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.h 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.h 2011-03-13 11:51:40 UTC (rev 15460)
@@ -550,7 +550,7 @@
QPixmap paletteAsPixmap( int theBand = 1 );
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer? */
- QString providerKey();
+ QString providerKey() const;
/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();
Modified: trunk/qgis/src/ui/qgisapp.ui
===================================================================
--- trunk/qgis/src/ui/qgisapp.ui 2011-03-13 01:16:00 UTC (rev 15459)
+++ trunk/qgis/src/ui/qgisapp.ui 2011-03-13 11:51:40 UTC (rev 15460)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>750</width>
- <height>481</height>
+ <width>1054</width>
+ <height>491</height>
</rect>
</property>
<widget class="QWidget" name="centralwidget"/>
@@ -16,7 +16,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>750</width>
+ <width>1054</width>
<height>25</height>
</rect>
</property>
@@ -300,6 +300,7 @@
<addaction name="mActionPan"/>
<addaction name="mActionZoomIn"/>
<addaction name="mActionZoomOut"/>
+ <addaction name="mActionZoomActualSize"/>
<addaction name="mActionZoomFullExtent"/>
<addaction name="mActionZoomToSelected"/>
<addaction name="mActionZoomToLayer"/>
@@ -945,9 +946,16 @@
</property>
</action>
<action name="mActionZoomActualSize">
+ <property name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/mActionZoomActual.png</normaloff>:/images/themes/default/mActionZoomActual.png</iconset>
+ </property>
<property name="text">
<string>Zoom Actual Size</string>
</property>
+ <property name="toolTip">
+ <string>Zoom to Native Pixel Resolution</string>
+ </property>
</action>
<action name="mActionMapTips">
<property name="checkable">
More information about the QGIS-commit
mailing list