Browse Source

fix loading icon sets (grass and silk)
(merge https://trac.osgeo.org/grass/changeset/49557 from devbr6)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49559 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 13 years ago
parent
commit
a2a934b297
1 changed files with 16 additions and 16 deletions
  1. 16 16
      gui/wxpython/icons/icon.py

+ 16 - 16
gui/wxpython/icons/icon.py

@@ -404,42 +404,42 @@ Icons = {
                           label = _('Quit')),
                           label = _('Quit')),
         },
         },
     'psMap' : {
     'psMap' : {
-        'scriptSave' : MetaIcon(img = iconSet['script-save'],
+        'scriptSave' : MetaIcon(img = iconSet.get('script-save', wx.ART_ERROR),
                                 label = _('Generate text file with mapping instructions')),
                                 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')),                           
                                 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')),
                                 label = _('Generate PostScript output')),
-        'pdfExport'  : MetaIcon(img = iconSet['pdf-export'],
+        'pdfExport'  : MetaIcon(img = iconSet.get('pdf-export', wx.ART_ERROR),
                                 label = _('Generate PDF output')),
                                 label = _('Generate PDF output')),
-        'pageSetup'  : MetaIcon(img = iconSet['page-settings'],
+        'pageSetup'  : MetaIcon(img = iconSet.get('page-settings', wx.ART_ERROR),
                                 label = _('Page setup'),
                                 label = _('Page setup'),
                                 desc = _('Specify paper size, margins and orientation')),
                                 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"),
                                 label = _("Full extent"),
                                 desc = _("Zoom to 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"),
                                 label = _("Map frame"),
                                 desc = _("Click and drag to place 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"),
                                 label = _("Raster map"),
                                 desc = _("Add 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"),
                                 label = _("Vector map"),
                                 desc = _("Add 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")),
                                 label = _("Delete selected object")),
-        'preview'    : MetaIcon(img = iconSet['execute'],
+        'preview'    : MetaIcon(img = iconSet.get('execute', wx.ART_ERROR),
                                 label = _("Show preview")),
                                 label = _("Show preview")),
-        'quit'       : MetaIcon(img = iconSet['quit'],
+        'quit'       : MetaIcon(img = iconSet.get('quit', wx.ART_ERROR),
                                 label = _('Quit Cartographic Composer')),
                                 label = _('Quit Cartographic Composer')),
-        'addText'    : MetaIcon(img = iconSet['text-add'],
+        'addText'    : MetaIcon(img = iconSet.get('text-add', wx.ART_ERROR),
                                 label = _('Text')),
                                 label = _('Text')),
-        'addMapinfo' : MetaIcon(img = iconSet['map-info'],
+        'addMapinfo' : MetaIcon(img = iconSet.get('map-info', wx.ART_ERROR),
                                 label = _('Map info')),
                                 label = _('Map info')),
-        'addLegend'  : MetaIcon(img = iconSet['legend-add'],
+        'addLegend'  : MetaIcon(img = iconSet.get('legend-add', wx.ART_ERROR),
                                 label = _('Legend')),
                                 label = _('Legend')),
-        'addScalebar' : MetaIcon(img = iconSet['scalebar-add'],
+        'addScalebar' : MetaIcon(img = iconSet.get('scalebar-add', wx.ART_ERROR),
                                  label = _('Scale bar')),
                                  label = _('Scale bar')),
         'addImage'   : MetaIcon(img = iconSet['image-add'],
         'addImage'   : MetaIcon(img = iconSet['image-add'],
                                  label = _('Image')),
                                  label = _('Image')),