[GRASS-SVN] r39271 - grass/branches/releasebranch_6_4/gui/wxpython/docs

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Sep 20 14:14:27 EDT 2009


Author: martinl
Date: 2009-09-20 14:14:26 -0400 (Sun, 20 Sep 2009)
New Revision: 39271

Added:
   grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Icons.html
Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/docs/Makefile
   grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html
   grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html
Log:
sychronize docs with devbr6 (please keep wxGUI manual page in sync as
much as possible)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/Makefile	2009-09-20 15:00:44 UTC (rev 39270)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/Makefile	2009-09-20 18:14:26 UTC (rev 39271)
@@ -3,7 +3,8 @@
 FILES = wxGUI \
 	wxGUI.Vector_Digitizing_Tool \
 	wxGUI.Attribute_Table_Manager \
-	wxGUI.Nviz
+	wxGUI.Nviz \
+	wxGUI.Icons
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 include $(MODULE_TOPDIR)/include/Make/Grass.make

Added: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Icons.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Icons.html	                        (rev 0)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Icons.html	2009-09-20 18:14:26 UTC (rev 39271)
@@ -0,0 +1,348 @@
+<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)</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/element-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>


Property changes on: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Icons.html
___________________________________________________________________
Added: svn:mime-type
   + text/html
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native

Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html	2009-09-20 15:00:44 UTC (rev 39270)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html	2009-09-20 18:14:26 UTC (rev 39271)
@@ -51,81 +51,68 @@
 
 <dl>
   <dt><img src="icons/grass2/point-create.png">&nbsp;
-    <img src="icons/grass/vdigit/new.point.gif">&nbsp;
-    <img src="icons/silk/bullet_add.png"> <em>Digitize new point</em></dt>
+    <em>Digitize new point</em></dt>
   <dd>Add new point to vector map and optionally define its
-  attributes.</dd>
-
+    attributes.</dd>
+  
   <dt><img src="icons/grass2/line-create.png">&nbsp;
-    <img src="icons/grass/vdigit/new.line.gif">&nbsp;
-    <img src="icons/silk/vector_add.png"> <em>Digitize new line</em></dt>
+    <em>Digitize new line</em></dt>
   <dd>Add new line to vector map and optionally define its
-  attributes.</dd>
+    attributes.</dd>
 
   <dt><img src="icons/grass2/polygon-create.png">&nbsp;
-    <img src="icons/grass/vdigit/new.boundary.gif">&nbsp;
-    <img src="icons/silk/shape_handles.png"> <em>Digitize new boundary</em></dt>
+    <em>Digitize new boundary</em></dt>
   <dd>Add new boundary to vector map and optionally define its
-  attributes.</dd>
-
+    attributes.</dd>
+  
   <dt><img src="icons/grass2/centroid-create.png">&nbsp;
-    <img src="icons/grass/vdigit/new.centroid.gif">&nbsp;
-    <img src="icons/silk/shape_square_add.png"> <em>Digitize new centroid</em></dt>
+    <em>Digitize new centroid</em></dt>
   <dd>Add new centroid to vector map and optionally define its
-  attributes.</dd>
-
+    attributes.</dd>
+  
   <dt><img src="icons/grass2/vertex-move.png">&nbsp;
-    <img src="icons/grass/vdigit/move.vertex.gif">&nbsp;
-    <img src="icons/silk/chart_line.png"> <em>Move vertex</em></dt>
+    <em>Move vertex</em></dt>
   <dd>Move selected vertex of linear feature. Thus shape of linear
-  feature is changed.</dd>
+    feature is changed.</dd>
 
   <dt><img src="icons/grass2/vertex-create.png">&nbsp;
-    <img src="icons/grass/vdigit/add.vertex.gif">&nbsp;
-    <img src="icons/silk/chart_line_add.png"> <em>Add vertex</em></dt>
+    <em>Add vertex</em></dt>
   <dd>Add new vertex to selected linear feature (shape not
-  changed).</dd>
+    changed).</dd>
 
   <dt><img src="icons/grass2/vertex-delete.png">&nbsp;
-    <img src="icons/grass/vdigit/rm.vertex.gif">&nbsp;
-    <img src="icons/silk/chart_line_delete.png"> <em>Remove vertex</em></dt>
+    <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;
-    <img src="icons/grass/vdigit/split.line.gif">&nbsp;
-    <img src="icons/silk/chart_line_link.png"> <em>Split line/boundary</em></dt>
+    <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;
-    <img src="icons/grass/vdigit/edit.line.gif">&nbsp;
-    <img src="icons/silk/chart_line_edit.png"> <em>Edit line/boundary</em></dt>
+    <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;
-    <img src="icons/grass/vdigit/move.line.gif">&nbsp;
-    <img src="icons/silk/bullet_go.png"> <em>Move feature(s)</em></dt>
+    <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;
-    <img src="icons/grass/vdigit/delete.line.gif">&nbsp;
-    <img src="icons/silk/vector_delete.png"> <em>Delete feature(s)</em></dt>
+    <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;
-    <img src="icons/grass/vdigit/display.cats.gif">&nbsp;
-    <img src="icons/silk/chart_organisation.png"> <em>Display/update categories</em></dt>
+    <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;
-    <img src="icons/grass/vdigit/copy.cats.gif">&nbsp;
-    <img src="icons/silk/chart_organisation_add.png"> <em>Copy categories / Duplicate attributes</em></dt>
+    <em>Copy categories / Duplicate attributes</em></dt>
   <dd><ul>
       <li>Copy category settings of selected vector feature to other
 	vector features. Layer/category pairs of source vector features are
@@ -142,16 +129,14 @@
   </dd>
 
   <dt><img src="icons/grass2/attributes-display.png">&nbsp;
-    <img src="icons/grass/vdigit/display.attributes.gif">&nbsp;
-    <img src="icons/silk/table.png"> <em>Display/update attributes</em></dt>
+    <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;
-    &nbsp;&nbsp;&nbsp;
-    <img src="icons/silk/plugin.png"> <em>Additional tools</em></dt>
+    <em>Additional tools</em></dt>
   <dd>
     <ul>
       <li>Copy features from (background) map<br> Make identical copy of
@@ -193,18 +178,15 @@
   </dd>
 
   <dt><img src="icons/grass2/undo.png">&nbsp;
-    &nbsp;&nbsp;&nbsp;
-    <img src="icons/silk/arrow_undo.png"> <em>Undo</em></dt>
+    <em>Undo</em></dt>
   <dd>Undo previous operations.</dd>
 
   <dt><img src="icons/grass2/settings.png">&nbsp;
-    <img src="icons/grass/vdigit/settings.gif">&nbsp;
-    <img src="icons/silk/color_swatch.png"> <em>Settings</em></dt>
+    <em>Settings</em></dt>
   <dd>Dialog for vector digitizer settings.</dd>
 
   <dt><img src="icons/grass2/quit.png">&nbsp;
-    <img src="icons/grass/gui-exit.gif">&nbsp;
-    <img src="icons/silk/door_in.png"> <em>Quit digitizing tool</em></dt>
+    <em>Quit digitizing tool</em></dt>
   <dd>Changes in vector map can be optionally discarded when
   digitizing session is quited.</dd>
 

Modified: grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html	2009-09-20 15:00:44 UTC (rev 39270)
+++ grass/branches/releasebranch_6_4/gui/wxpython/docs/wxGUI.html	2009-09-20 18:14:26 UTC (rev 39271)
@@ -1,14 +1,14 @@
 <h2>DESCRIPTION</h2>
 
 <b>wxGUI</b> is a new generation of the GUI for GRASS GIS. It's a successor
-of the <em><a href="gis.m.html">Tcl/Tk GUI</a></em>.
+of the <em><a href="gis.m.html">Tcl/Tk GUI</a></em> from GRASS 6.
 
 <p>
-To start the wxGUI automatically for each session run GRASS with
-<tt>wxpython</tt> switch
+If wxGUI is not your default GUI, you can define it as default by
+typing at GRASS command line prompt
 
 <div class="code"><pre>
-    g.gui -u wxpython& 
+   g.gui -u wxpython& 
 </pre></div>
 
 or define in your <tt>.grassrc6</tt> file 'GRASS_GUI' variable
@@ -18,21 +18,26 @@
 </pre></div>
 
 The GUI can be quit by selecting the 'File->Exit' menu item. The GUI
-can be restarted from the GRASS command line prompt by
-typing
+can be restarted from the GRASS command line prompt by typing
 
 <div class="code"><pre>
-    g.gui wxpython&
+    g.gui wxpython
 </pre></div>
 
-or 
+or  to restart with previously saved workspace type:
 
 <div class="code"><pre>
     g.gui wxpython workspace=file.gxw
 </pre></div>
 
-to launch wxGUI and load workspace file on start-up.
+<p>
+You can also start GRASS from the shell command line with wxGUI
+defined by the <tt>-wxpython</tt> switch:
 
+<div class="code"><pre>
+    grass64 -wxpython
+</pre></div>
+
 <p>
 The GUI is composed by <em>two</em> main components:
 
@@ -89,7 +94,6 @@
 (g.remove, g.rename), change its display properties (d.rast and d.vect 
 options such as color, symbol, etc.), show its metadata (r.info, v.info) or 
 attributes, if applicable.
-
 <p>
 A left mouse double click on a layer opens GUI for its display options 
 These options are those for the d.* command for each layer type (d.rast, 
@@ -100,8 +104,7 @@
 <dl>
 
 <dt><img src="icons/grass2/monitor-create.png">&nbsp;
-  <img src="icons/grass/gui-startmon.gif">&nbsp;
-  <img src="icons/silk/application_add.png"> <em>Open new Map Display Window</em></dt>
+<em>Open new Map Display Window</em></dt>
 <dd>Opens a new map display and creates empty layer tree tab in Layer Manager.</dd>
 
 <dt><img src="icons/grass2/create.png">&nbsp;
@@ -110,31 +113,28 @@
 where new layers can be added.</dd>
 
 <dt><img src="icons/grass2/layer-open.png">&nbsp;
-  <img src="icons/grass/file-new.gif">&nbsp;
-  <img src="icons/silk/page_white_get.png"> <em>Load map layers (raster, vector) into workspace</em></dt>
+<em>Load map layers (raster, vector) into workspace</em></dt>
 <dd>Loads selected raster or vector maps into current layer tree.</dd>
 
 <dt><img src="icons/grass2/open.png">&nbsp;
-  <img src="icons/grass/file-open.gif">&nbsp;
-  <img src="icons/silk/folder.png"> <em>Open an existing workspace file</em></dt>
+<em>Open an 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;
-  <img src="icons/grass/file-save.gif">&nbsp;
-  <img src="icons/silk/page_save.png"> <em>Save layers composition to workspace
-    file</em></dt>
+<em>Save workspace 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;
-  <img src="icons/grass/element-cell.gif">&nbsp;
-  <img src="icons/silk/image_add.png"> <em>Add raster-based map layer</em></dt>
-<dd>Adds raster map to layer tree, see <em><a href="d.rast.html">d.rast</a></em>. Includes also shaded relief map, RGB or HIS map or raster flow arrows map.</dd>
+<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-shaded-relief-add.png">&nbsp;
 <em>Add various raster-based map layers</em></dt>
 <dd>Opens a dropdown menu that allows user to select to:<br> 
+
   <ul>
     <li><dt><img src="icons/grass2/layer-shaded-relief-add.png">&nbsp;
 	<em>Add shaded relief raster map layer </em></dt>
@@ -162,44 +162,41 @@
 	see <em><a href="d.rast.num.html">d.rast.num</a></em>.</dd></li>
   </ul>
 
-<dt><img src="icons/grass2/layer-his-add.png">&nbsp;
-  <img src="icons/grass/channel-his.gif">&nbsp;
-  <img src="icons/silk/his.png"> <em>Add HIS raster layer</em></dt>
-<dd>Combines and displays two or three raster maps defined as hue,
-intensity, and (optionally) saturation channels,
-see <em><a href="d.his.html">d.his</a></em>.</dd>
-
-<dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
-  <img src="icons/grass/module-d.rast.arrow.gif">&nbsp;
-  <img src="icons/silk/arrow_out.png"> <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-vector-add.png">&nbsp;
-  <img src="icons/grass/element-vector.gif">&nbsp;
-  <img src="icons/silk/map_add.png"> <em>Add vector-based map layer</em></dt>
-<dd>Adds a vector map layer, see <em><a href="d.vect.html">d.vect</a></em>. Includes also thematic vector map or thematic charts layer.</dd>
+<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-thematic-add.png">&nbsp;
 <em>Add various vector-based map layers </em></dt>
 <dd>Opens a dropdown menu that allows user to select to:<br>
 
-<dt><img src="icons/grass2/layer-vector-chart-add.png">&nbsp;
-  <img src="icons/grass/module-d.vect.chart.gif">&nbsp;
-  <img src="icons/silk/chart_bar.png"> <em>Add thematic charts 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
-in the associated attribute table. Options include: chart type, layer
-and attributes to chart, chart colors, and chart size (fixed or based
-on attribute column),
-see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd>
+  <ul>
+    <li><dt><img src="icons/grass2/layer-vector-thematic-add.png">&nbsp;
+	<em>Add thematic map layer
+	  (for all vector types)</em></dt>
+      <dd>Adds layer for thematic display values from a numeric attribute
+	column associated with a vector map. Options include: thematic display
+	type (graduated colors or point sizes), methods for creating display
+	intervals, SQL query of attribute column to limit vector objects to
+	display, control of point icon types and sizes, control of thematic
+	color schemes, creation of legend for thematic map, and saving the
+	results of thematic mapping to a ps.map instructions file for later
+	printing,
+	see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd></li>
+      
+    <li><dt><img src="icons/grass2/layer-vector-chart-add.png">&nbsp;
+	<em>Add thematic charts 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
+	in the associated attribute table. Options include: chart type, layer
+	and attributes to chart, chart colors, and chart size (fixed or based
+	on attribute column),
+	see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd></li>
+  </ul>
 
 <dt><img src="icons/grass2/layer-command-add.png">&nbsp;
-  <img src="icons/grass/gui-cmd.gif">&nbsp;
-  <img src="icons/silk/cog_add.png"> <em>Add command layer</em></dt>
+<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.
 For example:
@@ -216,23 +213,18 @@
 </dd>
 
 <dt><img src="icons/grass2/layer-group-add.png">&nbsp;
-  <img src="icons/grass/gui-group.gif">&nbsp;
-  <img src="icons/silk/folder_add.png"> <em>Add layer group</em></dt>
+<em>Add layer group</em></dt>
 <dd>Adds an empty layer group. Layers can then be added to the group.</dd>
 
 <dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
    <em>Add grid or vector labels overlay</em></dt>
 <dd>Opens a dropdown menu that allows user to select to:<br>
 
-<dt><img src="icons/grass2/layer-label-add.png">&nbsp;
-  <img src="icons/grass/module-d.labels.gif">&nbsp;
-  <img src="icons/silk/tag_blue_add.png"> <em>Add labels layer for vector
-objects (from existing labels file)</em></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 in options panel). A labels file can also be
-created with a text editor,
-see <em><a href="d.labels.html">d.labels</a></em>.</dd>
+  <ul>
+  <li><dt><img src="icons/grass2/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></li>
 
   <li><dt><img src="icons/grass2/layer-label-add.png">&nbsp;
       <em>Add labels layer for vector objects (from existing labels file)</em></dt>
@@ -253,13 +245,11 @@
   </ul>
 
 <dt><img src="icons/grass2/layer-remove.png">&nbsp;
-  <img src="icons/grass/edit-cut.gif">&nbsp;
-  <img src="icons/silk/bin_closed.png"> <em>Remove map layer from layer tree</em></dt>
+   <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;
-  <img src="icons/grass/db-values.gif">&nbsp;
-  <img src="icons/silk/application_view_columns.png"> <em>Open <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a> for selected vector map</em></dt>
+  <em>Show <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a> for selected vector map</em></dt>
 <dd>Displays attribute data of selected vector map.</dd>
 
 </dl>
@@ -272,7 +262,7 @@
 the maps displayed.
 
 <center>
-  <br><img src="wxGUI_map_display.jpg" alt="Map Display Window"/><br><br>
+  <br><img src="wxGUI_map_display.jpg" alt="Map Display Window"><br><br>
 </center>
 
 Each Map Display Window has a unique layer tree (in the layer manager) 
@@ -304,8 +294,7 @@
 <dl>
 
 <dt><img src="icons/grass2/show.png">&nbsp;
-  <img src="icons/grass/gui-display.gif">&nbsp;
-  <img src="icons/silk/map_go.png"> <em>Display active layers (current region)</em></dt>
+  <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>
@@ -316,19 +305,16 @@
 or not.</dd>
 
 <dt><img src="icons/grass2/erase.png">&nbsp;
-  <img src="icons/grass/gui-erase.gif">&nbsp;
-  <img src="icons/silk/cross.png"> <em>Erase display content</em></dt>
+  <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;
-  <img src="icons/grass/gui-pointer.gif">&nbsp;
-  <img src="icons/silk/cursor.png"> <em>Arrow cursor</em></dt>
+  <em>Pointer</em></dt>
 <dd>Select arrow cursor for map display.</dd>
 
 <dt><img src="icons/grass2/info.png">&nbsp;
-
   <em>Query raster/vector maps</em></dt>
 <dd>Opens a dropdown menu that allows user to select to:<br>
   <ul>
@@ -343,8 +329,7 @@
   </ul>
 
 <dt><img src="icons/grass2/pan.png">&nbsp;
-  <img src="icons/grass/gui-pan.gif">&nbsp;
-  <img src="icons/silk/arrow_out.png"> <em>Pan</em></dt>
+  <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
 button to pan.  Panning changes the location of the region displayed
@@ -353,8 +338,7 @@
 processes, see <em><a href="g.region.html">g.region</a></em>.</dd>
 
 <dt><img src="icons/grass2/zoom-in.png">&nbsp;
-  <img src="icons/grass/gui-zoom_in.gif">&nbsp;
-  <img src="icons/silk/zoom_in.png"> <em>Zoom in</em></dt>
+  <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
 cursor causes the display to zoom in so that the area defined by the
@@ -366,8 +350,7 @@
 processes, see <em><a href="g.region.html">g.region</a></em>.</dd>
 
 <dt><img src="icons/grass2/zoom-out.png">&nbsp;
-  <img src="icons/grass/gui-zoom_out.gif">&nbsp;
-  <img src="icons/silk/zoom_out.png"> <em>Zoom out</em></dt>
+  <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
 cursor causes the display to zoom in so that the area displayed
@@ -380,9 +363,8 @@
 see <em><a href="g.region.html">g.region</a></em>.</dd>
 
 <dt><img src="icons/grass2/zoom-last.png">&nbsp;
-  <img src="icons/grass/gui-zoom_back.gif">&nbsp;
-  <img src="icons/silk/zoom_back.png"> <em>Revert zoom</em></dt>
-<dd>Returns to the previous zoom. Up to 10 levels of zoom back are
+  <em>Return to pervious 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;
@@ -403,14 +385,15 @@
   <em>Analyze menu</em></dt>
 <dd>Opens a dropdown menu with:<br>
 
-<dt><img src="icons/grass2/measure-length.png">&nbsp;
-  <img src="icons/grass/gui-measure.gif">&nbsp;
-  <img src="icons/silk/sum.png"> <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
-measuered is displayed in the command output window frame. Lengths are
-measured in the current measurement unit,
-see <em><a href="d.measure.html">d.measure</a></em>.</dd>
+  <ul>
+    <li> <dt><img src="icons/grass2/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
+        measuered is displayed in the command output window frame. Lengths are
+        measured in the current measurement unit,
+        see <em><a href="d.measure.html">d.measure</a></em>.</dd></li>
+
     <li><dt><img src="icons/grass2/layer-raster-profile.png">&nbsp;
         <em>Profile tool</em></dt>
       <dd>Interactively create profile of a raster map. Profile transect is
@@ -419,46 +402,43 @@
       simultaneously, 
       see <em><a href="gm_profile.html">Profile Tool help page</a></em>.</dd></li>
 
-<dt><img src="icons/grass2/layer-raster-histogram.png">&nbsp;
-  <img src="icons/silk/chart_bar.png">&nbsp;
-  <img src="icons/grass/module-d.histogram.gif"> Display histogram of selected raster map</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>
+    <li><dt><img src="icons/grass2/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></li>
+   </ul>
 
 <dt><img src="icons/grass2/overlay-add.png">&nbsp;
-  <img src="icons/silk/overlays.png">&nbsp;
-  <img src="icons/grass/gui-rastanalyze.gif"> Add overlay</dt>
-<dd>Adds overlay to map display like barscale, north arrow, text.</dd>
+    <em>Add overlay</em></dt>
+    <dd>opens a dropdown menu that allows user to:<br>
 
-<dt><img src="icons/grass2/scalebar-add.png">&nbsp;
-  <img src="icons/grass/module-d.barscale.gif">&nbsp;
-  <img src="icons/silk/page_white_picture.png"> <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>
+  <ul>
+    <li> <dt><img src="icons/grass2/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></li>
 
-<dt><img src="icons/grass2/legend-add.png">&nbsp;
-  <img src="icons/grass/module-d.legend.gif">&nbsp;
-  <img src="icons/silk/page_green.png"> <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>
+    <li><dt><img src="icons/grass2/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></li>
 
-<dt><img src="icons/grass2/text-add.png">&nbsp;
-  <img src="icons/grass/module-d.text.gif">&nbsp;
-  <img src="icons/silk/textfield_add.png"> <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
-include: text placement (screen coordinates); and text size, bolding,
-and color, see <em><a href="d.text.html">d.text</a></em>.</dd>
+    <li><dt><img src="icons/grass2/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
+        include: text placement (screen coordinates); and text size, bolding,
+        and color, see <em><a href="d.text.html">d.text</a></em>.</dd></li>
+  </ul>
 
 <dt><img src="icons/grass2/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;
-  <img src="icons/grass/file-print.gif">&nbsp;
-  <img src="icons/silk/printer.png"> <em>Print map</em></dt>
+  <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
 or EPS file.</dd>
@@ -488,31 +468,24 @@
 
 <h2>CONFIGURATION</h2>
 
-User preferences dialog ('Config->Preferences') enables configuration
-of various options.
+<em>User GIS settings</em> dialog ('Config->Preferences') enables
+configuration of various options.
 
-<h3>Icon Theme</h3>
+<p>
+For information about available <em>icon themes</em> see
+this <a href="wxGUI.Icons.html">page</a>.
 
-Currently are supported three icon theme sets:
-
-<ul>
-  <li><em>new</em> <a href="http://www.szczepanek.pl/icons.grass/v.0.1/">GRASS theme</a> v0.1 (<tt>grass2</tt>)</li>
-  <li><em>original TCL/TK-based</em> GRASS theme (<tt>grass</tt>)</li>
-  <li><em>Silk theme</em>-based
-  on <a href="http://www.famfamfam.com/lab/icons/silk/">Silk icon
-  set</a>, v1.3 (<tt>silk</tt>)</li>
-</ul>
-
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="wxGUI.Vector_Digitizing_Tool.html">Vector digitizing tool</a>,
-<a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a>,
-<a href="wxGUI.Nviz.html">Nviz extension</a>
+  <a href="wxGUI.Vector_Digitizing_Tool.html">Vector digitizing tool</a>,
+  <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a>,
+  <a href="wxGUI.Nviz.html">Nviz extension</a>,
+  <a href="wxGUI.Icons.html">Icon themes</a>
 </em>
 
 <p>
-See also <a href="http://grass.osgeo.org/wiki/WxPython-based_GUI_for_GRASS">Wiki</a> page.
+See also <a href="http://grass.osgeo.org/wiki/WxGUI">Wiki</a> page.
 
 <p>
 <em>



More information about the grass-commit mailing list