wxGUI: move barscale images to the separate directory

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

gui/images/Makefile

@@ -4,14 +4,20 @@ include $(MODULE_TOPDIR)/include/Make/Other.make
 
 ETCDIR = $(ETC)/gui/images
 
+# images
 IMGSRC := $(wildcard *.png)
 IMGDST := $(patsubst %,$(ETCDIR)/%,$(IMGSRC))
 
+# barscales
+BSCSRC := $(wildcard barscales/*.png)
+BSCDST := $(patsubst barscales/%,$(ETCDIR)/barscales/%,$(BSCSRC))
+
+# symbols
 CATEGORIES = basic demo extra geology n_arrows
 SYMSRC := $(foreach dir,$(CATEGORIES),$(wildcard symbols/$(dir)/*.png))
 SYMDST := $(patsubst symbols/%,$(ETCDIR)/symbols/%,$(SYMSRC))
 
-default: $(IMGDST) $(SYMDST)
+default: $(IMGDST) $(SYMDST) $(BSCDST)
 
 define symbols_rule
 $(ETCDIR)/symbols/$(1)/%.png: symbols/$(1)/%.png | $(ETCDIR)/symbols/$(1)
@@ -23,6 +29,9 @@ endef
 
 $(foreach category,$(CATEGORIES),$(eval $(call symbols_rule,$(category))))
 
+$(ETCDIR)/barscales/%.png: barscales/%.png | $(ETCDIR)/barscales
+	$(INSTALL_DATA) $< $@
+
 $(ETCDIR)/%.png: %.png | $(ETCDIR)
 	$(INSTALL_DATA) $< $@
 
@@ -31,3 +40,6 @@ $(ETCDIR):
 
 $(ETCDIR)/symbols: $(ETCDIR)
 	$(MKDIR) $@
+
+$(ETCDIR)/barscales: $(ETCDIR)
+	$(MKDIR) $@

gui/wxpython/gui_core/widgets.py

@@ -1253,7 +1253,7 @@ class ColorTablesComboBox(PictureComboBox):
 class BarscalesComboBox(PictureComboBox):
     """!ComboBox with barscales for d.barscale."""
     def _getPath(self, name):
-        return os.path.join(os.getenv("GISBASE"), "etc", "gui", "images", name + '.png')
+        return os.path.join(os.getenv("GISBASE"), "etc", "gui", "images", "barscales", name + '.png')
 
 
 class NArrowsComboBox(PictureComboBox):