[GRASS-SVN] r43268 - in grass/branches/develbranch_6/gui/wxpython: gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-25 19:05:43 +0000 (Wed, 25 Aug 2010)
New Revision: 43268

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
Log:
wxGUI/modeler: add help icon to the toolbar
(merge r43267 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py	2010-08-25 18:54:20 UTC (rev 43267)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gmodeler.py	2010-08-25 19:05:43 UTC (rev 43268)
@@ -672,6 +672,17 @@
         dlg.ShowModal()
         self.canvas.Refresh()
         
+    def OnHelp(self, event):
+        """!Show help"""
+        if self.parent and self.parent.GetName() == 'LayerManager':
+            log = self.parent.GetLogWindow()
+            log.RunCmd(['g.manual',
+                        'entry=wxGUI.Modeler'])
+        else:
+            gcmd.RunCommand('g.manual',
+                            quiet = True,
+                            entry = 'wxGUI.Modeler')
+
     def OnModelProperties(self, event):
         """!Model properties dialog"""
         dlg = PropertiesDialog(parent = self)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2010-08-25 18:54:20 UTC (rev 43267)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2010-08-25 19:05:43 UTC (rev 43268)
@@ -1505,10 +1505,10 @@
         self.run = wx.NewId()
         self.validate = wx.NewId()
         self.settings = wx.NewId()
-        # self.properties = wx.NewId()
         self.variables = wx.NewId()
         self.quit = wx.NewId()
         self.redraw = wx.NewId()
+        self.help = wx.NewId()
         
         # tool, label, bitmap, kind, shortHelp, longHelp, handler
         return (
@@ -1554,11 +1554,15 @@
             (self.settings, "settings", Icons["modelSettings"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["modelSettings"].GetLabel(), Icons["modelSettings"].GetDesc(),
              self.parent.OnPreferences),
+            (self.help, "help", Icons["modelHelp"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["modelHelp"].GetLabel(), Icons["modelHelp"].GetDesc(),
+             self.parent.OnHelp),
+            ('', '', '', '', '', '', ''),
             (self.quit, 'quit', Icons['quit'].GetBitmap(),
              wx.ITEM_NORMAL, Icons['quit'].GetLabel(), Icons['quit'].GetDesc(),
              self.parent.OnCloseWindow),
             )
-
+    
 class HistogramToolbar(AbstractToolbar):
     """!Histogram toolbar (see histogram.py)
     """

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-08-25 18:54:20 UTC (rev 43267)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2010-08-25 19:05:43 UTC (rev 43268)
@@ -357,7 +357,7 @@
                               label=_("3D view mode tools"),
                               desc=_("Show/hide 3D view mode settings dialog")),
     "nvizHelp"   : MetaIcon (img=Icons["help"],
-                             label=_("Help for 3D view mode"),
+                             label=_("Show help"),
                              desc = _("Display 3D view mode manual page")),
     "nvizQuit": MetaIcon (img=Icons["quit"],
                           label=_("Quit 3D view mode"),
@@ -393,6 +393,9 @@
                                  label=_("Manage model variables")),
     "modelRedraw" : MetaIcon (img=Icons["redraw"],
                               label=_("Redraw model canvas")),
+    "modelHelp"   : MetaIcon (img=Icons["help"],
+                             label=_("Show help"),
+                             desc = _("Display Graphical Modeler manual page")),
     }
 
 # testing ...