[GRASS-SVN] r45457 - in grass/trunk/gui: icons wxpython
wxpython/gui_modules wxpython/icons
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Feb 24 12:29:14 EST 2011
Author: martinl
Date: 2011-02-24 09:29:13 -0800 (Thu, 24 Feb 2011)
New Revision: 45457
Added:
grass/trunk/gui/icons/grass/
grass/trunk/gui/wxpython/icons/grass_icons.py
Removed:
grass/trunk/gui/icons/grass2/
grass/trunk/gui/wxpython/icons/grass2_icons.py
Modified:
grass/trunk/gui/icons/Makefile
grass/trunk/gui/wxpython/Makefile
grass/trunk/gui/wxpython/gui_modules/preferences.py
grass/trunk/gui/wxpython/gui_modules/toolbars.py
grass/trunk/gui/wxpython/icons/__init__.py
grass/trunk/gui/wxpython/icons/icon.py
Log:
unmaintained grass and silk icon sets removed (step 3)
Modified: grass/trunk/gui/icons/Makefile
===================================================================
--- grass/trunk/gui/icons/Makefile 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/icons/Makefile 2011-02-24 17:29:13 UTC (rev 45457)
@@ -3,24 +3,18 @@
include $(MODULE_TOPDIR)/include/Make/Dir.make
SRCICO := $(wildcard *.ico *.png)
-SRCICONS := $(wildcard grass/*.gif grass/vdigit/*.gif grass/vdigit/*.xbm silk/*.png grass2/*.png)
+SRCICONS := $(wildcard grass/*.png)
ETCICONS := $(patsubst %,$(ETC)/gui/icons/%,$(SRCICONS) $(SRCICO))
HTMLICONS := $(patsubst %,$(HTMLDIR)/icons/%,$(SRCICONS))
ETCDIRS = \
$(ETC)/gui \
$(ETC)/gui/icons \
- $(ETC)/gui/icons/grass \
- $(ETC)/gui/icons/grass/vdigit \
- $(ETC)/gui/icons/silk \
- $(ETC)/gui/icons/grass2
+ $(ETC)/gui/icons/grass
HTMLDIRS = \
$(HTMLDIR)/icons \
- $(HTMLDIR)/icons/grass \
- $(HTMLDIR)/icons/grass/vdigit \
- $(HTMLDIR)/icons/silk \
- $(HTMLDIR)/icons/grass2
+ $(HTMLDIR)/icons/grass
default: $(ICONS) $(ETCICONS) $(HTMLICONS)
Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/wxpython/Makefile 2011-02-24 17:29:13 UTC (rev 45457)
@@ -9,10 +9,10 @@
ETCDIR = $(ETC)/gui/wxpython
-SRCFILES := $(wildcard scripts/* compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py gis_set_error.py wxgui.py README
+SRCFILES := $(wildcard scripts/* compat/* gui_modules/* icons/*.* images/* xml/*) gis_set.py gis_set_error.py wxgui.py README
DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
-DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat gui_modules icons icons/silk images scripts xml)
+DSTDIRS := $(patsubst %,$(ETCDIR)/%,compat gui_modules icons images scripts xml)
default: $(DSTFILES) menustrings.py
$(MAKE) parsubdirs
Modified: grass/trunk/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/preferences.py 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/wxpython/gui_modules/preferences.py 2011-02-24 17:29:13 UTC (rev 45457)
@@ -149,8 +149,8 @@
#
'advanced' : {
'iconTheme' : {
- 'type' : 'grass2'
- }, # grass2, grass, silk
+ 'type' : 'grass'
+ },
},
#
# Attribute Table Manager
@@ -615,9 +615,7 @@
_("Expand all"))
self.internalSettings['atm']['leftDbClick']['choices'] = (_('Edit selected record'),
_('Display selected'))
- self.internalSettings['advanced']['iconTheme']['choices'] = ('grass',
- 'grass2',
- 'silk')
+ self.internalSettings['advanced']['iconTheme']['choices'] = ('grass',)
self.internalSettings['cmd']['verbosity']['choices'] = ('grassenv',
'verbose',
'quiet')
Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py 2011-02-24 17:29:13 UTC (rev 45457)
@@ -78,8 +78,8 @@
bmpDisabled = wx.NullBitmap
if label:
- Debug.msg(3, "CreateTool(): tool=%d, label=%s bitmap=%d" % \
- (tool, label, bitmap.GetWidth()))
+ Debug.msg(3, "CreateTool(): tool=%d, label=%s bitmap=%s" % \
+ (tool, label, bitmap))
toolWin = self.AddLabelTool(tool, label, bitmap,
bmpDisabled, kind,
shortHelp, longHelp)
@@ -254,7 +254,7 @@
self.dec = wx.NewId()
self.savefile = wx.NewId()
self.printmap = wx.NewId()
-
+
# tool, label, bitmap, kind, shortHelp, longHelp, handler
return (
(self.displaymap, "displaymap", Icons["displaymap"].GetBitmap(),
Modified: grass/trunk/gui/wxpython/icons/__init__.py
===================================================================
--- grass/trunk/gui/wxpython/icons/__init__.py 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/wxpython/icons/__init__.py 2011-02-24 17:29:13 UTC (rev 45457)
@@ -1,4 +1 @@
-all = [ "icon", "silk" ]
-
-
-
+all = [ "grass" ]
Deleted: grass/trunk/gui/wxpython/icons/grass2_icons.py
===================================================================
--- grass/trunk/gui/wxpython/icons/grass2_icons.py 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/wxpython/icons/grass2_icons.py 2011-02-24 17:29:13 UTC (rev 45457)
@@ -1,130 +0,0 @@
-"""
-New GRASS icon set
-http://robert.szczepanek.pl/icons.php
-https://svn.osgeo.org/osgeo/graphics/toolbar-icons/24x24/
-"""
-__author__ = "Robert Szczepanek"
-
-import os
-
-import globalvar
-
-iconpath = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass2")
-
-IconsGrass2 = {
- # map display
- "displaymap" : 'show.png',
- "rendermap" : 'layer-redraw.png',
- "erase" : 'erase.png',
- "pointer" : 'pointer.png',
- "query" : 'info.png',
- "savefile" : 'map-export.png',
- "printmap" : 'print.png',
- "pan" : 'pan.png',
- # zoom (mapdisplay)
- "zoom_in" : 'zoom-in.png',
- "zoom_out" : 'zoom-out.png',
- "zoom_back" : 'zoom-last.png',
- "zoommenu" : 'zoom-more.png',
- "zoom_extent" : 'zoom-extent.png',
- # analyze raster (mapdisplay)
- "analyze" : 'layer-raster-analyze.png',
- "measure" : 'measure-length.png',
- "profile" : 'layer-raster-profile.png',
- "histogram" : 'layer-raster-histogram.png',
- "font" : 'font.png',
- # overlay (mapdisplay)
- "overlay" : 'overlay-add.png',
- "addtext" : 'text-add.png',
- "addbarscale": 'scalebar-add.png',
- "addlegend" : 'legend-add.png',
- "quit" : 'quit.png',
- # digit
- ## add feature
- "digAddPoint": 'point-create.png',
- "digAddLine" : 'line-create.png',
- "digAddBoundary": 'boundary-create.png',
- "digAddCentroid": 'centroid-create.png',
- "digAddArea": 'polygon-create.png',
- ## vertex
- "digAddVertex" : 'vertex-create.png',
- "digMoveVertex" : 'vertex-move.png',
- "digRemoveVertex" : 'vertex-delete.png',
- "digSplitLine" : 'line-split.png',
- ## edit feature
- "digEditLine" : 'line-edit.png',
- "digMoveLine" : 'line-move.png',
- "digDeleteLine" : 'line-delete.png',
- ## cats
- "digDispCats" : 'cats-display.png',
- "digCopyCats" : 'cats-copy.png',
- ## attributes
- "digDispAttr" : 'attributes-display.png',
- ## general
- "digUndo" : 'undo.png',
- "digAdditionalTools" : 'tools.png',
- # layer manager
- "newdisplay" : 'monitor-create.png',
- "fileNew" : 'create.png',
- "fileLoad" : 'layer-open.png',
- "fileOpen" : 'open.png',
- "fileSave" : 'save.png',
- "fileImport" : 'layer-import.png',
- "addrast" : 'layer-raster-add.png',
- "rastmisc" : 'layer-raster-more.png',
- "addrast3d" : 'layer-raster3d-add.png',
- "addshaded" : 'layer-shaded-relief-add.png',
- "addrarrow" : 'layer-aspect-arrow-add.png',
- "addrnum" : 'layer-cell-cats-add.png',
- "addvect" : 'layer-vector-add.png',
- "vectmisc" : 'layer-vector-more.png',
- "addcmd" : 'layer-command-add.png',
- "addgrp" : 'layer-group-add.png',
- "addovl" : 'layer-more.png',
- "addgrid" : 'layer-grid-add.png',
- "addlabels" : 'layer-label-add.png',
- "delcmd" : 'layer-remove.png',
- "attrtable" : 'table.png',
- "vdigit" : 'edit.png',
- "addrgb" : 'layer-rgb-add.png',
- "addhis" : 'layer-his-add.png',
- "addthematic": 'layer-vector-thematic-add.png',
- "addchart" : 'layer-vector-chart-add.png',
- "layeropts" : 'options.png',
- "modeler" : 'modeler-main.png',
- # profile analysis
- "transect" : 'layer-raster-profile.png',
- "profiledraw" : 'show.png',
- # georectify
- "grGcpSet" : 'gcp-create.png',
- 'grGcpClear' : 'gcp-remove.png',
- 'grGeorect' : 'georectify.png',
- 'grGcpRms' : 'gcp-rms.png',
- "grGcpSave" : 'gcp-save.png',
- "grGcpAdd" : 'gcp-add.png',
- "grGcpDelete" : 'gcp-delete.png',
- "grGcpReload" : 'reload.png',
- # modeler
- "modelActionAdd" : 'module-add.png',
- "modelDataAdd" : 'data-add.png',
- "modelRelation" : 'relation-create.png',
- "modelRun" : 'execute.png',
- "modelValidate" : 'check.png',
- "imageSave" : 'image-export.png',
- "pythonSave" : 'python-export.png',
- "modelProperties" : 'options.png',
- "modelVariables" : 'modeler-variables.png',
- # 3d view
- "nvizView" : '3d-view.png',
- "nvizSurface" : '3d-raster.png',
- "nvizVector" : '3d-vector.png',
- "nvizVolume" : '3d-volume.png',
- "nvizLight" : '3d-light.png',
- "nvizFringe" : '3d-fringe.png',
- # various
- "settings" : 'settings.png',
- "redraw" : 'redraw.png',
- "help" : 'help.png',
- "psScript" : 'ps-script.png',
- "psExport" : 'ps-export.png',
- }
Copied: grass/trunk/gui/wxpython/icons/grass_icons.py (from rev 45454, grass/trunk/gui/wxpython/icons/grass2_icons.py)
===================================================================
--- grass/trunk/gui/wxpython/icons/grass_icons.py (rev 0)
+++ grass/trunk/gui/wxpython/icons/grass_icons.py 2011-02-24 17:29:13 UTC (rev 45457)
@@ -0,0 +1,132 @@
+"""
+New GRASS icon set
+http://robert.szczepanek.pl/icons.php
+https://svn.osgeo.org/osgeo/graphics/toolbar-icons/24x24/
+"""
+__author__ = "Robert Szczepanek"
+
+import os
+
+import globalvar
+
+iconPath = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass")
+
+iconSet = {
+ # map display
+ "displaymap" : 'show.png',
+ "rendermap" : 'layer-redraw.png',
+ "erase" : 'erase.png',
+ "pointer" : 'pointer.png',
+ "query" : 'info.png',
+ "savefile" : 'map-export.png',
+ "printmap" : 'print.png',
+ "pan" : 'pan.png',
+ # zoom (mapdisplay)
+ "zoom_in" : 'zoom-in.png',
+ "zoom_out" : 'zoom-out.png',
+ "zoom_back" : 'zoom-last.png',
+ "zoommenu" : 'zoom-more.png',
+ "zoom_extent" : 'zoom-extent.png',
+ # analyze raster (mapdisplay)
+ "analyze" : 'layer-raster-analyze.png',
+ "measure" : 'measure-length.png',
+ "profile" : 'layer-raster-profile.png',
+ "histogram" : 'layer-raster-histogram.png',
+ "font" : 'font.png',
+ # overlay (mapdisplay)
+ "overlay" : 'overlay-add.png',
+ "addtext" : 'text-add.png',
+ "addbarscale": 'scalebar-add.png',
+ "addlegend" : 'legend-add.png',
+ "quit" : 'quit.png',
+ # digit
+ ## add feature
+ "digAddPoint": 'point-create.png',
+ "digAddLine" : 'line-create.png',
+ "digAddBoundary": 'boundary-create.png',
+ "digAddCentroid": 'centroid-create.png',
+ "digAddArea": 'polygon-create.png',
+ ## vertex
+ "digAddVertex" : 'vertex-create.png',
+ "digMoveVertex" : 'vertex-move.png',
+ "digRemoveVertex" : 'vertex-delete.png',
+ "digSplitLine" : 'line-split.png',
+ ## edit feature
+ "digEditLine" : 'line-edit.png',
+ "digMoveLine" : 'line-move.png',
+ "digDeleteLine" : 'line-delete.png',
+ ## cats
+ "digDispCats" : 'cats-display.png',
+ "digCopyCats" : 'cats-copy.png',
+ ## attributes
+ "digDispAttr" : 'attributes-display.png',
+ ## general
+ "digUndo" : 'undo.png',
+ "digAdditionalTools" : 'tools.png',
+ # layer manager
+ "newdisplay" : 'monitor-create.png',
+ "fileNew" : 'create.png',
+ "fileLoad" : 'layer-open.png',
+ "fileOpen" : 'open.png',
+ "fileSave" : 'save.png',
+ "fileImport" : 'layer-import.png',
+ "addrast" : 'layer-raster-add.png',
+ "rastmisc" : 'layer-raster-more.png',
+ "addrast3d" : 'layer-raster3d-add.png',
+ "addshaded" : 'layer-shaded-relief-add.png',
+ "addrarrow" : 'layer-aspect-arrow-add.png',
+ "addrnum" : 'layer-cell-cats-add.png',
+ "addvect" : 'layer-vector-add.png',
+ "vectmisc" : 'layer-vector-more.png',
+ "addcmd" : 'layer-command-add.png',
+ "addgrp" : 'layer-group-add.png',
+ "addovl" : 'layer-more.png',
+ "addgrid" : 'layer-grid-add.png',
+ "addlabels" : 'layer-label-add.png',
+ "delcmd" : 'layer-remove.png',
+ "attrtable" : 'table.png',
+ "vdigit" : 'edit.png',
+ "addrgb" : 'layer-rgb-add.png',
+ "addhis" : 'layer-his-add.png',
+ "addthematic": 'layer-vector-thematic-add.png',
+ "addchart" : 'layer-vector-chart-add.png',
+ "addgeodesic" : 'options.png',
+ "addrhumb" : 'options.png',
+ "layeropts" : 'options.png',
+ "modeler" : 'modeler-main.png',
+ # profile analysis
+ "transect" : 'layer-raster-profile.png',
+ "profiledraw" : 'show.png',
+ # georectify
+ "grGcpSet" : 'gcp-create.png',
+ 'grGcpClear' : 'gcp-remove.png',
+ 'grGeorect' : 'georectify.png',
+ 'grGcpRms' : 'gcp-rms.png',
+ "grGcpSave" : 'gcp-save.png',
+ "grGcpAdd" : 'gcp-add.png',
+ "grGcpDelete" : 'gcp-delete.png',
+ "grGcpReload" : 'reload.png',
+ # modeler
+ "modelActionAdd" : 'module-add.png',
+ "modelDataAdd" : 'data-add.png',
+ "modelRelation" : 'relation-create.png',
+ "modelRun" : 'execute.png',
+ "modelValidate" : 'check.png',
+ "imageSave" : 'image-export.png',
+ "pythonSave" : 'python-export.png',
+ "modelProperties" : 'options.png',
+ "modelVariables" : 'modeler-variables.png',
+ # 3d view
+ "nvizView" : '3d-view.png',
+ "nvizSurface" : '3d-raster.png',
+ "nvizVector" : '3d-vector.png',
+ "nvizVolume" : '3d-volume.png',
+ "nvizLight" : '3d-light.png',
+ "nvizFringe" : '3d-fringe.png',
+ # various
+ "settings" : 'settings.png',
+ "redraw" : 'redraw.png',
+ "help" : 'help.png',
+ "psScript" : 'ps-script.png',
+ "psExport" : 'ps-export.png',
+ }
Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py 2011-02-24 12:42:09 UTC (rev 45456)
+++ grass/trunk/gui/wxpython/icons/icon.py 2011-02-24 17:29:13 UTC (rev 45457)
@@ -30,55 +30,32 @@
from preferences import globalSettings as UserSettings
-import grass_icons # default icon set
-iconpath_default = grass_icons.iconpath
-iconpath_vdigit = grass_icons.iconpath_vdigit
-Icons_default = grass_icons.IconsGrass
+# default icon set
+import grass_icons
+iconSetDefault = grass_icons.iconSet
+iconPathDefault = grass_icons.iconPath
iconTheme = UserSettings.Get(group='advanced', key='iconTheme', subkey='type')
-if iconTheme == 'silk':
- import silk_icons
- iconpath = silk_icons.iconpath
- Icons = silk_icons.IconsSilk
-elif iconTheme == 'grass2':
- import grass2_icons
- iconpath = grass2_icons.iconpath
- Icons = grass2_icons.IconsGrass2
-else:
- iconpath = iconpath_default
- Icons = grass_icons.IconsGrass
+if iconTheme != 'grass':
+ sys.stderr.write(_("Unknown iconset '%s', using default 'grass'...\n") % (iconTheme))
-# merge icons dictionaries, join paths
+iconSet = iconSetDefault
+iconPath = iconPathDefault
+
+# join paths
try:
- if iconpath and not os.path.exists(iconpath):
+ if iconPath and not os.path.exists(iconPath):
raise OSError
- if iconTheme != 'grass':
- # use default icons if no icon is available
- for key, img in Icons_default.iteritems():
- if not Icons.has_key(key) or \
- Icons[key] is None: # add key
- Icons[key] = img
-
- if Icons[key] == img:
- if key[0:3] == 'dig':
- iconpath_tmp = iconpath_vdigit
- else:
- iconpath_tmp = iconpath_default
- else:
- iconpath_tmp = iconpath
-
- Icons[key] = os.path.join(iconpath_tmp, Icons[key])
- else:
- for key, img in Icons.iteritems():
- if img and type (Icons[key]) == type(''):
- if key[0:3] == 'dig':
- Icons[key] = os.path.join(iconpath_vdigit, img)
- else:
- Icons[key] = os.path.join(iconpath_default, img)
-except:
- sys.exit(_("Unable to load icon theme..."))
-
+ for key, img in iconSet.iteritems():
+ if not iconSet.has_key(key) or \
+ iconSet[key] is None: # add key
+ iconSet[key] = img
+
+ iconSet[key] = os.path.join(iconPath, iconSet[key])
+except StandardError, e:
+ sys.exit(_("Unable to load icon theme. Reason: %s. Quiting wxGUI...") % e)
+
class MetaIcon:
"""!Handle icon metadata (image path, tooltip, ...)
"""
@@ -134,291 +111,291 @@
#
Icons = {
# map display
- "displaymap" : MetaIcon (img=Icons["displaymap"],
+ "displaymap" : MetaIcon (img=iconSet["displaymap"],
label=_("Display map"),
desc = _("Re-render modified map layers")),
- "rendermap" : MetaIcon (img=Icons["rendermap"],
+ "rendermap" : MetaIcon (img=iconSet["rendermap"],
label=_("Re-render map"),
desc=_("Force re-rendering all map layers")),
- "erase" : MetaIcon (img=Icons["erase"],
+ "erase" : MetaIcon (img=iconSet["erase"],
label=_("Erase display")),
- "pointer" : MetaIcon (img=Icons["pointer"],
+ "pointer" : MetaIcon (img=iconSet["pointer"],
label=_("Pointer")),
- "zoom_in" : MetaIcon (img=Icons["zoom_in"],
+ "zoom_in" : MetaIcon (img=iconSet["zoom_in"],
label=_("Zoom in"),
desc=_("Drag or click mouse to zoom")),
- "zoom_out" : MetaIcon (img=Icons["zoom_out"],
+ "zoom_out" : MetaIcon (img=iconSet["zoom_out"],
label=_("Zoom out"),
desc=_("Drag or click mouse to unzoom")),
- "pan" : MetaIcon (img=Icons["pan"],
+ "pan" : MetaIcon (img=iconSet["pan"],
label=_("Pan"),
desc=_("Drag with mouse to pan")),
- "query" : MetaIcon (img=Icons["query"],
+ "query" : MetaIcon (img=iconSet["query"],
label=_("Query raster/vector map(s)"),
desc=_("Query selected raster/vector map(s)")),
- "zoom_back" : MetaIcon (img=Icons["zoom_back"],
+ "zoom_back" : MetaIcon (img=iconSet["zoom_back"],
label=_("Return to previous zoom")),
- "zoommenu" : MetaIcon (img=Icons["zoommenu"],
+ "zoommenu" : MetaIcon (img=iconSet["zoommenu"],
label=_("Zoom options"),
desc=_("Display zoom management")),
- "zoom_extent" : MetaIcon (img=Icons["zoom_extent"],
+ "zoom_extent" : MetaIcon (img=iconSet["zoom_extent"],
label=_("Zoom to selected map layer(s)")),
- "overlay" : MetaIcon (img=Icons["overlay"],
+ "overlay" : MetaIcon (img=iconSet["overlay"],
label=_("Add map elements"),
desc=_("Overlay elements like scale and legend onto map")),
- "addbarscale": MetaIcon (img=Icons["addbarscale"],
+ "addbarscale": MetaIcon (img=iconSet["addbarscale"],
label=_("Add scalebar and north arrow")),
- "addlegend" : MetaIcon (img=Icons["addlegend"],
+ "addlegend" : MetaIcon (img=iconSet["addlegend"],
label=_("Add legend")),
- "savefile" : MetaIcon (img=Icons["savefile"],
+ "savefile" : MetaIcon (img=iconSet["savefile"],
label=_("Save display to graphic file")),
- "printmap" : MetaIcon (img=Icons["printmap"],
+ "printmap" : MetaIcon (img=iconSet["printmap"],
label=_("Print display")),
# layer manager
- "newdisplay" : MetaIcon (img=Icons["newdisplay"],
+ "newdisplay" : MetaIcon (img=iconSet["newdisplay"],
label=_("Start new map display")),
- "workspaceNew" : MetaIcon (img=Icons["fileNew"],
+ "workspaceNew" : MetaIcon (img=iconSet["fileNew"],
label=_("Create new workspace (Ctrl+N)")),
- "workspaceLoad" : MetaIcon (img=Icons["fileLoad"],
+ "workspaceLoad" : MetaIcon (img=iconSet["fileLoad"],
label=_("Load map layers into workspace (Ctrl+L)")),
- "workspaceOpen" : MetaIcon (img=Icons["fileOpen"],
+ "workspaceOpen" : MetaIcon (img=iconSet["fileOpen"],
label=_("Open existing workspace file (Ctrl+O)")),
- "workspaceSave" : MetaIcon (img=Icons["fileSave"],
+ "workspaceSave" : MetaIcon (img=iconSet["fileSave"],
label=_("Save current workspace to file (Ctrl+S)")),
- "rastImport" : MetaIcon (img=Icons["fileImport"],
+ "rastImport" : MetaIcon (img=iconSet["fileImport"],
label=_("Import raster data")),
- "rastLink" : MetaIcon (img=Icons["fileImport"],
+ "rastLink" : MetaIcon (img=iconSet["fileImport"],
label=_("Link external raster data")),
- "vectImport" : MetaIcon (img=Icons["fileImport"],
+ "vectImport" : MetaIcon (img=iconSet["fileImport"],
label=_("Import vector data")),
- "vectLink" : MetaIcon (img=Icons["fileImport"],
+ "vectLink" : MetaIcon (img=iconSet["fileImport"],
label=_("Link external vector data")),
- "addrast" : MetaIcon (img=Icons["addrast"],
+ "addrast" : MetaIcon (img=iconSet["addrast"],
label=_("Add raster map layer (Ctrl+R)")),
- "rastmisc" : MetaIcon (img=Icons["rastmisc"],
+ "rastmisc" : MetaIcon (img=iconSet["rastmisc"],
label=_("Add various raster map layers (RGB, HIS, shaded relief...)")),
- "addvect" : MetaIcon (img=Icons["addvect"],
+ "addvect" : MetaIcon (img=iconSet["addvect"],
label=_("Add vector map layer (Ctrl+V)")),
- "vectmisc" : MetaIcon (img=Icons["vectmisc"],
+ "vectmisc" : MetaIcon (img=iconSet["vectmisc"],
label=_("Add various vector map layers (thematic, chart...)")),
- "addcmd" : MetaIcon (img=Icons["addcmd"],
+ "addcmd" : MetaIcon (img=iconSet["addcmd"],
label=_("Add command layer")),
- "addgrp" : MetaIcon (img=Icons["addgrp"],
+ "addgrp" : MetaIcon (img=iconSet["addgrp"],
label=_("Add group")),
- "addovl" : MetaIcon (img=Icons["addovl"],
+ "addovl" : MetaIcon (img=iconSet["addovl"],
label=_("Add grid or vector labels overlay")),
- "delcmd" : MetaIcon (img=Icons["delcmd"],
+ "delcmd" : MetaIcon (img=iconSet["delcmd"],
label=_("Delete selected map layer")),
- "quit" : MetaIcon (img=Icons["quit"],
+ "quit" : MetaIcon (img=iconSet["quit"],
label=_("Quit")),
- "attrtable" : MetaIcon (img=Icons["attrtable"],
+ "attrtable" : MetaIcon (img=iconSet["attrtable"],
label=_("Show attribute table")),
- "vdigit" : MetaIcon (img=Icons["vdigit"],
+ "vdigit" : MetaIcon (img=iconSet["vdigit"],
label=_("Edit vector maps")),
- "addrgb" : MetaIcon (img=Icons["addrgb"],
+ "addrgb" : MetaIcon (img=iconSet["addrgb"],
label=_("Add RGB map layer")),
- "addhis" : MetaIcon (img=Icons["addhis"],
+ "addhis" : MetaIcon (img=iconSet["addhis"],
label=_("Add HIS map layer")),
- "addshaded" : MetaIcon (img=Icons["addshaded"],
+ "addshaded" : MetaIcon (img=iconSet["addshaded"],
label=_("Add shaded relief map layer")),
- "addrarrow" : MetaIcon (img=Icons["addrarrow"],
+ "addrarrow" : MetaIcon (img=iconSet["addrarrow"],
label=_("Add raster flow arrows")),
- "addrnum" : MetaIcon (img=Icons["addrnum"],
+ "addrnum" : MetaIcon (img=iconSet["addrnum"],
label=_("Add raster cell numbers")),
- "addthematic": MetaIcon (img=Icons["addthematic"],
+ "addthematic": MetaIcon (img=iconSet["addthematic"],
label=_("Add thematic area (choropleth) map layer")),
- "addchart" : MetaIcon (img=Icons["addchart"],
+ "addchart" : MetaIcon (img=iconSet["addchart"],
label=_("Add thematic chart layer")),
- "addgrid" : MetaIcon (img=Icons["addgrid"],
+ "addgrid" : MetaIcon (img=iconSet["addgrid"],
label=_("Add grid layer")),
- "addgeodesic": MetaIcon (img=Icons["addgeodesic"],
+ "addgeodesic": MetaIcon (img=iconSet["addgeodesic"],
label=_("Add geodesic line layer")),
- "addrhumb" : MetaIcon (img=Icons["addrhumb"],
+ "addrhumb" : MetaIcon (img=iconSet["addrhumb"],
label=_("Add rhumbline layer")),
- "addlabels" : MetaIcon (img=Icons["addlabels"],
+ "addlabels" : MetaIcon (img=iconSet["addlabels"],
label=_("Add labels")),
- "addtext" : MetaIcon (img=Icons["addtext"],
+ "addtext" : MetaIcon (img=iconSet["addtext"],
label=_("Add text layer")),
- "addrast3d" : MetaIcon (img=Icons["addrast3d"],
+ "addrast3d" : MetaIcon (img=iconSet["addrast3d"],
label=_("Add 3D raster map layer"),
desc = _("Note that 3D raster data are rendered only in 3D view mode")),
- "settings" : MetaIcon (img=Icons["settings"],
+ "settings" : MetaIcon (img=iconSet["settings"],
label=_("Show GUI settings")),
# digit
- "digAddPoint": MetaIcon (img=Icons["digAddPoint"],
+ "digAddPoint": MetaIcon (img=iconSet["digAddPoint"],
label=_("Digitize new point"),
desc=_("Left: new point")),
- "digAddLine" : MetaIcon (img=Icons["digAddLine"],
+ "digAddLine" : MetaIcon (img=iconSet["digAddLine"],
label=_("Digitize new line"),
desc=_("Left: new point; Middle: undo last point; Right: close line")),
- "digAddBoundary": MetaIcon (img=Icons["digAddBoundary"],
+ "digAddBoundary": MetaIcon (img=iconSet["digAddBoundary"],
label=_("Digitize new boundary"),
desc=_("Left: new point; Middle: undo last point; Right: close line")),
- "digAddCentroid": MetaIcon (img=Icons["digAddCentroid"],
+ "digAddCentroid": MetaIcon (img=iconSet["digAddCentroid"],
label=_("Digitize new centroid"),
desc=_("Left: new point")),
- "digAddArea": MetaIcon (img=Icons["digAddArea"],
+ "digAddArea": MetaIcon (img=iconSet["digAddArea"],
label=_("Digitize new area (composition of bondaries without category and one centroid with category)"),
desc=_("Left: new point")),
- "digAddVertex": MetaIcon (img=Icons["digAddVertex"],
+ "digAddVertex": MetaIcon (img=iconSet["digAddVertex"],
label=_("Add new vertex"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digCopyCats": MetaIcon (img=Icons["digCopyCats"],
+ "digCopyCats": MetaIcon (img=iconSet["digCopyCats"],
label=_("Copy categories"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digDeleteLine": MetaIcon (img=Icons["digDeleteLine"],
+ "digDeleteLine": MetaIcon (img=iconSet["digDeleteLine"],
label=_("Delete feature(s)"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digDispAttr": MetaIcon (img=Icons["digDispAttr"],
+ "digDispAttr": MetaIcon (img=iconSet["digDispAttr"],
label=_("Display/update attributes"),
desc=_("Left: Select")),
- "digDispCats": MetaIcon (img=Icons["digDispCats"],
+ "digDispCats": MetaIcon (img=iconSet["digDispCats"],
label=_("Display/update categories"),
desc=_("Left: Select")),
- "digEditLine": MetaIcon (img=Icons["digEditLine"],
+ "digEditLine": MetaIcon (img=iconSet["digEditLine"],
label=_("Edit line/boundary"),
desc=_("Left: new point; Middle: undo last point; Right: close line")),
- "digMoveLine": MetaIcon (img=Icons["digMoveLine"],
+ "digMoveLine": MetaIcon (img=iconSet["digMoveLine"],
label=_("Move feature(s)"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digMoveVertex": MetaIcon (img=Icons["digMoveVertex"],
+ "digMoveVertex": MetaIcon (img=iconSet["digMoveVertex"],
label=_("Move vertex"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digRemoveVertex": MetaIcon (img=Icons["digRemoveVertex"],
+ "digRemoveVertex": MetaIcon (img=iconSet["digRemoveVertex"],
label=_("Remove vertex"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digSettings": MetaIcon (img=Icons["settings"],
+ "digSettings": MetaIcon (img=iconSet["settings"],
label=_("Settings"),
desc=_("Settings dialog for digitization tool")),
- "digSplitLine": MetaIcon (img=Icons["digSplitLine"],
+ "digSplitLine": MetaIcon (img=iconSet["digSplitLine"],
label=_("Split line/boundary"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digExit" : MetaIcon (img=Icons["quit"],
+ "digExit" : MetaIcon (img=iconSet["quit"],
label=_("Quit digitizing tool")),
- "digAdditionalTools" : MetaIcon (img=Icons["digAdditionalTools"],
+ "digAdditionalTools" : MetaIcon (img=iconSet["digAdditionalTools"],
label=_("Additional tools " \
"(copy, flip, connect, etc.)"),
desc=_("Left: Select; Middle: Unselect; Right: Confirm")),
- "digUndo" : MetaIcon (img=Icons["digUndo"],
+ "digUndo" : MetaIcon (img=iconSet["digUndo"],
label=_("Undo"),
desc=_("Undo previous changes")),
# analyze raster
- "analyze" : MetaIcon (img=Icons["analyze"],
+ "analyze" : MetaIcon (img=iconSet["analyze"],
label=_("Analyze map")),
- "measure" : MetaIcon (img=Icons["measure"],
+ "measure" : MetaIcon (img=iconSet["measure"],
label=_("Measure distance")),
- "transect" : MetaIcon (img=Icons["transect"],
+ "transect" : MetaIcon (img=iconSet["transect"],
label=_("Draw transect in map display window to profile")),
- "profile" : MetaIcon (img=Icons["profile"],
+ "profile" : MetaIcon (img=iconSet["profile"],
label=_("Profile surface map")),
- "profiledraw": MetaIcon (img=Icons["profiledraw"],
+ "profiledraw": MetaIcon (img=iconSet["profiledraw"],
label=_("Draw/re-draw profile")),
- "profileopt" : MetaIcon (img=Icons["settings"],
+ "profileopt" : MetaIcon (img=iconSet["settings"],
label=_("Profile options")),
- "datasave" : MetaIcon (img=Icons["fileSave"],
+ "datasave" : MetaIcon (img=iconSet["fileSave"],
label=_("Save profile data to csv file")),
- "histogram" : MetaIcon (img=Icons["histogram"],
+ "histogram" : MetaIcon (img=iconSet["histogram"],
label=_("Create histogram of image or raster file")),
- "font" : MetaIcon (img=Icons["font"],
+ "font" : MetaIcon (img=iconSet["font"],
label=_("Select font")),
- "color" : MetaIcon (img=Icons["color"],
- label=_("Select color")),
- "layeropts" : MetaIcon (img=Icons["layeropts"],
+# "color" : MetaIcon (img=iconSet["color"],
+# label=_("Select color")),
+ "layeropts" : MetaIcon (img=iconSet["layeropts"],
label=_("Set options")),
- "analyze" : MetaIcon (img=Icons["analyze"],
+ "analyze" : MetaIcon (img=iconSet["analyze"],
label=_("Analyze")),
# georectify
- 'grGcpSet' : MetaIcon (img=Icons["grGcpSet"],
+ 'grGcpSet' : MetaIcon (img=iconSet["grGcpSet"],
label=_("Set GCP"),
desc=_("Define GCP (Ground Control Points)")),
- 'grGeorect' : MetaIcon (img=Icons["grGeorect"],
+ 'grGeorect' : MetaIcon (img=iconSet["grGeorect"],
label=_("Georectify")),
- 'grGcpRms' : MetaIcon (img=Icons["grGcpRms"],
+ 'grGcpRms' : MetaIcon (img=iconSet["grGcpRms"],
label=_("Recalculate RMS error")),
- 'grGcpSave' : MetaIcon (img=Icons["grGcpSave"],
+ 'grGcpSave' : MetaIcon (img=iconSet["grGcpSave"],
label=_("Save GCPs to POINTS file")),
- 'grGcpAdd' : MetaIcon (img=Icons["grGcpAdd"],
+ 'grGcpAdd' : MetaIcon (img=iconSet["grGcpAdd"],
label=_("Add new GCP")),
- 'grGcpDelete' : MetaIcon (img=Icons["grGcpDelete"],
+ 'grGcpDelete' : MetaIcon (img=iconSet["grGcpDelete"],
label=_("Delete selected GCP")),
- 'grGcpClear' : MetaIcon (img=Icons["grGcpClear"],
+ 'grGcpClear' : MetaIcon (img=iconSet["grGcpClear"],
label=_("Clear selected GCP")),
- 'grGcpReload' : MetaIcon (img=Icons["grGcpReload"],
+ 'grGcpReload' : MetaIcon (img=iconSet["grGcpReload"],
label=_("Reload GCPs from POINTS file")),
- 'grGcpQuit' : MetaIcon (img=Icons["quit"],
+ 'grGcpQuit' : MetaIcon (img=iconSet["quit"],
label=_("Quit georectification module")),
- "grSettings": MetaIcon (img=Icons["settings"],
+ "grSettings": MetaIcon (img=iconSet["settings"],
label=_("Settings"),
desc=_("Settings dialog for georectification tool")),
- "grHelp": MetaIcon (img=Icons["help"],
+ "grHelp": MetaIcon (img=iconSet["help"],
label=_('Show help'),
desc = _('Display GCP Manager manual page')),
# nviz
- "nvizView": MetaIcon (img=Icons["nvizView"],
+ "nvizView": MetaIcon (img=iconSet["nvizView"],
label=_("Switch to view control page"),
desc=_("Change view settings")),
- "nvizSurface": MetaIcon (img=Icons["nvizSurface"],
+ "nvizSurface": MetaIcon (img=iconSet["nvizSurface"],
label=_("Switch to surface (raster) control page"),
desc=_("Change surface (loaded raster maps) settings")),
- "nvizVector": MetaIcon (img=Icons["nvizVector"],
+ "nvizVector": MetaIcon (img=iconSet["nvizVector"],
label=_("Switch to vector (2D/3D) control page"),
desc=_("Change 2D/3D vector settings")),
- "nvizVolume": MetaIcon (img=Icons["nvizVolume"],
+ "nvizVolume": MetaIcon (img=iconSet["nvizVolume"],
label=_("Switch to volume (3D raster) control page"),
desc=_("Change volume (loaded 3D raster maps) settings")),
- "nvizLight": MetaIcon (img=Icons["nvizLight"],
+ "nvizLight": MetaIcon (img=iconSet["nvizLight"],
label=_("Switch to lighting control page"),
desc=_("Change lighting settings")),
- "nvizFringe": MetaIcon (img=Icons["nvizFringe"],
+ "nvizFringe": MetaIcon (img=iconSet["nvizFringe"],
label=_("Switch to fringe control page"),
desc=_("Switch on/off fringes")),
- "nvizSettings": MetaIcon (img=Icons["settings"],
+ "nvizSettings": MetaIcon (img=iconSet["settings"],
label=_("3D view mode tools"),
desc=_("Show/hide 3D view mode settings dialog")),
- "nvizHelp" : MetaIcon (img=Icons["help"],
+ "nvizHelp" : MetaIcon (img=iconSet["help"],
label=_("Show help"),
desc = _("Display 3D view mode manual page")),
- "nvizQuit": MetaIcon (img=Icons["quit"],
+ "nvizQuit": MetaIcon (img=iconSet["quit"],
label=_("Quit 3D view mode"),
desc=_("Switch back to 2D view mode")),
# modeler
- "modeler" : MetaIcon (img=Icons["modeler"],
+ "modeler" : MetaIcon (img=iconSet["modeler"],
label=_("Start Graphical Modeler")),
- "modelNew" : MetaIcon (img=Icons["fileNew"],
+ "modelNew" : MetaIcon (img=iconSet["fileNew"],
label=_("Create new model (Ctrl+N)")),
- "modelOpen" : MetaIcon (img=Icons["fileOpen"],
+ "modelOpen" : MetaIcon (img=iconSet["fileOpen"],
label=_("Load model from file (Ctrl+O)")),
- "modelSave" : MetaIcon (img=Icons["fileSave"],
+ "modelSave" : MetaIcon (img=iconSet["fileSave"],
label=_("Save current model to file (Ctrl+S)")),
- "modelToImage" : MetaIcon (img=Icons["imageSave"],
+ "modelToImage" : MetaIcon (img=iconSet["imageSave"],
label=_("Export model to image")),
- "modelToPython" : MetaIcon (img=Icons["pythonSave"],
+ "modelToPython" : MetaIcon (img=iconSet["pythonSave"],
label=_("Export model to Python script")),
- "modelActionAdd" : MetaIcon (img=Icons["modelActionAdd"],
+ "modelActionAdd" : MetaIcon (img=iconSet["modelActionAdd"],
label=_("Add action (GRASS module) to model")),
- "modelDataAdd" : MetaIcon (img=Icons["modelDataAdd"],
+ "modelDataAdd" : MetaIcon (img=iconSet["modelDataAdd"],
label=_("Add data item to model")),
- "modelRelation" : MetaIcon (img=Icons["modelRelation"],
+ "modelRelation" : MetaIcon (img=iconSet["modelRelation"],
label=_("Define relation between data and action items")),
- "modelRun" : MetaIcon (img=Icons["modelRun"],
+ "modelRun" : MetaIcon (img=iconSet["modelRun"],
label=_("Run model")),
- "modelValidate" : MetaIcon (img=Icons["modelValidate"],
+ "modelValidate" : MetaIcon (img=iconSet["modelValidate"],
label=_("Validate model")),
- "modelSettings" : MetaIcon (img=Icons["settings"],
+ "modelSettings" : MetaIcon (img=iconSet["settings"],
label=_("Show modeler settings")),
- "modelProperties" : MetaIcon (img=Icons["modelProperties"],
+ "modelProperties" : MetaIcon (img=iconSet["modelProperties"],
label=_("Show model properties")),
- "modelVariables" : MetaIcon (img=Icons["modelVariables"],
+ "modelVariables" : MetaIcon (img=iconSet["modelVariables"],
label=_("Manage model variables")),
- "modelRedraw" : MetaIcon (img=Icons["redraw"],
+ "modelRedraw" : MetaIcon (img=iconSet["redraw"],
label=_("Redraw model canvas")),
- "modelHelp" : MetaIcon (img=Icons["help"],
+ "modelHelp" : MetaIcon (img=iconSet["help"],
label=_("Show help"),
desc = _("Display Graphical Modeler manual page")),
# ps.map
- "psScript" : MetaIcon (img=Icons["psScript"],
+ "psScript" : MetaIcon (img=iconSet["psScript"],
label=_("Generate instruction file")),
- "psExport" : MetaIcon (img=Icons["psExport"],
+ "psExport" : MetaIcon (img=iconSet["psExport"],
label=_("Generate PostScript output")),
}
More information about the grass-commit
mailing list