ソースを参照

wxGUI: note wx.psmap in the manual
add help icon to the main toolbar


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

Martin Landa 14 年 前
コミット
5e1e7ab02c

+ 1 - 0
gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html

@@ -27,6 +27,7 @@ Other wxGUI components:<br>
   <a href="wxGUI.Nviz.html">3D Viewer</a><br>
   <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
   <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+  <a href="wxGUI.PsMap.html">Hardcopy Map Output Utility</a><br>
 </em>
 
 <p>

+ 1 - 0
gui/wxpython/docs/wxGUI.GCP_Manager.html

@@ -302,6 +302,7 @@ Other wxGUI components:<br>
   <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
   <a href="wxGUI.Nviz.html">3D Viewer</a><br>
   <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>  
+  <a href="wxGUI.PsMap.html">Hardcopy Map Output Utility</a><br>
 </em>
 
 <p>

+ 1 - 0
gui/wxpython/docs/wxGUI.Modeler.html

@@ -40,6 +40,7 @@ Other wxGUI components:<br>
   <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
   <a href="wxGUI.Nviz.html">3D Viewer</a><br>
   <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+  <a href="wxGUI.PsMap.html">Hardcopy Map Output Utility</a><br>
 </em>
 
 <p>

+ 1 - 0
gui/wxpython/docs/wxGUI.Nviz.html

@@ -305,6 +305,7 @@ Other wxGUI components:<br>
   <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a><br>
   <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
   <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+  <a href="wxGUI.PsMap.html">Hardcopy Map Output Utility</a><br>
 </em>
 
 <p>

+ 3 - 3
gui/wxpython/docs/wxGUI.PsMap.html

@@ -1,10 +1,10 @@
 <h2>DESCRIPTION</h2>
 
-<b>Note:</b> <em>wxGUI Hardcopy Map Utility is currently under
+<b>Note:</b> <em>wxGUI Hardcopy Map Output Utility is currently under
 development.</em>
 
 <p>
-<b>wxGUI Hardcopy Map Utility</b> also called <em>wx.psmap</em> is
+<b>wxGUI Hardcopy Map Output Utility</b> also called <em>wx.psmap</em> is
 a <em><a href="wxGUI.html">wxGUI</a></em> extension which allows the
 user to create interactively hardcopy map outputs. This tool
 generates <em><a href="ps.map.html">ps.map</a></em> configuration file
@@ -23,7 +23,7 @@ Possible output files:</p>
 </ul>
 
 <p>
-Hardcopy Map Utility enables to load in saved instructions file. It
+Hardcopy Map Output Utility enables to load in saved instructions file. It
 works better with files created by wx.psmap (more tested).</p>
 
 <p>

+ 1 - 0
gui/wxpython/docs/wxGUI.Vector_Digitizer.html

@@ -233,6 +233,7 @@ Other wxGUI components:<br>
   <a href="wxGUI.Nviz.html">3D Viewer</a><br>
   <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
   <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+  <a href="wxGUI.PsMap.html">Hardcopy Map Output Utility</a><br>
 </em>
 
 <p>

+ 1 - 0
gui/wxpython/docs/wxGUI.html

@@ -576,6 +576,7 @@ wxGUI components:<br>
   <a href="wxGUI.Nviz.html">3D Viewer</a><br>
   <a href="wxGUI.Modeler.html">Graphical Modeler</a><br>
   <a href="wxGUI.GCP_Manager.html">Manage Ground Control Points</a><br>
+  <a href="wxGUI.PsMap.html">Hardcopy Map Output Utility</a><br>
 </em>
 
 <p>

+ 4 - 1
gui/wxpython/gui_modules/toolbars.py

@@ -1583,6 +1583,7 @@ class LayerManagerToolbar(AbstractToolbar):
         self.delcmd = wx.NewId()
         self.attribute = wx.NewId()
         self.preferences = wx.NewId()
+        self.help = wx.NewId()
         
         icons = Icons['layerManager']
         return self._getToolbarData(((self.newdisplay, 'newdisplay', icons["newdisplay"],
@@ -1614,7 +1615,9 @@ class LayerManagerToolbar(AbstractToolbar):
                                       self.parent.OnShowAttributeTable),
                                      (None, ),
                                      (self.preferences, 'preferences', icons["settings"],
-                                      self.parent.OnPreferences)
+                                      self.parent.OnPreferences),
+                                     (self.help, 'help', Icons["misc"]["help"],
+                                      self.parent.OnHelp),
                                      ))
 
 class ToolsToolbar(AbstractToolbar):

+ 1 - 1
gui/wxpython/icons/icon.py

@@ -394,7 +394,7 @@ Icons = {
         'font' : MetaIcon(img = iconSet.get('font', wx.ART_ERROR),
                           label = _('Select font')),
         'help' : MetaIcon(img = iconSet.get('help', wx.ART_ERROR),
-                          label = _('Show help page')),
+                          label = _('Show manual')),
         'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
                           label = _('Quit')),
         },

+ 7 - 1
gui/wxpython/wxgui.py

@@ -997,7 +997,8 @@ class GMFrame(wx.Frame):
         win.Show()
         
     def OnPreferences(self, event):
-        """!General GUI preferences/settings"""
+        """!General GUI preferences/settings
+        """
         if not self.dialogs['preferences']:
             dlg = preferences.PreferencesDialog(parent = self)
             self.dialogs['preferences'] = dlg
@@ -1005,6 +1006,11 @@ class GMFrame(wx.Frame):
 
         self.dialogs['preferences'].ShowModal()
         
+    def OnHelp(self, event):
+        """!Show help
+        """
+        self.goutput.RunCmd(['g.manual','-i'])
+        
     def DispHistogram(self, event):
         """
         Init histogram display canvas and tools