[GRASS-SVN] r42782 - in grass/branches/develbranch_6/gui: icons/silk wxpython/icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-07-13 19:57:06 +0000 (Tue, 13 Jul 2010)
New Revision: 42782

Added:
   grass/branches/develbranch_6/gui/icons/silk/zoom_extend.png
Modified:
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
   grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
Log:
mmetz: add zoom_extend to silk icons & change label for grGcpReload
(merge r42777, r42778 & r42779 from trunk)


Copied: grass/branches/develbranch_6/gui/icons/silk/zoom_extend.png (from rev 42777, grass/trunk/gui/icons/silk/zoom_extend.png)
===================================================================
(Binary files differ)

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-07-13 18:29:48 UTC (rev 42781)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-07-13 19:57:06 UTC (rev 42782)
@@ -328,7 +328,7 @@
     'grGcpClear' : MetaIcon (img=Icons["grGcpClear"],
                              label=_("Clear selected GCP")),
     'grGcpReload' : MetaIcon (img=Icons["grGcpReload"],
-                              label=_("Reload GCPs from selected POINTS file")),
+                              label=_("Reload GCPs from POINTS file")),
     'grGcpQuit' : MetaIcon (img=Icons["quit"],
                             label=_("Quit georectification module")),
     "grSettings": MetaIcon (img=Icons["settings"],

Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-07-13 18:29:48 UTC (rev 42781)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-07-13 19:57:06 UTC (rev 42782)
@@ -29,7 +29,7 @@
     "zoom_out"   : 'zoom_out.png',
     "zoom_back"  : 'zoom_back.png',
     "zoommenu"   : 'zoom.png',
-    "zoom_extent" : wx.ART_ERROR, # FIXME
+    "zoom_extent" : 'zoom_extend.png',
     # analyze raster (mapdisplay)
     "analyze"    : 'application_lightning.png',
     "measure"    : 'sum.png',


Property changes on: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/branches/releasebranch_6_4/gui/wxpython/icons/silk_icons.py:42375
/grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806,41884,41888,42350,42372,42377,42498,42704
   + /grass/branches/releasebranch_6_4/gui/wxpython/icons/silk_icons.py:42375
/grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806,41884,41888,42350,42372,42377,42498,42704,42777-42779