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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-10 15:12:40 -0700 (Mon, 10 Oct 2011)
New Revision: 48719

Added:
   grass/branches/develbranch_6/gui/icons/grass2/loop-add.png
Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
   grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml
Log:
wxGUI/modeler: add new icon for loop/series (thanks to Robert Szczepanek)
	       (merge r48718 from trunk)


Added: grass/branches/develbranch_6/gui/icons/grass2/loop-add.png
===================================================================
(Binary files differ)


Property changes on: grass/branches/develbranch_6/gui/icons/grass2/loop-add.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2011-10-10 22:06:05 UTC (rev 48718)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2011-10-10 22:12:40 UTC (rev 48719)
@@ -1356,6 +1356,8 @@
                                       self.parent.OnAddData),
                                      ('relation', icons['relation'],
                                       self.parent.OnDefineRelation),
+                                     ('loop', icons['loop'],
+                                      self.parent.OnDefineLoop),
                                      (None, ),
                                      ('redraw', icons['redraw'],
                                       self.parent.OnCanvasRefresh),

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2011-10-10 22:06:05 UTC (rev 48718)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2011-10-10 22:12:40 UTC (rev 48719)
@@ -406,6 +406,8 @@
                                 label = _('Add data to model')),
         'relation'   : MetaIcon(img = iconSet.get('relation-create', wx.ART_ERROR),
                                 label = _('Manually define relation between data and commands')),
+        'loop'       : MetaIcon(img = iconSet.get('loop-add', wx.ART_ERROR),
+                                label = _('Add loop/series')),
         'run'        : MetaIcon(img = iconSet.get('execute', wx.ART_ERROR),
                                 label = _('Run model')),
         'validate'   : MetaIcon(img = iconSet.get('check', wx.ART_ERROR),

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml	2011-10-10 22:06:05 UTC (rev 48718)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata_modeler.xml	2011-10-10 22:12:40 UTC (rev 48719)
@@ -122,7 +122,6 @@
 	  <label>Validate model</label>
 	  <help>Validate entire model</help>
 	  <handler>OnValidateModel</handler>
-	  <shortcut>Ctrl+V</shortcut>
 	</menuitem>
       </items>
     </menu>