[GRASS-SVN] r42350 - in grass/trunk/gui/wxpython: gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-25 14:10:36 -0400 (Tue, 25 May 2010)
New Revision: 42350

Modified:
   grass/trunk/gui/wxpython/gui_modules/gmodeler.py
   grass/trunk/gui/wxpython/gui_modules/toolbars.py
   grass/trunk/gui/wxpython/icons/grass2_icons.py
   grass/trunk/gui/wxpython/icons/grass_icons.py
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/icons/silk_icons.py
Log:
wxGUI/modeler: preferences & properties available from toolbar


Modified: grass/trunk/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gmodeler.py	2010-05-25 15:57:35 UTC (rev 42349)
+++ grass/trunk/gui/wxpython/gui_modules/gmodeler.py	2010-05-25 18:10:36 UTC (rev 42350)
@@ -1126,7 +1126,7 @@
             WriteModelFile(fd = tmpfile,
                            actions = self.model.GetActions(),
                            data = self.model.GetData(),
-                           properties = self.properties)
+                           properties = self.model.GetProperties())
         except StandardError:
             GMessage(parent = self,
                      message = _("Writing current settings to model file failed."))

Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py	2010-05-25 15:57:35 UTC (rev 42349)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py	2010-05-25 18:10:36 UTC (rev 42350)
@@ -1399,6 +1399,8 @@
         self.relation = wx.NewId()
         self.run = wx.NewId()
         self.validate = wx.NewId()
+        self.settings = wx.NewId()
+        self.properties = wx.NewId()
         self.quit = wx.NewId()
         
         # tool, label, bitmap, kind, shortHelp, longHelp, handler
@@ -1428,6 +1430,9 @@
             (self.relation, 'relation', Icons['modelRelation'].GetBitmap(),
              wx.ITEM_NORMAL, Icons['modelRelation'].GetLabel(), Icons['modelRelation'].GetDesc(),
              self.parent.OnDefineRelation),
+            (self.properties, "properties", Icons["modelProperties"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["modelProperties"].GetLabel(), Icons["modelProperties"].GetDesc(),
+             self.parent.OnModelProperties),
             ('', '', '', '', '', '', ''),
             (self.run, 'run', Icons['modelRun'].GetBitmap(),
              wx.ITEM_NORMAL, Icons['modelRun'].GetLabel(), Icons['modelRun'].GetDesc(),
@@ -1436,6 +1441,9 @@
              wx.ITEM_NORMAL, Icons['modelValidate'].GetLabel(), Icons['modelValidate'].GetDesc(),
              self.parent.OnValidateModel),
             ('', '', '', '', '', '', ''),
+            (self.settings, "settings", Icons["modelSettings"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["modelSettings"].GetLabel(), Icons["modelSettings"].GetDesc(),
+             self.parent.OnPreferences),
             (self.quit, 'quit', Icons['quit'].GetBitmap(),
              wx.ITEM_NORMAL, Icons['quit'].GetLabel(), Icons['quit'].GetDesc(),
              self.parent.OnCloseWindow),

Modified: grass/trunk/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/grass2_icons.py	2010-05-25 15:57:35 UTC (rev 42349)
+++ grass/trunk/gui/wxpython/icons/grass2_icons.py	2010-05-25 18:10:36 UTC (rev 42350)
@@ -112,4 +112,6 @@
     "modelValidate"  : 'check.png',
     "imageSave"      : 'image-export.png',
     "pythonSave"     : 'python-export.png',
+    "modelSettings"  : 'settings.png',
+    "modelProperties" : 'options.png',
     }

Modified: grass/trunk/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/grass_icons.py	2010-05-25 15:57:35 UTC (rev 42349)
+++ grass/trunk/gui/wxpython/icons/grass_icons.py	2010-05-25 18:10:36 UTC (rev 42350)
@@ -114,4 +114,6 @@
     "modelValidate"  : wx.ART_ERROR,
     "imageSave"      : wx.ART_ERROR,
     "pythonSave"     : wx.ART_ERROR,
+    "modelSettings"  : wx.ART_ERROR,
+    "modelProperties" : wx.ART_ERROR,
     }

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2010-05-25 15:57:35 UTC (rev 42349)
+++ grass/trunk/gui/wxpython/icons/icon.py	2010-05-25 18:10:36 UTC (rev 42350)
@@ -357,6 +357,10 @@
                            label=_("Run entire model")),
     "modelValidate" : MetaIcon (img=Icons["modelValidate"],
                                 label=_("Validate entire model")),
+    "modelSettings" : MetaIcon (img=Icons["modelSettings"],
+                                label=_("Show modeler settings")),
+    "modelProperties" : MetaIcon (img=Icons["modelProperties"],
+                                  label=_("Show model properties")),
     }
 
 # testing ...

Modified: grass/trunk/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/silk_icons.py	2010-05-25 15:57:35 UTC (rev 42349)
+++ grass/trunk/gui/wxpython/icons/silk_icons.py	2010-05-25 18:10:36 UTC (rev 42350)
@@ -115,4 +115,6 @@
     "modelValidate"  : wx.ART_ERROR,
     "imageSave"      : wx.ART_ERROR,
     "pythonSave"     : wx.ART_ERROR,
+    "modelSettings"  : wx.ART_ERROR,
+    "modelProperties" : wx.ART_ERROR,
     }