[GRASS-SVN] r68948 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2016-07-12 11:53:16 -0700 (Tue, 12 Jul 2016)
New Revision: 68948

Modified:
   grass/trunk/gui/wxpython/gui_core/widgets.py
Log:
wxGUI/forms: use thumbnails in docs for north arrow (unify with scale bar and color tables)

Modified: grass/trunk/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/widgets.py	2016-07-12 18:39:35 UTC (rev 68947)
+++ grass/trunk/gui/wxpython/gui_core/widgets.py	2016-07-12 18:53:16 UTC (rev 68948)
@@ -1594,25 +1594,11 @@
     """ComboBox with north arrows for d.barscale."""
 
     def _getPath(self, name):
-        path = os.path.join(os.getenv("GISBASE"), "gui", "images",
-                            'symbols')
-        try:
-            int(name[0])
-            return os.path.join(path, 'n_arrows', 'n_arrow{name}.png'.format(name=name))
-        except ValueError:
-            if name == 'star':
-                name = '4pt_star'
-            if os.path.exists(os.path.join(path, 'n_arrows', '{name}.png'.format(name=name))):
-                return os.path.join(path, 'n_arrows', '{name}.png'.format(name=name))
-            elif os.path.exists(os.path.join(path, 'basic', '{name}.png'.format(name=name))):
-                return os.path.join(path, 'basic', '{name}.png'.format(name=name))
-            else:
-                return os.path.join(path, 'extra', '{name}.png'.format(name=name))
+        return os.path.join(
+            os.getenv("GISBASE"),
+            "docs", "html", "northarrows", "%s.png" % name)
 
-    def OnMeasureItem(self, item):
-        return 32
 
-
 class LayersList(GListCtrl, listmix.TextEditMixin):
     """List of layers to be imported (dxf, shp...)"""