[GRASS-SVN] r57729 - in grass/trunk/gui: images images/barscales wxpython/gui_core
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Sep 17 06:41:57 PDT 2013
Author: martinl
Date: 2013-09-17 06:41:57 -0700 (Tue, 17 Sep 2013)
New Revision: 57729
Added:
grass/trunk/gui/images/barscales/
grass/trunk/gui/images/barscales/arrow_ends.png
grass/trunk/gui/images/barscales/both_ticks.png
grass/trunk/gui/images/barscales/classic.png
grass/trunk/gui/images/barscales/down_ticks.png
grass/trunk/gui/images/barscales/full_checker.png
grass/trunk/gui/images/barscales/hollow.png
grass/trunk/gui/images/barscales/line.png
grass/trunk/gui/images/barscales/mixed_checker.png
grass/trunk/gui/images/barscales/part_checker.png
grass/trunk/gui/images/barscales/solid.png
grass/trunk/gui/images/barscales/tail_checker.png
grass/trunk/gui/images/barscales/up_ticks.png
Removed:
grass/trunk/gui/images/arrow_ends.png
grass/trunk/gui/images/both_ticks.png
grass/trunk/gui/images/classic.png
grass/trunk/gui/images/down_ticks.png
grass/trunk/gui/images/full_checker.png
grass/trunk/gui/images/hollow.png
grass/trunk/gui/images/line.png
grass/trunk/gui/images/mixed_checker.png
grass/trunk/gui/images/part_checker.png
grass/trunk/gui/images/solid.png
grass/trunk/gui/images/tail_checker.png
grass/trunk/gui/images/up_ticks.png
Modified:
grass/trunk/gui/images/Makefile
grass/trunk/gui/wxpython/gui_core/widgets.py
Log:
wxGUI: move barscale images to the separate directory
Modified: grass/trunk/gui/images/Makefile
===================================================================
--- grass/trunk/gui/images/Makefile 2013-09-17 12:38:39 UTC (rev 57728)
+++ grass/trunk/gui/images/Makefile 2013-09-17 13:41:57 UTC (rev 57729)
@@ -4,14 +4,20 @@
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 @@
$(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)/symbols: $(ETCDIR)
$(MKDIR) $@
+
+$(ETCDIR)/barscales: $(ETCDIR)
+ $(MKDIR) $@
Deleted: grass/trunk/gui/images/arrow_ends.png
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/arrow_ends.png (from rev 57727, grass/trunk/gui/images/arrow_ends.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/both_ticks.png (from rev 57727, grass/trunk/gui/images/both_ticks.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/classic.png (from rev 57727, grass/trunk/gui/images/classic.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/down_ticks.png (from rev 57727, grass/trunk/gui/images/down_ticks.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/full_checker.png (from rev 57727, grass/trunk/gui/images/full_checker.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/hollow.png (from rev 57727, grass/trunk/gui/images/hollow.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/line.png (from rev 57727, grass/trunk/gui/images/line.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/mixed_checker.png (from rev 57727, grass/trunk/gui/images/mixed_checker.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/part_checker.png (from rev 57727, grass/trunk/gui/images/part_checker.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/solid.png (from rev 57727, grass/trunk/gui/images/solid.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/tail_checker.png (from rev 57727, grass/trunk/gui/images/tail_checker.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/gui/images/barscales/up_ticks.png (from rev 57727, grass/trunk/gui/images/up_ticks.png)
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/both_ticks.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/classic.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/down_ticks.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/full_checker.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/hollow.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/line.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/mixed_checker.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/part_checker.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/solid.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/tail_checker.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/gui/images/up_ticks.png
===================================================================
(Binary files differ)
Modified: grass/trunk/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/widgets.py 2013-09-17 12:38:39 UTC (rev 57728)
+++ grass/trunk/gui/wxpython/gui_core/widgets.py 2013-09-17 13:41:57 UTC (rev 57729)
@@ -1253,7 +1253,7 @@
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):
More information about the grass-commit
mailing list