[GRASS-SVN] r45841 - in grass-addons/gui/wxpython/wx.psmap:
gui_modules xml
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Apr 4 06:16:31 EDT 2011
Author: martinl
Date: 2011-04-04 03:16:31 -0700 (Mon, 04 Apr 2011)
New Revision: 45841
Modified:
grass-addons/gui/wxpython/wx.psmap/gui_modules/psmap.py
grass-addons/gui/wxpython/wx.psmap/xml/menudata_psmap.xml
Log:
wx.psmap: use new icons
indent menudata xml file
minor changes in the toolbar
Modified: grass-addons/gui/wxpython/wx.psmap/gui_modules/psmap.py
===================================================================
--- grass-addons/gui/wxpython/wx.psmap/gui_modules/psmap.py 2011-04-04 10:11:18 UTC (rev 45840)
+++ grass-addons/gui/wxpython/wx.psmap/gui_modules/psmap.py 2011-04-04 10:16:31 UTC (rev 45841)
@@ -52,14 +52,13 @@
import wx.lib.flatnotebook as fnb
Icons['psMap'] = {
- 'script' : MetaIcon(img = iconSet['ps-script'],
- label = _('Generate instruction file')),
- 'export' : MetaIcon(img = iconSet['ps-export'],
- label = _('Generate PostScript output')),
- 'loadFile' : MetaIcon(img = iconSet['open'],
- label = _('Load file'),
- desc = _('Load file with mapping instructions')),
- 'pageSetup' : MetaIcon(img = iconSet['settings'],
+ 'scriptSave' : MetaIcon(img = iconSet['script-save'],
+ label = _('Generate text file with mapping instructions')),
+ 'scriptLoad' : MetaIcon(img = iconSet['script-load'],
+ label = _('Load text file with mapping instructions')),
+ 'psExport' : MetaIcon(img = iconSet['ps-export'],
+ label = _('Generate PostScript output')),
+ 'pageSetup' : MetaIcon(img = iconSet['page-settings'],
label = _('Page setup'),
desc = _('Specify paper size, margins and orientation')),
'fullExtent' : MetaIcon(img = iconSet['zoom-extent'],
@@ -82,7 +81,7 @@
label = _('Quit Hardcopy Map Utility')),
'addText' : MetaIcon(img = iconSet['text-add'],
label = _('Add text')),
- 'addMapinfo': MetaIcon(img = iconSet['legend-add'],
+ 'addMapinfo': MetaIcon(img = iconSet['map-settings'],
label = _('Add map info')),
'addLegend' : MetaIcon(img = iconSet['legend-add'],
label = _('Add legend')),
@@ -144,7 +143,12 @@
self.pan = wx.NewId()
icons = Icons['psMap']
- return self._getToolbarData(((self.pagesetup, 'page setup', icons['pageSetup'],
+ return self._getToolbarData(((self.loadFile, 'loadFile', icons['scriptLoad'],
+ self.parent.OnLoadFile),
+ (self.instructionFile, 'psScript', icons['scriptSave'],
+ self.parent.OnInstructionFile),
+ (None, ),
+ (self.pagesetup, 'page setup', icons['pageSetup'],
self.parent.OnPageSetup),
(None, ),
(self.pointer, "pointer", Icons["displayWindow"]["pointer"],
@@ -171,18 +175,13 @@
(None, ),
(self.preview, "preview", icons["preview"],
self.parent.OnPreview),
- (self.instructionFile, 'psScript', icons['script'],
- self.parent.OnInstructionFile),
- (self.generatePS, 'generatePS', icons['export'],
+ (self.generatePS, 'generatePS', icons['psExport'],
self.parent.OnPSFile),
- (self.loadFile, 'loadFile', icons['loadFile'],
- self.parent.OnLoadFile),
(None, ),
(self.quit, 'quit', icons['quit'],
self.parent.OnCloseWindow))
)
-
-
+
class PsMapFrame(wx.Frame):
def __init__(self, parent = None, id = wx.ID_ANY,
title = _("GRASS GIS Hardcopy Map Output Utility"), **kwargs):
Modified: grass-addons/gui/wxpython/wx.psmap/xml/menudata_psmap.xml
===================================================================
--- grass-addons/gui/wxpython/wx.psmap/xml/menudata_psmap.xml 2011-04-04 10:11:18 UTC (rev 45840)
+++ grass-addons/gui/wxpython/wx.psmap/xml/menudata_psmap.xml 2011-04-04 10:16:31 UTC (rev 45841)
@@ -4,91 +4,91 @@
<label>&File</label>
<items>
<menuitem>
- <label>Page setup</label>
- <help>Specify paper size, margins and orientation</help>
- <handler>OnPageSetup</handler>
- <shortcut>Ctrl+P</shortcut>
- </menuitem>
- <separator/>
- <menuitem>
- <label>Load file</label>
- <help>Load text file with mapping instructions</help>
- <handler>OnLoadFile</handler>
- <shortcut>Ctrl+O</shortcut>
- </menuitem>
- <menuitem>
- <label>Export instruction file</label>
- <help>Generate text file with mapping instructions</help>
- <handler>OnInstructionFile</handler>
- <shortcut>Ctrl+Shift+E</shortcut>
- </menuitem>
- <menuitem>
- <label>Export to PostScript</label>
- <help>Generate PostScript file</help>
- <handler>OnPSFile</handler>
- <shortcut>Ctrl+E</shortcut>
- </menuitem>
- <separator/>
- <menuitem>
- <label>Quit</label>
- <help>Close Hardcopy Map Output Utility</help>
- <handler>OnCloseWindow</handler>
- <shortcut>Ctrl+W</shortcut>
- </menuitem>
+ <label>Page setup</label>
+ <help>Specify paper size, margins and orientation</help>
+ <handler>OnPageSetup</handler>
+ <shortcut>Ctrl+P</shortcut>
+ </menuitem>
+ <separator/>
+ <menuitem>
+ <label>Load instruction file</label>
+ <help>Load text file with mapping instructions</help>
+ <handler>OnLoadFile</handler>
+ <shortcut>Ctrl+O</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Export instruction file</label>
+ <help>Generate text file with mapping instructions</help>
+ <handler>OnInstructionFile</handler>
+ <shortcut>Ctrl+Shift+E</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Export to PostScript</label>
+ <help>Generate PostScript output</help>
+ <handler>OnPSFile</handler>
+ <shortcut>Ctrl+E</shortcut>
+ </menuitem>
+ <separator/>
+ <menuitem>
+ <label>Quit</label>
+ <help>Close Hardcopy Map Output Utility</help>
+ <handler>OnCloseWindow</handler>
+ <shortcut>Ctrl+W</shortcut>
+ </menuitem>
</items>
</menu>
<menu>
<label>&Insert</label>
<items>
- <menuitem>
- <label>Map frame</label>
- <help>Add or edit map frame</help>
- <handler>OnAddMap</handler>
- <shortcut>Ctrl+M</shortcut>
- </menuitem>
- <menuitem>
- <label>Raster map</label>
- <help>Add or edit raster map</help>
- <handler>OnAddRaster</handler>
- <shortcut>Ctrl+R</shortcut>
- </menuitem>
- <menuitem>
- <label>Vector map</label>
- <help>Add or edit vector map</help>
- <handler>OnAddVect</handler>
- <shortcut>Ctrl+V</shortcut>
- </menuitem>
- <menuitem>
- <label>Map legend</label>
- <help>Add or edit raster and vector legend</help>
- <handler>OnAddLegend</handler>
- <shortcut>Ctrl+L</shortcut>
- </menuitem>
- <menuitem>
- <label>Map info</label>
- <help>Add or edit map info</help>
- <handler>OnAddMapinfo</handler>
- <shortcut>Ctrl+I</shortcut>
- </menuitem>
- <menuitem>
- <label>Scale bar</label>
- <help>Add or edit scale bar</help>
- <handler>OnAddScalebar</handler>
- <shortcut>Ctrl+B</shortcut>
- </menuitem>
- <menuitem>
- <label>Text</label>
- <help>Add text</help>
- <handler>OnAddText</handler>
- <shortcut>Ctrl+T</shortcut>
- </menuitem>
- <separator/>
- <menuitem>
- <label>Delete</label>
- <help>Delete selected object</help>
- <handler>OnDelete</handler>
- <shortcut>Delete</shortcut>
- </menuitem>
+ <menuitem>
+ <label>Map frame</label>
+ <help>Add or edit map frame</help>
+ <handler>OnAddMap</handler>
+ <shortcut>Ctrl+M</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Raster map</label>
+ <help>Add or edit raster map</help>
+ <handler>OnAddRaster</handler>
+ <shortcut>Ctrl+R</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Vector map</label>
+ <help>Add or edit vector map</help>
+ <handler>OnAddVect</handler>
+ <shortcut>Ctrl+V</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Map legend</label>
+ <help>Add or edit raster and vector legend</help>
+ <handler>OnAddLegend</handler>
+ <shortcut>Ctrl+L</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Map info</label>
+ <help>Add or edit map info</help>
+ <handler>OnAddMapinfo</handler>
+ <shortcut>Ctrl+I</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Scale bar</label>
+ <help>Add or edit scale bar</help>
+ <handler>OnAddScalebar</handler>
+ <shortcut>Ctrl+B</shortcut>
+ </menuitem>
+ <menuitem>
+ <label>Text</label>
+ <help>Add text</help>
+ <handler>OnAddText</handler>
+ <shortcut>Ctrl+T</shortcut>
+ </menuitem>
+ <separator/>
+ <menuitem>
+ <label>Delete</label>
+ <help>Delete selected object</help>
+ <handler>OnDelete</handler>
+ <shortcut>Delete</shortcut>
+ </menuitem>
</items>
</menu>
<menu>
More information about the grass-commit
mailing list