[GRASS-SVN] r46375 - in
grass/branches/releasebranch_6_4/gui/wxpython: . docs
gui_modules icons
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun May 22 11:20:04 EDT 2011
Author: martinl
Date: 2011-05-22 08:20:03 -0700 (Sun, 22 May 2011)
New Revision: 46375
Modified:
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.GCP_Manager.html
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Modeler.html
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Nviz.html
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.PsMap.html
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html
grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
grass/branches/releasebranch_6_4/gui/wxpython/icons/icon.py
grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py
Log:
wxGUI: note wx.psmap in the manual
add help icon to the main toolbar
(merge r46373 from trunk)
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -27,6 +27,7 @@
<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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.GCP_Manager.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.GCP_Manager.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.GCP_Manager.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -302,6 +302,7 @@
<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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Modeler.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Modeler.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Modeler.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -36,6 +36,7 @@
<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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Nviz.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Nviz.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Nviz.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -305,6 +305,7 @@
<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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.PsMap.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.PsMap.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.PsMap.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -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 @@
</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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizer.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizer.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -233,6 +233,7 @@
<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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html 2011-05-22 15:20:03 UTC (rev 46375)
@@ -561,6 +561,7 @@
<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>
Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py 2011-05-22 15:20:03 UTC (rev 46375)
@@ -1592,6 +1592,7 @@
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"],
@@ -1623,7 +1624,9 @@
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):
Modified: grass/branches/releasebranch_6_4/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/icons/icon.py 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/icons/icon.py 2011-05-22 15:20:03 UTC (rev 46375)
@@ -427,7 +427,7 @@
'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')),
},
Modified: grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py 2011-05-22 15:18:59 UTC (rev 46374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/wxgui.py 2011-05-22 15:20:03 UTC (rev 46375)
@@ -1056,7 +1056,8 @@
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
@@ -1064,6 +1065,11 @@
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
More information about the grass-commit
mailing list