[GRASS-SVN] r45794 - grass/branches/develbranch_6/gui/wxpython/icons
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Mar 28 08:56:31 EDT 2011
Author: martinl
Date: 2011-03-28 05:56:30 -0700 (Mon, 28 Mar 2011)
New Revision: 45794
Modified:
grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
grass/branches/develbranch_6/gui/wxpython/icons/icon.py
grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
Log:
#1309: Error launching 6.5 wxgui
Modified: grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py 2011-03-28 07:27:04 UTC (rev 45793)
+++ grass/branches/develbranch_6/gui/wxpython/icons/grass_icons.py 2011-03-28 12:56:30 UTC (rev 45794)
@@ -12,7 +12,6 @@
iconPathVDigit = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass", "edit")
iconSet = {
- # map display
"show" : 'gui-display.gif',
"layer-redraw" : 'gui-redraw.gif',
"erase" : 'gui-erase.gif',
@@ -23,35 +22,23 @@
"info" : 'gui-query.gif',
"zoom-last" : 'gui-zoom_back.gif',
"zoom-more" : 'gui-mapzoom.gif',
- "zoom-extent" : wx.ART_ERROR, # FIXME
"map-export" : 'file-save.gif',
"print" : 'file-print.gif',
"overlay-add" : 'gui-overlay.gif',
- # digit
- ## add feature
"point-create": 'new.point.gif',
"line-create" : 'new.line.gif',
"boundary-create": 'new.boundary.gif',
"centroid-create": 'new.centroid.gif',
- "polygon-create": wx.ART_ERROR,
- ## vertex
"vertex-create" : 'add.vertex.gif',
"vertex-move" : 'move.vertex.gif',
"vertex-delete" : 'rm.vertex.gif',
"line-split" : 'split.line.gif',
- ## edit feature
"line-edit" : 'edit.line.gif',
"line-move" : 'move.line.gif',
"line-delete" : 'delete.line.gif',
- ## cats
"cats-copy" : 'copy.cats.gif',
"cats-display" : 'display.cats.gif',
- ## attributes
"attributes-display" : 'display.attributes.gif',
- ## general
- "undo" : wx.ART_ERROR, # FIXME
- "tools" : wx.ART_ERROR, # FIXME
- # layer manager
"monitor-create" : 'gui-startmon.gif',
"create" : 'file-new.gif',
"layer-open" : 'file-new.gif',
@@ -68,7 +55,6 @@
"layer-more" : 'module-d.grid.gif',
"layer-remove" : 'edit-cut.gif',
"table" : 'db-values.gif',
- "edit" : wx.ART_ERROR,
"layer-rgb-add" : 'module-d.rgb.gif',
"layer-his-add" : 'channel-his.gif',
"layer-shaded-relief-add" : 'module-d.shadedmap.gif',
@@ -84,49 +70,22 @@
"scalebar-add": 'module-d.barscale.gif',
"legend-add" : 'module-d.legend.gif',
"quit" : 'gui-exit.gif',
- "modeler-main" : wx.ART_ERROR,
- # analyze raster
"layer-raster-analyze" : 'gui-rastanalyze.gif',
"measure-length" : 'gui-measure.gif',
"font" : 'gui-font.gif',
"layer-raster-histogram" : 'module-d.histogram.gif',
"color" : 'edit-color.gif',
"options" : 'gui-layeroptions.gif',
- # profile
"layer-raster-profile" : 'gui-profile.gif',
"layer-raster-profile" : 'gui-profiledefine.gif',
"show" : 'gui-display.gif',
"profileopt" : 'gui-profileopt.gif',
- # georectify
'gcp-remove' : 'gui-gcperase.gif',
'gcp-create' : 'gui-gcpset.gif',
'georectify' : 'gui-georect.gif',
'gcp-rms' : 'gui-rms.gif',
"gcp-save" : 'file-save.gif',
- "gcp-add" : wx.ART_NEW, # FIXME
- "gcp-delete" : wx.ART_DELETE, # FIXME
"reload" : 'gui-redraw.gif',
- # modeler
- "module-add" : wx.ART_ERROR,
- "data-add" : wx.ART_ERROR,
- "relation-create" : wx.ART_ERROR,
- "execute" : wx.ART_ERROR,
- "check" : wx.ART_ERROR,
- "image-export" : wx.ART_ERROR,
- "python-export" : wx.ART_ERROR,
- "options" : wx.ART_ERROR,
- "modeler-variables" : wx.ART_ERROR,
- # 3d view
- "3d-view" : wx.ART_ERROR,
- "3d-raster" : wx.ART_ERROR,
- "3d-vector" : wx.ART_ERROR,
- "3d-volume" : wx.ART_ERROR,
- "3d-light" : wx.ART_ERROR,
- "3d-fringe" : wx.ART_ERROR,
- # various
"settings" : 'edit-color.gif',
"redraw" : 'gui-display.gif',
- "help" : wx.ART_ERROR,
- "ps-script" : wx.ART_ERROR,
- "ps-export" : wx.ART_ERROR,
}
Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py 2011-03-28 07:27:04 UTC (rev 45793)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py 2011-03-28 12:56:30 UTC (rev 45794)
@@ -144,291 +144,291 @@
#
Icons = {
'displayWindow' : {
- 'display' : MetaIcon(img = iconSet['show'],
+ 'display' : MetaIcon(img = iconSet.get('show', wx.ART_ERROR),
label = _('Display map'),
desc = _('Re-render modified map layers only')),
- 'render' : MetaIcon(img = iconSet['layer-redraw'],
+ 'render' : MetaIcon(img = iconSet.get('layer-redraw', wx.ART_ERROR),
label = _('Render map'),
desc = _('Force re-rendering all map layers')),
- 'erase' : MetaIcon(img = iconSet['erase'],
+ 'erase' : MetaIcon(img = iconSet.get('erase', wx.ART_ERROR),
label = _('Erase display'),
desc = _('Erase display canvas with given background color')),
- 'pointer' : MetaIcon(img = iconSet['pointer'],
+ 'pointer' : MetaIcon(img = iconSet.get('pointer', wx.ART_ERROR),
label = _('Pointer')),
- 'zoomIn' : MetaIcon(img = iconSet['zoom-in'],
+ 'zoomIn' : MetaIcon(img = iconSet.get('zoom-in', wx.ART_ERROR),
label = _('Zoom in'),
desc = _('Drag or click mouse to zoom')),
- 'zoomOut' : MetaIcon(img = iconSet['zoom-out'],
+ 'zoomOut' : MetaIcon(img = iconSet.get('zoom-out', wx.ART_ERROR),
label = _('Zoom out'),
desc = _('Drag or click mouse to unzoom')),
- 'pan' : MetaIcon(img = iconSet['pan'],
+ 'pan' : MetaIcon(img = iconSet.get('pan', wx.ART_ERROR),
label = _('Pan'),
desc = _('Drag with mouse to pan')),
- 'query' : MetaIcon(img = iconSet['info'],
+ 'query' : MetaIcon(img = iconSet.get('info', wx.ART_ERROR),
label = _('Query raster/vector map(s)'),
desc = _('Query selected raster/vector map(s)')),
- 'zoomBack' : MetaIcon(img = iconSet['zoom-last'],
+ 'zoomBack' : MetaIcon(img = iconSet.get('zoom-last', wx.ART_ERROR),
label = _('Return to previous zoom')),
- 'zoomMenu' : MetaIcon(img = iconSet['zoom-more'],
+ 'zoomMenu' : MetaIcon(img = iconSet.get('zoom-more', wx.ART_ERROR),
label = _('Various zoom options'),
desc = _('Zoom to computational, default, saved region, ...')),
- 'zoomExtent' : MetaIcon(img = iconSet['zoom-extent'],
+ 'zoomExtent' : MetaIcon(img = iconSet.get('zoom-extent', wx.ART_ERROR),
label = _('Zoom to selected map layer(s)')),
- 'overlay' : MetaIcon(img = iconSet['overlay-add'],
+ 'overlay' : MetaIcon(img = iconSet.get('overlay-add', wx.ART_ERROR),
label = _('Add map elements'),
desc = _('Overlay elements like scale and legend onto map')),
- 'addBarscale': MetaIcon(img = iconSet['scalebar-add'],
+ 'addBarscale': MetaIcon(img = iconSet.get('scalebar-add', wx.ART_ERROR),
label = _('Add scalebar and north arrow')),
- 'addLegend' : MetaIcon(img = iconSet['legend-add'],
+ 'addLegend' : MetaIcon(img = iconSet.get('legend-add', wx.ART_ERROR),
label = _('Add legend')),
- 'saveFile' : MetaIcon(img = iconSet['map-export'],
+ 'saveFile' : MetaIcon(img = iconSet.get('map-export', wx.ART_ERROR),
label = _('Save display to graphic file')),
- 'print' : MetaIcon(img = iconSet['print'],
+ 'print' : MetaIcon(img = iconSet.get('print', wx.ART_ERROR),
label = _('Print display')),
- 'analyze' : MetaIcon(img = iconSet['layer-raster-analyze'],
+ 'analyze' : MetaIcon(img = iconSet.get('layer-raster-analyze', wx.ART_ERROR),
label = _('Analyze map'),
desc = _('Measuring, profiling, histogramming, ...')),
- 'measure' : MetaIcon(img = iconSet['measure-length'],
+ 'measure' : MetaIcon(img = iconSet.get('measure-length', wx.ART_ERROR),
label = _('Measure distance')),
- 'profile' : MetaIcon(img = iconSet['layer-raster-profile'],
+ 'profile' : MetaIcon(img = iconSet.get('layer-raster-profile', wx.ART_ERROR),
label = _('Profile surface map')),
- 'addText' : MetaIcon(img = iconSet['text-add'],
+ 'addText' : MetaIcon(img = iconSet.get('text-add', wx.ART_ERROR),
label = _('Add text layer')),
- 'histogram' : MetaIcon(img = iconSet['layer-raster-histogram'],
+ 'histogram' : MetaIcon(img = iconSet.get('layer-raster-histogram', wx.ART_ERROR),
label = _('Create histogram of image or raster file')),
},
'layerManager' : {
- 'newdisplay' : MetaIcon(img = iconSet['monitor-create'],
+ 'newdisplay' : MetaIcon(img = iconSet.get('monitor-create', wx.ART_ERROR),
label = _('Start new map display')),
- 'workspaceNew' : MetaIcon(img = iconSet['create'],
+ 'workspaceNew' : MetaIcon(img = iconSet.get('create', wx.ART_ERROR),
label = _('Create new workspace (Ctrl+N)')),
- 'workspaceLoad' : MetaIcon(img = iconSet['layer-open'],
+ 'workspaceLoad' : MetaIcon(img = iconSet.get('layer-open', wx.ART_ERROR),
label = _('Load map layers into workspace (Ctrl+L)')),
- 'workspaceOpen' : MetaIcon(img = iconSet['open'],
+ 'workspaceOpen' : MetaIcon(img = iconSet.get('open', wx.ART_ERROR),
label = _('Open existing workspace file (Ctrl+O)')),
- 'workspaceSave' : MetaIcon(img = iconSet['save'],
+ 'workspaceSave' : MetaIcon(img = iconSet.get('save', wx.ART_ERROR),
label = _('Save current workspace to file (Ctrl+S)')),
- 'rastImport' : MetaIcon(img = iconSet['layer-import'],
+ 'rastImport' : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),
label = _('Import raster data')),
- 'rastLink' : MetaIcon(img = iconSet['layer-import'],
+ 'rastLink' : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),
label = _('Link external raster data')),
- 'vectImport' : MetaIcon(img = iconSet['layer-import'],
+ 'vectImport' : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),
label = _('Import vector data')),
- 'vectLink' : MetaIcon(img = iconSet['layer-import'],
+ 'vectLink' : MetaIcon(img = iconSet.get('layer-import', wx.ART_ERROR),
label = _('Link external vector data')),
- 'addRast' : MetaIcon(img = iconSet['layer-raster-add'],
+ 'addRast' : MetaIcon(img = iconSet.get('layer-raster-add', wx.ART_ERROR),
label = _('Add raster map layer (Ctrl+R)')),
- 'rastMisc' : MetaIcon(img = iconSet['layer-raster-more'],
+ 'rastMisc' : MetaIcon(img = iconSet.get('layer-raster-more', wx.ART_ERROR),
label = _('Add various raster map layers (RGB, HIS, shaded relief...)')),
- 'addVect' : MetaIcon(img = iconSet['layer-vector-add'],
+ 'addVect' : MetaIcon(img = iconSet.get('layer-vector-add', wx.ART_ERROR),
label = _('Add vector map layer (Ctrl+V)')),
- 'vectMisc' : MetaIcon(img = iconSet['layer-vector-more'],
+ 'vectMisc' : MetaIcon(img = iconSet.get('layer-vector-more', wx.ART_ERROR),
label = _('Add various vector map layers (thematic, chart...)')),
- 'addCmd' : MetaIcon(img = iconSet['layer-command-add'],
+ 'addCmd' : MetaIcon(img = iconSet.get('layer-command-add', wx.ART_ERROR),
label = _('Add command layer')),
- 'addGroup' : MetaIcon(img = iconSet['layer-group-add'],
+ 'addGroup' : MetaIcon(img = iconSet.get('layer-group-add', wx.ART_ERROR),
label = _('Add group')),
- 'addOverlay' : MetaIcon(img = iconSet['layer-more'],
+ 'addOverlay' : MetaIcon(img = iconSet.get('layer-more', wx.ART_ERROR),
label = _('Add grid or vector labels overlay')),
- 'delCmd' : MetaIcon(img = iconSet['layer-remove'],
+ 'delCmd' : MetaIcon(img = iconSet.get('layer-remove', wx.ART_ERROR),
label = _('Delete selected map layer')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit')),
- 'attrTable' : MetaIcon(img = iconSet['table'],
+ 'attrTable' : MetaIcon(img = iconSet.get('table', wx.ART_ERROR),
label = _('Show attribute table')),
- 'vdigit' : MetaIcon(img = iconSet['edit'],
+ 'vdigit' : MetaIcon(img = iconSet.get('edit', wx.ART_ERROR),
label = _('Edit vector maps')),
- 'addRgb' : MetaIcon(img = iconSet['layer-rgb-add'],
+ 'addRgb' : MetaIcon(img = iconSet.get('layer-rgb-add', wx.ART_ERROR),
label = _('Add RGB map layer')),
- 'addHis' : MetaIcon(img = iconSet['layer-his-add'],
+ 'addHis' : MetaIcon(img = iconSet.get('layer-his-add', wx.ART_ERROR),
label = _('Add HIS map layer')),
- 'addShaded' : MetaIcon(img = iconSet['layer-shaded-relief-add'],
+ 'addShaded' : MetaIcon(img = iconSet.get('layer-shaded-relief-add', wx.ART_ERROR),
label = _('Add shaded relief map layer')),
- 'addRArrow' : MetaIcon(img = iconSet['layer-aspect-arrow-add'],
+ 'addRArrow' : MetaIcon(img = iconSet.get('layer-aspect-arrow-add', wx.ART_ERROR),
label = _('Add raster flow arrows')),
- 'addRNum' : MetaIcon(img = iconSet['layer-cell-cats-add'],
+ 'addRNum' : MetaIcon(img = iconSet.get('layer-cell-cats-add', wx.ART_ERROR),
label = _('Add raster cell numbers')),
- 'addThematic': MetaIcon(img = iconSet['layer-vector-thematic-add'],
+ 'addThematic': MetaIcon(img = iconSet.get('layer-vector-thematic-add', wx.ART_ERROR),
label = _('Add thematic area (choropleth) map layer')),
- 'addChart' : MetaIcon(img = iconSet['layer-vector-chart-add'],
+ 'addChart' : MetaIcon(img = iconSet.get('layer-vector-chart-add', wx.ART_ERROR),
label = _('Add thematic chart layer')),
- 'addGrid' : MetaIcon(img = iconSet['layer-grid-add'],
+ 'addGrid' : MetaIcon(img = iconSet.get('layer-grid-add', wx.ART_ERROR),
label = _('Add grid layer')),
- 'addGeodesic': MetaIcon(img = iconSet['shortest-distance'],
+ 'addGeodesic': MetaIcon(img = iconSet.get('shortest-distance', wx.ART_ERROR),
label = _('Add geodesic line layer')),
- 'addRhumb' : MetaIcon(img = iconSet['shortest-distance'],
+ 'addRhumb' : MetaIcon(img = iconSet.get('shortest-distance', wx.ART_ERROR),
label = _('Add rhumbline layer')),
- 'addLabels' : MetaIcon(img = iconSet['layer-label-add'],
+ 'addLabels' : MetaIcon(img = iconSet.get('layer-label-add', wx.ART_ERROR),
label = _('Add labels')),
- 'addRast3d' : MetaIcon(img = iconSet['layer-raster3d-add'],
+ 'addRast3d' : MetaIcon(img = iconSet.get('layer-raster3d-add', wx.ART_ERROR),
label = _('Add 3D raster map layer'),
desc = _('Note that 3D raster data are rendered only in 3D view mode')),
- 'settings' : MetaIcon(img = iconSet['settings'],
+ 'settings' : MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
label = _('Show GUI settings')),
- 'modeler' : MetaIcon(img = iconSet['modeler-main'],
+ 'modeler' : MetaIcon(img = iconSet.get('modeler-main', wx.ART_ERROR),
label = _('Start Graphical Modeler')),
- "layerOptions" : MetaIcon(img = iconSet['options'],
+ "layerOptions" : MetaIcon(img = iconSet.get('options', wx.ART_ERROR),
label = _('Set options')),
},
'vdigit' : {
- 'addPoint' : MetaIcon(img = iconSet['point-create'],
+ 'addPoint' : MetaIcon(img = iconSet.get('point-create', wx.ART_ERROR),
label = _('Digitize new point'),
desc = _('Left: new point')),
- 'addLine' : MetaIcon(img = iconSet['line-create'],
+ 'addLine' : MetaIcon(img = iconSet.get('line-create', wx.ART_ERROR),
label = _('Digitize new line'),
desc = _('Left: new point; Ctrl+Left: undo last point; Right: close line')),
- 'addBoundary' : MetaIcon(img = iconSet['boundary-create'],
+ 'addBoundary' : MetaIcon(img = iconSet.get('boundary-create', wx.ART_ERROR),
label = _('Digitize new boundary'),
desc = _('Left: new point; Ctrl+Left: undo last point; Right: close line')),
- 'addCentroid' : MetaIcon(img = iconSet['centroid-create'],
+ 'addCentroid' : MetaIcon(img = iconSet.get('centroid-create', wx.ART_ERROR),
label = _('Digitize new centroid'),
desc = _('Left: new point')),
- 'addArea' : MetaIcon(img = iconSet['polygon-create'],
+ 'addArea' : MetaIcon(img = iconSet.get('polygon-create', wx.ART_ERROR),
label = _('Digitize new area (composition of bondaries without category and one centroid with category)'),
desc = _('Left: new point')),
- 'addVertex' : MetaIcon(img = iconSet['vertex-create'],
+ 'addVertex' : MetaIcon(img = iconSet.get('vertex-create', wx.ART_ERROR),
label = _('Add new vertex'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'copyCats' : MetaIcon(img = iconSet['cats-copy'],
+ 'copyCats' : MetaIcon(img = iconSet.get('cats-copy', wx.ART_ERROR),
label = _('Copy categories'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'deleteLine' : MetaIcon(img = iconSet['line-delete'],
+ 'deleteLine' : MetaIcon(img = iconSet.get('line-delete', wx.ART_ERROR),
label = _('Delete feature(s)'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'displayAttr' : MetaIcon(img = iconSet['attributes-display'],
+ 'displayAttr' : MetaIcon(img = iconSet.get('attributes-display', wx.ART_ERROR),
label = _('Display/update attributes'),
desc = _('Left: Select')),
- 'displayCats' : MetaIcon(img = iconSet['cats-display'],
+ 'displayCats' : MetaIcon(img = iconSet.get('cats-display', wx.ART_ERROR),
label = _('Display/update categories'),
desc = _('Left: Select')),
- 'editLine' : MetaIcon(img = iconSet['line-edit'],
+ 'editLine' : MetaIcon(img = iconSet.get('line-edit', wx.ART_ERROR),
label = _('Edit line/boundary'),
desc = _('Left: new point; Ctrl+Left: undo last point; Right: close line')),
- 'moveLine' : MetaIcon(img = iconSet['line-move'],
+ 'moveLine' : MetaIcon(img = iconSet.get('line-move', wx.ART_ERROR),
label = _('Move feature(s)'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'moveVertex' : MetaIcon(img = iconSet['vertex-move'],
+ 'moveVertex' : MetaIcon(img = iconSet.get('vertex-move', wx.ART_ERROR),
label = _('Move vertex'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'removeVertex' : MetaIcon(img = iconSet['vertex-delete'],
+ 'removeVertex' : MetaIcon(img = iconSet.get('vertex-delete', wx.ART_ERROR),
label = _('Remove vertex'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'settings' : MetaIcon(img = iconSet['settings'],
+ 'settings' : MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
label = _('Digitization settings')),
- 'splitLine' : MetaIcon(img = iconSet['line-split'],
+ 'splitLine' : MetaIcon(img = iconSet.get('line-split', wx.ART_ERROR),
label = _('Split line/boundary'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit digitizer'),
desc = _('Quit digitizer and save changes')),
- 'additionalTools' : MetaIcon(img = iconSet['tools'],
+ 'additionalTools' : MetaIcon(img = iconSet.get('tools', wx.ART_ERROR),
label = _('Additional tools ' \
'(copy, flip, connect, etc.)'),
desc = _('Left: Select; Ctrl+Left: Unselect; Right: Confirm')),
- 'undo' : MetaIcon(img = iconSet['undo'],
+ 'undo' : MetaIcon(img = iconSet.get('undo', wx.ART_ERROR),
label = _('Undo'),
desc = _('Undo previous changes')),
},
'profile' : {
- 'draw' : MetaIcon(img = iconSet['show'],
+ 'draw' : MetaIcon(img = iconSet.get('show', wx.ART_ERROR),
label = _('Draw/re-draw profile')),
- 'transect' : MetaIcon(img = iconSet['layer-raster-profile'],
+ 'transect' : MetaIcon(img = iconSet.get('layer-raster-profile', wx.ART_ERROR),
label = _('Draw transect in map display window to profile')),
- 'options' : MetaIcon(img = iconSet['settings'],
+ 'options' : MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
label = _('Profile options')),
- 'save' : MetaIcon(img = iconSet['save'],
+ 'save' : MetaIcon(img = iconSet.get('save', wx.ART_ERROR),
label = _('Save profile data to CSV file')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit Profile Analysis Tool'))
},
'georectify' : {
- 'gcpSet' : MetaIcon(img = iconSet['gcp-create'],
+ 'gcpSet' : MetaIcon(img = iconSet.get('gcp-create', wx.ART_ERROR),
label = _('Set GCP'),
desc = _('Define GCP (Ground Control Points)')),
- 'georectify': MetaIcon(img = iconSet['georectify'],
+ 'georectify': MetaIcon(img = iconSet.get('georectify', wx.ART_ERROR),
label = _('Georectify')),
- 'gcpRms' : MetaIcon(img = iconSet['gcp-rms'],
+ 'gcpRms' : MetaIcon(img = iconSet.get('gcp-rms', wx.ART_ERROR),
label = _('Recalculate RMS error')),
- 'gcpSave' : MetaIcon(img = iconSet['gcp-save'],
+ 'gcpSave' : MetaIcon(img = iconSet.get('gcp-save', wx.ART_ERROR),
label = _('Save GCPs to POINTS file')),
- 'gcpAdd' : MetaIcon(img = iconSet['gcp-add'],
+ 'gcpAdd' : MetaIcon(img = iconSet.get('gcp-add', wx.ART_ERROR),
label = _('Add new GCP')),
- 'gcpDelete' : MetaIcon(img = iconSet['gcp-delete'],
+ 'gcpDelete' : MetaIcon(img = iconSet.get('gcp-delete', wx.ART_ERROR),
label = _('Delete selected GCP')),
- 'gcpClear' : MetaIcon(img = iconSet['gcp-remove'],
+ 'gcpClear' : MetaIcon(img = iconSet.get('gcp-remove', wx.ART_ERROR),
label = _('Clear selected GCP')),
- 'gcpReload' : MetaIcon(img = iconSet['reload'],
+ 'gcpReload' : MetaIcon(img = iconSet.get('reload', wx.ART_ERROR),
label = _('Reload GCPs from POINTS file')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit georectification')),
- 'settings' : MetaIcon(img = iconSet['settings'],
+ 'settings' : MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
label = _('Settings'),
desc = _('Settings dialog for georectification tool')),
},
'nviz' : {
- 'view' : MetaIcon(img = iconSet['3d-view'],
+ 'view' : MetaIcon(img = iconSet.get('3d-view', wx.ART_ERROR),
label = _('Switch to view control page'),
desc = _('Change view settings')),
- 'surface' : MetaIcon(img = iconSet['3d-raster'],
+ 'surface' : MetaIcon(img = iconSet.get('3d-raster', wx.ART_ERROR),
label = _('Switch to surface (raster) control page'),
desc = _('Change surface (loaded raster maps) settings')),
- 'vector' : MetaIcon(img = iconSet['3d-vector'],
+ 'vector' : MetaIcon(img = iconSet.get('3d-vector', wx.ART_ERROR),
label = _('Switch to vector (2D/3D) control page'),
desc = _('Change 2D/3D vector settings')),
- 'volume' : MetaIcon(img = iconSet['3d-volume'],
+ 'volume' : MetaIcon(img = iconSet.get('3d-volume', wx.ART_ERROR),
label = _('Switch to volume (3D raster) control page'),
desc = _('Change volume (loaded 3D raster maps) settings')),
- 'light' : MetaIcon(img = iconSet['3d-light'],
+ 'light' : MetaIcon(img = iconSet.get('3d-light', wx.ART_ERROR),
label = _('Switch to lighting control page'),
desc = _('Change lighting settings')),
- 'fringe' : MetaIcon(img = iconSet['3d-fringe'],
+ 'fringe' : MetaIcon(img = iconSet.get('3d-fringe', wx.ART_ERROR),
label = _('Switch to fringe control page'),
desc = _('Switch on/off fringes')),
- 'settings': MetaIcon(img = iconSet['settings'],
+ 'settings': MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
label = _('3D view mode tools'),
desc = _('Show/hide 3D view mode settings dialog')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit 3D view mode'),
desc = _('Switch back to 2D view mode')),
},
'modeler' : {
- 'new' : MetaIcon(img = iconSet['create'],
+ 'new' : MetaIcon(img = iconSet.get('create', wx.ART_ERROR),
label = _('Create new model (Ctrl+N)')),
- 'open' : MetaIcon(img = iconSet['open'],
+ 'open' : MetaIcon(img = iconSet.get('open', wx.ART_ERROR),
label = _('Load model from file (Ctrl+O)')),
- 'save' : MetaIcon(img = iconSet['save'],
+ 'save' : MetaIcon(img = iconSet.get('save', wx.ART_ERROR),
label = _('Save current model to file (Ctrl+S)')),
- 'toImage' : MetaIcon(img = iconSet['image-export'],
+ 'toImage' : MetaIcon(img = iconSet.get('image-export', wx.ART_ERROR),
label = _('Export model to image')),
- 'toPython' : MetaIcon(img = iconSet['python-export'],
+ 'toPython' : MetaIcon(img = iconSet.get('python-export', wx.ART_ERROR),
label = _('Export model to Python script')),
- 'actionAdd' : MetaIcon(img = iconSet['module-add'],
+ 'actionAdd' : MetaIcon(img = iconSet.get('module-add', wx.ART_ERROR),
label = _('Add action (GRASS module) to model')),
- 'dataAdd' : MetaIcon(img = iconSet['data-add'],
+ 'dataAdd' : MetaIcon(img = iconSet.get('data-add', wx.ART_ERROR),
label = _('Add data item to model')),
- 'relation' : MetaIcon(img = iconSet['relation-create'],
+ 'relation' : MetaIcon(img = iconSet.get('relation-create', wx.ART_ERROR),
label = _('Define relation between data and action items')),
- 'run' : MetaIcon(img = iconSet['execute'],
+ 'run' : MetaIcon(img = iconSet.get('execute', wx.ART_ERROR),
label = _('Run model')),
- 'validate' : MetaIcon(img = iconSet['check'],
+ 'validate' : MetaIcon(img = iconSet.get('check', wx.ART_ERROR),
label = _('Validate model')),
- 'settings' : MetaIcon(img = iconSet['settings'],
+ 'settings' : MetaIcon(img = iconSet.get('settings', wx.ART_ERROR),
label = _('Show modeler settings')),
- 'properties' : MetaIcon(img = iconSet['options'],
+ 'properties' : MetaIcon(img = iconSet.get('options', wx.ART_ERROR),
label = _('Show model properties')),
- 'variables' : MetaIcon(img = iconSet['modeler-variables'],
+ 'variables' : MetaIcon(img = iconSet.get('modeler-variables', wx.ART_ERROR),
label = _('Manage model variables')),
- 'redraw' : MetaIcon(img = iconSet['redraw'],
+ 'redraw' : MetaIcon(img = iconSet.get('redraw', wx.ART_ERROR),
label = _('Redraw model canvas')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit Graphical Modeler')),
},
'misc' : {
- 'font' : MetaIcon(img = iconSet['font'],
+ 'font' : MetaIcon(img = iconSet.get('font', wx.ART_ERROR),
label = _('Select font')),
- 'help' : MetaIcon(img = iconSet['help'],
+ 'help' : MetaIcon(img = iconSet.get('help', wx.ART_ERROR),
label = _('Show help page')),
- 'quit' : MetaIcon(img = iconSet['quit'],
+ 'quit' : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
label = _('Quit')),
}
}
Modified: grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py 2011-03-28 07:27:04 UTC (rev 45793)
+++ grass/branches/develbranch_6/gui/wxpython/icons/silk_icons.py 2011-03-28 12:56:30 UTC (rev 45794)
@@ -15,7 +15,6 @@
iconPath = os.path.join(globalvar.ETCDIR, "gui", "icons", "silk")
iconSet = {
- # map display
"show" : 'map_go.png',
"layer-redraw" : 'arrow_refresh.png',
"erase" : 'cross.png',
@@ -24,49 +23,37 @@
"map-export" : 'picture_save.png',
"print" : 'printer.png',
"pan" : 'arrow_out.png',
- # zoom (mapdisplay)
"zoom-in" : 'zoom_in.png',
"zoom-out" : 'zoom_out.png',
"zoom-last" : 'zoom_back.png',
"zoom-more" : 'zoom.png',
"zoom-extent" : 'zoom_extent.png',
- # layer-raster-analyze raster (mapdisplay)
"layer-raster-analyze" : 'application_lightning.png',
"measure-length" : 'sum.png',
"layer-raster-profile" : 'wand.png',
"layer-raster-histogram" : 'chart_bar.png',
"font" : 'font.png',
- # overlay-add (mapdisplay)
"overlay-add" : 'overlays.png',
"text-add" : 'textfield_add.png',
"scalebar-add": 'page_white_picture.png',
"legend-add" : 'page_green.png',
"quit" : 'door_in.png',
- # digit
- ## add feature
"point-create": 'bullet_add.png',
"line-create" : 'vector_add.png',
"boundary-create": 'shape_handles.png',
"centroid-create": 'shape_square_add.png',
- "polygon-create": wx.ART_ERROR,
- ## vertex
"vertex-create" : 'chart_line_add.png',
"vertex-move" : 'chart_line.png',
"vertex-delete" : 'chart_line_delete.png',
"line-split" : 'chart_line_link.png',
- ## edit feature
"line-edit" : 'chart_line_edit.png',
"line-move" : 'bullet_go.png',
"line-delete" : 'vector_delete.png',
- ## cats
"cats-display" : 'chart_organisation.png',
"cats-copy" : 'chart_organisation_add.png',
- ## attributes
"attributes-display" : 'table.png',
- ## general
"undo" : 'arrow_undo.png',
"tools" : 'plugin.png',
- # layer manager
"monitor-create" : 'application_add.png',
"create" : 'page_white.png',
"layer-open" : 'page_white_get.png',
@@ -88,18 +75,14 @@
"layer-label-add" : 'tag_blue_add.png',
"layer-remove" : 'bin_closed.png',
"table" : 'application_view_columns.png',
- "edit" : wx.ART_ERROR,
"layer-rgb-add" : 'rgb.png',
"layer-his-add" : 'his.png',
"layer-vector-thematic-add": 'thematic.png',
"layer-vector-chart-add" : 'chart_bar.png',
"options" : 'map_edit.png',
- "modeler-main" : wx.ART_ERROR,
- # layer-raster-profile analysis
"layer-raster-profile" : 'image_edit.png',
"layer-raster-show" : 'arrow_refresh.png',
"layer-raster-profileopt" : 'color_swatch.png',
- # georectify
"gcp-create" : 'bullet_add.png',
'gcp-remove' : 'cross.png',
'georectify' : 'application_lightning.png',
@@ -108,27 +91,6 @@
"gcp-add" : 'bullet_add.png',
"gcp-delete" : 'bullet_delete.png',
"reload" : 'arrow_refresh.png',
- # modeler-main
- "module-add" : wx.ART_ERROR,
- "data-add" : wx.ART_ERROR,
- "relation-create" : wx.ART_ERROR,
- "execute" : wx.ART_ERROR,
- "check" : wx.ART_ERROR,
- "image-export" : wx.ART_ERROR,
- "python-export" : wx.ART_ERROR,
- "options" : wx.ART_ERROR,
- "modeler-variables" : wx.ART_ERROR,
- # 3d view
- "3d-view" : wx.ART_ERROR,
- "3d-raster" : wx.ART_ERROR,
- "3d-vector" : wx.ART_ERROR,
- "3d-volume" : wx.ART_ERROR,
- "3d-light" : wx.ART_ERROR,
- "3d-fringe" : wx.ART_ERROR,
- # various
"settings" : 'color_swatch.png',
"redraw" : 'arrow_refresh.png',
- "help" : wx.ART_ERROR,
- "ps-script" : wx.ART_ERROR,
- "ps-export" : wx.ART_ERROR,
}
More information about the grass-commit
mailing list