[QGIS Commit] r9017 - in trunk/qgis: images/themes/default src/app
src/gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Aug 7 05:28:14 EDT 2008
Author: timlinux
Date: 2008-08-07 05:28:14 -0400 (Thu, 07 Aug 2008)
New Revision: 9017
Added:
trunk/qgis/images/themes/default/extents.png
trunk/qgis/images/themes/default/extents.svg
trunk/qgis/images/themes/default/tracking.png
trunk/qgis/images/themes/default/tracking.svg
Modified:
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/gui/qgsprojectionselector.cpp
Log:
Patial fix for #971 - prevent extents display being obscured by other status messages. The part not implemented yet but requested in the ticket is to be able to manually edit and set the extents. The implementation here provides a toggle button on the status bar to switch between display of mouse coordinates and current extents.
Added: trunk/qgis/images/themes/default/extents.png
===================================================================
(Binary files differ)
Property changes on: trunk/qgis/images/themes/default/extents.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/qgis/images/themes/default/extents.svg
===================================================================
--- trunk/qgis/images/themes/default/extents.svg (rev 0)
+++ trunk/qgis/images/themes/default/extents.svg 2008-08-07 09:28:14 UTC (rev 9017)
@@ -0,0 +1,115 @@
+<?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="32"
+ height="32"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="extents.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/images/themes/default/extents.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="25"
+ inkscape:cx="9.06"
+ inkscape:cy="16"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1680"
+ inkscape:window-height="986"
+ inkscape:window-x="0"
+ inkscape:window-y="0">
+ <sodipodi:guide
+ orientation="1,0"
+ position="8.6,16.52"
+ id="guide3165" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ style="opacity:0.92642139999999995;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect2383"
+ width="23.200001"
+ height="22.440001"
+ x="5.04"
+ y="5.5999999"
+ ry="1.0600001" />
+ <rect
+ style="opacity:0.9264214;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.95314872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3155"
+ width="15.086851"
+ height="4.9268513"
+ x="9.0965748"
+ y="3.2165747"
+ ry="0.96001154" />
+ <rect
+ style="opacity:0.9264214;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3157"
+ width="4.7199998"
+ height="13.44"
+ x="2.6400001"
+ y="10.24"
+ ry="1.0600001" />
+ <rect
+ style="opacity:0.9264214;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3161"
+ width="4.7199998"
+ height="13.44"
+ x="25.84"
+ y="9.7200003"
+ ry="1.0600001" />
+ <rect
+ style="opacity:0.9264214;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.95314872;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3163"
+ width="15.086851"
+ height="4.9268513"
+ x="9.0165739"
+ y="25.496574"
+ ry="0.96001154" />
+ </g>
+</svg>
Added: trunk/qgis/images/themes/default/tracking.png
===================================================================
(Binary files differ)
Property changes on: trunk/qgis/images/themes/default/tracking.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/qgis/images/themes/default/tracking.svg
===================================================================
--- trunk/qgis/images/themes/default/tracking.svg (rev 0)
+++ trunk/qgis/images/themes/default/tracking.svg 2008-08-07 09:28:14 UTC (rev 9017)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="32"
+ height="32"
+ id="svg5215"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:docname="tracking.svg"
+ version="1.0"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/src/plugins/coordinate_capture/tracking.png"
+ inkscape:export-xdpi="94.536186"
+ inkscape:export-ydpi="94.536186">
+ <metadata
+ id="metadata5462">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs5460">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 765.35431 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="1530.7086 : 765.35431 : 1"
+ inkscape:persp3d-origin="765.35431 : 510.23621 : 1"
+ id="perspective5464" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-height="986"
+ inkscape:window-width="1680"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:zoom="25"
+ inkscape:cx="16"
+ inkscape:cy="16"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:current-layer="g7445" />
+<!-- EMR_SETMAPMODE --><!-- EMR_SETWINDOWEXTEX --><!-- EMR_SETVIEWPORTEXTEX --><!-- EMR_SETBKMODE --><!-- EMR_STRETCHDIBITS --><!-- EMR_SETBKCOLOR --> <path
+ style="fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path5221"
+ d="" />
+<!-- EMR_SETBKCOLOR --> <path
+ style="fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path5239"
+ d="" />
+<!-- EMR_SETBKCOLOR --> <path
+ style="fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path5339"
+ d="" />
+<!-- EMR_SETBKCOLOR --> <path
+ style="fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path5365"
+ d="" />
+<!-- EMR_SETBKCOLOR --> <g
+ id="g7438"
+ transform="translate(559.935,-420.779)">
+ <g
+ id="g7445"
+ transform="matrix(1.23751,0,0,1.23751,-561.671,-729.504)">
+ <g
+ id="g3387"
+ transform="matrix(1.2441348,0,0,1.0636724,-4.8301853,-60.654504)">
+ <path
+ id="path3276"
+ d="M 19.100853,941.77982 C 19.008084,941.83744 18.955701,942.01187 18.934129,942.35366 C 18.908376,943.12101 17.116629,947.73404 12.391171,946.21524 C 10.879759,945.73974 12.972503,948.12699 11.618279,951.04591 C 14.657798,955.26914 18.375471,955.19637 21.597776,953.70485 C 24.769373,952.24327 26.244604,946.51729 24.004043,943.53193 C 20.906639,943.94438 19.547819,941.50216 19.100853,941.77982 z M 18.176749,947.79101 C 20.073882,946.60297 21.86885,949.64581 19.891076,950.81307 C 17.913302,951.98033 16.249687,948.92834 18.176749,947.79101 z"
+ style="fill:#b4a8a8;fill-opacity:1;stroke:none;stroke-width:0.05888587px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path3278"
+ d="M 9.7699276,935.86406 C 9.7699276,935.86406 10.356887,937.09029 10.946336,937.97319 C 11.535783,938.85607 12.856787,937.73455 12.548342,937.09607 C 12.219114,936.53824 11.680379,935.62542 11.261362,934.91545 C 10.812416,934.15477 9.3118336,934.97202 9.7699276,935.86406"
+ style="fill:#b4a8a8;fill-opacity:1;stroke:none;stroke-width:1.14153004px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path3280"
+ d="M 18.287483,947.93116 C 20.139762,946.83797 21.56912,949.65346 19.846068,950.67039 C 18.07994,951.71274 16.435202,949.02436 18.287483,947.93116"
+ style="fill:#b4a8a8;fill-opacity:1;stroke:none;stroke-width:0.05888587px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path3286"
+ d="M 8.9834083,932.90943 C 8.6999176,933.00837 6.3347409,934.67778 5.7669574,936.38041 C 7.5478178,941.48323 12.322382,945.98161 15.56796,944.06611 C 18.783609,942.09989 17.173982,935.66522 13.91332,931.299 C 11.387662,931.42209 10.271995,932.08055 9.2369689,932.75978 C 9.6742805,933.73246 10.2338,934.56464 10.2338,934.56464 C 10.2338,934.56464 11.134983,934.2379 11.314561,934.54217 C 11.524071,934.89716 12.362104,936.3171 12.751191,936.97635 C 13.14028,937.63562 12.358815,938.1652 12.358815,938.1652 C 12.358815,938.1652 13.774661,940.68003 14.202826,941.52135 C 14.647601,941.46398 13.875284,942.12492 14.029906,941.69178 C 13.760539,941.23537 12.054542,938.34478 12.054542,938.34478 C 12.054542,938.34478 11.233998,938.6923 10.973777,938.36725 C 10.683629,937.99148 9.7649517,936.55076 9.5072196,935.88235 C 9.4382117,935.64957 9.3209809,935.10337 10.030951,934.68436 C 9.7225057,934.04588 9.1513525,933.4257 8.9834083,932.90943"
+ style="fill:#b4a8a8;fill-opacity:1;stroke:none;stroke-width:0.05888587px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ id="path3288"
+ d="M 11.499432,950.8434 C 12.150345,948.8182 12.007357,949.03935 11.681419,946.63341 C 11.412853,944.67224 13.360776,947.62518 16.424289,945.74875 C 19.517731,943.92304 18.15757,940.69158 19.604149,941.75236 C 21.080661,942.86386 21.439819,943.47241 23.914765,943.37925 C 22.968646,941.54446 20.130371,940.21102 17.994523,935.3177 C 16.951955,932.85607 14.641585,931.14269 14.044674,931.28985 C 15.02321,932.832 15.334142,933.12713 16.420761,935.08412 C 17.537311,937.09182 18.599056,942.48232 15.708462,944.18831 C 12.817869,945.89431 8.6718298,942.46089 7.5461337,940.32183 C 6.3697251,938.2127 6.6158241,939.09311 5.584891,936.41948 C 5.1002366,937.79954 6.5227443,940.78907 7.1030453,941.54061 C 9.7143992,944.92252 10.461038,949.19983 11.499432,950.8434"
+ style="fill:#b4a8a8;fill-opacity:1;stroke:none;stroke-width:0.05888587px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.77776337;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.77776341, 1.77776341;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 2.3401831,947.06548 C 3.600779,943.54228 6.5421694,943.67157 6.5421694,943.67157"
+ id="path3261" />
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.77776337;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.77776341, 1.77776341;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 17.596626,934.45951 C 17.596626,934.45951 20.990538,935.97869 22.768302,933.42517 C 24.546065,930.87166 25.03091,930.32217 26.194537,930.25752"
+ id="path3263" />
+ <g
+ id="g3379"
+ transform="translate(-1.5838253,-0.2262608)">
+ <path
+ inkscape:export-ydpi="94.536186"
+ inkscape:export-xdpi="94.536186"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/src/plugins/coordinate_capture/path5375.png"
+ id="path5371"
+ d="M 8.0298809,932.26863 C 7.7463902,932.36757 5.3812135,934.03698 4.81343,935.73961 C 6.5942904,940.84243 11.368855,945.34081 14.614433,943.42531 C 17.830082,941.45909 16.220455,935.02442 12.959793,930.6582 C 10.434135,930.78129 9.3184675,931.43975 8.2834415,932.11898 C 8.7207531,933.09166 9.2802725,933.92384 9.2802725,933.92384 C 9.2802725,933.92384 10.181456,933.5971 10.361034,933.90137 C 10.570544,934.25636 11.408577,935.6763 11.797664,936.33555 C 12.186753,936.99482 11.405288,937.5244 11.405288,937.5244 C 11.405288,937.5244 12.821134,940.03923 13.249299,940.88055 C 13.694074,940.82318 12.921757,941.48412 13.076379,941.05098 C 12.807012,940.59457 11.101015,937.70398 11.101015,937.70398 C 11.101015,937.70398 10.280471,938.0515 10.02025,937.72645 C 9.730102,937.35068 8.8114243,935.90996 8.5536922,935.24155 C 8.4846843,935.00877 8.3674535,934.46257 9.0774238,934.04356 C 8.7689783,933.40508 8.1978251,932.7849 8.0298809,932.26863"
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5135231;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ id="g3373">
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5135231;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 18.147326,941.13902 C 18.054557,941.19664 18.002174,941.37107 17.980602,941.71286 C 17.954849,942.48021 16.163102,947.09324 11.437644,945.57444 C 9.9262317,945.09894 12.018976,947.48619 10.664752,950.40511 C 13.704271,954.62834 17.421944,954.55557 20.644249,953.06405 C 23.815846,951.60247 25.291077,945.87649 23.050516,942.89113 C 19.953112,943.30358 18.594292,940.86136 18.147326,941.13902 z M 17.223222,947.15021 C 19.120355,945.96217 20.915323,949.00501 18.937549,950.17227 C 16.959775,951.33953 15.29616,948.28754 17.223222,947.15021 z"
+ id="path5367"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/src/plugins/coordinate_capture/path5375.png"
+ inkscape:export-xdpi="94.536186"
+ inkscape:export-ydpi="94.536186" />
+ <path
+ style="fill:#241b1b;fill-opacity:1;stroke:none;stroke-width:1.14153004px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.8164002,935.22326 C 8.8164002,935.22326 9.4033595,936.44949 9.9928089,937.33239 C 10.582256,938.21527 11.90326,937.09375 11.594815,936.45527 C 11.265587,935.89744 10.726852,934.98462 10.307835,934.27465 C 9.8588887,933.51397 8.3583062,934.33122 8.8164002,935.22326"
+ id="path5373" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5135231;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 17.333956,947.29036 C 19.186235,946.19717 20.615593,949.01266 18.892541,950.02959 C 17.126413,951.07194 15.481675,948.38356 17.333956,947.29036"
+ id="path5375"
+ inkscape:export-xdpi="94.536186"
+ inkscape:export-ydpi="94.536186" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5135231;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10.545905,950.2026 C 11.196818,948.1774 11.05383,948.39855 10.727892,945.99261 C 10.459326,944.03144 12.407249,946.98438 15.470762,945.10795 C 18.564204,943.28224 17.204043,940.05078 18.650622,941.11156 C 20.127134,942.22306 20.486292,942.83161 22.961238,942.73845 C 22.015119,940.90366 19.176844,939.57022 17.040996,934.6769 C 15.998428,932.21527 13.688058,930.50189 13.091147,930.64905 C 14.069683,932.1912 14.380615,932.48633 15.467234,934.44332 C 16.583784,936.45102 17.645529,941.84152 14.754935,943.54751 C 11.864342,945.25351 7.7183024,941.82009 6.5926063,939.68103 C 5.4161977,937.5719 5.6622967,938.45231 4.6313636,935.77868 C 4.1467092,937.15874 5.5692169,940.14827 6.1495179,940.89981 C 8.7608718,944.28172 9.5075103,948.55903 10.545905,950.2026"
+ id="path5369"
+ inkscape:export-filename="/home/timlinux/dev/cpp/qgis/src/plugins/coordinate_capture/path5375.png"
+ inkscape:export-xdpi="94.536186"
+ inkscape:export-ydpi="94.536186" />
+ </g>
+ </g>
+ </g>
+ </g>
+ <path
+ style="fill:#e00a0e;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.0354331px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ id="path5379"
+ d="" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:0.0354331px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d=""
+ id="path5393" />
+<!-- EMR_SETBKCOLOR --> <path
+ style="fill:none;stroke:#ffffff;stroke-width:1.41732001px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d=""
+ id="path5397" />
+<!-- EMR_SETBKCOLOR --><!-- EMR_SETBKCOLOR --><!-- EMR_SETBKCOLOR --><!-- EMR_SETBKCOLOR --> <path
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.885827px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ id="path5413"
+ d="" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:0.885827px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d=""
+ id="path5423" />
+<!-- EMR_SETBKCOLOR --> <path
+ style="fill:none;stroke:none"
+ d=""
+ id="path5433" />
+<!-- EMR_SETBKCOLOR --> <path
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.106299px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ id="path5439"
+ d="" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:0.106299px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d=""
+ id="path5445" />
+<!-- EMR_SETBKCOLOR --> <g
+ id="g6218" />
+ <path
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.106299px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ id="path5451"
+ d="" />
+ <path
+ style="fill:none;stroke:#ffffff;stroke-width:0.106299px;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+ d=""
+ id="path5457" />
+</svg>
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2008-08-07 07:27:56 UTC (rev 9016)
+++ trunk/qgis/src/app/qgisapp.cpp 2008-08-07 09:28:14 UTC (rev 9017)
@@ -516,54 +516,54 @@
//
// File Menu Related Items
//
- mActionFileNew= new QAction(getThemeIcon("/mActionFileNew.png"), tr("&New Project"), this);
+ mActionFileNew= new QAction(getThemeIcon("mActionFileNew.png"), tr("&New Project"), this);
mActionFileNew->setShortcut(tr("Ctrl+N","New Project"));
mActionFileNew->setStatusTip(tr("New Project"));
connect(mActionFileNew, SIGNAL(triggered()), this, SLOT(fileNew()));
//
- mActionFileOpen= new QAction(getThemeIcon("/mActionFileOpen.png"), tr("&Open Project..."), this);
+ mActionFileOpen= new QAction(getThemeIcon("mActionFileOpen.png"), tr("&Open Project..."), this);
mActionFileOpen->setShortcut(tr("Ctrl+O","Open a Project"));
mActionFileOpen->setStatusTip(tr("Open a Project"));
connect(mActionFileOpen, SIGNAL(triggered()), this, SLOT(fileOpen()));
//
- mActionFileSave= new QAction(getThemeIcon("/mActionFileSave.png"), tr("&Save Project"), this);
+ mActionFileSave= new QAction(getThemeIcon("mActionFileSave.png"), tr("&Save Project"), this);
mActionFileSave->setShortcut(tr("Ctrl+S","Save Project"));
mActionFileSave->setStatusTip(tr("Save Project"));
connect(mActionFileSave, SIGNAL(triggered()), this, SLOT(fileSave()));
//
- mActionFileSaveAs= new QAction(getThemeIcon("/mActionFileSaveAs.png"), tr("Save Project &As..."), this);
+ mActionFileSaveAs= new QAction(getThemeIcon("mActionFileSaveAs.png"), tr("Save Project &As..."), this);
mActionFileSaveAs->setShortcut(tr("Ctrl+A","Save Project under a new name"));
mActionFileSaveAs->setStatusTip(tr("Save Project under a new name"));
connect(mActionFileSaveAs, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
//
- mActionFilePrint= new QAction(getThemeIcon("/mActionFilePrint.png"), tr("&Print..."), this);
+ mActionFilePrint= new QAction(getThemeIcon("mActionFilePrint.png"), tr("&Print..."), this);
mActionFilePrint->setShortcut(tr("Ctrl+P","Print"));
mActionFilePrint->setStatusTip(tr("Print"));
connect(mActionFilePrint, SIGNAL(triggered()), this, SLOT(filePrint()));
//
- mActionSaveMapAsImage= new QAction(getThemeIcon("/mActionSaveMapAsImage.png"), tr("Save as Image..."), this);
+ mActionSaveMapAsImage= new QAction(getThemeIcon("mActionSaveMapAsImage.png"), tr("Save as Image..."), this);
mActionSaveMapAsImage->setShortcut(tr("Ctrl+I","Save map as image"));
mActionSaveMapAsImage->setStatusTip(tr("Save map as image"));
connect(mActionSaveMapAsImage, SIGNAL(triggered()), this, SLOT(saveMapAsImage()));
//
- mActionFileExit= new QAction(getThemeIcon("/mActionFileExit.png"), tr("Exit"), this);
+ mActionFileExit= new QAction(getThemeIcon("mActionFileExit.png"), tr("Exit"), this);
mActionFileExit->setShortcut(tr("Ctrl+Q","Exit QGIS"));
mActionFileExit->setStatusTip(tr("Exit QGIS"));
connect(mActionFileExit, SIGNAL(triggered()), this, SLOT(fileExit()));
//
// Layer Menu Related Items
//
- mActionAddOgrLayer= new QAction(getThemeIcon("/mActionAddOgrLayer.png"), tr("Add a Vector Layer..."), this);
+ mActionAddOgrLayer= new QAction(getThemeIcon("mActionAddOgrLayer.png"), tr("Add a Vector Layer..."), this);
mActionAddOgrLayer->setShortcut(tr("V","Add a Vector Layer"));
mActionAddOgrLayer->setStatusTip(tr("Add a Vector Layer"));
connect(mActionAddOgrLayer, SIGNAL(triggered()), this, SLOT(addVectorLayer()));
//
- mActionAddRasterLayer= new QAction(getThemeIcon("/mActionAddRasterLayer.png"), tr("Add a Raster Layer..."), this);
+ mActionAddRasterLayer= new QAction(getThemeIcon("mActionAddRasterLayer.png"), tr("Add a Raster Layer..."), this);
mActionAddRasterLayer->setShortcut(tr("R","Add a Raster Layer"));
mActionAddRasterLayer->setStatusTip(tr("Add a Raster Layer"));
connect(mActionAddRasterLayer, SIGNAL(triggered()), this, SLOT(addRasterLayer()));
//
- mActionAddLayer= new QAction(getThemeIcon("/mActionAddLayer.png"), tr("Add a PostGIS Layer..."), this);
+ mActionAddLayer= new QAction(getThemeIcon("mActionAddLayer.png"), tr("Add a PostGIS Layer..."), this);
mActionAddLayer->setShortcut(tr("D","Add a PostGIS Layer"));
mActionAddLayer->setStatusTip(tr("Add a PostGIS Layer"));
//#ifdef HAVE_POSTGRESQL
@@ -575,63 +575,63 @@
//#endif
connect(mActionAddLayer, SIGNAL(triggered()), this, SLOT(addDatabaseLayer()));
//
- mActionNewVectorLayer= new QAction(getThemeIcon("/mActionNewVectorLayer.png"), tr("New Vector Layer..."), this);
+ mActionNewVectorLayer= new QAction(getThemeIcon("mActionNewVectorLayer.png"), tr("New Vector Layer..."), this);
mActionNewVectorLayer->setShortcut(tr("N","Create a New Vector Layer"));
mActionNewVectorLayer->setStatusTip(tr("Create a New Vector Layer"));
connect(mActionNewVectorLayer, SIGNAL(triggered()), this, SLOT(newVectorLayer()));
//
- mActionRemoveLayer= new QAction(getThemeIcon("/mActionRemoveLayer.png"), tr("Remove Layer"), this);
+ mActionRemoveLayer= new QAction(getThemeIcon("mActionRemoveLayer.png"), tr("Remove Layer"), this);
mActionRemoveLayer->setShortcut(tr("Ctrl+D","Remove a Layer"));
mActionRemoveLayer->setStatusTip(tr("Remove a Layer"));
connect(mActionRemoveLayer, SIGNAL(triggered()), this, SLOT(removeLayer()));
mActionRemoveLayer->setEnabled(false);
//
- mActionAddAllToOverview= new QAction(getThemeIcon("/mActionAddAllToOverview.png"), tr("Add All To Overview"), this);
+ mActionAddAllToOverview= new QAction(getThemeIcon("mActionAddAllToOverview.png"), tr("Add All To Overview"), this);
mActionAddAllToOverview->setShortcut(tr("+","Show all layers in the overview map"));
mActionAddAllToOverview->setStatusTip(tr("Show all layers in the overview map"));
connect(mActionAddAllToOverview, SIGNAL(triggered()), this, SLOT(addAllToOverview()));
//
- mActionRemoveAllFromOverview= new QAction(getThemeIcon("/mActionRemoveAllFromOverview.png"), tr("Remove All From Overview"), this);
+ mActionRemoveAllFromOverview= new QAction(getThemeIcon("mActionRemoveAllFromOverview.png"), tr("Remove All From Overview"), this);
mActionRemoveAllFromOverview->setShortcut(tr("-","Remove all layers from overview map"));
mActionRemoveAllFromOverview->setStatusTip(tr("Remove all layers from overview map"));
connect(mActionRemoveAllFromOverview, SIGNAL(triggered()), this, SLOT(removeAllFromOverview()));
//
- mActionToggleFullScreen = new QAction(getThemeIcon("/mActionToggleFullScreen.png"), tr("Toggle full screen mode"), this);
+ mActionToggleFullScreen = new QAction(getThemeIcon("mActionToggleFullScreen.png"), tr("Toggle full screen mode"), this);
mActionToggleFullScreen->setShortcut(tr("Ctrl-F","Toggle fullscreen mode"));
mActionToggleFullScreen->setStatusTip(tr("Toggle fullscreen mode"));
connect(mActionToggleFullScreen, SIGNAL(triggered()), this, SLOT(toggleFullScreen()));
//
- mActionShowAllLayers= new QAction(getThemeIcon("/mActionShowAllLayers.png"), tr("Show All Layers"), this);
+ mActionShowAllLayers= new QAction(getThemeIcon("mActionShowAllLayers.png"), tr("Show All Layers"), this);
mActionShowAllLayers->setShortcut(tr("S","Show all layers"));
mActionShowAllLayers->setStatusTip(tr("Show all layers"));
connect(mActionShowAllLayers, SIGNAL(triggered()), this, SLOT(showAllLayers()));
//
- mActionHideAllLayers= new QAction(getThemeIcon("/mActionHideAllLayers.png"), tr("Hide All Layers"), this);
+ mActionHideAllLayers= new QAction(getThemeIcon("mActionHideAllLayers.png"), tr("Hide All Layers"), this);
mActionHideAllLayers->setShortcut(tr("H","Hide all layers"));
mActionHideAllLayers->setStatusTip(tr("Hide all layers"));
connect(mActionHideAllLayers, SIGNAL(triggered()), this, SLOT(hideAllLayers()));
//
// Settings Menu Related Items
//
- mActionProjectProperties= new QAction(getThemeIcon("/mActionProjectProperties.png"), tr("Project Properties..."), this);
+ mActionProjectProperties= new QAction(getThemeIcon("mActionProjectProperties.png"), tr("Project Properties..."), this);
mActionProjectProperties->setShortcut(tr("P","Set project properties"));
mActionProjectProperties->setStatusTip(tr("Set project properties"));
connect(mActionProjectProperties, SIGNAL(triggered()), this, SLOT(projectProperties()));
//
- mActionOptions= new QAction(getThemeIcon("/mActionOptions.png"), tr("Options..."), this);
+ mActionOptions= new QAction(getThemeIcon("mActionOptions.png"), tr("Options..."), this);
// mActionOptions->setShortcut(tr("Alt+O","Change various QGIS options"));
mActionOptions->setStatusTip(tr("Change various QGIS options"));
connect(mActionOptions, SIGNAL(triggered()), this, SLOT(options()));
//
- mActionCustomProjection= new QAction(getThemeIcon("/mActionCustomProjection.png"), tr("Custom CRS..."), this);
+ mActionCustomProjection= new QAction(getThemeIcon("mActionCustomProjection.png"), tr("Custom CRS..."), this);
// mActionCustomProjection->setShortcut(tr("Alt+I","Manage custom projections"));
mActionCustomProjection->setStatusTip(tr("Manage custom coordinate reference systems"));
connect(mActionCustomProjection, SIGNAL(triggered()), this, SLOT(customProjection()));
//
// Help Menu Related items
//
- mActionHelpContents= new QAction(getThemeIcon("/mActionHelpContents.png"), tr("Help Contents"), this);
+ mActionHelpContents= new QAction(getThemeIcon("mActionHelpContents.png"), tr("Help Contents"), this);
#ifdef Q_WS_MAC
mActionHelpContents->setShortcut(tr("Ctrl+?","Help Documentation (Mac)"));
#else
@@ -640,89 +640,89 @@
mActionHelpContents->setStatusTip(tr("Help Documentation"));
connect(mActionHelpContents, SIGNAL(triggered()), this, SLOT(helpContents()));
//
- mActionQgisHomePage= new QAction(getThemeIcon("/mActionQgisHomePage.png"), tr("Qgis Home Page"), this);
+ mActionQgisHomePage= new QAction(getThemeIcon("mActionQgisHomePage.png"), tr("Qgis Home Page"), this);
#ifndef Q_WS_MAC
mActionQgisHomePage->setShortcut(tr("Ctrl+H","QGIS Home Page"));
#endif
mActionQgisHomePage->setStatusTip(tr("QGIS Home Page"));
connect(mActionQgisHomePage, SIGNAL(triggered()), this, SLOT(helpQgisHomePage()));
//
- mActionHelpAbout= new QAction(getThemeIcon("/mActionHelpAbout.png"), tr("About"), this);
+ mActionHelpAbout= new QAction(getThemeIcon("mActionHelpAbout.png"), tr("About"), this);
mActionHelpAbout->setStatusTip(tr("About QGIS"));
connect(mActionHelpAbout, SIGNAL(triggered()), this, SLOT(about()));
//
- mActionCheckQgisVersion= new QAction(getThemeIcon("/mActionCheckQgisVersion.png"), tr("Check Qgis Version"), this);
+ mActionCheckQgisVersion= new QAction(getThemeIcon("mActionCheckQgisVersion.png"), tr("Check Qgis Version"), this);
mActionCheckQgisVersion->setStatusTip(tr("Check if your QGIS version is up to date (requires internet access)"));
connect(mActionCheckQgisVersion, SIGNAL(triggered()), this, SLOT(checkQgisVersion()));
//
// View Menu Items
//
- mActionDraw= new QAction(getThemeIcon("/mActionDraw.png"), tr("Refresh"), this);
+ mActionDraw= new QAction(getThemeIcon("mActionDraw.png"), tr("Refresh"), this);
mActionDraw->setShortcut(tr("Ctrl+R","Refresh Map"));
mActionDraw->setStatusTip(tr("Refresh Map"));
connect(mActionDraw, SIGNAL(triggered()), this, SLOT(refreshMapCanvas()));
//
- mActionZoomIn= new QAction(getThemeIcon("/mActionZoomIn.png"), tr("Zoom In"), this);
+ mActionZoomIn= new QAction(getThemeIcon("mActionZoomIn.png"), tr("Zoom In"), this);
mActionZoomIn->setShortcut(tr("Ctrl++","Zoom In"));
mActionZoomIn->setStatusTip(tr("Zoom In"));
connect(mActionZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn()));
//
- mActionZoomOut= new QAction(getThemeIcon("/mActionZoomOut.png"), tr("Zoom Out"), this);
+ mActionZoomOut= new QAction(getThemeIcon("mActionZoomOut.png"), tr("Zoom Out"), this);
mActionZoomOut->setShortcut(tr("Ctrl+-","Zoom Out"));
mActionZoomOut->setStatusTip(tr("Zoom Out"));
connect(mActionZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut()));
//
- mActionZoomFullExtent= new QAction(getThemeIcon("/mActionZoomFullExtent.png"), tr("Zoom Full"), this);
+ mActionZoomFullExtent= new QAction(getThemeIcon("mActionZoomFullExtent.png"), tr("Zoom Full"), this);
mActionZoomFullExtent->setShortcut(tr("F","Zoom to Full Extents"));
mActionZoomFullExtent->setStatusTip(tr("Zoom to Full Extents"));
connect(mActionZoomFullExtent, SIGNAL(triggered()), this, SLOT(zoomFull()));
//
- mActionZoomToSelected= new QAction(getThemeIcon("/mActionZoomToSelected.png"), tr("Zoom To Selection"), this);
+ mActionZoomToSelected= new QAction(getThemeIcon("mActionZoomToSelected.png"), tr("Zoom To Selection"), this);
mActionZoomToSelected->setShortcut(tr("Ctrl+F","Zoom to selection"));
mActionZoomToSelected->setStatusTip(tr("Zoom to selection"));
connect(mActionZoomToSelected, SIGNAL(triggered()), this, SLOT(zoomToSelected()));
//
- mActionPan= new QAction(getThemeIcon("/mActionPan.png"), tr("Pan Map"), this);
+ mActionPan= new QAction(getThemeIcon("mActionPan.png"), tr("Pan Map"), this);
mActionPan->setStatusTip(tr("Pan the map"));
connect(mActionPan, SIGNAL(triggered()), this, SLOT(pan()));
//
- mActionZoomLast= new QAction(getThemeIcon("/mActionZoomLast.png"), tr("Zoom Last"), this);
+ mActionZoomLast= new QAction(getThemeIcon("mActionZoomLast.png"), tr("Zoom Last"), this);
//mActionZoomLast->setShortcut(tr("Ctrl+O","Zoom to Last Extent"));
mActionZoomLast->setStatusTip(tr("Zoom to Last Extent"));
connect(mActionZoomLast, SIGNAL(triggered()), this, SLOT(zoomPrevious()));
//
- mActionZoomToLayer= new QAction(getThemeIcon("/mActionZoomToLayer.png"), tr("Zoom To Layer"), this);
+ mActionZoomToLayer= new QAction(getThemeIcon("mActionZoomToLayer.png"), tr("Zoom To Layer"), this);
//mActionZoomToLayer->setShortcut(tr("Ctrl+O","Zoom to Layer"));
mActionZoomToLayer->setStatusTip(tr("Zoom to Layer"));
connect(mActionZoomToLayer, SIGNAL(triggered()), this, SLOT(zoomToLayerExtent()));
//
- mActionIdentify= new QAction(getThemeIcon("/mActionIdentify.png"), tr("Identify Features"), this);
+ mActionIdentify= new QAction(getThemeIcon("mActionIdentify.png"), tr("Identify Features"), this);
mActionIdentify->setShortcut(tr("I","Click on features to identify them"));
mActionIdentify->setStatusTip(tr("Click on features to identify them"));
connect(mActionIdentify, SIGNAL(triggered()), this, SLOT(identify()));
//
- mActionSelect= new QAction(getThemeIcon("/mActionSelect.png"), tr("Select Features"), this);
+ mActionSelect= new QAction(getThemeIcon("mActionSelect.png"), tr("Select Features"), this);
mActionSelect->setStatusTip(tr("Select Features"));
connect(mActionSelect, SIGNAL(triggered()), this, SLOT(select()));
mActionSelect->setEnabled(false);
//
- mActionOpenTable= new QAction(getThemeIcon("/mActionOpenTable.png"), tr("Open Table"), this);
+ mActionOpenTable= new QAction(getThemeIcon("mActionOpenTable.png"), tr("Open Table"), this);
//mActionOpenTable->setShortcut(tr("Ctrl+O","Open Table"));
mActionOpenTable->setStatusTip(tr("Open Table"));
connect(mActionOpenTable, SIGNAL(triggered()), this, SLOT(attributeTable()));
mActionOpenTable->setEnabled(false);
//
- mActionMeasure= new QAction(getThemeIcon("/mActionMeasure.png"), tr("Measure Line "), this);
+ mActionMeasure= new QAction(getThemeIcon("mActionMeasure.png"), tr("Measure Line "), this);
mActionMeasure->setShortcut(tr("Ctrl+M","Measure a Line"));
mActionMeasure->setStatusTip(tr("Measure a Line"));
connect(mActionMeasure, SIGNAL(triggered()), this, SLOT(measure()));
//
- mActionMeasureArea= new QAction(getThemeIcon("/mActionMeasureArea.png"), tr("Measure Area"), this);
+ mActionMeasureArea= new QAction(getThemeIcon("mActionMeasureArea.png"), tr("Measure Area"), this);
mActionMeasureArea->setShortcut(tr("Ctrl+J","Measure an Area"));
mActionMeasureArea->setStatusTip(tr("Measure an Area"));
connect(mActionMeasureArea, SIGNAL(triggered()), this, SLOT(measureArea()));
//
- mActionShowBookmarks= new QAction(getThemeIcon("/mActionShowBookmarks.png"), tr("Show Bookmarks"), this);
+ mActionShowBookmarks= new QAction(getThemeIcon("mActionShowBookmarks.png"), tr("Show Bookmarks"), this);
mActionShowBookmarks->setShortcut(tr("B","Show Bookmarks"));
mActionShowBookmarks->setStatusTip(tr("Show Bookmarks"));
connect(mActionShowBookmarks, SIGNAL(triggered()), this, SLOT(showBookmarks()));
@@ -739,17 +739,17 @@
connect(mActionHideAllToolbars, SIGNAL(triggered()), this,
SLOT(hideAllToolbars()));
//
- mActionNewBookmark= new QAction(getThemeIcon("/mActionNewBookmark.png"), tr("New Bookmark..."), this);
+ mActionNewBookmark= new QAction(getThemeIcon("mActionNewBookmark.png"), tr("New Bookmark..."), this);
mActionNewBookmark->setShortcut(tr("Ctrl+B","New Bookmark"));
mActionNewBookmark->setStatusTip(tr("New Bookmark"));
connect(mActionNewBookmark, SIGNAL(triggered()), this, SLOT(newBookmark()));
//
- mActionAddWmsLayer= new QAction(getThemeIcon("/mActionAddWmsLayer.png"), tr("Add WMS Layer..."), this);
+ mActionAddWmsLayer= new QAction(getThemeIcon("mActionAddWmsLayer.png"), tr("Add WMS Layer..."), this);
mActionAddWmsLayer->setShortcut(tr("W","Add Web Mapping Server Layer"));
mActionAddWmsLayer->setStatusTip(tr("Add Web Mapping Server Layer"));
connect(mActionAddWmsLayer, SIGNAL(triggered()), this, SLOT(addWmsLayer()));
//
- mActionInOverview= new QAction(getThemeIcon("/mActionInOverview.png"), tr("In Overview"), this);
+ mActionInOverview= new QAction(getThemeIcon("mActionInOverview.png"), tr("In Overview"), this);
mActionInOverview->setShortcut(tr("O","Add current layer to overview map"));
mActionInOverview->setStatusTip(tr("Add current layer to overview map"));
connect(mActionInOverview, SIGNAL(triggered()), this, SLOT(inOverview()));
@@ -757,7 +757,7 @@
//
// Plugin Menu Related Items
//
- mActionShowPluginManager= new QAction(getThemeIcon("/mActionShowPluginManager.png"), tr("Plugin Manager..."), this);
+ mActionShowPluginManager= new QAction(getThemeIcon("mActionShowPluginManager.png"), tr("Plugin Manager..."), this);
// mActionShowPluginManager->setShortcut(tr("Ctrl+P","Open the plugin manager"));
mActionShowPluginManager->setStatusTip(tr("Open the plugin manager"));
connect(mActionShowPluginManager, SIGNAL(triggered()), this, SLOT(showPluginManager()));
@@ -769,7 +769,7 @@
// Digitising Toolbar Items
//
- mActionToggleEditing = new QAction(getThemeIcon("/mActionToggleEditing.png"),
+ mActionToggleEditing = new QAction(getThemeIcon("mActionToggleEditing.png"),
tr("Toggle editing"), this);
mActionToggleEditing->setStatusTip(tr("Toggles the editing state of the current layer"));
mActionToggleEditing->setCheckable(true);
@@ -777,81 +777,81 @@
mActionToggleEditing->setEnabled(false);
//
- mActionCapturePoint= new QAction(getThemeIcon("/mActionCapturePoint.png"), tr("Capture Point"), this);
+ mActionCapturePoint= new QAction(getThemeIcon("mActionCapturePoint.png"), tr("Capture Point"), this);
mActionCapturePoint->setShortcut(tr(".","Capture Points"));
mActionCapturePoint->setStatusTip(tr("Capture Points"));
connect(mActionCapturePoint, SIGNAL(triggered()), this, SLOT(capturePoint()));
mActionCapturePoint->setEnabled(false);
//
- mActionCaptureLine= new QAction(getThemeIcon("/mActionCaptureLine.png"), tr("Capture Line"), this);
+ mActionCaptureLine= new QAction(getThemeIcon("mActionCaptureLine.png"), tr("Capture Line"), this);
mActionCaptureLine->setShortcut(tr("/","Capture Lines"));
mActionCaptureLine->setStatusTip(tr("Capture Lines"));
connect(mActionCaptureLine, SIGNAL(triggered()), this, SLOT(captureLine()));
mActionCaptureLine->setEnabled(false);
//
- mActionCapturePolygon= new QAction(getThemeIcon("/mActionCapturePolygon.png"), tr("Capture Polygon"), this);
+ mActionCapturePolygon= new QAction(getThemeIcon("mActionCapturePolygon.png"), tr("Capture Polygon"), this);
mActionCapturePolygon->setShortcut(tr("Ctrl+/","Capture Polygons"));
mActionCapturePolygon->setStatusTip(tr("Capture Polygons"));
connect(mActionCapturePolygon, SIGNAL(triggered()), this, SLOT(capturePolygon()));
mActionCapturePolygon->setEnabled(false);
//
- mActionDeleteSelected = new QAction(getThemeIcon("/mActionDeleteSelected.png"), tr("Delete Selected"), this);
+ mActionDeleteSelected = new QAction(getThemeIcon("mActionDeleteSelected.png"), tr("Delete Selected"), this);
mActionDeleteSelected->setStatusTip(tr("Delete Selected"));
connect(mActionDeleteSelected, SIGNAL(triggered()), this, SLOT(deleteSelected()));
mActionDeleteSelected->setEnabled(false);
//
- mActionMoveFeature = new QAction(getThemeIcon("/mActionMoveFeature.png"), tr("Move Feature"), this);
+ mActionMoveFeature = new QAction(getThemeIcon("mActionMoveFeature.png"), tr("Move Feature"), this);
mActionMoveFeature->setStatusTip(tr("Move Feature"));
connect(mActionMoveFeature, SIGNAL(triggered()), this, SLOT(moveFeature()));
mActionMoveFeature->setEnabled(false);
//
- mActionSplitFeatures = new QAction(getThemeIcon("/mActionSplitFeatures.png"), tr("Split Features"), this);
+ mActionSplitFeatures = new QAction(getThemeIcon("mActionSplitFeatures.png"), tr("Split Features"), this);
mActionSplitFeatures->setStatusTip(tr("Split Features"));
connect(mActionSplitFeatures, SIGNAL(triggered()), this, SLOT(splitFeatures()));
mActionSplitFeatures->setEnabled(false);
//
- mActionAddVertex = new QAction(getThemeIcon("/mActionAddVertex.png"), tr("Add Vertex"), this);
+ mActionAddVertex = new QAction(getThemeIcon("mActionAddVertex.png"), tr("Add Vertex"), this);
mActionAddVertex->setStatusTip(tr("Add Vertex"));
connect(mActionAddVertex, SIGNAL(triggered()), this, SLOT(addVertex()));
mActionAddVertex->setEnabled(false);
//
- mActionDeleteVertex = new QAction(getThemeIcon("/mActionDeleteVertex.png"), tr("Delete Vertex"), this);
+ mActionDeleteVertex = new QAction(getThemeIcon("mActionDeleteVertex.png"), tr("Delete Vertex"), this);
mActionDeleteVertex->setStatusTip(tr("Delete Vertex"));
connect(mActionDeleteVertex, SIGNAL(triggered()), this, SLOT(deleteVertex()));
mActionDeleteVertex->setEnabled(false);
//
- mActionMoveVertex = new QAction(getThemeIcon("/mActionMoveVertex.png"), tr("Move Vertex"), this);
+ mActionMoveVertex = new QAction(getThemeIcon("mActionMoveVertex.png"), tr("Move Vertex"), this);
mActionMoveVertex->setStatusTip(tr("Move Vertex"));
connect(mActionMoveVertex, SIGNAL(triggered()), this, SLOT(moveVertex()));
mActionMoveVertex->setEnabled(false);
- mActionAddRing = new QAction(getThemeIcon("/mActionAddRing.png"), tr("Add Ring"), this);
+ mActionAddRing = new QAction(getThemeIcon("mActionAddRing.png"), tr("Add Ring"), this);
mActionAddRing->setStatusTip(tr("Add Ring"));
connect(mActionAddRing, SIGNAL(triggered()), this, SLOT(addRing()));
mActionAddRing->setEnabled(false);
- mActionAddIsland = new QAction(getThemeIcon("/mActionAddIsland.png"), tr("Add Island"), this);
+ mActionAddIsland = new QAction(getThemeIcon("mActionAddIsland.png"), tr("Add Island"), this);
mActionAddIsland->setStatusTip(tr("Add Island to multipolygon"));
connect(mActionAddIsland, SIGNAL(triggered()), this, SLOT(addIsland()));
mActionAddIsland->setEnabled(false);
- mActionEditCut = new QAction(getThemeIcon("/mActionEditCut.png"), tr("Cut Features"), this);
+ mActionEditCut = new QAction(getThemeIcon("mActionEditCut.png"), tr("Cut Features"), this);
mActionEditCut->setStatusTip(tr("Cut selected features"));
connect(mActionEditCut, SIGNAL(triggered()), this, SLOT(editCut()));
mActionEditCut->setEnabled(false);
- mActionEditCopy = new QAction(getThemeIcon("/mActionEditCopy.png"), tr("Copy Features"), this);
+ mActionEditCopy = new QAction(getThemeIcon("mActionEditCopy.png"), tr("Copy Features"), this);
mActionEditCopy->setStatusTip(tr("Copy selected features"));
connect(mActionEditCopy, SIGNAL(triggered()), this, SLOT(editCopy()));
mActionEditCopy->setEnabled(false);
- mActionEditPaste = new QAction(getThemeIcon("/mActionEditPaste.png"), tr("Paste Features"), this);
+ mActionEditPaste = new QAction(getThemeIcon("mActionEditPaste.png"), tr("Paste Features"), this);
mActionEditPaste->setStatusTip(tr("Paste selected features"));
connect(mActionEditPaste, SIGNAL(triggered()), this, SLOT(editPaste()));
mActionEditPaste->setEnabled(false);
// maptips
- mActionMapTips = new QAction(getThemeIcon("/mActionMapTips.png"), tr("Map Tips"), this);
+ mActionMapTips = new QAction(getThemeIcon("mActionMapTips.png"), tr("Map Tips"), this);
mActionMapTips->setStatusTip(tr("Show information about a feature when the mouse is hovered over it"));
connect ( mActionMapTips, SIGNAL ( triggered() ), this, SLOT ( toggleMapTips() ) );
mActionMapTips->setCheckable(true);
@@ -1123,6 +1123,28 @@
QFont myFont( "Arial", 9 );
statusBar()->setFont(myFont);
+ //toggle to switch between mouse pos and extents display in status bar widget
+ mToggleExtentsViewButton = new QToolButton( statusBar() );
+ mToggleExtentsViewButton->setMaximumWidth(20);
+ mToggleExtentsViewButton->setMaximumHeight(20);
+ mToggleExtentsViewButton->setIcon(getThemeIcon("tracking.png"));
+ mToggleExtentsViewButton->setToolTip(tr("Toggle extents and mouse position display") );
+ mToggleExtentsViewButton->setCheckable(true);
+ connect(mToggleExtentsViewButton, SIGNAL(toggled(bool)), this, SLOT(extentsViewToggled(bool)));
+ statusBar()->addPermanentWidget(mToggleExtentsViewButton, 0);
+ //coords status bar widget
+ mCoordsLabel = new QLabel(QString(), statusBar());
+ mCoordsLabel->setMinimumWidth(10);
+ mCoordsLabel->setMaximumHeight(20);
+ mCoordsLabel->setFont(myFont);
+ mCoordsLabel->setMargin(3);
+ mCoordsLabel->setAlignment(Qt::AlignCenter);
+ mCoordsLabel->setWhatsThis(tr("Shows the map coordinates at the "
+ "current cursor position. The display is continuously updated "
+ "as the mouse is moved."));
+ mCoordsLabel->setToolTip(tr("Map coordinates at mouse cursor position"));
+ statusBar()->addPermanentWidget(mCoordsLabel, 0);
+ // add a label to show current scale
mScaleLabel = new QLabel(QString(),statusBar());
mScaleLabel->setFont(myFont);
mScaleLabel->setMinimumWidth(10);
@@ -1149,23 +1171,11 @@
statusBar()->addPermanentWidget(mScaleEdit, 0);
connect(mScaleEdit, SIGNAL(editingFinished()), this, SLOT(userScale()));
- //coords status bar widget
- mCoordsLabel = new QLabel(QString(), statusBar());
- mCoordsLabel->setMinimumWidth(10);
- mCoordsLabel->setMaximumHeight(20);
- mCoordsLabel->setFont(myFont);
- mCoordsLabel->setMargin(3);
- mCoordsLabel->setAlignment(Qt::AlignCenter);
- mCoordsLabel->setWhatsThis(tr("Shows the map coordinates at the "
- "current cursor position. The display is continuously updated "
- "as the mouse is moved."));
- mCoordsLabel->setToolTip(tr("Map coordinates at mouse cursor position"));
- statusBar()->addPermanentWidget(mCoordsLabel, 0);
//stop rendering status bar widget
mStopRenderButton = new QToolButton( statusBar() );
mStopRenderButton->setMaximumWidth(20);
mStopRenderButton->setMaximumHeight(20);
- mStopRenderButton->setIcon(getThemeIcon("/mIconDelete.png"));
+ mStopRenderButton->setIcon(getThemeIcon("mIconDelete.png"));
mStopRenderButton->setToolTip(tr("Stop map rendering") );
statusBar()->addPermanentWidget(mStopRenderButton, 0);
// render suppression status bar widget
@@ -1186,7 +1196,7 @@
// Maintain uniform widget height in status bar by setting button height same as labels
// For Qt/Mac 3.3, the default toolbutton height is 30 and labels were expanding to match
mOnTheFlyProjectionStatusButton->setMaximumHeight(mScaleLabel->height());
- mOnTheFlyProjectionStatusButton->setIcon(getThemeIcon("/mIconProjectionDisabled.png"));
+ mOnTheFlyProjectionStatusButton->setIcon(getThemeIcon("mIconProjectionDisabled.png"));
if (!QFile::exists(QgsApplication::defaultThemePath() + "/mIconProjectionDisabled.png"))
{
QMessageBox::critical(this, tr("Resource Location Error"),
@@ -1297,7 +1307,6 @@
//signal when mouse moved over window (coords display in status bar)
connect(mMapCanvas, SIGNAL(xyCoordinates(QgsPoint &)), this, SLOT(showMouseCoordinate(QgsPoint &)));
- //signal when mouse in capturePoint mode and mouse clicked on canvas
connect(mMapCanvas->mapRenderer(), SIGNAL(drawingProgress(int,int)), this, SLOT(showProgress(int,int)));
connect(mMapCanvas->mapRenderer(), SIGNAL(projectionsEnabled(bool)), this, SLOT(projectionsEnabled(bool)));
connect(mMapCanvas->mapRenderer(), SIGNAL(destinationSrsChanged()), this, SLOT(destinationSrsChanged()));
@@ -3653,12 +3662,6 @@
void QgisApp::showMouseCoordinate(QgsPoint & p)
{
- mCoordsLabel->setText(p.stringRep(mMousePrecisionDecimalPlaces));
- // Set minimum necessary width
- if ( mCoordsLabel->width() > mCoordsLabel->minimumWidth() )
- {
- mCoordsLabel->setMinimumWidth(mCoordsLabel->width());
- }
if ( mMapTipsVisible )
{
@@ -3676,6 +3679,20 @@
//QgsDebugMsg("Started maptips timer");
}
}
+ if (mToggleExtentsViewButton->isChecked())
+ {
+ //we are in show extents mode so no need to do anything
+ return;
+ }
+ else
+ {
+ mCoordsLabel->setText(p.stringRep(mMousePrecisionDecimalPlaces));
+ // Set minimum necessary width
+ if ( mCoordsLabel->width() > mCoordsLabel->minimumWidth() )
+ {
+ mCoordsLabel->setMinimumWidth(mCoordsLabel->width());
+ }
+ }
}
@@ -4434,12 +4451,12 @@
if (theFlag)
{
mOnTheFlyProjectionStatusButton->setIcon(
- getThemeIcon("/mIconProjectionEnabled.png"));
+ getThemeIcon("mIconProjectionEnabled.png"));
}
else
{
mOnTheFlyProjectionStatusButton->setIcon(
- getThemeIcon("/mIconProjectionDisabled.png"));
+ getThemeIcon("mIconProjectionDisabled.png"));
}
}
// slot to update the progress bar in the status bar
@@ -4470,12 +4487,36 @@
}
}
+void QgisApp::extentsViewToggled(bool theFlag)
+{
+ if (theFlag)
+ {
+ //extents view mode!
+ mToggleExtentsViewButton->setIcon(getThemeIcon("extents.png"));
+ showExtents();
+ }
+ else
+ {
+ //mouse cursor pos view mode!
+ mToggleExtentsViewButton->setIcon(getThemeIcon("tracking.png"));
+ }
+}
+
void QgisApp::showExtents()
{
+ if (!mToggleExtentsViewButton->isChecked())
+ {
+ //we are in show coords mode so no need to do anything
+ return;
+ }
// update the statusbar with the current extents.
QgsRect myExtents = mMapCanvas->extent();
- statusBar()->showMessage(QString(tr("Extents: ")) + myExtents.stringRep(true));
-
+ mCoordsLabel->setText(QString(tr("Extents: ")) + myExtents.stringRep(true));
+ //ensure the label is big enough
+ if ( mCoordsLabel->width() > mCoordsLabel->minimumWidth() )
+ {
+ mCoordsLabel->setMinimumWidth(mCoordsLabel->width());
+ }
} // QgisApp::showExtents
@@ -5296,8 +5337,8 @@
QIcon QgisApp::getThemeIcon(const QString theName)
{
- QString myPreferredPath = QgsApplication::activeThemePath() + theName;
- QString myDefaultPath = QgsApplication::defaultThemePath() + theName;
+ QString myPreferredPath = QgsApplication::activeThemePath() + QDir::separator() + theName;
+ QString myDefaultPath = QgsApplication::defaultThemePath() + QDir::separator() + theName;
if (QFile::exists(myPreferredPath))
{
return QIcon(myPreferredPath);
@@ -5316,8 +5357,8 @@
QPixmap QgisApp::getThemePixmap(const QString theName)
{
- QString myPreferredPath = QgsApplication::activeThemePath() + theName;
- QString myDefaultPath = QgsApplication::defaultThemePath() + theName;
+ QString myPreferredPath = QgsApplication::activeThemePath() + QDir::separator() + theName;
+ QString myDefaultPath = QgsApplication::defaultThemePath() + QDir::separator() + theName;
if (QFile::exists(myPreferredPath))
{
return QPixmap(myPreferredPath);
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2008-08-07 07:27:56 UTC (rev 9016)
+++ trunk/qgis/src/app/qgisapp.h 2008-08-07 09:28:14 UTC (rev 9017)
@@ -333,6 +333,7 @@
public slots:
void showProgress(int theProgress, int theTotalSteps);
+ void extentsViewToggled(bool theFlag);
void showExtents();
void showStatusMessage(QString theMessage);
void updateMouseCoordinatePrecision();
@@ -607,6 +608,8 @@
QProgressBar * mProgressBar;
//! Widget used to suppress rendering
QCheckBox * mRenderSuppressionCBox;
+ //! A toggle to switch between mouse coords and view extents display
+ QToolButton * mToggleExtentsViewButton;
//! Button used to stop rendering
QToolButton* mStopRenderButton;
//! Widget in status bar used to show status of on the fly projection
Modified: trunk/qgis/src/gui/qgsprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsprojectionselector.cpp 2008-08-07 07:27:56 UTC (rev 9016)
+++ trunk/qgis/src/gui/qgsprojectionselector.cpp 2008-08-07 09:28:14 UTC (rev 9017)
@@ -660,6 +660,10 @@
{
// This is a projected srs
+ if (previousSrsTypeNode == NULL)
+ {
+ previousSrsTypeNode = mProjList;
+ }
QTreeWidgetItem *node;
QString srsType = QString::fromUtf8((char*)sqlite3_column_text(ppStmt, 3));
// Find the node for this type and add the projection to it
More information about the QGIS-commit
mailing list