[GRASS-SVN] r41885 - in grass/branches/develbranch_6/gui: icons/grass2 wxpython/icons wxpython/xml

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-16 08:40:00 -0400 (Fri, 16 Apr 2010)
New Revision: 41885

Added:
   grass/branches/develbranch_6/gui/icons/grass2/check.png
   grass/branches/develbranch_6/gui/icons/grass2/execute.png
   grass/branches/develbranch_6/gui/icons/grass2/image-export.png
Modified:
   grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
   grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
   grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
Log:
wxGUI/modeler: new icons by Robert Szczepanek
(merge 41884 from trunk)


Copied: grass/branches/develbranch_6/gui/icons/grass2/check.png (from rev 41884, grass/trunk/gui/icons/grass2/check.png)
===================================================================
(Binary files differ)

Copied: grass/branches/develbranch_6/gui/icons/grass2/execute.png (from rev 41884, grass/trunk/gui/icons/grass2/execute.png)
===================================================================
(Binary files differ)

Copied: grass/branches/develbranch_6/gui/icons/grass2/image-export.png (from rev 41884, grass/trunk/gui/icons/grass2/image-export.png)
===================================================================
(Binary files differ)

Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py	2010-04-16 09:50:04 UTC (rev 41884)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py	2010-04-16 12:40:00 UTC (rev 41885)
@@ -107,6 +107,7 @@
     "modelActionAdd" : 'layer-add.png',
     "modelDataAdd"   : 'map-add.png',
     "modelRelation"  : 'move.png',
-    "modelRun"       : 'redo.png',
-    "modelValidate"  : 'tools.png',
+    "modelRun"       : 'execute.png',
+    "modelValidate"  : 'check.png',
+    "imageSave"      : 'image-export.png',
     }

Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py	2010-04-16 09:50:04 UTC (rev 41884)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py	2010-04-16 12:40:00 UTC (rev 41885)
@@ -111,4 +111,5 @@
     "modelRelation"  : wx.ART_ERROR,
     "modelRun"       : wx.ART_ERROR,
     "modelValidate"  : wx.ART_ERROR,
+    "imageSave"      : wx.ART_ERROR,
     }

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-04-16 09:50:04 UTC (rev 41884)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-04-16 12:40:00 UTC (rev 41885)
@@ -341,7 +341,7 @@
                                 label=_("Load model from file (Ctrl+O)")),
     "modelSave" : MetaIcon (img=Icons["fileSave"],
                                 label=_("Save current model to file (Ctrl+S)")),
-    "modelToImage" : MetaIcon (img=Icons["savefile"],
+    "modelToImage" : MetaIcon (img=Icons["imageSave"],
                                 label=_("Export model to image")),
     "modelToPython" : MetaIcon (img=Icons["printmap"],
                                 label=_("Export model to Python script")),

Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-04-16 09:50:04 UTC (rev 41884)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-04-16 12:40:00 UTC (rev 41885)
@@ -112,4 +112,5 @@
     "modelRelation"  : wx.ART_ERROR,
     "modelRun"       : wx.ART_ERROR,
     "modelValidate"  : wx.ART_ERROR,
+    "imageSave"      : wx.ART_ERROR,
     }


Property changes on: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806
   + /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806,41884

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-04-16 09:50:04 UTC (rev 41884)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-04-16 12:40:00 UTC (rev 41885)
@@ -1797,7 +1797,7 @@
 	      <handler>OnNewVector</handler>
 	    </menuitem>
 	    <menuitem>
-	      <label>Digitize vector map (requires TclTk)</label>
+	      <label>Digitize vector map using Tcl/Tk digitizer</label>
 	      <help>Interactive editing and digitization of vector maps.</help>
 	      <keywords>vector,editing,digitization</keywords>
 	      <handler>OnMenuCmd</handler>