[GRASS-SVN] r48322 - in grass/trunk/gui/wxpython: . docs
gui_modules icons xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Sep 16 07:15:13 EDT 2011
Author: annakrat
Date: 2011-09-16 04:15:12 -0700 (Fri, 16 Sep 2011)
New Revision: 48322
Modified:
grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html
grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html
grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html
grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
grass/trunk/gui/wxpython/docs/wxGUI.PsMap.html
grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
grass/trunk/gui/wxpython/docs/wxGUI.html
grass/trunk/gui/wxpython/gui_modules/menudata.py
grass/trunk/gui/wxpython/gui_modules/psmap.py
grass/trunk/gui/wxpython/gui_modules/toolbars.py
grass/trunk/gui/wxpython/icons/icon.py
grass/trunk/gui/wxpython/wxgui.py
grass/trunk/gui/wxpython/xml/menudata.xml
grass/trunk/gui/wxpython/xml/menudata_psmap.xml
Log:
wx.psmap: renamed from Hardcopy Map Output Utility to Cartographic Composer
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -27,7 +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>
+<a href="wxGUI.PsMap.html">Cartographic Composer</a><br>
</em>
<p>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.GCP_Manager.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -301,7 +301,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>
+ <a href="wxGUI.PsMap.html">Cartographic Composer</a><br>
</em>
<p>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Modeler.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -40,7 +40,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>
+<a href="wxGUI.PsMap.html">Cartographic Composer</a><br>
</em>
<p>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -380,7 +380,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>
+ <a href="wxGUI.PsMap.html">Cartographic Composer</a><br>
</em>
<p>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.PsMap.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.PsMap.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.PsMap.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -1,10 +1,10 @@
<h2>DESCRIPTION</h2>
-<b>Note:</b> <em>wxGUI Hardcopy Map Output Utility is currently under
+<b>Note:</b> <em>wxGUI Cartographic Composer is currently under
development.</em>
<p>
-<b>wxGUI Hardcopy Map Output Utility</b> also called <em>wx.psmap</em> is
+<b>wxGUI Cartographic Composer</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 Output Utility enables to load in saved instructions file. It
+Cartographic Composer enables to load in saved instructions file. It
works better with files created by wx.psmap (more tested).
<p>
@@ -46,7 +46,7 @@
</ul>
-<h3>HARDCOPY MAP UTILITY TOOLBAR</h3>
+<h3>CARTOGRAPHIC COMPOSER TOOLBAR</h3>
<dl>
<dt><img src="icons/script-save.png">
<em>Generate instructions file</em></dt>
@@ -197,7 +197,7 @@
</em>
<p>
-See also <a href="http://grass.osgeo.org/wiki/WxGUI_Hardcopy_Map_Output_Utility">wiki</a> page.
+See also <a href="http://grass.osgeo.org/wiki/WxGUI_Cartographic_Composer">wiki</a> page.
<h2>AUTHORS</h2>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Vector_Digitizer.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -233,7 +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>
+ <a href="wxGUI.PsMap.html">Cartographic Composer</a><br>
</em>
<p>
Modified: grass/trunk/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.html 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/docs/wxGUI.html 2011-09-16 11:15:12 UTC (rev 48322)
@@ -583,7 +583,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>
+ <a href="wxGUI.PsMap.html">Cartographic Composer</a><br>
</em>
<p>
Modified: grass/trunk/gui/wxpython/gui_modules/menudata.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menudata.py 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/gui_modules/menudata.py 2011-09-16 11:15:12 UTC (rev 48322)
@@ -239,7 +239,7 @@
class PsMapData(MenuData):
def __init__(self, path = None):
- """!Menu for Hardcopy Map Output Utility (psmap.py)
+ """!Menu for Cartographic Composer (psmap.py)
@path path to XML to be read (None for menudata_psmap.xml)
"""
Modified: grass/trunk/gui/wxpython/gui_modules/psmap.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/psmap.py 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/gui_modules/psmap.py 2011-09-16 11:15:12 UTC (rev 48322)
@@ -52,7 +52,7 @@
class PsMapFrame(wx.Frame):
def __init__(self, parent = None, id = wx.ID_ANY,
- title = _("GRASS GIS Hardcopy Map Output Utility"), **kwargs):
+ title = _("GRASS GIS Cartographic Composer"), **kwargs):
"""!Main window of ps.map GUI
@param parent parent window
@@ -909,7 +909,7 @@
info = wx.AboutDialogInfo()
info.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
- info.SetName(_('wxGUI Hardcopy Map Utility'))
+ info.SetName(_('wxGUI Cartographic Composer'))
info.SetWebSite('http://grass.osgeo.org')
info.SetDescription(_('(C) 2011 by the GRASS Development Team\n\n') +
'\n'.join(textwrap.wrap(_('This program is free software under the GNU General Public License'
Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-09-16 11:15:12 UTC (rev 48322)
@@ -1549,7 +1549,7 @@
class PsMapToolbar(AbstractToolbar):
def __init__(self, parent):
- """!Toolbar Hardcopy Map Output Utility (psmap.py)
+ """!Toolbar Cartographic Composer (psmap.py)
@param parent parent window
"""
Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/icons/icon.py 2011-09-16 11:15:12 UTC (rev 48322)
@@ -239,7 +239,7 @@
'layerOptions' : MetaIcon(img = iconSet.get('options', wx.ART_ERROR),
label = _('Set options')),
'mapOutput' : MetaIcon(img = iconSet.get('print-compose', wx.ART_ERROR),
- label = _('Hardcopy Map Output Utility')),
+ label = _('Cartographic Composer')),
'mapcalc' : MetaIcon(img = iconSet.get('calculator', wx.ART_ERROR),
label = _('Raster Map Calculator')),
},
@@ -420,7 +420,7 @@
'preview' : MetaIcon(img = iconSet['execute'],
label = _("Show preview")),
'quit' : MetaIcon(img = iconSet['quit'],
- label = _('Quit Hardcopy Map Utility')),
+ label = _('Quit Cartographic Composer')),
'addText' : MetaIcon(img = iconSet['text-add'],
label = _('Add text')),
'addMapinfo' : MetaIcon(img = iconSet['map-info'],
Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/wxgui.py 2011-09-16 11:15:12 UTC (rev 48322)
@@ -367,7 +367,7 @@
win.Show()
def OnPsMap(self, event):
- """!Launch Hardcopy Map Output Utility
+ """!Launch Cartographic Composer
"""
win = psmap.PsMapFrame(parent = self)
win.CentreOnScreen()
Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/xml/menudata.xml 2011-09-16 11:15:12 UTC (rev 48322)
@@ -731,8 +731,8 @@
</menuitem>
<separator />
<menuitem>
- <label>Hardcopy Map Output Utility</label>
- <help>Launch Hardcopy Map Output Utility</help>
+ <label>Cartographic Composer</label>
+ <help>Launch Cartographic Composer</help>
<keywords>postscript,map,printing</keywords>
<handler>OnPsMap</handler>
<command>ps.map</command>
Modified: grass/trunk/gui/wxpython/xml/menudata_psmap.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata_psmap.xml 2011-09-16 11:00:29 UTC (rev 48321)
+++ grass/trunk/gui/wxpython/xml/menudata_psmap.xml 2011-09-16 11:15:12 UTC (rev 48322)
@@ -43,7 +43,7 @@
<separator/>
<menuitem>
<label>Quit</label>
- <help>Close Hardcopy Map Output Utility</help>
+ <help>Close Cartographic Composer</help>
<handler>OnCloseWindow</handler>
<shortcut>Ctrl+W</shortcut>
</menuitem>
@@ -108,13 +108,13 @@
<items>
<menuitem>
<label>Help</label>
- <help>Display the HTML man pages of Hardcopy Map Output Utility</help>
+ <help>Display the HTML man pages of Cartographic Composer</help>
<handler>OnHelp</handler>
</menuitem>
<separator />
<menuitem>
- <label>About Hardcopy Map Output Utility</label>
- <help>Display information about Hardcopy Map Output Utility</help>
+ <label>About Cartographic Composer</label>
+ <help>Display information about Cartographic Composer</help>
<handler>OnAbout</handler>
</menuitem>
</items>
More information about the grass-commit
mailing list