[QGIS Commit] r10588 - in trunk/qgis: images/themes/classic images/themes/default images/themes/gis images/themes/nkids python/gui src/app src/gui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Apr 17 20:02:23 EDT 2009 

Author: gsherman
Date: 2009-04-17 20:02:22 -0400 (Fri, 17 Apr 2009)
New Revision: 10588

Added:
   trunk/qgis/images/themes/classic/mActionZoomNext.png
   trunk/qgis/images/themes/default/mActionZoomNext.png
   trunk/qgis/images/themes/gis/mActionZoomNext.png
   trunk/qgis/images/themes/nkids/mActionZoomNext.png
Modified:
   trunk/qgis/python/gui/qgisinterface.sip
   trunk/qgis/python/gui/qgsmapcanvas.sip
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/app/qgisappinterface.cpp
   trunk/qgis/src/app/qgisappinterface.h
   trunk/qgis/src/gui/qgisinterface.h
   trunk/qgis/src/gui/qgsmapcanvas.cpp
   trunk/qgis/src/gui/qgsmapcanvas.h
Log:
Applied patch from ticket #1522 for Zoom Next functionality.
Includes icons for zoom next tool (same icon for all themes).


Added: trunk/qgis/images/themes/classic/mActionZoomNext.png
===================================================================
--- trunk/qgis/images/themes/classic/mActionZoomNext.png	                        (rev 0)
+++ trunk/qgis/images/themes/classic/mActionZoomNext.png	2009-04-18 00:02:22 UTC (rev 10588)
@@ -0,0 +1,23 @@
+‰PNG
+
+   
+IHDR           szzô   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs  @  @Oåš   tIMEÙ bÜ–´  ÄIDATXõ–kPU×Çÿ{Ÿ÷}q¯ÀAA!FÀš¨ ‰(X
+‰õ…ÁúJ«Ó¤­ŽÓjë#1ɇ¦&&§¦¶ýЂ3±hÑúJ|ôK‰Q@@"A¯‚(ryˆpß÷œ{öîG'f´smôÿåì9kþ³{­5³áœã~***J48@8Ëå)
+9²,ôH¸!Õ›@yKý¹s-øž"÷ÈŸRT.ËêzY–í)#F‘Ô‘ÙôÉÜ<¥¯§Çèl÷0og;ø¹ËåôD‚þÕ§Nê}$ É‚¢¾)ŠjñÔ²¥â²Hrh¦‰$L5‰<x3ªu…t]ß´âPõŸòÝŒ¹œ	ÛöíÝ»÷{Lš4Í¥Xè¾ä´©+EŸÍÏÃèd
+·†|Ão
+ A#GrÛ@PÇMÑhÿ:¼çþ}ãÇåßùÇ¿}X zç ªlS’{xê«Þ£3'";Å‚AŸÏuçr 0™)
+…cE(TUÁü%/cּŸäñ¼PUUõ“ÿ+“'=§X,ïUVë°Y:9GŒ™¦¨ÇB)±îë.ãÄqgÏÁ²mˆªDйhëfTpÀ1Lå÷Ó/pÓ\¾ìÇ3ËÊÊúâÎ@ii©"*ʦ¢seUQa2“qÄÀ Iêˆ=ÿÂr00
+™Æ|Ä&™¦)Rpqéª5¤«û†p¾¾áOU¿?2–R:¬°äy0# êa¿[øݦH3T" ²|»—/÷°ú`Á ¡$’"š4…ÇŒLÌÈýÁDx½Þ¼šššIqpÊÇZíš–š
+S‹¦Æô ›¡$¦1¿æµkw
+<Fpã„ß~¬ýˆ"‡ ”Ç”ŒÑÙ¸ÞuƒBžŽ@$ÀØ´Œ,jW˜5º§š2¯,ÌÀ9Xk+ô/¾ ùŽ1zàSÄ.^„¶q#¤Y³ “!ë‰'ðÙ?o‘ÁAßD »âP-–§FdŒ&ŒôïûÌK—À
+ãÞN}€9vÅãÄqÐÌLÙcxfæ(ôõõNˆ»ª¦úýCƒà„F¹iÆÝ<€2w”×~17 ¸ïÖ  —ËéÚ¿?+z8Òp­£µ0{‡­jW.#DÀEEI‚yñ+„Þxfkë]£ºx	ÔÕ«!dgƒë:•ô«íPU‰‰‰=³gÏfqe Š4ÝìõòpDçԝÂhJ
+HR¨Ó	j³X,òÆAYõÊ]“²b%ÔõëAG‚Jfµ%«ózgG;ÒÒ†sBHSÜM( v™1“yšëµàœß`œÇ'œsNT.«"»iŠûöËö*Ôµk»VIíw9ƒ:à²æ¦äåŽe šãîÚÚÚþééÿ^	#n7i‰1*ÄL“Sï+=·¸£Cž>Îóõ·«Ï! 8% ¡ø¤úc„BAL›VL9çM54Eú5çfìÓÝ…Ó"e
+³IQ·C†;ARµp¦SbŒ¢móëІgtØî¯ÕÑíò›¾ê?þùQ”LŸÆntu5WWW7?ô4\³víò‹Í-›ç”/Fù‹K ˆ(! 0õ`r,pß1Yl®YÑ‚„ í­­øàý­H°[
+GÀÁ!
+b$Ç9àÙTØô,»ê‹kîüè£êéÅÅgO;ˆwÞÚ€oJ PU³õiVg'!„ ¥”sfbßžÝØ´q¬ª‚[ý˜”?	[¶lAAAZ]z:bˆÕ¨™÷BÒÒÒ"µ´´¼uäØçåÝ^/¦N+EVödggcÔè,
+H}}=ZSc£¯®¶=Þn<S8…ûò,R8ÊÀf³¡ªòo…¾Æöi.FbmÐÍXum(î•ìôéÓSjëÎï¸ÒúkWW
+… ”€s‚Ô”TdŒLç%%ÓYSÃ…Þ“'N¦l|}#µZ­¨«­ÃgÇŽ jÏ|ŒL©€qt1S|7Ú ›+ïA´”ž9sÆ*Šâ2ÎùÄþþþ	ÝÝ^‡ÝaLjôt.IR/!䀚ukÖ5„"¡CK_ZŠŽŽvÔž­Ãú
+Ì­pC“Þ˜ŒÐ¡
+fzïñ@€ïª®®.‰1–.Šb[~~~àÛ±ñ99õFŠË!bëf
+EE
+¸$€ÈN(Îí —0tp³‡¼mbŒÝ7ÀÿÒŒqIËmÛôò<ùÑó‰€,€K\ Õ9u' ‚›û1k¸·Í~â‘  Àsãµ9.¾ûR™“¼Pâ—@¦·¿–DHYç@ϾE¦éowŠ·!  ”æhs\VòîŠ2÷Y;¸$€ËpKÄñ•à<†ë{™š>О¬`å# €â1òÜ‹°uU‰,È·Ü[k2háÇ`+h«~Å´	üÄ# €Â,y^‚Eøýk¥6²°Àò­ÑGÁ­NÀâDCÇ”L¾û±  ÀÄLy¾S£ïür¦TL¶Üóth¾np—Ê—R<&5^Õ÷Ø›8éãŸÔ„îþoêÔq¸1Äú±?ü°¿ù±eàŽžtˬäw?j%á(篁+­Ü~¿œóÇ  ‰b¹ÛA×;4á’M滎\ˆ|y'ö_Q¡ƒµÆðë    IEND®B`‚
\ No newline at end of file

Added: trunk/qgis/images/themes/default/mActionZoomNext.png
===================================================================
--- trunk/qgis/images/themes/default/mActionZoomNext.png	                        (rev 0)
+++ trunk/qgis/images/themes/default/mActionZoomNext.png	2009-04-18 00:02:22 UTC (rev 10588)
@@ -0,0 +1,23 @@
+‰PNG
+
+   
+IHDR           szzô   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs  @  @Oåš   tIMEÙ bÜ–´  ÄIDATXõ–kPU×Çÿ{Ÿ÷}q¯ÀAA!FÀš¨ ‰(X
+‰õ…ÁúJ«Ó¤­ŽÓjë#1ɇ¦&&§¦¶ýЂ3±hÑúJ|ôK‰Q@@"A¯‚(ryˆpß÷œ{öîG'f´smôÿåì9kþ³{­5³áœã~***J48@8Ëå)
+9²,ôH¸!Õ›@yKý¹s-øž"÷ÈŸRT.ËêzY–í)#F‘Ô‘ÙôÉÜ<¥¯§Çèl÷0og;ø¹ËåôD‚þÕ§Nê}$ É‚¢¾)ŠjñÔ²¥â²Hrh¦‰$L5‰<x3ªu…t]ß´âPõŸòÝŒ¹œ	ÛöíÝ»÷{Lš4Í¥Xè¾ä´©+EŸÍÏÃèd
+·†|Ão
+ A#GrÛ@PÇMÑhÿ:¼çþ}ãÇåßùÇ¿}X zç ªlS’{xê«Þ£3'";Å‚AŸÏuçr 0™)
+…cE(TUÁü%/cּŸäñ¼PUUõ“ÿ+“'=§X,ïUVë°Y:9GŒ™¦¨ÇB)±îë.ãÄqgÏÁ²mˆªDйhëfTpÀ1Lå÷Ó/pÓ\¾ìÇ3ËÊÊúâÎ@ii©"*ʦ¢seUQa2“qÄÀ Iêˆ=ÿÂr00
+™Æ|Ä&™¦)Rpqéª5¤«û†p¾¾áOU¿?2–R:¬°äy0# êa¿[øݦH3T" ²|»—/÷°ú`Á ¡$’"š4…ÇŒLÌÈýÁDx½Þ¼šššIqpÊÇZíš–š
+S‹¦Æô ›¡$¦1¿æµkw
+<Fpã„ß~¬ýˆ"‡ ”Ç”ŒÑÙ¸ÞuƒBžŽ@$ÀØ´Œ,jW˜5º§š2¯,ÌÀ9Xk+ô/¾ ùŽ1zàSÄ.^„¶q#¤Y³ “!ë‰'ðÙ?o‘ÁAßD »âP-–§FdŒ&ŒôïûÌK—À
+ãÞN}€9vÅãÄqÐÌLÙcxfæ(ôõõNˆ»ª¦úýCƒà„F¹iÆÝ<€2w”×~17 ¸ïÖ  —ËéÚ¿?+z8Òp­£µ0{‡­jW.#DÀEEI‚yñ+„Þxfkë]£ºx	ÔÕ«!dgƒë:•ô«íPU‰‰‰=³gÏfqe Š4ÝìõòpDçԝÂhJ
+HR¨Ó	j³X,òÆAYõÊ]“²b%ÔõëAG‚Jfµ%«ózgG;ÒÒ†sBHSÜM( v™1“yšëµàœß`œÇ'œsNT.«"»iŠûöËö*Ôµk»VIíw9ƒ:à²æ¦äåŽe šãîÚÚÚþééÿ^	#n7i‰1*ÄL“Sï+=·¸£Cž>Îóõ·«Ï! 8% ¡ø¤úc„BAL›VL9çM54Eú5çfìÓÝ…Ó"e
+³IQ·C†;ARµp¦SbŒ¢móëІgtØî¯ÕÑíò›¾ê?þùQ”LŸÆntu5WWW7?ô4\³víò‹Í-›ç”/Fù‹K ˆ(! 0õ`r,pß1Yl®YÑ‚„ í­­øàý­H°[
+GÀÁ!
+b$Ç9àÙTØô,»ê‹kîüè£êéÅÅgO;ˆwÞÚ€oJ PU³õiVg'!„ ¥”sfbßžÝØ´q¬ª‚[ý˜”?	[¶lAAAZ]z:bˆÕ¨™÷BÒÒÒ"µ´´¼uäØçåÝ^/¦N+EVödggcÔè,
+H}}=ZSc£¯®¶=Þn<S8…ûò,R8ÊÀf³¡ªòo…¾Æöi.FbmÐÍXum(î•ìôéÓSjëÎï¸ÒúkWW
+… ”€s‚Ô”TdŒLç%%ÓYSÃ…Þ“'N¦l|}#µZ­¨«­ÃgÇŽ jÏ|ŒL©€qt1S|7Ú ›+ïA´”ž9sÆ*Šâ2ÎùÄþþþ	ÝÝ^‡ÝaLjôt.IR/!䀚ukÖ5„"¡CK_ZŠŽŽvÔž­Ãú
+Ì­pC“Þ˜ŒÐ¡
+fzïñ@€ïª®®.‰1–.Šb[~~~àÛ±ñ99õFŠË!bëf
+EE
+¸$€ÈN(Îí —0tp³‡¼mbŒÝ7ÀÿÒŒqIËmÛôò<ùÑó‰€,€K\ Õ9u' ‚›û1k¸·Í~â‘  Àsãµ9.¾ûR™“¼Pâ—@¦·¿–DHYç@ϾE¦éowŠ·!  ”æhs\VòîŠ2÷Y;¸$€ËpKÄñ•à<†ë{™š>О¬`å# €â1òÜ‹°uU‰,È·Ü[k2háÇ`+h«~Å´	üÄ# €Â,y^‚Eøýk¥6²°Àò­ÑGÁ­NÀâDCÇ”L¾û±  ÀÄLy¾S£ïür¦TL¶Üóth¾np—Ê—R<&5^Õ÷Ø›8éãŸÔ„îþoêÔq¸1Äú±?ü°¿ù±eàŽžtˬäw?j%á(篁+­Ü~¿œóÇ  ‰b¹ÛA×;4á’M滎\ˆ|y'ö_Q¡ƒµÆðë    IEND®B`‚
\ No newline at end of file

Added: trunk/qgis/images/themes/gis/mActionZoomNext.png
===================================================================
--- trunk/qgis/images/themes/gis/mActionZoomNext.png	                        (rev 0)
+++ trunk/qgis/images/themes/gis/mActionZoomNext.png	2009-04-18 00:02:22 UTC (rev 10588)
@@ -0,0 +1,23 @@
+‰PNG
+
+   
+IHDR           szzô   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs  @  @Oåš   tIMEÙ bÜ–´  ÄIDATXõ–kPU×Çÿ{Ÿ÷}q¯ÀAA!FÀš¨ ‰(X
+‰õ…ÁúJ«Ó¤­ŽÓjë#1ɇ¦&&§¦¶ýЂ3±hÑúJ|ôK‰Q@@"A¯‚(ryˆpß÷œ{öîG'f´smôÿåì9kþ³{­5³áœã~***J48@8Ëå)
+9²,ôH¸!Õ›@yKý¹s-øž"÷ÈŸRT.ËêzY–í)#F‘Ô‘ÙôÉÜ<¥¯§Çèl÷0og;ø¹ËåôD‚þÕ§Nê}$ É‚¢¾)ŠjñÔ²¥â²Hrh¦‰$L5‰<x3ªu…t]ß´âPõŸòÝŒ¹œ	ÛöíÝ»÷{Lš4Í¥Xè¾ä´©+EŸÍÏÃèd
+·†|Ão
+ A#GrÛ@PÇMÑhÿ:¼çþ}ãÇåßùÇ¿}X zç ªlS’{xê«Þ£3'";Å‚AŸÏuçr 0™)
+…cE(TUÁü%/cּŸäñ¼PUUõ“ÿ+“'=§X,ïUVë°Y:9GŒ™¦¨ÇB)±îë.ãÄqgÏÁ²mˆªDйhëfTpÀ1Lå÷Ó/pÓ\¾ìÇ3ËÊÊúâÎ@ii©"*ʦ¢seUQa2“qÄÀ Iêˆ=ÿÂr00
+™Æ|Ä&™¦)Rpqéª5¤«û†p¾¾áOU¿?2–R:¬°äy0# êa¿[øݦH3T" ²|»—/÷°ú`Á ¡$’"š4…ÇŒLÌÈýÁDx½Þ¼šššIqpÊÇZíš–š
+S‹¦Æô ›¡$¦1¿æµkw
+<Fpã„ß~¬ýˆ"‡ ”Ç”ŒÑÙ¸ÞuƒBžŽ@$ÀØ´Œ,jW˜5º§š2¯,ÌÀ9Xk+ô/¾ ùŽ1zàSÄ.^„¶q#¤Y³ “!ë‰'ðÙ?o‘ÁAßD »âP-–§FdŒ&ŒôïûÌK—À
+ãÞN}€9vÅãÄqÐÌLÙcxfæ(ôõõNˆ»ª¦úýCƒà„F¹iÆÝ<€2w”×~17 ¸ïÖ  —ËéÚ¿?+z8Òp­£µ0{‡­jW.#DÀEEI‚yñ+„Þxfkë]£ºx	ÔÕ«!dgƒë:•ô«íPU‰‰‰=³gÏfqe Š4ÝìõòpDçԝÂhJ
+HR¨Ó	j³X,òÆAYõÊ]“²b%ÔõëAG‚Jfµ%«ózgG;ÒÒ†sBHSÜM( v™1“yšëµàœß`œÇ'œsNT.«"»iŠûöËö*Ôµk»VIíw9ƒ:à²æ¦äåŽe šãîÚÚÚþééÿ^	#n7i‰1*ÄL“Sï+=·¸£Cž>Îóõ·«Ï! 8% ¡ø¤úc„BAL›VL9çM54Eú5çfìÓÝ…Ó"e
+³IQ·C†;ARµp¦SbŒ¢móëІgtØî¯ÕÑíò›¾ê?þùQ”LŸÆntu5WWW7?ô4\³víò‹Í-›ç”/Fù‹K ˆ(! 0õ`r,pß1Yl®YÑ‚„ í­­øàý­H°[
+GÀÁ!
+b$Ç9àÙTØô,»ê‹kîüè£êéÅÅgO;ˆwÞÚ€oJ PU³õiVg'!„ ¥”sfbßžÝØ´q¬ª‚[ý˜”?	[¶lAAAZ]z:bˆÕ¨™÷BÒÒÒ"µ´´¼uäØçåÝ^/¦N+EVödggcÔè,
+H}}=ZSc£¯®¶=Þn<S8…ûò,R8ÊÀf³¡ªòo…¾Æöi.FbmÐÍXum(î•ìôéÓSjëÎï¸ÒúkWW
+… ”€s‚Ô”TdŒLç%%ÓYSÃ…Þ“'N¦l|}#µZ­¨«­ÃgÇŽ jÏ|ŒL©€qt1S|7Ú ›+ïA´”ž9sÆ*Šâ2ÎùÄþþþ	ÝÝ^‡ÝaLjôt.IR/!䀚ukÖ5„"¡CK_ZŠŽŽvÔž­Ãú
+Ì­pC“Þ˜ŒÐ¡
+fzïñ@€ïª®®.‰1–.Šb[~~~àÛ±ñ99õFŠË!bëf
+EE
+¸$€ÈN(Îí —0tp³‡¼mbŒÝ7ÀÿÒŒqIËmÛôò<ùÑó‰€,€K\ Õ9u' ‚›û1k¸·Í~â‘  Àsãµ9.¾ûR™“¼Pâ—@¦·¿–DHYç@ϾE¦éowŠ·!  ”æhs\VòîŠ2÷Y;¸$€ËpKÄñ•à<†ë{™š>О¬`å# €â1òÜ‹°uU‰,È·Ü[k2háÇ`+h«~Å´	üÄ# €Â,y^‚Eøýk¥6²°Àò­ÑGÁ­NÀâDCÇ”L¾û±  ÀÄLy¾S£ïür¦TL¶Üóth¾np—Ê—R<&5^Õ÷Ø›8éãŸÔ„îþoêÔq¸1Äú±?ü°¿ù±eàŽžtˬäw?j%á(篁+­Ü~¿œóÇ  ‰b¹ÛA×;4á’M滎\ˆ|y'ö_Q¡ƒµÆðë    IEND®B`‚
\ No newline at end of file

Added: trunk/qgis/images/themes/nkids/mActionZoomNext.png
===================================================================
--- trunk/qgis/images/themes/nkids/mActionZoomNext.png	                        (rev 0)
+++ trunk/qgis/images/themes/nkids/mActionZoomNext.png	2009-04-18 00:02:22 UTC (rev 10588)
@@ -0,0 +1,23 @@
+‰PNG
+
+   
+IHDR           szzô   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs  @  @Oåš   tIMEÙ bÜ–´  ÄIDATXõ–kPU×Çÿ{Ÿ÷}q¯ÀAA!FÀš¨ ‰(X
+‰õ…ÁúJ«Ó¤­ŽÓjë#1ɇ¦&&§¦¶ýЂ3±hÑúJ|ôK‰Q@@"A¯‚(ryˆpß÷œ{öîG'f´smôÿåì9kþ³{­5³áœã~***J48@8Ëå)
+9²,ôH¸!Õ›@yKý¹s-øž"÷ÈŸRT.ËêzY–í)#F‘Ô‘ÙôÉÜ<¥¯§Çèl÷0og;ø¹ËåôD‚þÕ§Nê}$ É‚¢¾)ŠjñÔ²¥â²Hrh¦‰$L5‰<x3ªu…t]ß´âPõŸòÝŒ¹œ	ÛöíÝ»÷{Lš4Í¥Xè¾ä´©+EŸÍÏÃèd
+·†|Ão
+ A#GrÛ@PÇMÑhÿ:¼çþ}ãÇåßùÇ¿}X zç ªlS’{xê«Þ£3'";Å‚AŸÏuçr 0™)
+…cE(TUÁü%/cּŸäñ¼PUUõ“ÿ+“'=§X,ïUVë°Y:9GŒ™¦¨ÇB)±îë.ãÄqgÏÁ²mˆªDйhëfTpÀ1Lå÷Ó/pÓ\¾ìÇ3ËÊÊúâÎ@ii©"*ʦ¢seUQa2“qÄÀ Iêˆ=ÿÂr00
+™Æ|Ä&™¦)Rpqéª5¤«û†p¾¾áOU¿?2–R:¬°äy0# êa¿[øݦH3T" ²|»—/÷°ú`Á ¡$’"š4…ÇŒLÌÈýÁDx½Þ¼šššIqpÊÇZíš–š
+S‹¦Æô ›¡$¦1¿æµkw
+<Fpã„ß~¬ýˆ"‡ ”Ç”ŒÑÙ¸ÞuƒBžŽ@$ÀØ´Œ,jW˜5º§š2¯,ÌÀ9Xk+ô/¾ ùŽ1zàSÄ.^„¶q#¤Y³ “!ë‰'ðÙ?o‘ÁAßD »âP-–§FdŒ&ŒôïûÌK—À
+ãÞN}€9vÅãÄqÐÌLÙcxfæ(ôõõNˆ»ª¦úýCƒà„F¹iÆÝ<€2w”×~17 ¸ïÖ  —ËéÚ¿?+z8Òp­£µ0{‡­jW.#DÀEEI‚yñ+„Þxfkë]£ºx	ÔÕ«!dgƒë:•ô«íPU‰‰‰=³gÏfqe Š4ÝìõòpDçԝÂhJ
+HR¨Ó	j³X,òÆAYõÊ]“²b%ÔõëAG‚Jfµ%«ózgG;ÒÒ†sBHSÜM( v™1“yšëµàœß`œÇ'œsNT.«"»iŠûöËö*Ôµk»VIíw9ƒ:à²æ¦äåŽe šãîÚÚÚþééÿ^	#n7i‰1*ÄL“Sï+=·¸£Cž>Îóõ·«Ï! 8% ¡ø¤úc„BAL›VL9çM54Eú5çfìÓÝ…Ó"e
+³IQ·C†;ARµp¦SbŒ¢móëІgtØî¯ÕÑíò›¾ê?þùQ”LŸÆntu5WWW7?ô4\³víò‹Í-›ç”/Fù‹K ˆ(! 0õ`r,pß1Yl®YÑ‚„ í­­øàý­H°[
+GÀÁ!
+b$Ç9àÙTØô,»ê‹kîüè£êéÅÅgO;ˆwÞÚ€oJ PU³õiVg'!„ ¥”sfbßžÝØ´q¬ª‚[ý˜”?	[¶lAAAZ]z:bˆÕ¨™÷BÒÒÒ"µ´´¼uäØçåÝ^/¦N+EVödggcÔè,
+H}}=ZSc£¯®¶=Þn<S8…ûò,R8ÊÀf³¡ªòo…¾Æöi.FbmÐÍXum(î•ìôéÓSjëÎï¸ÒúkWW
+… ”€s‚Ô”TdŒLç%%ÓYSÃ…Þ“'N¦l|}#µZ­¨«­ÃgÇŽ jÏ|ŒL©€qt1S|7Ú ›+ïA´”ž9sÆ*Šâ2ÎùÄþþþ	ÝÝ^‡ÝaLjôt.IR/!䀚ukÖ5„"¡CK_ZŠŽŽvÔž­Ãú
+Ì­pC“Þ˜ŒÐ¡
+fzïñ@€ïª®®.‰1–.Šb[~~~àÛ±ñ99õFŠË!bëf
+EE
+¸$€ÈN(Îí —0tp³‡¼mbŒÝ7ÀÿÒŒqIËmÛôò<ùÑó‰€,€K\ Õ9u' ‚›û1k¸·Í~â‘  Àsãµ9.¾ûR™“¼Pâ—@¦·¿–DHYç@ϾE¦éowŠ·!  ”æhs\VòîŠ2÷Y;¸$€ËpKÄñ•à<†ë{™š>О¬`å# €â1òÜ‹°uU‰,È·Ü[k2háÇ`+h«~Å´	üÄ# €Â,y^‚Eøýk¥6²°Àò­ÑGÁ­NÀâDCÇ”L¾û±  ÀÄLy¾S£ïür¦TL¶Üóth¾np—Ê—R<&5^Õ÷Ø›8éãŸÔ„îþoêÔq¸1Äú±?ü°¿ù±eàŽžtˬäw?j%á(篁+­Ü~¿œóÇ  ‰b¹ÛA×;4á’M滎\ˆ|y'ö_Q¡ƒµÆðë    IEND®B`‚
\ No newline at end of file

Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/python/gui/qgisinterface.sip	2009-04-18 00:02:22 UTC (rev 10588)
@@ -32,6 +32,8 @@
     virtual void zoomFull()=0;
     //! Zoom to previous view extent
     virtual void zoomToPrevious()=0;
+    //! Zoom to next view extent
+    virtual void zoomToNext()=0;
     //! Zoome to extent of the active layer
     virtual void zoomToActiveLayer()=0;
 

Modified: trunk/qgis/python/gui/qgsmapcanvas.sip
===================================================================
--- trunk/qgis/python/gui/qgsmapcanvas.sip	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/python/gui/qgsmapcanvas.sip	2009-04-18 00:02:22 UTC (rev 10588)
@@ -90,6 +90,9 @@
     //! Zoom to the previous extent (view)
     void zoomToPreviousExtent();
 
+    //! Zoom to the next extent (view)
+    void zoomToNextExtent();
+
     /**Zooms to the extend of the selected features*/
     void zoomToSelected();
 

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-04-18 00:02:22 UTC (rev 10588)
@@ -724,6 +724,10 @@
   mActionZoomLast->setStatusTip( tr( "Zoom to Last Extent" ) );
   connect( mActionZoomLast, SIGNAL( triggered() ), this, SLOT( zoomToPrevious() ) );
 
+  mActionZoomNext = new QAction( getThemeIcon( "mActionZoomNext.png" ), tr( "Zoom Next" ), this );
+  mActionZoomNext->setStatusTip( tr( "Zoom to Forward Extent" ) );
+  connect( mActionZoomNext, SIGNAL( triggered() ), this, SLOT( zoomToNext() ) );
+
   mActionZoomActualSize = new QAction( tr( "Zoom Actual Size" ), this );
   mActionZoomActualSize->setStatusTip( tr( "Zoom to Actual Size" ) );
   connect( mActionZoomActualSize, SIGNAL( triggered() ), this, SLOT( zoomActualSize() ) );
@@ -1098,6 +1102,7 @@
   mViewMenu->addAction( mActionZoomToLayer );
   mViewMenu->addAction( mActionZoomToSelected );
   mViewMenu->addAction( mActionZoomLast );
+  mViewMenu->addAction( mActionZoomNext );
   mViewMenu->addAction( mActionZoomActualSize );
   mActionViewSeparator2 = mViewMenu->addSeparator();
 
@@ -1274,6 +1279,7 @@
   mMapNavToolBar->addAction( mActionZoomToSelected );
   mMapNavToolBar->addAction( mActionZoomToLayer );
   mMapNavToolBar->addAction( mActionZoomLast );
+  mMapNavToolBar->addAction( mActionZoomNext );
   mMapNavToolBar->addAction( mActionDraw );
   mToolbarMenu->addAction( mMapNavToolBar->toggleViewAction() );
   //
@@ -1489,6 +1495,7 @@
   mActionZoomToSelected->setIcon( getThemeIcon( "/mActionZoomToSelected.png" ) );
   mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
   mActionZoomLast->setIcon( getThemeIcon( "/mActionZoomLast.png" ) );
+  mActionZoomNext->setIcon( getThemeIcon( "/mActionZoomNext.png" ) );
   mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.png" ) );
   mActionIdentify->setIcon( getThemeIcon( "/mActionIdentify.png" ) );
   mActionSelect->setIcon( getThemeIcon( "/mActionSelect.png" ) );
@@ -3856,6 +3863,14 @@
 
 }
 
+void QgisApp::zoomToNext()
+{
+  mMapCanvas->zoomToNextExtent();
+  // notify the project we've made a change
+  QgsProject::instance()->dirty( true );
+
+}
+
 void QgisApp::zoomActualSize()
 {
   mMapLegend->legendLayerZoomNative();
@@ -5807,4 +5822,3 @@
     return QPixmap( myDefaultPath );
   }
 }
-

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/app/qgisapp.h	2009-04-18 00:02:22 UTC (rev 10588)
@@ -235,6 +235,7 @@
     QAction *actionZoomToLayer() { return mActionZoomToLayer; }
     QAction *actionZoomToSelected() { return mActionZoomToSelected; }
     QAction *actionZoomLast() { return mActionZoomLast; }
+    QAction *actionZoomNext() { return mActionZoomNext; }
     QAction *actionZoomActualSize() { return mActionZoomActualSize; }
     QAction *actionViewSeparator2() { return mActionViewSeparator2; }
     QAction *actionMapTips() { return mActionMapTips; }
@@ -326,6 +327,8 @@
     void zoomFull();
     //! Zoom to the previous extent
     void zoomToPrevious();
+    //! Zoom to the forward extent
+    void zoomToNext();
     //! Zoom to selected features
     void zoomToSelected();
 
@@ -711,6 +714,7 @@
     QAction *mActionZoomToLayer;
     QAction *mActionZoomToSelected;
     QAction *mActionZoomLast;
+    QAction *mActionZoomNext;
     QAction *mActionZoomActualSize;
     QAction *mActionViewSeparator2;
     QAction *mActionMapTips;

Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/app/qgisappinterface.cpp	2009-04-18 00:02:22 UTC (rev 10588)
@@ -55,6 +55,11 @@
   qgis->zoomToPrevious();
 }
 
+void QgisAppInterface::zoomToNext()
+{
+  qgis->zoomToNext();
+}
+
 void QgisAppInterface::zoomToActiveLayer()
 {
   qgis->zoomToLayerExtent();
@@ -245,6 +250,7 @@
 QAction *QgisAppInterface::actionZoomToLayer() { return qgis->actionZoomToLayer(); }
 QAction *QgisAppInterface::actionZoomToSelected() { return qgis->actionZoomToSelected(); }
 QAction *QgisAppInterface::actionZoomLast() { return qgis->actionZoomLast(); }
+QAction *QgisAppInterface::actionZoomNext() { return qgis->actionZoomNext(); }
 QAction *QgisAppInterface::actionZoomActualSize() { return qgis->actionZoomActualSize(); }
 QAction *QgisAppInterface::actionViewSeparator2() { return qgis->actionViewSeparator2(); }
 QAction *QgisAppInterface::actionMapTips() { return qgis->actionMapTips(); }

Modified: trunk/qgis/src/app/qgisappinterface.h
===================================================================
--- trunk/qgis/src/app/qgisappinterface.h	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/app/qgisappinterface.h	2009-04-18 00:02:22 UTC (rev 10588)
@@ -47,6 +47,8 @@
     void zoomFull();
     //! Zoom map to previous extent
     void zoomToPrevious();
+    //! Zoom map to next extent
+    void zoomToNext();
     //! Zoom to active layer
     void zoomToActiveLayer();
 
@@ -183,6 +185,7 @@
     virtual QAction *actionZoomToLayer();
     virtual QAction *actionZoomToSelected();
     virtual QAction *actionZoomLast();
+    virtual QAction *actionZoomNext();
     virtual QAction *actionZoomActualSize();
     virtual QAction *actionViewSeparator2();
     virtual QAction *actionMapTips();

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/gui/qgisinterface.h	2009-04-18 00:02:22 UTC (rev 10588)
@@ -71,6 +71,9 @@
     //! Zoom to previous view extent
     virtual void zoomToPrevious() = 0;
 
+    //! Zoom to next view extent
+    virtual void zoomToNext() = 0;
+
     //! Zoom to extent of the active layer
     virtual void zoomToActiveLayer() = 0;
 

Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp	2009-04-18 00:02:22 UTC (rev 10588)
@@ -85,7 +85,7 @@
   setScene( mScene );
   setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
   setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-
+  mLastExtentIndex=-1;
   mCurrentLayer = NULL;
   mMapOverview = NULL;
   mMapTool = NULL;
@@ -493,8 +493,17 @@
   updateScale();
   if ( mMapOverview )
     mMapOverview->drawExtentRect();
-  mLastExtent = current;
+  if (mLastExtent.size()>20) mLastExtent.removeAt(0);
 
+  //clear all extent items after current index
+  for (int i=mLastExtent.size()-1; i>mLastExtentIndex; i--)
+  {
+	  mLastExtent.removeAt(i);
+  }
+
+
+  mLastExtent.append(extent()) ;
+  mLastExtentIndex=mLastExtent.size()-1;
   // notify canvas items of change
   updateCanvasItemPositions();
 
@@ -541,18 +550,44 @@
 
 void QgsMapCanvas::zoomToPreviousExtent()
 {
-  if ( mDrawing )
-  {
-    return;
-  }
+	 if ( mDrawing )
+	 {
+    	return;
+	 }
 
-  QgsRectangle current = extent();
-  setExtent( mLastExtent );
-  mLastExtent = current;
+	if (mLastExtentIndex>1)
+	{
+		mLastExtentIndex--;
+		mMapRenderer->setExtent(mLastExtent[mLastExtentIndex]);
+		emit extentsChanged();
+		updateScale();
+		if ( mMapOverview )
+			 mMapOverview->drawExtentRect();
+	}
+
   refresh();
 } // zoomToPreviousExtent
 
+void QgsMapCanvas::zoomToNextExtent()
+{
+	if ( mDrawing )
+	{
+	    return;
+	}
+	if (mLastExtentIndex<mLastExtent.size()-1)
+	{
+		mLastExtentIndex++;
+		mMapRenderer->setExtent(mLastExtent[mLastExtentIndex]);
+		emit extentsChanged();
+		updateScale();
+		  if ( mMapOverview )
+		    mMapOverview->drawExtentRect();
+	}
+	refresh();
+}// zoomToNextExtent
 
+
+
 bool QgsMapCanvas::hasCrsTransformEnabled()
 {
   return mMapRenderer->hasCrsTransformEnabled();

Modified: trunk/qgis/src/gui/qgsmapcanvas.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.h	2009-04-17 23:41:14 UTC (rev 10587)
+++ trunk/qgis/src/gui/qgsmapcanvas.h	2009-04-18 00:02:22 UTC (rev 10588)
@@ -29,6 +29,7 @@
 
 #include <QDomDocument>
 #include <QGraphicsView>
+#include <QtCore>
 
 class QWheelEvent;
 class QPixmap;
@@ -142,6 +143,9 @@
     //! Zoom to the previous extent (view)
     void zoomToPreviousExtent();
 
+    //! Zoom to the Next extent (view)
+    void zoomToNextExtent();
+
     /**Zooms to the extend of the selected features*/
     void zoomToSelected();
 
@@ -412,7 +416,8 @@
     QgsMapTool* mLastNonZoomMapTool;
 
     //! recently used extent
-    QgsRectangle mLastExtent;
+    QList <QgsRectangle> mLastExtent;
+    int mLastExtentIndex;
 
     //! Scale factor multiple for default zoom in/out
     double mWheelZoomFactor;

More information about the QGIS-commit mailing list