14 năm trước cách đây · fe64a6395c
--- a/gui/icons/Makefile
+++ b/gui/icons/Makefile
@@ -3,24 +3,18 @@ MODULE_TOPDIR = ../..
 
				 include $(MODULE_TOPDIR)/include/Make/Dir.make
			
 
				 
			
 
				 SRCICO := $(wildcard *.ico *.png)
			
 
				-SRCICONS := $(wildcard grass/*.gif grass/vdigit/*.gif grass/vdigit/*.xbm silk/*.png grass2/*.png)
			
 
				+SRCICONS := $(wildcard grass/*.png)
			
 
				 ETCICONS := $(patsubst %,$(ETC)/gui/icons/%,$(SRCICONS) $(SRCICO))
			
 
				 HTMLICONS := $(patsubst %,$(HTMLDIR)/icons/%,$(SRCICONS))
			
 
				 
			
 
				 ETCDIRS = \
			
 
				 	$(ETC)/gui \
			
 
				 	$(ETC)/gui/icons \
			
 
				-	$(ETC)/gui/icons/grass \
			
 
				-	$(ETC)/gui/icons/grass/vdigit \
			
 
				-	$(ETC)/gui/icons/silk \
			
 
				-	$(ETC)/gui/icons/grass2
			
 
				+	$(ETC)/gui/icons/grass
			
 
				 
			
 
				 HTMLDIRS = \
			
 
				 	$(HTMLDIR)/icons \
			
 
				-	$(HTMLDIR)/icons/grass \
			
 
				-	$(HTMLDIR)/icons/grass/vdigit \
			
 
				-	$(HTMLDIR)/icons/silk \
			
 
				-	$(HTMLDIR)/icons/grass2
			
 
				+	$(HTMLDIR)/icons/grass
			
 
				 
			
 
				 default: $(ICONS) $(ETCICONS) $(HTMLICONS)
			
 
				 
			
--- a/gui/icons/grass2/3d-fringe.png
+++ b/gui/icons/grass2/3d-fringe.png
--- a/gui/icons/grass2/3d-light.png
+++ b/gui/icons/grass2/3d-light.png
--- a/gui/icons/grass2/3d-raster.png
+++ b/gui/icons/grass2/3d-raster.png
--- a/gui/icons/grass2/3d-vector.png
+++ b/gui/icons/grass2/3d-vector.png
--- a/gui/icons/grass2/3d-view.png
+++ b/gui/icons/grass2/3d-view.png
--- a/gui/icons/grass2/3d-volume.png
+++ b/gui/icons/grass2/3d-volume.png
--- a/gui/icons/grass2/LICENSE.TXT
+++ b/gui/icons/grass2/LICENSE.TXT
--- a/gui/icons/grass2/attributes-display.png
+++ b/gui/icons/grass2/attributes-display.png
--- a/gui/icons/grass2/boundary-create.png
+++ b/gui/icons/grass2/boundary-create.png
--- a/gui/icons/grass2/cats-copy.png
+++ b/gui/icons/grass2/cats-copy.png
--- a/gui/icons/grass2/cats-display.png
+++ b/gui/icons/grass2/cats-display.png
--- a/gui/icons/grass2/centroid-create.png
+++ b/gui/icons/grass2/centroid-create.png
--- a/gui/icons/grass2/check.png
+++ b/gui/icons/grass2/check.png
--- a/gui/icons/grass2/create.png
+++ b/gui/icons/grass2/create.png
--- a/gui/icons/grass2/data-add.png
+++ b/gui/icons/grass2/data-add.png
--- a/gui/icons/grass2/edit.png
+++ b/gui/icons/grass2/edit.png
--- a/gui/icons/grass2/erase.png
+++ b/gui/icons/grass2/erase.png
--- a/gui/icons/grass2/execute.png
+++ b/gui/icons/grass2/execute.png
--- a/gui/icons/grass2/font.png
+++ b/gui/icons/grass2/font.png
--- a/gui/icons/grass2/gcp-add.png
+++ b/gui/icons/grass2/gcp-add.png
--- a/gui/icons/grass2/gcp-create.png
+++ b/gui/icons/grass2/gcp-create.png
--- a/gui/icons/grass2/gcp-delete.png
+++ b/gui/icons/grass2/gcp-delete.png
--- a/gui/icons/grass2/gcp-remove.png
+++ b/gui/icons/grass2/gcp-remove.png
--- a/gui/icons/grass2/gcp-rms.png
+++ b/gui/icons/grass2/gcp-rms.png
--- a/gui/icons/grass2/gcp-save.png
+++ b/gui/icons/grass2/gcp-save.png
--- a/gui/icons/grass2/georectify.png
+++ b/gui/icons/grass2/georectify.png
--- a/gui/icons/grass2/help.png
+++ b/gui/icons/grass2/help.png
--- a/gui/icons/grass2/image-export.png
+++ b/gui/icons/grass2/image-export.png
--- a/gui/icons/grass2/info.png
+++ b/gui/icons/grass2/info.png
--- a/gui/icons/grass2/layer-add.png
+++ b/gui/icons/grass2/layer-add.png
--- a/gui/icons/grass2/layer-aspect-arrow-add.png
+++ b/gui/icons/grass2/layer-aspect-arrow-add.png
--- a/gui/icons/grass2/layer-cell-cats-add.png
+++ b/gui/icons/grass2/layer-cell-cats-add.png
--- a/gui/icons/grass2/layer-command-add.png
+++ b/gui/icons/grass2/layer-command-add.png
--- a/gui/icons/grass2/layer-grid-add.png
+++ b/gui/icons/grass2/layer-grid-add.png
--- a/gui/icons/grass2/layer-group-add.png
+++ b/gui/icons/grass2/layer-group-add.png
--- a/gui/icons/grass2/layer-his-add.png
+++ b/gui/icons/grass2/layer-his-add.png
--- a/gui/icons/grass2/layer-import.png
+++ b/gui/icons/grass2/layer-import.png
--- a/gui/icons/grass2/layer-label-add.png
+++ b/gui/icons/grass2/layer-label-add.png
--- a/gui/icons/grass2/layer-more.png
+++ b/gui/icons/grass2/layer-more.png
--- a/gui/icons/grass2/layer-open.png
+++ b/gui/icons/grass2/layer-open.png
--- a/gui/icons/grass2/layer-raster-add.png
+++ b/gui/icons/grass2/layer-raster-add.png
--- a/gui/icons/grass2/layer-raster-analyze.png
+++ b/gui/icons/grass2/layer-raster-analyze.png
--- a/gui/icons/grass2/layer-raster-histogram.png
+++ b/gui/icons/grass2/layer-raster-histogram.png
--- a/gui/icons/grass2/layer-raster-more.png
+++ b/gui/icons/grass2/layer-raster-more.png
--- a/gui/icons/grass2/layer-raster-profile.png
+++ b/gui/icons/grass2/layer-raster-profile.png
--- a/gui/icons/grass2/layer-raster3d-add.png
+++ b/gui/icons/grass2/layer-raster3d-add.png
--- a/gui/icons/grass2/layer-redraw.png
+++ b/gui/icons/grass2/layer-redraw.png
--- a/gui/icons/grass2/layer-remove.png
+++ b/gui/icons/grass2/layer-remove.png
--- a/gui/icons/grass2/layer-rgb-add.png
+++ b/gui/icons/grass2/layer-rgb-add.png
--- a/gui/icons/grass2/layer-shaded-relief-add.png
+++ b/gui/icons/grass2/layer-shaded-relief-add.png
--- a/gui/icons/grass2/layer-vector-add.png
+++ b/gui/icons/grass2/layer-vector-add.png
--- a/gui/icons/grass2/layer-vector-chart-add.png
+++ b/gui/icons/grass2/layer-vector-chart-add.png
--- a/gui/icons/grass2/layer-vector-more.png
+++ b/gui/icons/grass2/layer-vector-more.png
--- a/gui/icons/grass2/layer-vector-thematic-add.png
+++ b/gui/icons/grass2/layer-vector-thematic-add.png
--- a/gui/icons/grass2/legend-add.png
+++ b/gui/icons/grass2/legend-add.png
--- a/gui/icons/grass2/line-create.png
+++ b/gui/icons/grass2/line-create.png
--- a/gui/icons/grass2/line-delete.png
+++ b/gui/icons/grass2/line-delete.png
--- a/gui/icons/grass2/line-edit.png
+++ b/gui/icons/grass2/line-edit.png
--- a/gui/icons/grass2/line-move.png
+++ b/gui/icons/grass2/line-move.png
--- a/gui/icons/grass2/line-split.png
+++ b/gui/icons/grass2/line-split.png
--- a/gui/icons/grass2/map-add.png
+++ b/gui/icons/grass2/map-add.png
--- a/gui/icons/grass2/map-export.png
+++ b/gui/icons/grass2/map-export.png
--- a/gui/icons/grass2/measure-length.png
+++ b/gui/icons/grass2/measure-length.png
--- a/gui/icons/grass2/modeler-main.png
+++ b/gui/icons/grass2/modeler-main.png
--- a/gui/icons/grass2/modeler-variables.png
+++ b/gui/icons/grass2/modeler-variables.png
--- a/gui/icons/grass2/module-add.png
+++ b/gui/icons/grass2/module-add.png
--- a/gui/icons/grass2/monitor-create.png
+++ b/gui/icons/grass2/monitor-create.png
--- a/gui/icons/grass2/move.png
+++ b/gui/icons/grass2/move.png
--- a/gui/icons/grass2/open.png
+++ b/gui/icons/grass2/open.png
--- a/gui/icons/grass2/options.png
+++ b/gui/icons/grass2/options.png
--- a/gui/icons/grass2/overlay-add.png
+++ b/gui/icons/grass2/overlay-add.png
--- a/gui/icons/grass2/pan.png
+++ b/gui/icons/grass2/pan.png
--- a/gui/icons/grass2/point-create.png
+++ b/gui/icons/grass2/point-create.png
--- a/gui/icons/grass2/pointer.png
+++ b/gui/icons/grass2/pointer.png
--- a/gui/icons/grass2/polygon-create.png
+++ b/gui/icons/grass2/polygon-create.png
--- a/gui/icons/grass2/print.png
+++ b/gui/icons/grass2/print.png
--- a/gui/icons/grass2/ps-export.png
+++ b/gui/icons/grass2/ps-export.png
--- a/gui/icons/grass2/ps-script.png
+++ b/gui/icons/grass2/ps-script.png
--- a/gui/icons/grass2/python-export.png
+++ b/gui/icons/grass2/python-export.png
--- a/gui/icons/grass2/quit.png
+++ b/gui/icons/grass2/quit.png
--- a/gui/icons/grass2/redo.png
+++ b/gui/icons/grass2/redo.png
--- a/gui/icons/grass2/redraw.png
+++ b/gui/icons/grass2/redraw.png
--- a/gui/icons/grass2/relation-create.png
+++ b/gui/icons/grass2/relation-create.png
--- a/gui/icons/grass2/reload.png
+++ b/gui/icons/grass2/reload.png
--- a/gui/icons/grass2/save.png
+++ b/gui/icons/grass2/save.png
--- a/gui/icons/grass2/scalebar-add.png
+++ b/gui/icons/grass2/scalebar-add.png
--- a/gui/icons/grass2/settings.png
+++ b/gui/icons/grass2/settings.png
--- a/gui/icons/grass2/show.png
+++ b/gui/icons/grass2/show.png
--- a/gui/icons/grass2/table.png
+++ b/gui/icons/grass2/table.png
--- a/gui/icons/grass2/text-add.png
+++ b/gui/icons/grass2/text-add.png
--- a/gui/icons/grass2/tools.png
+++ b/gui/icons/grass2/tools.png
--- a/gui/icons/grass2/undo.png
+++ b/gui/icons/grass2/undo.png
--- a/gui/icons/grass2/vertex-create.png
+++ b/gui/icons/grass2/vertex-create.png
--- a/gui/icons/grass2/vertex-delete.png
+++ b/gui/icons/grass2/vertex-delete.png
--- a/gui/icons/grass2/vertex-move.png
+++ b/gui/icons/grass2/vertex-move.png
--- a/gui/icons/grass2/zoom-extent.png
+++ b/gui/icons/grass2/zoom-extent.png
--- a/gui/icons/grass2/zoom-in.png
+++ b/gui/icons/grass2/zoom-in.png
--- a/gui/icons/grass2/zoom-last.png
+++ b/gui/icons/grass2/zoom-last.png
--- a/gui/icons/grass2/zoom-more.png
+++ b/gui/icons/grass2/zoom-more.png