[GRASS-SVN] r49665 - in grass/trunk/gui: icons/grass wxpython/icons wxpython/mapdisp wxpython/psmap

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-12-11 23:00:24 -0800 (Sun, 11 Dec 2011)
New Revision: 49665

Added:
   grass/trunk/gui/icons/grass/north-arrow-add.png
Modified:
   grass/trunk/gui/wxpython/icons/icon.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/psmap/frame.py
Log:
wxGUI: north arrow icon added (thanks to Robert Szczepanek)

Added: grass/trunk/gui/icons/grass/north-arrow-add.png
===================================================================
(Binary files differ)


Property changes on: grass/trunk/gui/icons/grass/north-arrow-add.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2011-12-12 06:51:34 UTC (rev 49664)
+++ grass/trunk/gui/wxpython/icons/icon.py	2011-12-12 07:00:24 UTC (rev 49665)
@@ -146,6 +146,8 @@
                                 label = _('Add scalebar and north arrow')),
         'addLegend'  : MetaIcon(img = iconSet.get('legend-add', wx.ART_ERROR),
                                 label = _('Add legend')),
+        'addNorthArrow': MetaIcon(img = iconSet.get('north-arrow-add', wx.ART_ERROR),
+                                label = _('North Arrow')),
         'saveFile'   : MetaIcon(img = iconSet.get('map-export', wx.ART_ERROR),
                                 label = _('Save display to graphic file')),
         'print'      : MetaIcon(img = iconSet.get('print', wx.ART_ERROR),
@@ -441,8 +443,10 @@
                                 label = _('Legend')),
         'addScalebar' : MetaIcon(img = iconSet.get('scalebar-add', wx.ART_ERROR),
                                  label = _('Scale bar')),
-        'addImage'   : MetaIcon(img = iconSet['image-add'],
+        'addImage'   : MetaIcon(img = iconSet.get('image-add', wx.ART_ERROR),
                                  label = _('Image')),
+        'addNorthArrow': MetaIcon(img = iconSet.get('north-arrow-add', wx.ART_ERROR),
+                                 label = _('North Arrow')),
         }
     }
 

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2011-12-12 06:51:34 UTC (rev 49664)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2011-12-12 07:00:24 UTC (rev 49665)
@@ -1146,8 +1146,8 @@
         # temporary
         if self.IsPaneShown('3d'):
             AddScale.Enable(False)
-            AddArrow = wx.MenuItem(decmenu, wx.ID_ANY, _("Add north arrow"))
-            AddArrow.SetBitmap(icons["addBarscale"].GetBitmap(self.iconsize))
+            AddArrow = wx.MenuItem(decmenu, wx.ID_ANY, icons['addNorthArrow'].GetLabel())
+            AddArrow.SetBitmap(icons['addNorthArrow'].GetBitmap(self.iconsize))
             decmenu.AppendItem(AddArrow)
             self.Bind(wx.EVT_MENU, self.OnAddArrow, AddArrow)
         

Modified: grass/trunk/gui/wxpython/psmap/frame.py
===================================================================
--- grass/trunk/gui/wxpython/psmap/frame.py	2011-12-12 06:51:34 UTC (rev 49664)
+++ grass/trunk/gui/wxpython/psmap/frame.py	2011-12-12 07:00:24 UTC (rev 49665)
@@ -610,9 +610,8 @@
         decmenu.AppendItem(AddImage)
         self.Bind(wx.EVT_MENU, self.OnAddImage, AddImage) 
         # north arrow image
-        AddNorthArrow = wx.MenuItem(decmenu, wx.ID_ANY, _("North arrow"))
-        AddNorthArrow.SetBitmap(wx.ArtProvider.GetBitmap(id = wx.ART_MISSING_IMAGE,
-                                client = wx.ART_MENU, size = self.iconsize))
+        AddNorthArrow = wx.MenuItem(decmenu, wx.ID_ANY, Icons['psMap']["addNorthArrow"].GetLabel())
+        AddNorthArrow.SetBitmap(Icons['psMap']["addNorthArrow"].GetBitmap(self.iconsize))
         decmenu.AppendItem(AddNorthArrow)
         self.Bind(wx.EVT_MENU, self.OnAddNorthArrow, AddNorthArrow) 
         # Popup the menu.  If an item is selected then its handler