[GRASS-SVN] r62643 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-11-06 14:03:17 -0800 (Thu, 06 Nov 2014)
New Revision: 62643

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/widgets.py
Log:
wxGUI: fix d.northarrow thumbnail selection widget - change of directory structure was not reflected (merge from trunk, r62642)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606,62609,62614,62618,62632
   + /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606,62609,62614,62618,62632,62642

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/widgets.py	2014-11-06 22:02:16 UTC (rev 62642)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/widgets.py	2014-11-06 22:03:17 UTC (rev 62643)
@@ -1346,8 +1346,8 @@
 class NArrowsComboBox(PictureComboBox):
     """!ComboBox with north arrows for d.barscale."""
     def _getPath(self, name):
-        path = os.path.join(os.getenv("GISBASE"), "etc", "gui", "images",
-                                      'symbols', 'n_arrows')
+        path = os.path.join(os.getenv("GISBASE"), "gui", "images",
+                            'symbols', 'n_arrows')
         try:
             int(name[0])
             return os.path.join(path, 'n_arrow{name}.png'.format(name=name))