wxGUI/nviz: add help icon to the toolbar + update documentation

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43084 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/docs/wxGUI.Nviz.html

@@ -1,7 +1,7 @@
 <h2>DESCRIPTION</h2>
 
-<b>Note:</b> <em>wxNviz is currently under development. Not
-all functionality is implemented.</em>
+Note: <b>wxNviz is currently under development. Not
+all functionality is implemented.</b>
 
 <p>
 <b>wxNviz</b> is a <em><a href="wxGUI.html">wxGUI</a></em> <b>3D view
@@ -62,6 +62,17 @@ the 3D display mode.
     <em>Switch to fringe page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>fringe</b>
   control page (appearance).</dd>
+  <dt><img src="icons/grass2/settings.png">&nbsp;
+    <em>Show 3D view mode settings</em></dt>
+  <dd>Show dialog with settings for wxGUI 3D view mode. The user
+  settings can be stored in wxGUI settings file.</dd>
+  <dt><img src="icons/grass2/help.png">&nbsp;
+    <em>Show help</em></dt>
+  <dd>Show this help.</dd>
+  <dt><img src="icons/grass2/quit.png">&nbsp;
+    <em>Quit</em></dt>
+  <dd>Quit 3D view mode and switch map display to the 2D view
+  mode.</dd>
 </dl>
 
 <h2>3D View Layer Manager Toolbox</h2>

gui/wxpython/gui_modules/toolbars.py

@@ -1523,6 +1523,8 @@ class NvizToolbar(AbstractToolbar):
     """
     def __init__(self, parent, mapcontent):
         self.mapcontent = mapcontent
+        self.lmgr = parent.GetLayerManager()
+        
         AbstractToolbar.__init__(self, parent)
         
         # only one dialog can be open
@@ -1542,8 +1544,9 @@ class NvizToolbar(AbstractToolbar):
         self.light = wx.NewId()
         self.fringe = wx.NewId()
         self.settings = wx.NewId()
+        self.help = wx.NewId()
         self.quit = wx.NewId()
-
+        
         # tool, label, bitmap, kind, shortHelp, longHelp, handler
         return   (
             (self.view, "view", Icons["nvizView"].GetBitmap(),
@@ -1570,6 +1573,10 @@ class NvizToolbar(AbstractToolbar):
             (self.settings, "settings", Icons["nvizSettings"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["nvizSettings"].GetLabel(), Icons["nvizSettings"].GetDesc(),
              self.OnSettings),
+            (self.help, "help", Icons["nvizHelp"].GetBitmap(),
+             wx.ITEM_NORMAL, Icons["nvizHelp"].GetLabel(), Icons["nvizHelp"].GetDesc(),
+             self.OnHelp),
+            ("", "", "", "", "", "", ""),
             (self.quit, 'quit', Icons["nvizQuit"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["nvizQuit"].GetLabel(), Icons["nvizQuit"].GetDesc(),
              self.OnExit),
@@ -1577,28 +1584,37 @@ class NvizToolbar(AbstractToolbar):
     
     def OnShowPage(self, event):
         """!Go to the selected page"""
-        lmgr = self.parent.GetLayerManager()
-        if not lmgr or not hasattr(lmgr, "nviz"):
+        if not self.lmgr or not hasattr(self.lmgr, "nviz"):
             event.Skip()
             return
         
         eId = event.GetId()
         if eId == self.view:
-            lmgr.nviz.SetPage('view')
+            self.lmgr.nviz.SetPage('view')
         elif eId == self.surface:
-            lmgr.nviz.SetPage('surface')
+            self.lmgr.nviz.SetPage('surface')
         elif eId == self.surface:
-            lmgr.nviz.SetPage('surface')
+            self.lmgr.nviz.SetPage('surface')
         elif eId == self.vector:
-            lmgr.nviz.SetPage('vector')
+            self.lmgr.nviz.SetPage('vector')
         elif eId == self.volume:
-            lmgr.nviz.SetPage('volume')
+            self.lmgr.nviz.SetPage('volume')
         elif eId == self.light:
-            lmgr.nviz.SetPage('light')
+            self.lmgr.nviz.SetPage('light')
         elif eId == self.fringe:
-            lmgr.nviz.SetPage('fringe')
+            self.lmgr.nviz.SetPage('fringe')
         
-        lmgr.Raise()
+        self.lmgr.Raise()
+
+    def OnHelp(self, event):
+        """!Show 3D view mode help"""
+        if not self.lmgr:
+            gcmd.RunCommand('g.manual',
+                            entry = 'wxGUI.Nviz')
+        else:
+            log = self.lmgr.GetLogWindow()
+            log.RunCmd(['g.manual',
+                        'entry=wxGUI.Nviz'])
         
     def OnSettings(self, event):
         """!Show nviz notebook page"""

gui/wxpython/icons/grass2_icons.py

@@ -118,5 +118,6 @@ IconsGrass2 = {
     "nvizFringe"     : '3d-fringe.png',
     # various
     "settings"       : 'settings.png',
-    'redraw'         : 'redraw.png',
+    "redraw"         : 'redraw.png',
+    "help"           : 'help.png',
     }

gui/wxpython/icons/grass_icons.py

@@ -121,4 +121,5 @@ IconsGrass = {
     # various
     "settings"       : 'edit-color.gif',
     "redraw"         : 'gui-display.gif',
+    "help"           : wx.ART_ERROR,
     }

gui/wxpython/icons/icon.py

@@ -336,20 +336,23 @@ Icons = {
                             desc=_("Settings dialog for georectification tool")),
     # nviz
     "nvizView": MetaIcon (img=Icons["nvizView"],
-                          label=_("Go to view control page")),
+                          label=_("Switch to view control page")),
     "nvizSurface": MetaIcon (img=Icons["nvizSurface"],
-                          label=_("Go to surface (raster) control page")),
+                          label=_("Switch to surface (raster) control page")),
     "nvizVector": MetaIcon (img=Icons["nvizVector"],
-                          label=_("Go to vector (2D/3D) control page")),
+                          label=_("Switch to vector (2D/3D) control page")),
     "nvizVolume": MetaIcon (img=Icons["nvizVolume"],
-                          label=_("Go to volume (3D raster) control page")),
+                          label=_("Switch to volume (3D raster) control page")),
     "nvizLight": MetaIcon (img=Icons["nvizLight"],
-                          label=_("Go to lighting control page")),
+                          label=_("Switch to lighting control page")),
     "nvizFringe": MetaIcon (img=Icons["nvizFringe"],
-                          label=_("Go to fringe control page")),
+                          label=_("Switch to fringe control page")),
     "nvizSettings": MetaIcon (img=Icons["settings"],
                               label=_("3D view mode tools"),
-                              desc=_("Show/hide 3D view mode tools dialog")),
+                              desc=_("Show/hide 3D view mode settings dialog")),
+    "nvizHelp"   : MetaIcon (img=Icons["help"],
+                             label=_("Help for 3D view mode"),
+                             desc = _("Display 3D view mode manual page")),
     "nvizQuit": MetaIcon (img=Icons["quit"],
                           label=_("Quit 3D view mode"),
                           desc=_("Switch back to 2D view mode")),

gui/wxpython/icons/silk_icons.py

@@ -121,6 +121,7 @@ IconsSilk = {
     "nvizLight"      : wx.ART_ERROR,
     "nvizFringe"     : wx.ART_ERROR,
     # various
-    "settings"     : 'color_swatch.png',
-    "redraw"       : 'arrow_refresh.png',
+    "settings"       : 'color_swatch.png',
+    "redraw"         : 'arrow_refresh.png',
+    "help"           : wx.ART_ERROR,
     }