[GRASS-SVN] r49557 - grass/branches/develbranch_6/gui/wxpython/icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-05 08:24:38 -0800 (Mon, 05 Dec 2011)
New Revision: 49557

Modified:
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
Log:
fix loading icon sets (grass and silk)

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2011-12-05 15:56:54 UTC (rev 49556)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2011-12-05 16:24:38 UTC (rev 49557)
@@ -83,7 +83,7 @@
                     iconSet[key] = os.path.join(iconPathVDigit, img)
                 else:
                     iconSet[key] = os.path.join(iconPath, img)
-                print img, iconSet[key]
+
 except StandardError, e:
     sys.exit(_("Unable to load icon theme. Reason: %s") % e)
 
@@ -429,42 +429,42 @@
                           label = _('Quit')),
         },
     'psMap' : {
-        'scriptSave' : MetaIcon(img = iconSet['script-save'],
+        'scriptSave' : MetaIcon(img = iconSet.get('script-save', wx.ART_ERROR),
                                 label = _('Generate text file with mapping instructions')),
-        'scriptLoad' : MetaIcon(img = iconSet['script-load'],
+        'scriptLoad' : MetaIcon(img = iconSet.get('script-load', wx.ART_ERROR),
                                 label = _('Load text file with mapping instructions')),                           
-        'psExport'   : MetaIcon(img = iconSet['ps-export'],
+        'psExport'   : MetaIcon(img = iconSet.get('ps-export', wx.ART_ERROR),
                                 label = _('Generate PostScript output')),
-        'pdfExport'  : MetaIcon(img = iconSet['pdf-export'],
+        'pdfExport'  : MetaIcon(img = iconSet.get('pdf-export', wx.ART_ERROR),
                                 label = _('Generate PDF output')),
-        'pageSetup'  : MetaIcon(img = iconSet['page-settings'],
+        'pageSetup'  : MetaIcon(img = iconSet.get('page-settings', wx.ART_ERROR),
                                 label = _('Page setup'),
                                 desc = _('Specify paper size, margins and orientation')),
-        'fullExtent' : MetaIcon(img = iconSet['zoom-extent'],
+        'fullExtent' : MetaIcon(img = iconSet.get('zoom-extent', wx.ART_ERROR),
                                 label = _("Full extent"),
                                 desc = _("Zoom to full extent")),
-        'addMap'     : MetaIcon(img = iconSet['layer-add'],
+        'addMap'     : MetaIcon(img = iconSet.get('layer-add', wx.ART_ERROR),
                                 label = _("Map frame"),
                                 desc = _("Click and drag to place map frame")),
-        'addRast'    : MetaIcon(img = iconSet['layer-raster-add'],
+        'addRast'    : MetaIcon(img = iconSet.get('layer-raster-add', wx.ART_ERROR),
                                 label = _("Raster map"),
                                 desc = _("Add raster map")),
-        'addVect'    : MetaIcon(img = iconSet['layer-vector-add'],
+        'addVect'    : MetaIcon(img = iconSet.get('layer-vector-add', wx.ART_ERROR),
                                 label = _("Vector map"),
                                 desc = _("Add vector map")),
-        'deleteObj'  : MetaIcon(img = iconSet['layer-remove'],
+        'deleteObj'  : MetaIcon(img = iconSet.get('layer-remove', wx.ART_ERROR),
                                 label = _("Delete selected object")),
-        'preview'    : MetaIcon(img = iconSet['execute'],
+        'preview'    : MetaIcon(img = iconSet.get('execute', wx.ART_ERROR),
                                 label = _("Show preview")),
-        'quit'       : MetaIcon(img = iconSet['quit'],
+        'quit'       : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
                                 label = _('Quit Cartographic Composer')),
-        'addText'    : MetaIcon(img = iconSet['text-add'],
+        'addText'    : MetaIcon(img = iconSet.get('text-add', wx.ART_ERROR),
                                 label = _('Add text')),
-        'addMapinfo' : MetaIcon(img = iconSet['map-info'],
+        'addMapinfo' : MetaIcon(img = iconSet.get('map-info', wx.ART_ERROR),
                                 label = _('Add map info')),
-        'addLegend'  : MetaIcon(img = iconSet['legend-add'],
+        'addLegend'  : MetaIcon(img = iconSet.get('legend-add', wx.ART_ERROR),
                                 label = _('Add legend')),
-        'addScalebar' : MetaIcon(img = iconSet['scalebar-add'],
+        'addScalebar' : MetaIcon(img = iconSet.get('scalebar-add', wx.ART_ERROR),
                                  label = _('Add scale bar')),
         }
     }