[GRASS-SVN] r39068 - grass/branches/develbranch_6/gui/wxpython/docs

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Sep 7 11:33:20 EDT 2009


Author: martinl
Date: 2009-09-07 11:33:20 -0400 (Mon, 07 Sep 2009)
New Revision: 39068

Added:
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html
Modified:
   grass/branches/develbranch_6/gui/wxpython/docs/Makefile
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html
   grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html
Log:
wxGUI icon themes info separated to the new manual page
      (merge r39066 & r39067 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/docs/Makefile
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/Makefile	2009-09-07 15:31:46 UTC (rev 39067)
+++ grass/branches/develbranch_6/gui/wxpython/docs/Makefile	2009-09-07 15:33:20 UTC (rev 39068)
@@ -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

Copied: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html (from rev 39066, grass/trunk/gui/wxpython/docs/wxGUI.Icons.html)
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html	                        (rev 0)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Icons.html	2009-09-07 15:33:20 UTC (rev 39068)
@@ -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>

Modified: grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html	2009-09-07 15:31:46 UTC (rev 39067)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.Vector_Digitizing_Tool.html	2009-09-07 15:33:20 UTC (rev 39068)
@@ -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/develbranch_6/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html	2009-09-07 15:31:46 UTC (rev 39067)
+++ grass/branches/develbranch_6/gui/wxpython/docs/wxGUI.html	2009-09-07 15:33:20 UTC (rev 39068)
@@ -101,89 +101,74 @@
 <dl>
 
 <dt><img src="icons/grass2/monitor-create.png">&nbsp;
-  <img src="icons/grass/gui-startmon.gif">&nbsp;
 <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;
-  <img src="icons/grass/file-new.gif">&nbsp;
 <em>Creates 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;
-  <img src="icons/grass/file-new.gif">&nbsp;
 <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;
 <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;
 <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;
 <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;
-  <img src="icons/grass/module-d.shadedmap.gif">&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;
-	<img src="icons/grass/module-d.shadedmap.gif">&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></li>
     <li><dt><img src="icons/grass2/layer-rgb-add.png">&nbsp;
-	<img src="icons/grass/channel-rgb.gif">&nbsp;
 	<em>Add RGB raster layer</em></dt>
       <dd>Combines and displays three raster maps defined as red, green, and blue
 	channels, see <em><a href="d.rgb.html">d.rgb</a></em>.</dd></li>
     <li><dt><img src="icons/grass2/layer-his-add.png">&nbsp;
-	<img src="icons/grass/channel-his.gif">&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,
 	see <em><a href="d.his.html">d.his</a></em>.</dd></li>
     <li><dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
-	<img src="icons/grass/module-d.rast.arrow.gif">&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></li>
     <li><dt><img src="icons/grass2/layer-cell-cats-add.png">&nbsp;
-	<img src="icons/grass/module-d.rast.num.gif">&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></li>
   </ul>
 
 <dt><img src="icons/grass2/layer-vector-add.png">&nbsp;
-  <img src="icons/grass/element-vector.gif">&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-thematic-add.png">&nbsp;
-  <img src="icons/grass/module-d.vect.thematic.gif">&nbsp;
 <em>Add various vector-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-vector-thematic-add.png">&nbsp;
-	<img src="icons/grass/module-d.vect.thematic.gif">&nbsp;
 	<em>Add thematic map layer
 	  (for all vector types)</em></dt>
       <dd>Adds layer for thematic display values from a numeric attribute
@@ -197,7 +182,6 @@
 	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;
-	<img src="icons/grass/module-d.vect.chart.gif">&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
@@ -208,7 +192,6 @@
   </ul>
 
 <dt><img src="icons/grass2/layer-command-add.png">&nbsp;
-  <img src="icons/grass/gui-cmd.gif">&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.
@@ -226,24 +209,20 @@
 </dd>
 
 <dt><img src="icons/grass2/layer-group-add.png">&nbsp;
-  <img src="icons/grass/gui-group.gif">&nbsp;
 <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;
-  <img src="icons/grass/module-d.grid.gif">&nbsp;
    <em>Add grid or vector labels overlay</em></dt>
 <dd>opens a dropdown menu that allows user to select to:<br>
 
   <ul>
   <li><dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
-      <img src="icons/grass/module-d.grid.gif">&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;
-      <img src="icons/grass/module-d.labels.gif">&nbsp;
       <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
@@ -251,25 +230,21 @@
       created with a text editor, see <em><a href="d.labels.html">d.labels</a></em>.</dd></li>
 
   <li><dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
-      <img src="icons/grass/module-d.grid.gif">&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></li>
 
   <li><dt><img src="icons/grass2/layer-grid-add.png">&nbsp;
-      <img src="icons/grass/module-d.grid.gif">&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></li>
   </ul>
 
 <dt><img src="icons/grass2/layer-remove.png">&nbsp;
-  <img src="icons/grass/edit-cut.gif">&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;
-  <img src="icons/grass/db-values.gif">&nbsp;
   <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>
 
@@ -332,34 +307,29 @@
 <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 active layers (current region)</em></dt>
 <dd>Displays all active layers from layer tree at current resolution
 and region extents for that map display window.</dd>
 
 <dt><img src="icons/grass2/layer-redraw.png">&nbsp;
-  <img src="icons/grass/gui-redraw.gif">&nbsp;
-  <img src="icons/silk/arrow_refresh.png"> <em>Re-render and display all active
+  <em>Re-render and display all active
 layers and zoom to current region</em></dt>
 <dd>Resets the region to the display resolution and extents and forces
 re-display and re-rendering all active layers.</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 content</em></dt>
 <dd>Erases the currently selected map display to a white background;
 also removes all frames,
 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>Arrow cursor</em></dt>
 <dd>Select arrow cursor for map display.</dd>
 
 <dt><img src="icons/grass2/info.png">&nbsp;
-  <img src="icons/grass/gui-query.gif">&nbsp;
-  <img src="icons/silk/information.png"> <em>Query tool (select a map first)</em></dt>
+  <em>Query tool (select a map first)</em></dt>
 <dd>Query selected raster, RGB raster (all three map channels will be
 queried), or vector map(s) using the mouse. Map(s) must be selected
 before query.  Vector charts and thematic vector maps cannot be
@@ -368,8 +338,7 @@
 see <em><a href="r.what.html">r.what</a>, <a href="v.what.html">v.what</a></em>.</dd>
 
 <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
@@ -378,8 +347,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
@@ -391,8 +359,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
@@ -405,14 +372,12 @@
 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>
+  <em>Revert zoom</em></dt>
 <dd>Returns to the previous zoom. 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;
-  <img src="icons/grass/gui-mapzoom.gif">&nbsp;
-  <img src="icons/silk/zoom.png"> <em>Zoom menu</em></dt>
+  <em>Zoom menu</em></dt>
 <dd>Automatic zoom settings menu. Zoom to match the extents of a selected
 map, zoom to match the computational region (set with
 <em>g.region</em>), zoom to match the extents of a saved region or
@@ -422,14 +387,12 @@
 See <em><a href="g.region.html">g.region</a></em>.</dd>
 
 <dt><img src="icons/grass2/layer-raster-analyze.png">&nbsp;
-  <img src="icons/grass/gui-rastanalyze.gif">&nbsp;
-  <img src="icons/silk/application_lightning.png"> <em>Analyze menu</em></dt>
+  <em>Analyze menu</em></dt>
 <dd>Contains functions for distance measurement, creating histogram or
 profile tool.</dd>
 
 <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>
+  <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
@@ -437,8 +400,7 @@
 see <em><a href="d.measure.html">d.measure</a></em>.</dd>
 
 <dt><img src="icons/grass2/layer-raster-profile.png">&nbsp;
-  <img src="icons/grass/gui-profile.gif">&nbsp;
-  <img src="icons/silk/wand.png"> <em>Profile tool</em></dt>
+  <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
 displayed map or a different map,
@@ -446,46 +408,39 @@
 page</a></em>.</dd>
 
 <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>
+  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>
 
 <dt><img src="icons/grass2/element-add.png">&nbsp;
-  <img src="icons/silk/overlays.png">&nbsp;
-  <img src="icons/grass/gui-rastanalyze.gif"> Add overlay</dt>
+  Add overlay</dt>
 <dd>Adds overlay to map display like barscale, north arrow, text.</dd>
 
 <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>
+  <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;
-  <img src="icons/grass/module-d.legend.gif">&nbsp;
-  <img src="icons/silk/page_green.png"> <em>Add raster map legend</em></dt>
+  <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;
-  <img src="icons/grass/module-d.text.gif">&nbsp;
-  <img src="icons/silk/textfield_add.png"> <em>Add text layer</em></dt>
+  <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>
 
 <dt><img src="icons/grass2/map-export.png">&nbsp;
-  <img src="icons/grass/file-save.gif">&nbsp;
-  <img src="icons/silk/picture_save.png"> <em>Export map display</em></dt>
+  <em>Export map display</em></dt>
 <dd>Exports visible 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 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>
@@ -494,31 +449,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