[GRASS-SVN] r46017 - in grass/branches/develbranch_6/gui: icons tcltk/gis.m tcltk/gis.m/docs wxpython/docs

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Apr 18 06:08:17 EDT 2011


Author: martinl
Date: 2011-04-18 03:08:17 -0700 (Mon, 18 Apr 2011)
New Revision: 46017

Removed:
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html
Modified:
   grass/branches/develbranch_6/gui/icons/Makefile
   grass/branches/develbranch_6/gui/tcltk/gis.m/description.html
   grass/branches/develbranch_6/gui/tcltk/gis.m/docs/gm_animate.html
   grass/branches/develbranch_6/gui/tcltk/gis.m/gm_profile.html
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.GCP_Manager.html
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Nviz.html
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html
Log:
wxGUI/manual: install default icons to $HTMLDIR/icons
	      (merge r46008 from trunk)


Modified: grass/branches/develbranch_6/gui/icons/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/icons/Makefile	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/icons/Makefile	2011-04-18 10:08:17 UTC (rev 46017)
@@ -5,27 +5,29 @@
 SRCICO := $(wildcard *.ico *.png)
 SRCICONS := $(wildcard grass/*.gif grass/vdigit/*.gif grass/vdigit/*.xbm silk/*.png grass2/*.png)
 ETCICONS := $(patsubst %,$(ETC)/gui/icons/%,$(SRCICONS) $(SRCICO))
-HTMLICONS := $(patsubst %,$(HTMLDIR)/icons/%,$(SRCICONS))
+HTMLICONS := $(patsubst grass2/%,$(HTMLDIR)/icons/%,$(wildcard grass2/*.png))
+HTMLICONS += $(patsubst grass/%,$(HTMLDIR)/icons/%,$(wildcard grass/*.gif))
 
-default: $(ICONS)
-	if [ ! -d $(ETC)/gui ] ; then $(MKDIR) $(ETC)/gui ; fi
-	if [ ! -d $(ETC)/gui/icons ] ; then $(MKDIR) $(ETC)/gui/icons ; fi
-	if [ ! -d $(ETC)/gui/icons/grass ] ; then $(MKDIR) $(ETC)/gui/icons/grass ; fi
-	if [ ! -d $(ETC)/gui/icons/grass/vdigit ] ; then $(MKDIR) $(ETC)/gui/icons/grass/vdigit ; fi
-	if [ ! -d $(ETC)/gui/icons/silk ] ; then $(MKDIR) $(ETC)/gui/icons/silk ; fi
-	if [ ! -d $(ETC)/gui/icons/grass2 ] ; then $(MKDIR) $(ETC)/gui/icons/grass2 ; fi
-	if [ ! -d $(DOCSDIR) ] ; then $(MKDIR) $(DOCSDIR) ; fi
-	if [ ! -d $(HTMLDIR) ] ; then $(MKDIR) $(HTMLDIR) ; fi
-	if [ ! -d $(HTMLDIR)/icons ] ; then $(MKDIR) $(HTMLDIR)/icons ; fi
-	if [ ! -d $(HTMLDIR)/icons/grass ] ; then $(MKDIR) $(HTMLDIR)/icons/grass ; fi
-	if [ ! -d $(HTMLDIR)/icons/grass/vdigit ] ; then $(MKDIR) $(HTMLDIR)/icons/grass/vdigit ; fi
-	if [ ! -d $(HTMLDIR)/icons/silk ] ; then $(MKDIR) $(HTMLDIR)/icons/silk ; fi
-	if [ ! -d $(HTMLDIR)/icons/grass2 ] ; then $(MKDIR) $(HTMLDIR)/icons/grass2 ; fi
-	$(MAKE) $(ETCICONS)
-	$(MAKE) $(HTMLICONS)
+ETCDIRS = \
+	$(ETC)/gui \
+	$(ETC)/gui/icons/grass \
+	$(ETC)/gui/icons/grass/vdigit \
+	$(ETC)/gui/icons/silk \
+	$(ETC)/gui/icons/grass2
 
-$(ETC)/gui/icons/%: %
+HTMLDIRS = \
+	$(HTMLDIR)/icons
+
+default: $(ETCICONS) $(HTMLICONS)
+
+$(ETC)/gui/icons/%: % | $(ETCDIRS)
 	$(INSTALL_DATA) $< $@
 
-$(HTMLDIR)/icons/%: %
+$(HTMLDIR)/icons/%: grass/% | $(HTMLDIRS)
 	$(INSTALL_DATA) $< $@
+
+$(HTMLDIR)/icons/%: grass2/% | $(HTMLDIRS)
+	$(INSTALL_DATA) $< $@
+
+$(ETCDIRS) $(HTMLDIRS): %:
+	$(MKDIR) $@

Modified: grass/branches/develbranch_6/gui/tcltk/gis.m/description.html
===================================================================
--- grass/branches/develbranch_6/gui/tcltk/gis.m/description.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/tcltk/gis.m/description.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -100,10 +100,10 @@
 
 <DL>
 
-<DT><img src="icons/grass/gui-startmon.gif" alt="icon"> Open new map display</DT>
+<DT><img src="icons/gui-startmon.gif" alt="icon"> Open new map display</DT>
 <DD>Opens a new map display and resets layer tree.</DD>
 
-<DT><img src="icons/grass/element-cell.gif" alt="icon"> Add raster layer</DT>
+<DT><img src="icons/element-cell.gif" alt="icon"> Add raster layer</DT>
 <DD>Adds a raster map to the layer tree. Raster display options include:
 displaying a selected subset of raster cells, defined by their cat
 values; draping (or "fusing") a second map over the base map;
@@ -112,38 +112,38 @@
  (for draping/fusing).</i>
 </DD>
 
-<DT><img src="icons/grass/channel-rgb.gif" alt="icon"> Add RGB or HIS raster layer</DT>
+<DT><img src="icons/channel-rgb.gif" alt="icon"> Add RGB or HIS raster layer</DT>
 <DD>Combines and displays three raster maps defined as red, green, and blue
 channels; or combines and displays two or three raster maps defined as
 hue, intensity, and (optionally) saturation channels.
 <i>See <a href="d.rgb.html">d.rgb</a> and <a href="d.his.html">d.his</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.histogram.gif" alt="icon"> Add histogram layer</DT>
+<DT><img src="icons/module-d.histogram.gif" alt="icon"> Add histogram layer</DT>
 <DD>Adds a layer to display histogram of a raster map or image.
 <i>See <a href="d.histogram.html">d.histogram</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.rast.num.gif" alt="icon"> Add cell values layer</DT>
+<DT><img src="icons/module-d.rast.num.gif" alt="icon"> Add cell values layer</DT>
 <DD>Adds map of raster cells with cell values printed inside.
 Only works when &lt;10,000 cells are displayed.
 <i>See <a href="d.rast.num.html">d.rast.num</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.rast.arrow.gif" alt="icon"> Add raster arrows layer</DT>
+<DT><img src="icons/module-d.rast.arrow.gif" alt="icon"> Add raster arrows layer</DT>
 <DD>Adds map of raster cells with directional arrows drawn.
 Arrow direction and length are determined by separate aspect/directional map
 and (optional) slope/intensity map.
 <i>See <a href="d.rast.arrow.html">d.rast.arrow</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.legend.gif" alt="icon"> Add raster legend</DT>
+<DT><img src="icons/module-d.legend.gif" alt="icon"> Add raster legend</DT>
 <DD>Adds a legend for a single raster map to the layer tree.
 Multiple options for formatting the legend are available.
 <i>See <a href="d.legend.html">d.legend</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/element-vector.gif" alt="icon"> Add vector layer</DT>
+<DT><img src="icons/element-vector.gif" alt="icon"> Add vector layer</DT>
 <DD>Adds a vector map to the layer tree. A large number of options are
 available for displaying the vector map, including: outline and fill
 color, icon type and size for points, line widths for all vector types,
@@ -153,7 +153,7 @@
 <i>See <a href="d.vect.html">d.vect</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.vect.thematic.gif" alt="icon"> Add thematic map layer
+<DT><img src="icons/module-d.vect.thematic.gif" alt="icon"> Add thematic map layer
 (for all vector types)</DT>
 <DD>Adds layer for thematic display values from a numeric attribute column
 associated with a vector map. Options include: thematic display type
@@ -166,7 +166,7 @@
 <i>See <a href="d.vect.thematic.html">d.vect.thematic</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.vect.chart.gif" alt="icon"> Add thematic charts layer
+<DT><img src="icons/module-d.vect.chart.gif" alt="icon"> Add thematic charts layer
 (for vector points)</DT>
 <DD>Adds layer in which pie or bar charts can be automatically created at
 vector point locations. Charts display values from selected columns in the
@@ -176,7 +176,7 @@
 <i>See <a href="d.vect.chart.html">d.vect.chart</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.labels.gif" alt="icon"> Add raster labels layer for vector
+<DT><img src="icons/module-d.labels.gif" alt="icon"> Add raster labels layer for vector
 objects (from existing labels file)</DT>
 <DD>Add raster text layer from a labels file for vector objects created with
 the <em><a href="v.label.html">v.label</a></em> module (accessed from button
@@ -184,7 +184,7 @@
 <i>See <a href="d.labels.html">d.labels</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.text.gif" alt="icon"> Add text layer</DT>
+<DT><img src="icons/module-d.text.gif" alt="icon"> Add text layer</DT>
 <DD>Adds layer to display a line of text using default GRASS font
 (selected with <em><a href="d.font.html">d.font</a></em>).
 Options include: text placement (screen coordinates); and text size,
@@ -192,7 +192,7 @@
 <i>See <a href="d.text.html">d.text</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/gui-maptext.gif" alt="icon"> Add PostScript labels layer for vector
+<DT><img src="icons/gui-maptext.gif" alt="icon"> Add PostScript labels layer for vector
 objects (from existing labels file)</DT>
 <DD>Add PostScript text layer from a labels file for vector objects created
 with the <em><a href="v.label.html">v.label</a></em> module (accessed from
@@ -200,7 +200,7 @@
 <i>See <a href="d.labels.html">d.labels</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/gui-maplabels.gif" alt="icon"> Add PostScript text layer</DT>
+<DT><img src="icons/gui-maplabels.gif" alt="icon"> Add PostScript text layer</DT>
 <DD>Adds layer to display a line of PostScript text. Options include: text
 placement by coordinates (geographic or screen); text
 alignment, font and line spacing; and text size, bolding, and color.
@@ -213,14 +213,14 @@
 
 <DL>
 
-<DT><img src="icons/grass/module-d.barscale.gif" alt="icon"> Add scalebar and north arrow layer</DT>
+<DT><img src="icons/module-d.barscale.gif" alt="icon"> Add scalebar and north arrow layer</DT>
 <DD>Adds layer to display a combined scalebar and north arrow. Options
 include scalebar placement (using screen coordinates or a mouse),
 scalebar format, and scalebar colors.
 <i>See <a href="d.barscale.html">d.barscale</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/module-d.grid.gif" alt="icon"> Overlay grids and lines</DT>
+<DT><img src="icons/module-d.grid.gif" alt="icon"> Overlay grids and lines</DT>
 <DD>Adds layer to display regular grid (for all locations), or geodesic and
 rhumblines (for latitude/longitude locations only). Grid options
 include: grid and border colors, grid origin, and grid line spacing.
@@ -230,7 +230,7 @@
  and <a href="d.rhumbline.html">d.rhumbline</a>.</i>
 </DD>
 
-<DT><img src="icons/grass/gui-cmd.gif" alt="icon"> Add command layer</DT>
+<DT><img src="icons/gui-cmd.gif" alt="icon"> Add command layer</DT>
 <DD>Adds a layer in which a GRASS GIS command or command list can be entered.
 For a command list use the pipe symbol as "|" as separator.
 For example:
@@ -244,33 +244,33 @@
 <tt>d.text.freetype text=Population\ density</tt>
 </DD>
 
-<DT><img src="icons/grass/gui-group.gif" alt="icon"> Add group</DT>
+<DT><img src="icons/gui-group.gif" alt="icon"> Add group</DT>
 <DD>Adds an empty layer group. Layers can then be added to the group.</DD>
 
-<DT><img src="icons/grass/edit-copy.gif" alt="icon"> Duplicate selected layer or group</DT>
+<DT><img src="icons/edit-copy.gif" alt="icon"> Duplicate selected layer or group</DT>
 <DD>Adds a new layer that duplicates the selected layer.</DD>
 
-<DT><img src="icons/grass/edit-cut.gif" alt="icon"> Cut selected layer or group</DT>
+<DT><img src="icons/edit-cut.gif" alt="icon"> Cut selected layer or group</DT>
 <DD>Deletes the selected group or layer.</DD>
 
-<DT><img src="icons/grass/file-new.gif" alt="icon"> Erase all layers and create a new group</DT>
+<DT><img src="icons/file-new.gif" alt="icon"> Erase all layers and create a new group</DT>
 <DD>Removes all layers in the layer tree and creates a new, empty group to
 which new layers can be added.<br></DD>
 
-<DT><img src="icons/grass/file-open.gif" alt="icon"> Open an existing group file</DT>
+<DT><img src="icons/file-open.gif" alt="icon"> Open an existing group file</DT>
 <DD>Opens an previously saved group file, containing a set of display
 layers and their option settings.</DD>
 
-<DT><img src="icons/grass/file-save.gif" alt="icon"> Save layers to group file</DT>
+<DT><img src="icons/file-save.gif" alt="icon"> Save layers to group file</DT>
 <DD>Saves current set of layers and their options to a group file.</DD>
 
-<DT><img src="icons/grass/module-xganim.gif" alt="icon"> Animate raster map series</DT>
+<DT><img src="icons/module-xganim.gif" alt="icon"> Animate raster map series</DT>
 <DD>Starts the interactive Animation Tool interface to display a series
 of raster maps as an animation.
 <i>See the <a href="gm_animate.html">Animation Tool help page</a></i>.
 </DD>
 
-<DT><img src="icons/grass/module-v.digit.gif" alt="icon"> Digitize raster or vector maps</DT>
+<DT><img src="icons/module-v.digit.gif" alt="icon"> Digitize raster or vector maps</DT>
 <DD>Starts the raster digitizing or vector digitizing module, depending on
 whether a raster or vector map is selected. Raster digitizing always
 creates a new map. Vector digitizing will either edit an existing map
@@ -292,37 +292,37 @@
 
 <DL>
 
-<DT><img src="icons/grass/gui-display.gif" alt="icon"> Display active layers (current region)</DT>
+<DT><img src="icons/gui-display.gif" alt="icon"> Display active layers (current region)</DT>
 <DD>Displays all active layers at current resolution and region extents for
 that map display window.</DD>
 
-<DT><img src="icons/grass/gui-zoom_current.gif" alt="icon"> Re-render and display all active
+<DT><img src="icons/gui-zoom_current.gif" alt="icon"> Re-render and display all active
 layers and zoom to current region</DT>
 <DD>Resets the region to the resolution and extents to the values set with
 <em>g.region</em>; forces re-display and re-rendering all active layers.
 <i>See <a href="g.region.html">g.region</a>.</i></DD>
 
-<DT><img src="icons/grass/module-nviz.gif" alt="icon"> NVIZ</DT>
+<DT><img src="icons/module-nviz.gif" alt="icon"> NVIZ</DT>
 <DD>Starts NVIZ, the <i>n</i>-dimensional visualization module and interactive
 graphical interface. All active raster and vector layers in the layer
 tree will be displayed in NVIZ.
 <i>See the <a href="nviz.html">nviz</a> manual.</i></DD>
 
-<DT><img src="icons/grass/module-d.nviz.gif" alt="icon"> Create fly through path for NVIZ</DT>
+<DT><img src="icons/module-d.nviz.gif" alt="icon"> Create fly through path for NVIZ</DT>
 <DD>Starts a GRASS module for interactive creation of a fly-through path to
 be animated in NVIZ.
 <i>See <a href="d.nviz.html">d.nviz</a></i>.</DD>
 
-<DT><img src="icons/grass/gui-erase.gif" alt="icon"> Erase to white</DT>
+<DT><img src="icons/gui-erase.gif" alt="icon"> Erase to white</DT>
 <DD>Erases the currently selected monitor to a white background; also
 removes all frames.
 <i>See <a href="d.erase.html">d.erase</a> and
 <a href="d.frame.html">d.frame -e</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-pointer.gif" alt="icon"> Arrow cursor</DT>
+<DT><img src="icons/gui-pointer.gif" alt="icon"> Arrow cursor</DT>
 <DD>Select arrow cursor for map display.</DD>
 
-<DT><img src="icons/grass/gui-zoom_in.gif" alt="icon"> Zoom in</DT>
+<DT><img src="icons/gui-zoom_in.gif" alt="icon"> Zoom in</DT>
 <DD>Interactive zooming with the mouse in the active display monitor.
 Drawing a box with the mouse (left button) and zoom-in cursor causes
 the display to zoom in so that the area defined by the box fills the
@@ -333,7 +333,7 @@
 computational region for other GIS processes.
 <i>See <a href="g.region.html">g.region</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-zoom_out.gif" alt="icon"> Zoom out</DT>
+<DT><img src="icons/gui-zoom_out.gif" alt="icon"> Zoom out</DT>
 <DD>Interactive zooming with the mouse in the active display monitor.
 Drawing a box with the mouse (left button) and zoom-out cursor causes
 the display to zoom in so that the area displayed shrinks to fill the
@@ -344,7 +344,7 @@
 affect the computational region for other GIS processes.
 <i>See <a href="g.region.html">g.region</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-pan.gif" alt="icon"> Pan</DT>
+<DT><img src="icons/gui-pan.gif" alt="icon"> Pan</DT>
 <DD>Interactive selection of a new center of view in the active display
 monitor. Drag the pan cursor while pressing the left mouse button to pan.
 Panning changes the location of the region displayed but not the size of
@@ -352,11 +352,11 @@
 computational region for other GIS processes.
 <i>See <a href="g.region.html">g.region</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-zoom_back.gif" alt="icon"> Revert zoom</DT>
+<DT><img src="icons/gui-zoom_back.gif" alt="icon"> Revert zoom</DT>
 <DD>Returns to the previous zoom. Up to 5 levels of zoom back are maintained.
 <i>See <a href="g.region.html">g.region</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-mapzoom.gif" alt="icon"> Zoom menu</DT>
+<DT><img src="icons/gui-mapzoom.gif" alt="icon"> Zoom menu</DT>
 <DD>Automatic zoom settings menu. Zoom to match the extents of a selected
 map or to match the extents of a saved region; save the current extents
 to a named region file; zoom to match the computational region (set with
@@ -365,7 +365,7 @@
 (does not change the resolution).
 <i>See <a href="g.region.html">g.region</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-query.gif" alt="icon"> Query tool (select a map first)</DT>
+<DT><img src="icons/gui-query.gif" alt="icon"> Query tool (select a map first)</DT>
 <DD>Query selected raster (only the base map of a draped map will be
 queried), RGB raster map (all three map channels will be queried), or
 vector map using the mouse. A map must be selected before query.
@@ -374,35 +374,35 @@
 <i>See <a href="r.what.html">r.what</a> and <a href="v.what.html">v.what</a></i>.
 </DD>
 
-<DT><img src="icons/grass/gui-measure.gif" alt="icon"> Distance measurement tool</DT>
+<DT><img src="icons/gui-measure.gif" alt="icon"> Distance measurement tool</DT>
 <DD>Interactive measurement of lengths defined with the mouse. The length
 of each segment and the cumulative length of all segments measuered is
 displayed in the console window. Lengths are measured in the current
 measurement unit.
 <i>See also <a href="d.measure.html">d.measure</a>.</i></DD>
 
-<DT><img src="icons/grass/gui-profile.gif" alt="icon"> Profile tool</DT>
+<DT><img src="icons/gui-profile.gif" alt="icon"> Profile tool</DT>
 <DD>Interactively create profile of a raster map. Profile transect
 is drawn with the mouse in map display. The profile may be of the
 displayed map or a different map.<i>
 See the <a href="gm_profile.html">Profile Tool help page</a>.</i></DD>
 
-<DT><img src="icons/grass/file-print.gif" alt="icon"> Print map</DT>
+<DT><img src="icons/file-print.gif" alt="icon"> Print map</DT>
 <DD>Prints map on the UNIX <i>lpr</i> printer or PostScript device;
 saves visible map display (including PostScript text and labels) to PDF
 or EPS file. Requires <tt>ghostscript</tt> for all output except EPS.</DD>
 
-<DT><img src="icons/grass/file-save.gif" alt="icon"> Export map display</DT>
+<DT><img src="icons/file-save.gif" alt="icon"> Export map display</DT>
 <DD>Exports visible map display to different raster graphic formats.
 Exported map does not include PostScript text or PostScript labels.</DD>
 
-<DT><img src="icons/grass/drawmode-strict.gif" alt="icon"> Strict draw mode</DT>
+<DT><img src="icons/drawmode-strict.gif" alt="icon"> Strict draw mode</DT>
 <DD>Selects strict draw mode. In strict mode the aspect ratio and resolution
 from the last zoom are used when drawing the maps. The map will show only
 the area and resolution selected. It will not usually fill the screen.
 Strict mode only shows what is asked for.</DD>
 
-<DT><img src="icons/grass/drawmode-explore.gif" alt="icon"> Explore draw mode</DT>
+<DT><img src="icons/drawmode-explore.gif" alt="icon"> Explore draw mode</DT>
 <DD>Selects explore draw mode. In explore mode the region from the last zoom
 is expanded to fill the entire screen. The resolution is adjusted to match
 the screen resolution. Explore mode shows as much as possible.</DD>

Modified: grass/branches/develbranch_6/gui/tcltk/gis.m/docs/gm_animate.html
===================================================================
--- grass/branches/develbranch_6/gui/tcltk/gis.m/docs/gm_animate.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/tcltk/gis.m/docs/gm_animate.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -19,7 +19,7 @@
 <h3>Using the Animation Tool</h3>
 
 The Animation Tool is started from the <i>File</i> menu or
-from the animation button (<img src="icons/grass/module-xganim.gif" alt="icon">)
+from the animation button (<img src="icons/module-xganim.gif" alt="icon">)
 on the GIS Manager toolbar.
 
 <P>
@@ -37,7 +37,7 @@
 
 <h3>Selecting Maps to Animate</h3>
 
-Click the maps button (<img src="icons/grass/element-cell.gif" alt="icon">)
+Click the maps button (<img src="icons/element-cell.gif" alt="icon">)
 on the main animation window toolbar to open a map selection window.
 <br><br>
 
@@ -76,46 +76,46 @@
 <P>
 <img src="gm_animatetool.png" alt="Animation Toolbar">
 <P>
-<img src="icons/grass/gui-rewind.gif">
+<img src="icons/gui-rewind.gif">
 The rewind button will set the display to the first animation frame.
 <P>
-<img src="icons/grass/gui-rplay.gif">
+<img src="icons/gui-rplay.gif">
 The reverse button will play the animation in reverse order.
 <P>
-<img src="icons/grass/gui-stepb.gif"> The reverse step button will step
+<img src="icons/gui-stepb.gif"> The reverse step button will step
 through the animation frame by frame in reverse order.
 <P>
-<img src="icons/grass/gui-stop.gif"> The pause button will stop the
+<img src="icons/gui-stop.gif"> The pause button will stop the
 animation at whatever frame is visible when the animation is stopped.
 The animation will be continued from this frame when a forward or reverse
 button is pressed.
 <P>
-<img src="icons/grass/gui-stepf.gif"> The forward step button will step
+<img src="icons/gui-stepf.gif"> The forward step button will step
 through the animation frame by frame.
 <P>
-<img src="icons/grass/gui-play.gif"> The play button will display the maps
+<img src="icons/gui-play.gif"> The play button will display the maps
 of the animation in the order they are listed in the map selection window.
 <P>
-<img src="icons/grass/gui-snail.gif"> The slow button will increase the
+<img src="icons/gui-snail.gif"> The slow button will increase the
 time between the display of each consecutive frame in the animation,
 causing it to to slow down.
 <P>
-<img src="icons/grass/gui-rabbit.gif"> The fast button will decrease the
+<img src="icons/gui-rabbit.gif"> The fast button will decrease the
 time between the display of each consecutive frame in the animation,
 causing it to to speed up.
 <P>
-<img src="icons/grass/gui-loop.gif"> The repeat switch will cause the
+<img src="icons/gui-loop.gif"> The repeat switch will cause the
 animation to repeatedly cycle from first to last frame if the play button
 is pressed, or cycle from last to first if the reverse button is pressed.
 <P>
-<img src="icons/grass/gui-swing.gif"> The alternating switch will cause the
+<img src="icons/gui-swing.gif"> The alternating switch will cause the
 animation to alternately play from first frame to last frame, and from last
 to first.
 <P>
 <tt>[Names]</tt> The names switch will cause the file names of the maps used for the
 animation to display in the lower left corner of each animation frame.
 <P>
-<img src="icons/grass/gui-exit.gif"> The Exit button will quit the Animation Tool.
+<img src="icons/gui-exit.gif"> The Exit button will quit the Animation Tool.
 <br>
 
 

Modified: grass/branches/develbranch_6/gui/tcltk/gis.m/gm_profile.html
===================================================================
--- grass/branches/develbranch_6/gui/tcltk/gis.m/gm_profile.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/tcltk/gis.m/gm_profile.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -19,7 +19,7 @@
 <h3>Using the Profile Tool</h3>
 
 The Profile Tool is started from profile button
- <img alt="" src="icons/grass/gui-profile.gif"> on the toolbar of an active
+ <img alt="" src="icons/gui-profile.gif"> on the toolbar of an active
 map display.
 <br>
 <br>

Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.GCP_Manager.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.GCP_Manager.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.GCP_Manager.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -85,26 +85,26 @@
 
 <dl>
 
-<dt><img src="icons/grass2/show.png">&nbsp;
+<dt><img src="icons/show.png">&nbsp;
   <em>Display map</em></dt>
 <dd>Displays maps for source and target canvas and re-renders any layers
 that have changed since the last time the display was updated.</dd>
 
-<dt><img src="icons/grass2/layer-redraw.png">&nbsp;
+<dt><img src="icons/layer-redraw.png">&nbsp;
   <em>Re-render map</em></dt>
 <dd>Re-renders both source and target canvas regardless of whether they
 have changed or not.</dd>
 
-<dt><img src="icons/grass2/erase.png">&nbsp;
+<dt><img src="icons/erase.png">&nbsp;
   <em>Erase display</em></dt>
 <dd>Erases both source and target canvas to a white background.</dd>
 
-<dt><img src="icons/grass2/gcp-create.png">&nbsp;
+<dt><img src="icons/gcp-create.png">&nbsp;
   <em>Define GCP (Ground Control Points)</em></dt>
 <dd>On left mouse click, coordinates are defined for the currently
 selected GCP.</dd>
 
-<dt><img src="icons/grass2/pan.png">&nbsp;
+<dt><img src="icons/pan.png">&nbsp;
   <em>Pan</em></dt>
 <dd>Interactive selection of a new center of view in the active
 display monitor. Drag the pan cursor while pressing the left mouse
@@ -112,7 +112,7 @@
 changes the location of the region displayed but not the size of the
 area displayed or the resolution.</dd>
 
-<dt><img src="icons/grass2/zoom-in.png">&nbsp;
+<dt><img src="icons/zoom-in.png">&nbsp;
   <em>Zoom in</em></dt>
 <dd>Interactive zooming with the mouse in the active map canvas (source 
 or target). Drawing a box or just a left click with the mouse and zoom-in
@@ -122,7 +122,7 @@
 point where the mouse is clicked. Zooming changes the display region
 extents (both size and location of area displayed).</dd>
 
-<dt><img src="icons/grass2/zoom-out.png">&nbsp;
+<dt><img src="icons/zoom-out.png">&nbsp;
   <em>Zoom out</em></dt>
 <dd>Interactive zooming with the mouse in the active map canvas (source 
 or target). Drawing a box or just a left click with the mouse and zoom-out
@@ -133,7 +133,7 @@
 changes the display region extents (both size and location of area
 displayed).</dd>
 
-<dt><img src="icons/grass2/zoom-more.png">&nbsp;
+<dt><img src="icons/zoom-more.png">&nbsp;
   <em>Adjust display zoom</em></dt>
 <dd>Source and target display are adjusted by using the current GCPs for
 coordinate transformation:
@@ -153,17 +153,17 @@
 <em>Zoom to extent of currently displayed map</em>. Alternatively, move
 the mouse over the map canvas to be used as active canvas.</dd>
 
-<dt><img src="icons/grass2/zoom-last.png">&nbsp;
+<dt><img src="icons/zoom-last.png">&nbsp;
   <em>Return to pervious zoom</em></dt>
 <dd>Returns to the previous zoom extent. Up to 10 levels of zoom back are
 maintained.</dd>
 
-<dt><img src="icons/grass2/zoom-extent.png">&nbsp;
+<dt><img src="icons/zoom-extent.png">&nbsp;
 <em>Zoom to extent of currently displayed map</em></dt>
 <dd>Zoom to the extent of the currently displayed map in the active map
 canvas (source or target).</dd>
 
-<dt><img src="icons/grass2/settings.png">&nbsp;
+<dt><img src="icons/settings.png">&nbsp;
 <em>Settings</em></dt>
 <dd>Shows a settings dialog for GCP management and display:<br><br> 
 
@@ -225,11 +225,11 @@
   </dl><br>
 </dd>
 
-<dt><img src="icons/grass2/help.png">&nbsp;
+<dt><img src="icons/help.png">&nbsp;
 <em>Show Help</em></dt>
 <dd>Show help page for the GCP Manager.
 
-<dt><img src="icons/grass2/quit.png">&nbsp;
+<dt><img src="icons/quit.png">&nbsp;
 <em>Quit</em></dt>
 <dd>Quit the GCP Manager.
 
@@ -239,34 +239,34 @@
 
 <dl>
 
-<dt><img src="icons/grass2/gcp-save.png">&nbsp;
+<dt><img src="icons/gcp-save.png">&nbsp;
 <em>Save GCPs to POINTS file</em></dt>
 <dd>The current list of GCPs is saved to the imagery group's POINTS file
 and to a backup copy.</dd>
 
-<dt><img src="icons/grass2/gcp-add.png">&nbsp;
+<dt><img src="icons/gcp-add.png">&nbsp;
 <em>Add new GCP</em></dt>
 <dd>Adds a new Ground Control Point to the list and selects it for editing.</dd>
 
-<dt><img src="icons/grass2/gcp-delete.png">&nbsp;
+<dt><img src="icons/gcp-delete.png">&nbsp;
 <em>Delete selected GCP</em></dt>
 <dd>Deletes the currently selected GCP from the list.</dd>
 
-<dt><img src="icons/grass2/gcp-remove.png">&nbsp;
+<dt><img src="icons/gcp-remove.png">&nbsp;
 <em>Clear selected GCP</em></dt>
 <dd>Resets all coordinates of the currently selected GCP to 0 (zero).</dd>
 
-<dt><img src="icons/grass2/reload.png">&nbsp;
+<dt><img src="icons/reload.png">&nbsp;
 <em>Reload GCPs from POINTS file</em></dt>
 <dd>Reloads GCPs from the imagery group's POINTS file.</dd>
 
-<dt><img src="icons/grass2/gcp-rms.png">&nbsp;
+<dt><img src="icons/gcp-rms.png">&nbsp;
 <em>Recalculate RMS error</em></dt>
 <dd>Recalculates forward and backward RMS error for all GCP marked for
 use (activated checkbox in first row).
 </dd>
 
-<dt><img src="icons/grass2/georectify.png">&nbsp;
+<dt><img src="icons/georectify.png">&nbsp;
 <em>Georectify</em></dt>
 <dd>Uses <em><a href="i.rectify.html">i.rectify</a></em> to georectify
 all images in the source imagery group.

Deleted: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -1,348 +0,0 @@
-<h2>wxGUI Icons sets</h2>
-
-This page serves as reference for the icons themes available for
-<em><a href="wxGUI.html">wxGUI<a></em>.
-
-<p>
-The icon theme can be changed from the <b>User GUI settings</b> dialog
-(available from menu 'Config->Preferences'); tab 'Advanced'. Note that
-GUI restart is required to reflect newly selected icon set.
-
-<p>
-Currently are supported three icon theme sets:
-
-<dl>
-<dt><b>grass2</b></dt>
-<dd><em>New</em> <a href="http://www.szczepanek.pl/icons.grass/v.0.1/">GRASS
-    theme</a> v0.1 (author Robert Szczepanek) available also from <a href="https://svn.osgeo.org/osgeo/graphics/trunk/toolbar-icons/24x24">SVN</a></dd>
-<dt><b>grass</b></dt>
-<dd><em>Original TCL/TK-based</em> GRASS icon theme</dd>
-<dt><b>silk</b></dt>
-<dd><em>Silk theme</em>-based
-  on <a href="http://www.famfamfam.com/lab/icons/silk/">Silk icon
-    set</a>, v1.3</dd>
-</dl>
-
-<h3>List of icons</h3>
-
-<table border="0">
-  <tr>
-    <td style="text-align: center"><b>Layer Manager Toolbar</b></td>
-    <td style="text-align: center"><b>Map Display Toolbar</b></td>
-    <td style="text-align: center"><b>Vector Digitizer Toolbar</b></td>
-  </tr>
-  <tr>
-    <td style="vertical-align: top">
-      <table border="1" style="border-collapse: collapse; text-align: center">
-	<tr>
-	  <td>&nbsp;&nbsp;&nbsp;<b>grass2</b>&nbsp;&nbsp;&nbsp;</td>
-	  <td>&nbsp;&nbsp;&nbsp;<b>grass</b>&nbsp;&nbsp;&nbsp;</td>
-	  <td>&nbsp;&nbsp;&nbsp;<b>silk</b>&nbsp;&nbsp;&nbsp;</td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/monitor-create.png"></td>
-	  <td><img src="icons/grass/gui-startmon.gif"></td>
-	  <td><img src="icons/silk/application_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/create.png"></td>
-	  <td><img src="icons/grass/file-new.gif"></td>
-	  <td><img src="icons/silk/page_white.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-open.png"></td>
-	  <td><img src="icons/grass/file-new.gif"></td>
-	  <td><img src="icons/silk/page_white_get.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/open.png"></td>
-	  <td><img src="icons/grass/file-open.gif"></td>
-	  <td><img src="icons/silk/folder.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/save.png"></td>
-	  <td><img src="icons/grass/file-save.gif"></td>
-	  <td><img src="icons/silk/page_save.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-raster-add.png"></td>
-	  <td><img src="icons/grass/element-cell.gif"></td>
-	  <td><img src="icons/silk/image_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-shaded-relief-add.png"></td>
-	  <td><img src="icons/grass/module-d.shadedmap.gif"></td>
-	  <td><img src="icons/silk/picture_empty.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-rgb-add.png"></td>
-	  <td><img src="icons/grass/channel-rgb.gif"></td>
-	  <td><img src="icons/silk/rgb.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-his-add.png"></td>
-	  <td><img src="icons/grass/channel-his.gif"></td>
-	  <td><img src="icons/silk/his.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-cell-cats-add.png"></td>
-	  <td><img src="icons/grass/module-d.rast.arrow.gif"></td>
-	  <td><img src="icons/silk/arrow_out.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-vector-add.png"></td>
-	  <td><img src="icons/grass/element-vector.gif"></td>
-	  <td><img src="icons/silk/map_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-vector-thematic-add.png"></td>
-	  <td><img src="icons/grass/module-d.vect.thematic.gif"></td>
-	  <td><img src="icons/silk/thematic.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-vector-chart-add.png"></td>
-	  <td><img src="icons/grass/module-d.vect.chart.gif"></td>
-	  <td><img src="icons/silk/chart_bar.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-command-add.png"></td>
-	  <td><img src="icons/grass/gui-cmd.gif"></td>
-	  <td><img src="icons/silk/cog_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-group-add.png"></td>
-	  <td><img src="icons/grass/gui-group.gif"></td>
-	  <td><img src="icons/silk/folder_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-grid-add.png"></td>
-	  <td><img src="icons/grass/module-d.grid.gif"></td>
-	  <td><img src="icons/silk/images.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-label-add.png"></td>
-	  <td><img src="icons/grass/module-d.labels.gif"></td>
-	  <td><img src="icons/silk/tag_blue_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-remove.png"></td>
-	  <td><img src="icons/grass/edit-cut.gif"></td>
-	  <td><img src="icons/silk/bin_closed.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/table.png"></td>
-	  <td><img src="icons/grass/db-values.gif"></td>
-	  <td><img src="icons/silk/application_view_columns.png"></td>
-	</tr>
-      </table>
-    </td>
-    <td style="vertical-align: top">
-      <table border="1" style="border-collapse: collapse; text-align: center">
-	<tr>
-	  <td>&nbsp;&nbsp;&nbsp;<b>grass2</b>&nbsp;&nbsp;&nbsp;</td>
-	  <td>&nbsp;&nbsp;&nbsp;<b>grass</b>&nbsp;&nbsp;&nbsp;</td>
-	  <td>&nbsp;&nbsp;&nbsp;<b>silk</b>&nbsp;&nbsp;&nbsp;</td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/show.png"></td>
-	  <td><img src="icons/grass/gui-display.gif"></td>
-	  <td><img src="icons/silk/map_go.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-redraw.png"></td>
-	  <td><img src="icons/grass/gui-redraw.gif"></td>
-	  <td><img src="icons/silk/arrow_refresh.png"></td>
-	</tr>
-	<tr><td><img src="icons/grass2/erase.png"></td>
-	  <td><img src="icons/grass/gui-erase.gif"></td>
-	  <td><img src="icons/silk/cross.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/pointer.png"></td>
-	  <td><img src="icons/grass/gui-pointer.gif"></td>
-	  <td><img src="icons/silk/cursor.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/info.png"></td>
-	  <td><img src="icons/grass/gui-query.gif"></td>
-	  <td><img src="icons/silk/information.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/pan.png"></td>
-	  <td><img src="icons/grass/gui-pan.gif"></td>
-	  <td><img src="icons/silk/arrow_out.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/zoom-in.png"></td>
-	  <td><img src="icons/grass/gui-zoom_in.gif"></td>
-	  <td><img src="icons/silk/zoom_in.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/zoom-out.png"></td>
-	  <td><img src="icons/grass/gui-zoom_out.gif"></td>
-	  <td><img src="icons/silk/zoom_out.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/zoom-last.png"></td>
-	  <td><img src="icons/grass/gui-zoom_back.gif"></td>
-	  <td><img src="icons/silk/zoom_back.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/zoom-more.png"></td>
-	  <td><img src="icons/grass/gui-mapzoom.gif"></td>
-	  <td><img src="icons/silk/zoom.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-raster-analyze.png"></td>
-	  <td><img src="icons/grass/gui-rastanalyze.gif"></td>
-	  <td><img src="icons/silk/application_lightning.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/measure-length.png"></td>
-	  <td><img src="icons/grass/gui-measure.gif"></td>
-	  <td><img src="icons/silk/sum.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-raster-profile.png"></td>
-	  <td><img src="icons/grass/gui-profile.gif"></td>
-	  <td><img src="icons/silk/wand.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/layer-raster-histogram.png"></td>
-	  <td><img src="icons/silk/chart_bar.png"></td>
-	  <td><img src="icons/grass/module-d.histogram.gif"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/overlay-add.png"></td>
-	  <td><img src="icons/silk/overlays.png"></td>
-	  <td><img src="icons/grass/gui-rastanalyze.gif"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/scalebar-add.png"></td>
-	  <td><img src="icons/grass/module-d.barscale.gif"></td>
-	  <td><img src="icons/silk/page_white_picture.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/legend-add.png"></td>
-	  <td><img src="icons/grass/module-d.legend.gif"></td>
-	  <td><img src="icons/silk/page_green.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/text-add.png"></td>
-	  <td><img src="icons/grass/module-d.text.gif"></td>
-	  <td><img src="icons/silk/textfield_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/map-export.png"></td>
-	  <td><img src="icons/grass/file-save.gif"></td>
-	  <td><img src="icons/silk/picture_save.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/print.png"></td>
-	  <td><img src="icons/grass/file-print.gif"></td>
-	  <td><img src="icons/silk/printer.png"></td>
-	</tr>
-      </table>
-    </td>
-    <td style="vertical-align: top">
-      <table border="1" style="border-collapse: collapse; text-align: center">
-	<tr>
-	  <td>&nbsp;&nbsp;&nbsp;<b>grass2</b>&nbsp;&nbsp;&nbsp;</td>
-	  <td>&nbsp;&nbsp;&nbsp;<b>grass</b>&nbsp;&nbsp;&nbsp;</td>
-	  <td>&nbsp;&nbsp;&nbsp;<b>silk</b>&nbsp;&nbsp;&nbsp;</td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/point-create.png"></td>
-	  <td><img src="icons/grass/vdigit/new.point.gif"></td>
-	  <td><img src="icons/silk/bullet_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/line-create.png"></td>
-	  <td><img src="icons/grass/vdigit/new.line.gif"></td>
-	  <td><img src="icons/silk/vector_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/polygon-create.png"></td>
-	  <td><img src="icons/grass/vdigit/new.boundary.gif"></td>
-	  <td><img src="icons/silk/shape_handles.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/centroid-create.png"></td>
-	  <td><img src="icons/grass/vdigit/new.centroid.gif"></td>
-	  <td><img src="icons/silk/shape_square_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/vertex-move.png"></td>
-	  <td><img src="icons/grass/vdigit/move.vertex.gif"></td>
-	  <td><img src="icons/silk/chart_line.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/vertex-create.png"></td>
-	  <td><img src="icons/grass/vdigit/add.vertex.gif"></td>
-	  <td><img src="icons/silk/chart_line_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/vertex-delete.png"></td>
-	  <td><img src="icons/grass/vdigit/rm.vertex.gif"></td>
-	  <td><img src="icons/silk/chart_line_delete.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/line-split.png"></td>
-	  <td><img src="icons/grass/vdigit/split.line.gif"></td>
-	  <td><img src="icons/silk/chart_line_link.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/line-edit.png"></td>
-	  <td><img src="icons/grass/vdigit/edit.line.gif"></td>
-	  <td><img src="icons/silk/chart_line_edit.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/line-move.png"></td>
-	  <td><img src="icons/grass/vdigit/move.line.gif"></td>
-	  <td><img src="icons/silk/bullet_go.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/line-delete.png"></td>
-	  <td><img src="icons/grass/vdigit/delete.line.gif"></td>
-	  <td><img src="icons/silk/vector_delete.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/cats-display.png"></td>
-	  <td><img src="icons/grass/vdigit/display.cats.gif"></td>
-	  <td><img src="icons/silk/chart_organisation.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/cats-copy.png"></td>
-	  <td><img src="icons/grass/vdigit/copy.cats.gif"></td>
-	  <td><img src="icons/silk/chart_organisation_add.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/attributes-display.png"></td>
-	  <td><img src="icons/grass/vdigit/display.attributes.gif"></td>
-	  <td><img src="icons/silk/table.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/tools.png"></td>
-	  <td>&nbsp;</td>
-	  <td><img src="icons/silk/plugin.png"></td>
-	</tr>
-	<tr><td><img src="icons/grass2/undo.png"></td>
-	  <td>&nbsp;</td>
-	  <td><img src="icons/silk/arrow_undo.png"></td>
-	</tr>
-	<tr><td><img src="icons/grass2/settings.png"></td>
-	  <td><img src="icons/grass/vdigit/settings.gif"></td>
-	  <td><img src="icons/silk/color_swatch.png"></td>
-	</tr>
-	<tr>
-	  <td><img src="icons/grass2/quit.png"></td>
-	  <td><img src="icons/grass/gui-exit.gif"></td>
-	  <td><img src="icons/silk/door_in.png"></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<p>
-<i>$Date$</i>

Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Modeler.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -5,7 +5,9 @@
 <p>
 <b>Graphical modeler</b> is a <em><a href="wxGUI.html">wxGUI</a></em>
 extension which allows the user to create, edit, and manage
-models. It's available from the menu &quot;File | Graphical modeler&quot;.
+models. The modeler can be launched from the menu &quot;File |
+Graphical modeler&quot; or by clicking on
+icon <img src="icons/modeler-main.png"> in the toolbar.
 
 <p>
 The modeler currently allows to:

Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Nviz.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Nviz.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Nviz.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -38,38 +38,38 @@
 </center>
 
 <dl>
-  <dt><img src="icons/grass2/3d-view.png">&nbsp;
+  <dt><img src="icons/3d-view.png">&nbsp;
     <em>Switch to view page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>view</b>
   control page.</dd>
-  <dt><img src="icons/grass2/3d-raster.png">&nbsp;
+  <dt><img src="icons/3d-raster.png">&nbsp;
     <em>Switch to surface page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>surface</b>
   control page (data properties).</dd>
-  <dt><img src="icons/grass2/3d-vector.png">&nbsp;
+  <dt><img src="icons/3d-vector.png">&nbsp;
     <em>Switch to vector page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>vector</b>
   control page (data properties).</dd>
-  <dt><img src="icons/grass2/3d-volume.png">&nbsp;
+  <dt><img src="icons/3d-volume.png">&nbsp;
     <em>Switch to volume page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>volume</b>
   control page (data properties).</dd>
-  <dt><img src="icons/grass2/3d-light.png">&nbsp;
+  <dt><img src="icons/3d-light.png">&nbsp;
     <em>Switch to light page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>light</b>
   control page (appearance).</dd>
-  <dt><img src="icons/grass2/3d-fringe.png">&nbsp;
+  <dt><img src="icons/3d-fringe.png">&nbsp;
     <em>Switch to fringe page</em></dt>
   <dd>Switch 3D Layer Manager Toolbox's page to the <b>fringe</b>
   control page (appearance).</dd>
-  <dt><img src="icons/grass2/settings.png">&nbsp;
+  <dt><img src="icons/settings.png">&nbsp;
     <em>Show 3D view mode settings</em></dt>
   <dd>Show dialog with settings for wxGUI 3D view mode. The user
   settings can be stored in wxGUI settings file.</dd>
-  <dt><img src="icons/grass2/help.png">&nbsp;
+  <dt><img src="icons/help.png">&nbsp;
     <em>Show help</em></dt>
   <dd>Show this help.</dd>
-  <dt><img src="icons/grass2/quit.png">&nbsp;
+  <dt><img src="icons/quit.png">&nbsp;
     <em>Quit</em></dt>
   <dd>Quit 3D view mode and switch map display to the 2D view
   mode.</dd>

Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizer.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizer.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizer.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -49,68 +49,68 @@
 </center>
 
 <dl>
-  <dt><img src="icons/grass2/point-create.png">&nbsp;
+  <dt><img src="icons/point-create.png">&nbsp;
     <em>Digitize new point</em></dt>
   <dd>Add new point to vector map and optionally define its
     attributes.</dd>
   
-  <dt><img src="icons/grass2/line-create.png">&nbsp;
+  <dt><img src="icons/line-create.png">&nbsp;
     <em>Digitize new line</em></dt>
   <dd>Add new line to vector map and optionally define its
     attributes.</dd>
 
-  <dt><img src="icons/grass2/polygon-create.png">&nbsp;
+  <dt><img src="icons/polygon-create.png">&nbsp;
     <em>Digitize new boundary</em></dt>
   <dd>Add new boundary to vector map and optionally define its
     attributes.</dd>
   
-  <dt><img src="icons/grass2/centroid-create.png">&nbsp;
+  <dt><img src="icons/centroid-create.png">&nbsp;
     <em>Digitize new centroid</em></dt>
   <dd>Add new centroid to vector map and optionally define its
     attributes.</dd>
   
-  <dt><img src="icons/grass2/vertex-move.png">&nbsp;
+  <dt><img src="icons/vertex-move.png">&nbsp;
     <em>Move vertex</em></dt>
   <dd>Move selected vertex of linear feature. Thus shape of linear
     feature is changed.</dd>
 
-  <dt><img src="icons/grass2/vertex-create.png">&nbsp;
+  <dt><img src="icons/vertex-create.png">&nbsp;
     <em>Add vertex</em></dt>
   <dd>Add new vertex to selected linear feature (shape not
     changed).</dd>
 
-  <dt><img src="icons/grass2/vertex-delete.png">&nbsp;
+  <dt><img src="icons/vertex-delete.png">&nbsp;
     <em>Remove vertex</em></dt>
   <dd>Remove selected vertex from linear feature. Thus shape of selected
   feature can be changed.</dd>
 
-  <dt><img src="icons/grass2/line-split.png">&nbsp;
+  <dt><img src="icons/line-split.png">&nbsp;
     <em>Split line/boundary</em></dt>
   <dd>Split selected linear feature on given position to separate
   vector features.</dd>
 
-  <dt><img src="icons/grass2/line-edit.png">&nbsp;
+  <dt><img src="icons/line-edit.png">&nbsp;
     <em>Edit line/boundary</em></dt>
   <dd>Edit selected linear feature, add new segments or remove
   existing segments of linear feature.</dd>
 
-  <dt><img src="icons/grass2/line-move.png">&nbsp;
+  <dt><img src="icons/line-move.png">&nbsp;
     <em>Move feature(s)</em></dt>
   <dd>Move selected vector features. Selection can be done by mouse or
     by query.</dd>
 
-  <dt><img src="icons/grass2/line-delete.png">&nbsp;
+  <dt><img src="icons/line-delete.png">&nbsp;
     <em>Delete feature(s)</em></dt>
   <dd>Delete selected vector features. Selection can be done by mouse
   or by query.</dd>
 
-  <dt><img src="icons/grass2/cats-display.png">&nbsp;
+  <dt><img src="icons/cats-display.png">&nbsp;
     <em>Display/update categories</em></dt>
   <dd>Display categories of selected vector feature. Category settings
   can be modified, new layer/category pairs added or already defined pairs
   removed.</dd>
 
-  <dt><img src="icons/grass2/cats-copy.png">&nbsp;
+  <dt><img src="icons/cats-copy.png">&nbsp;
     <em>Copy categories / Duplicate attributes</em></dt>
   <dd><ul>
       <li>Copy category settings of selected vector feature to other
@@ -127,14 +127,14 @@
     </ul>
   </dd>
 
-  <dt><img src="icons/grass2/attributes-display.png">&nbsp;
+  <dt><img src="icons/attributes-display.png">&nbsp;
     <em>Display/update attributes</em></dt>
   <dd>Display attributes of selected vector feature (based on its
     category settings).  Attributes can be also modified. Same
     functionality is accessible from Main toolbar "Query vector map
     (editable mode)".</dd>
 
-  <dt><img src="icons/grass2/tools.png">&nbsp;
+  <dt><img src="icons/tools.png">&nbsp;
     <em>Additional tools</em></dt>
   <dd>
     <ul>
@@ -176,15 +176,15 @@
     </ul>
   </dd>
 
-  <dt><img src="icons/grass2/undo.png">&nbsp;
+  <dt><img src="icons/undo.png">&nbsp;
     <em>Undo</em></dt>
   <dd>Undo previous operations.</dd>
 
-  <dt><img src="icons/grass2/settings.png">&nbsp;
+  <dt><img src="icons/settings.png">&nbsp;
     <em>Settings</em></dt>
   <dd>Dialog for vector digitizer settings.</dd>
 
-  <dt><img src="icons/grass2/quit.png">&nbsp;
+  <dt><img src="icons/quit.png">&nbsp;
     <em>Quit digitizing tool</em></dt>
   <dd>Changes in vector map can be optionally discarded when
   digitizing session is quited.</dd>

Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html	2011-04-18 06:16:18 UTC (rev 46016)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html	2011-04-18 10:08:17 UTC (rev 46017)
@@ -52,10 +52,6 @@
   under different tabs in the Layer Manager.</li>
 </ul>
 
-<p>
-wxGUI comes with more <em>icon themes</em>, for detailed information
-see this <a href="wxGUI.Icons.html">page</a>.
-
 <h3>Layer Manager</h3>
 
 The <em>Layer Manager</em> provides an interactive graphical interface for
@@ -107,99 +103,99 @@
 
 <dl>
   
-  <dt><img src="icons/grass2/monitor-create.png">&nbsp;
+  <dt><img src="icons/monitor-create.png">&nbsp;
     <em>Start new map display</em></dt>
   <dd>Opens a new map display and creates empty layer tree tab in Layer Manager.</dd>
   
-  <dt><img src="icons/grass2/layer-open.png">&nbsp;
+  <dt><img src="icons/layer-open.png">&nbsp;
     <em>Load / import map layers into workspace</em></dt>
   <dd>Loads or imports selected raster or vector maps into current layer tree.
     
     <dl>
-      <dt><img src="icons/grass2/create.png">&nbsp;
+      <dt><img src="icons/create.png">&nbsp;
 	<em>Create new workspace file</em></dt>
       <dd>Removes all layers in the layer tree and creates a new, empty tree
 	where new layers can be added.</dd>
       
-      <dt><img src="icons/grass2/layer-open.png">&nbsp;
+      <dt><img src="icons/layer-open.png">&nbsp;
 	<em>Load map layers into workspace</em></dt>
       <dd>Loads selected raster or vector maps into current layer tree.</dd>
       
-      <dt><img src="icons/grass2/layer-import.png">&nbsp;
+      <dt><img src="icons/layer-import.png">&nbsp;
 	<em>Import raster data</em></dt>
       <dd>Import selected raster data into GRASS and load them into current layer tree.</dd>
       
-      <dt><img src="icons/grass2/layer-import.png">&nbsp;
+      <dt><img src="icons/layer-import.png">&nbsp;
 	<em>Import vector data</em></dt>
       <dd>Import selected vector data into GRASS and load them into current layer tree.</dd>
     </dl>
   </dd>
   
-  <dt><img src="icons/grass2/open.png">&nbsp;
+  <dt><img src="icons/open.png">&nbsp;
     <em>Open existing workspace file</em></dt>
   <dd>Opens an previously saved workspace file, containing a set of display
     layers and their option settings.</dd>
   
-  <dt><img src="icons/grass2/save.png">&nbsp;
+  <dt><img src="icons/save.png">&nbsp;
     <em>Save current workspace to file</em></dt>
   <dd>Saves current set of layers and their options to a workspace
     file.</dd>
   
-  <dt><img src="icons/grass2/layer-raster-add.png">&nbsp;
+  <dt><img src="icons/layer-raster-add.png">&nbsp;
     <em>Add raster map layer</em></dt>
   <dd>Adds raster map to layer tree,
   see <em><a href="d.rast.html">d.rast</a></em>.</dd>
   
-  <dt><img src="icons/grass2/layer-raster-more.png">&nbsp;
+  <dt><img src="icons/layer-raster-more.png">&nbsp;
     <em>Add various raster map layers (RGB, HIS, shaded relief...)</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     
     <dl>
-      <dt><img src="icons/grass2/layer-raster3d-add.png">&nbsp;
+      <dt><img src="icons/layer-raster3d-add.png">&nbsp;
 	<em>Add 3D raster map layer</em></dt>
       <dd>Adds 3D raster map to layer tree.</dd>
       
-      <dt><img src="icons/grass2/layer-rgb-add.png">&nbsp;
+      <dt><img src="icons/layer-rgb-add.png">&nbsp;
 	<em>Add RGB raster layer</em></dt>
       <dd>Combines and displays three raster maps defined as red, green, 
 	and blue channels to create an RGB color map, 
 	see <em><a href="d.rgb.html">d.rgb</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-his-add.png">&nbsp;
+      <dt><img src="icons/layer-his-add.png">&nbsp;
 	<em>Add HIS raster layer</em></dt>
       <dd>Combines and displays two or three raster maps defined as hue,
 	intensity, and (optionally) saturation channels to create a color map,
 	see <em><a href="d.his.html">d.his</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-shaded-relief-add.png">&nbsp;
+      <dt><img src="icons/layer-shaded-relief-add.png">&nbsp;
 	<em>Add shaded relief raster map layer </em></dt>
       <dd>Adds shaded relief raster map layer,
 	see <em><a href="d.shadedmap.html">d.shadedmap</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-aspect-arrow-add.png">&nbsp;
+      <dt><img src="icons/layer-aspect-arrow-add.png">&nbsp;
 	<em>Add raster arrows layer</em></dt>
       <dd>Adds map of raster cells with directional arrows drawn. Arrow
 	direction and length are determined by separate aspect/directional map
 	and (optional) slope/intensity map,
 	see <em><a href="d.rast.arrow.html">d.rast.arrow</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
+      <dt><img src="icons/layer-cell-cats-add.png">&nbsp;
 	<em>Add raster numbers layer</em></dt>
       <dd>Adds map of raster cells with numbers representing the cell values, 
 	see <em><a href="d.rast.num.html">d.rast.num</a></em>.</dd>
     </dl>
     </dd>
   
-  <dt><img src="icons/grass2/layer-vector-add.png">&nbsp;
+  <dt><img src="icons/layer-vector-add.png">&nbsp;
     <em>Add vector map layer</em></dt>
   <dd>Adds a vector map layer, see <em><a href="d.vect.html">d.vect</a></em>.</dd>
   
-  <dt><img src="icons/grass2/layer-vector-more.png">&nbsp;
+  <dt><img src="icons/layer-vector-more.png">&nbsp;
     <em>Add various vector map layers (thematic, chart...)</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     
     <dl>
-      <dt><img src="icons/grass2/layer-vector-thematic-add.png">&nbsp;
+      <dt><img src="icons/layer-vector-thematic-add.png">&nbsp;
 	<em>Add thematic area (choropleth) map layer
 	  (for all vector types)</em></dt>
       <dd>Adds layer for thematic display values from a numeric attribute
@@ -212,7 +208,7 @@
 	printing,
 	see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-vector-chart-add.png">&nbsp;
+      <dt><img src="icons/layer-vector-chart-add.png">&nbsp;
 	<em>Add thematic chart layer (for vector points)</em></dt>
       <dd>Adds layer in which pie or bar charts can be automatically created
 	at vector point locations. Charts display values from selected columns
@@ -223,38 +219,38 @@
     </dl>
   </dd>
 
-  <dt><img src="icons/grass2/layer-group-add.png">&nbsp;
+  <dt><img src="icons/layer-group-add.png">&nbsp;
       <em>Add group</em></dt>
   <dd>Adds an empty group. Layers can then be added to the group.</dd>
   
-  <dt><img src="icons/grass2/layer-more.png">&nbsp;
+  <dt><img src="icons/layer-more.png">&nbsp;
     <em>Add grid or vector labels overlay</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     
     <dl>
-      <dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
+      <dt><img src="icons/layer-grid-add.png">&nbsp;
 	<em>Add overlay grids and lines</em></dt>
       <dd>Adds layer to display regular grid (for all locations)
 	see <em><a href="d.grid.html">d.grid</a></em></dd>
       
-      <dt><img src="icons/grass2/layer-label-add.png">&nbsp;
+      <dt><img src="icons/layer-label-add.png">&nbsp;
 	<em>Add labels layer for vector objects (from existing labels file)</em></dt>
       <dd>Add a layer of text from a labels file for vector objects
 	created with the <em><a href="v.label.html">v.label</a></em> module. 
 	A labels file can also be created with a text editor, 
 	see <em><a href="d.labels.html">d.labels</a></em>.</dd>
       
-      <dt><img src="icons/grass/module-d.geodesic.gif">&nbsp;
+      <dt><img src="icons/shortest-distance.png">&nbsp;
 	<em>Add geodesic line layer</em></dt>
       <dd>Add layer to display geodesic line for latitude/longitude locations only,
 	see <em><a href="d.geodesic.html">d.geodesic</a></em></dd>
       
-      <dt><img src="icons/grass/module-d.geodesic.gif">&nbsp;
+      <dt><img src="icons/shortest-distance.png">&nbsp;
 	<em>Add rhumbline layer</em>
 	<dd>Add layer to display rhumblines (for latitude/longitude locations only),
           see <em><a href="d.rhumbline.html">d.rhumbline</a></em>.</dd>
 	
-      <dt><img src="icons/grass2/layer-command-add.png">&nbsp;
+      <dt><img src="icons/layer-command-add.png">&nbsp;
 	<em>Add command layer</em></dt>
       <dd>Adds a layer in which a GRASS GIS command or command list can be entered.
 	For a command list use the semi-colon (";") symbol as a separator.
@@ -273,19 +269,19 @@
     </dl>
   </dd>
 
-  <dt><img src="icons/grass2/layer-remove.png">&nbsp;
+  <dt><img src="icons/layer-remove.png">&nbsp;
     <em>Delete selected layer</em></dt>
   <dd>Removes selected map layer or map layer group from layer tree.</dd>
   
-  <dt><img src="icons/grass2/table.png">&nbsp;
+  <dt><img src="icons/table.png">&nbsp;
     <em>Show attribute table</em></dt>
   <dd>Opens <em><a href="wxGUI.Attribute_Table_Manager.html">attribute table manager</a></em> for selected vector map.</dd>
   
-  <dt><img src="icons/grass2/modeler-main.png">&nbsp;
+  <dt><img src="icons/modeler-main.png">&nbsp;
     <em>Start Graphical Modeler</em></dt>
   <dd>Opens <em><a href="wxGUI.Modeler.html">graphical modeler</a></em> to create models and run them.</dd>
   
-  <dt><img src="icons/grass2/settings.png">&nbsp;
+  <dt><img src="icons/settings.png">&nbsp;
     <em>Show GUI settings</em></dt>
   <dd>Opens dialog to change GUI preferences.</dd>
   
@@ -371,28 +367,28 @@
 
 <dl>
 
-  <dt><img src="icons/grass2/show.png">&nbsp;
+  <dt><img src="icons/show.png">&nbsp;
     <em>Display map</em></dt>
   <dd>Displays all active layers from layer tree and re-renders for display
     any layers that have changed since the last time the display was updated, 
     including layers added or removed.</dd>
   
-  <dt><img src="icons/grass2/layer-redraw.png">&nbsp;
+  <dt><img src="icons/layer-redraw.png">&nbsp;
     <em>Re-render map</em></dt>
   <dd>Re-renders all active layers regardless of whether they have changed
     or not.</dd>
   
-  <dt><img src="icons/grass2/erase.png">&nbsp;
+  <dt><img src="icons/erase.png">&nbsp;
     <em>Erase display</em></dt>
   <dd>Erases the currently selected map display to a white background,
     see <em><a href="d.erase.html">d.erase</a>, <a href="d.frame.html">d.frame
 	-e</a></em>.</dd>
   
-  <dt><img src="icons/grass2/pointer.png">&nbsp;
+  <dt><img src="icons/pointer.png">&nbsp;
     <em>Pointer</em></dt>
   <dd>Select arrow cursor for map display.</dd>
   
-  <dt><img src="icons/grass2/info.png">&nbsp;
+  <dt><img src="icons/info.png">&nbsp;
     <em>Query raster/vector maps</em></dt>
   <dd>Opens a dropdown menu that allows user to select to:
     <dl>
@@ -409,7 +405,7 @@
     </dl>
   </dd>
   
-  <dt><img src="icons/grass2/pan.png">&nbsp;
+  <dt><img src="icons/pan.png">&nbsp;
     <em>Pan</em></dt>
   <dd>Interactive selection of a new center of view in the active
     display monitor. Drag the pan cursor while pressing the left mouse
@@ -418,7 +414,7 @@
     does <em>not</em> affect the computational region for other GIS
     processes, see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass2/zoom-in.png">&nbsp;
+  <dt><img src="icons/zoom-in.png">&nbsp;
     <em>Zoom in</em></dt>
   <dd>Interactive zooming with the mouse in the active display monitor.
     Drawing a box or just click with the mouse (left button) and zoom-in
@@ -430,7 +426,7 @@
     does <em>not</em> affect the computational region for other GIS
     processes, see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass2/zoom-out.png">&nbsp;
+  <dt><img src="icons/zoom-out.png">&nbsp;
     <em>Zoom out</em></dt>
   <dd>Interactive zooming with the mouse in the active display monitor.
     Drawing a box or just click with the mouse (left button) and zoom-out
@@ -443,7 +439,7 @@
     other GIS processes,
     see <em><a href="g.region.html">g.region</a></em>.</dd>
 
-  <dt><img src="icons/grass2/zoom-extent.png">&nbsp;
+  <dt><img src="icons/zoom-extent.png">&nbsp;
     <em>Zoom to selected map(s)</em></dt>
   <dd>Set zoom extent based on selected raster or vector maps. Zooming
     resets the display region extents (both size and location of area
@@ -451,12 +447,12 @@
     for other GIS processes,
     see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass2/zoom-last.png">&nbsp;
+  <dt><img src="icons/zoom-last.png">&nbsp;
     <em>Return to previous zoom</em></dt>
   <dd>Returns to the previous zoom extent. Up to 10 levels of zoom back are
     maintained, see <em><a href="g.region.html">g.region</a></em>.</dd>
   
-  <dt><img src="icons/grass2/zoom-more.png">&nbsp;
+  <dt><img src="icons/zoom-more.png">&nbsp;
     <em>Zoom options</em></dt>
   <dd>Opens a dropdown menu that allows user to:
     <ul>
@@ -471,11 +467,11 @@
     </ul>
   </dd>
 
-  <dt><img src="icons/grass2/layer-raster-analyze.png">&nbsp;
+  <dt><img src="icons/layer-raster-analyze.png">&nbsp;
       <em>Analyze menu</em></dt>
   <dd>Opens a dropdown menu with:
     <dl>
-      <dt><img src="icons/grass2/measure-length.png">&nbsp;
+      <dt><img src="icons/measure-length.png">&nbsp;
 	<em>Distance measurement tool</em></dt>
       <dd>Interactive measurement of lengths defined with the mouse. The
 	length of each segment and the cumulative length of all segments
@@ -483,7 +479,7 @@
 	measured in the current measurement unit,
 	see <em><a href="d.measure.html">d.measure</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-raster-profile.png">&nbsp;
+      <dt><img src="icons/layer-raster-profile.png">&nbsp;
 	<em>Profile tool</em></dt>
       <dd>Interactively create profile of a raster map. Profile transect is
 	drawn with the mouse in map display. The profile may be of the
@@ -491,30 +487,30 @@
 	simultaneously, 
 	see <em><a href="gm_profile.html">Profile Tool help page</a></em>.</dd>
       
-      <dt><img src="icons/grass2/layer-raster-histogram.png">&nbsp;
+      <dt><img src="icons/layer-raster-histogram.png">&nbsp;
 	<em>Histogram tool</em></dt>
       <dd>Displays histogram of selected raster map or image in new window,
 	see <em><a href="d.histogram.html">d.histogram</a></em>.</dd>
     </dl>
   </dd>
   
-  <dt><img src="icons/grass2/overlay-add.png">&nbsp;
+  <dt><img src="icons/overlay-add.png">&nbsp;
     <em>Add overlay</em></dt>
   <dd>opens a dropdown menu that allows user to:
     <dl>
-      <dt><img src="icons/grass2/scalebar-add.png">&nbsp;
+      <dt><img src="icons/scalebar-add.png">&nbsp;
 	<em>Add scalebar and north arrow</em></dt>
       <dd>Adds layer to display a combined scalebar and north arrow. Options
 	include scalebar placement (using screen coordinates or a mouse),
 	scalebar format, and scalebar colors,
 	see <em><a href="d.barscale.html">d.barscale</a></em>.</dd>
       
-      <dt><img src="icons/grass2/legend-add.png">&nbsp;
+      <dt><img src="icons/legend-add.png">&nbsp;
 	<em>Add raster map legend</em></dt>
       <dd>Adds layer to display with legend of selected raster map,
 	see <em><a href="d.legend.html">d.legend</a></em>.</dd>
       
-      <dt><img src="icons/grass2/text-add.png">&nbsp;
+      <dt><img src="icons/text-add.png">&nbsp;
 	<em>Add text layer</em></dt>
       <dd>Adds layer to display a line of text using default GRASS font
 	(selected with <em><a href="d.font.html">d.font</a></em>).  Options
@@ -523,11 +519,11 @@
     </dl>
   </dd>
   
-  <dt><img src="icons/grass2/map-export.png">&nbsp;
+  <dt><img src="icons/map-export.png">&nbsp;
     <em>Save display to graphic file</em></dt>
   <dd>Save the visible image in map display to different raster graphic formats.</dd>
   
-  <dt><img src="icons/grass2/print.png">&nbsp;
+  <dt><img src="icons/print.png">&nbsp;
     <em>Print map</em></dt>
   <dd>Prints map on system native printer or PostScript device;
     saves visible map display (including PostScript text and labels) to PDF
@@ -568,11 +564,6 @@
 </em>
 
 <p>
-<em>
-  <a href="wxGUI.Icons.html">Icon themes</a>
-</em>
-
-<p>
 See also wxGUI <a href="http://grass.osgeo.org/wiki/WxGUI">wiki</a> page,
 and <a href="http://grass.osgeo.org/wiki/Quick_wxGUI_tutorial">Quick
 wxGUI Tutorial</a>.



More information about the grass-commit mailing list