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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-16 14:52:47 -0400 (Fri, 16 Apr 2010)
New Revision: 41889

Added:
   grass/branches/develbranch_6/gui/icons/grass2/python-export.png
   grass/branches/develbranch_6/gui/icons/grass2/relation-create.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
Log:
wxGUI/modeler: more icons by Robert Szczepanek
(merge r41888 from trunk)


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

Copied: grass/branches/develbranch_6/gui/icons/grass2/relation-create.png (from rev 41888, grass/trunk/gui/icons/grass2/relation-create.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 18:49:35 UTC (rev 41888)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass2_icons.py	2010-04-16 18:52:47 UTC (rev 41889)
@@ -106,8 +106,9 @@
     # modeler
     "modelActionAdd" : 'layer-add.png',
     "modelDataAdd"   : 'map-add.png',
-    "modelRelation"  : 'move.png',
+    "modelRelation"  : 'relation-create.png',
     "modelRun"       : 'execute.png',
     "modelValidate"  : 'check.png',
     "imageSave"      : 'image-export.png',
+    "pythonSave"     : 'python-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 18:49:35 UTC (rev 41888)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py	2010-04-16 18:52:47 UTC (rev 41889)
@@ -112,4 +112,5 @@
     "modelRun"       : wx.ART_ERROR,
     "modelValidate"  : wx.ART_ERROR,
     "imageSave"      : wx.ART_ERROR,
+    "pythonSave"     : 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 18:49:35 UTC (rev 41888)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-04-16 18:52:47 UTC (rev 41889)
@@ -343,7 +343,7 @@
                                 label=_("Save current model to file (Ctrl+S)")),
     "modelToImage" : MetaIcon (img=Icons["imageSave"],
                                 label=_("Export model to image")),
-    "modelToPython" : MetaIcon (img=Icons["printmap"],
+    "modelToPython" : MetaIcon (img=Icons["pythonSave"],
                                 label=_("Export model to Python script")),
     "modelActionAdd" : MetaIcon (img=Icons["modelActionAdd"],
                                  label=_("Add action (GRASS module) to model")),

Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-04-16 18:49:35 UTC (rev 41888)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py	2010-04-16 18:52:47 UTC (rev 41889)
@@ -113,4 +113,5 @@
     "modelRun"       : wx.ART_ERROR,
     "modelValidate"  : wx.ART_ERROR,
     "imageSave"      : wx.ART_ERROR,
+    "pythonSave"     : 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,41884
   + /grass/trunk/gui/wxpython/icons/silk_icons.py:41584,41586-41587,41590-41592,41594,41596,41598,41600,41806,41884,41888