[GRASS-SVN] r30585 - in grass/trunk/gui: icons icons/silk wxpython/docs wxpython/icons wxpython/icons/silk

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Mar 16 12:27:16 EDT 2008


Author: martinl
Date: 2008-03-16 12:27:15 -0400 (Sun, 16 Mar 2008)
New Revision: 30585

Added:
   grass/trunk/gui/icons/silk/
   grass/trunk/gui/icons/silk/application.png
   grass/trunk/gui/icons/silk/application_add.png
   grass/trunk/gui/icons/silk/application_delete.png
   grass/trunk/gui/icons/silk/application_lightning.png
   grass/trunk/gui/icons/silk/application_view_columns.png
   grass/trunk/gui/icons/silk/application_view_icons.png
   grass/trunk/gui/icons/silk/arrow_inout.png
   grass/trunk/gui/icons/silk/arrow_out.png
   grass/trunk/gui/icons/silk/arrow_refresh.png
   grass/trunk/gui/icons/silk/arrow_undo.png
   grass/trunk/gui/icons/silk/bin_closed.png
   grass/trunk/gui/icons/silk/bullet_add.png
   grass/trunk/gui/icons/silk/bullet_go.png
   grass/trunk/gui/icons/silk/chart_bar.png
   grass/trunk/gui/icons/silk/chart_line.png
   grass/trunk/gui/icons/silk/chart_line_add.png
   grass/trunk/gui/icons/silk/chart_line_delete.png
   grass/trunk/gui/icons/silk/chart_line_edit.png
   grass/trunk/gui/icons/silk/chart_line_link.png
   grass/trunk/gui/icons/silk/chart_organisation.png
   grass/trunk/gui/icons/silk/chart_organisation_add.png
   grass/trunk/gui/icons/silk/cog_add.png
   grass/trunk/gui/icons/silk/color_swatch.png
   grass/trunk/gui/icons/silk/cross.png
   grass/trunk/gui/icons/silk/cursor.png
   grass/trunk/gui/icons/silk/door_in.png
   grass/trunk/gui/icons/silk/folder.png
   grass/trunk/gui/icons/silk/folder_add.png
   grass/trunk/gui/icons/silk/font.png
   grass/trunk/gui/icons/silk/grid.png
   grass/trunk/gui/icons/silk/his.png
   grass/trunk/gui/icons/silk/image_add.png
   grass/trunk/gui/icons/silk/images.png
   grass/trunk/gui/icons/silk/information.png
   grass/trunk/gui/icons/silk/layout_content.png
   grass/trunk/gui/icons/silk/map.png
   grass/trunk/gui/icons/silk/map_add.png
   grass/trunk/gui/icons/silk/map_go.png
   grass/trunk/gui/icons/silk/map_magnify.png
   grass/trunk/gui/icons/silk/map_magnify_menu.png
   grass/trunk/gui/icons/silk/overlays.png
   grass/trunk/gui/icons/silk/page_green.png
   grass/trunk/gui/icons/silk/page_save.png
   grass/trunk/gui/icons/silk/page_white.png
   grass/trunk/gui/icons/silk/page_white_get.png
   grass/trunk/gui/icons/silk/page_white_picture.png
   grass/trunk/gui/icons/silk/picture_empty.png
   grass/trunk/gui/icons/silk/picture_save.png
   grass/trunk/gui/icons/silk/plugin.png
   grass/trunk/gui/icons/silk/plugin_add.png
   grass/trunk/gui/icons/silk/printer.png
   grass/trunk/gui/icons/silk/rgb.png
   grass/trunk/gui/icons/silk/shape_handles.png
   grass/trunk/gui/icons/silk/shape_square_add.png
   grass/trunk/gui/icons/silk/sum.png
   grass/trunk/gui/icons/silk/table.png
   grass/trunk/gui/icons/silk/table_add.png
   grass/trunk/gui/icons/silk/tag_blue_add.png
   grass/trunk/gui/icons/silk/tag_green.png
   grass/trunk/gui/icons/silk/textfield_add.png
   grass/trunk/gui/icons/silk/thematic.png
   grass/trunk/gui/icons/silk/vector_add.png
   grass/trunk/gui/icons/silk/vector_delete.png
   grass/trunk/gui/icons/silk/wand.png
   grass/trunk/gui/icons/silk/zoom.png
   grass/trunk/gui/icons/silk/zoom_back.png
   grass/trunk/gui/icons/silk/zoom_in.png
   grass/trunk/gui/icons/silk/zoom_out.png
Removed:
   grass/trunk/gui/wxpython/icons/silk/application.png
   grass/trunk/gui/wxpython/icons/silk/application_add.png
   grass/trunk/gui/wxpython/icons/silk/application_delete.png
   grass/trunk/gui/wxpython/icons/silk/application_lightning.png
   grass/trunk/gui/wxpython/icons/silk/application_view_columns.png
   grass/trunk/gui/wxpython/icons/silk/application_view_icons.png
   grass/trunk/gui/wxpython/icons/silk/arrow_inout.png
   grass/trunk/gui/wxpython/icons/silk/arrow_out.png
   grass/trunk/gui/wxpython/icons/silk/arrow_refresh.png
   grass/trunk/gui/wxpython/icons/silk/arrow_undo.png
   grass/trunk/gui/wxpython/icons/silk/bin_closed.png
   grass/trunk/gui/wxpython/icons/silk/bullet_add.png
   grass/trunk/gui/wxpython/icons/silk/bullet_go.png
   grass/trunk/gui/wxpython/icons/silk/chart_bar.png
   grass/trunk/gui/wxpython/icons/silk/chart_line.png
   grass/trunk/gui/wxpython/icons/silk/chart_line_add.png
   grass/trunk/gui/wxpython/icons/silk/chart_line_delete.png
   grass/trunk/gui/wxpython/icons/silk/chart_line_edit.png
   grass/trunk/gui/wxpython/icons/silk/chart_line_link.png
   grass/trunk/gui/wxpython/icons/silk/chart_organisation.png
   grass/trunk/gui/wxpython/icons/silk/chart_organisation_add.png
   grass/trunk/gui/wxpython/icons/silk/cog_add.png
   grass/trunk/gui/wxpython/icons/silk/color_swatch.png
   grass/trunk/gui/wxpython/icons/silk/cross.png
   grass/trunk/gui/wxpython/icons/silk/cursor.png
   grass/trunk/gui/wxpython/icons/silk/door_in.png
   grass/trunk/gui/wxpython/icons/silk/folder.png
   grass/trunk/gui/wxpython/icons/silk/folder_add.png
   grass/trunk/gui/wxpython/icons/silk/font.png
   grass/trunk/gui/wxpython/icons/silk/grid.png
   grass/trunk/gui/wxpython/icons/silk/his.png
   grass/trunk/gui/wxpython/icons/silk/image_add.png
   grass/trunk/gui/wxpython/icons/silk/images.png
   grass/trunk/gui/wxpython/icons/silk/information.png
   grass/trunk/gui/wxpython/icons/silk/layout_content.png
   grass/trunk/gui/wxpython/icons/silk/map.png
   grass/trunk/gui/wxpython/icons/silk/map_add.png
   grass/trunk/gui/wxpython/icons/silk/map_go.png
   grass/trunk/gui/wxpython/icons/silk/map_magnify.png
   grass/trunk/gui/wxpython/icons/silk/map_magnify_menu.png
   grass/trunk/gui/wxpython/icons/silk/overlays.png
   grass/trunk/gui/wxpython/icons/silk/page_green.png
   grass/trunk/gui/wxpython/icons/silk/page_save.png
   grass/trunk/gui/wxpython/icons/silk/page_white.png
   grass/trunk/gui/wxpython/icons/silk/page_white_get.png
   grass/trunk/gui/wxpython/icons/silk/page_white_picture.png
   grass/trunk/gui/wxpython/icons/silk/picture_empty.png
   grass/trunk/gui/wxpython/icons/silk/picture_save.png
   grass/trunk/gui/wxpython/icons/silk/plugin.png
   grass/trunk/gui/wxpython/icons/silk/plugin_add.png
   grass/trunk/gui/wxpython/icons/silk/printer.png
   grass/trunk/gui/wxpython/icons/silk/rgb.png
   grass/trunk/gui/wxpython/icons/silk/shape_handles.png
   grass/trunk/gui/wxpython/icons/silk/shape_square_add.png
   grass/trunk/gui/wxpython/icons/silk/sum.png
   grass/trunk/gui/wxpython/icons/silk/table.png
   grass/trunk/gui/wxpython/icons/silk/table_add.png
   grass/trunk/gui/wxpython/icons/silk/tag_blue_add.png
   grass/trunk/gui/wxpython/icons/silk/tag_green.png
   grass/trunk/gui/wxpython/icons/silk/textfield_add.png
   grass/trunk/gui/wxpython/icons/silk/thematic.png
   grass/trunk/gui/wxpython/icons/silk/vector_add.png
   grass/trunk/gui/wxpython/icons/silk/vector_delete.png
   grass/trunk/gui/wxpython/icons/silk/wand.png
   grass/trunk/gui/wxpython/icons/silk/zoom.png
   grass/trunk/gui/wxpython/icons/silk/zoom_back.png
   grass/trunk/gui/wxpython/icons/silk/zoom_in.png
   grass/trunk/gui/wxpython/icons/silk/zoom_out.png
Modified:
   grass/trunk/gui/icons/Makefile
   grass/trunk/gui/wxpython/docs/wxGUI.html
   grass/trunk/gui/wxpython/icons/icon.py
Log:
wxGUI: silk-based icons moved to gui/icons
icons are installed only to docs/html/icons (available for on-line manual pages), not installed to $GISBASE/etc/gui/icons (to save space)


Modified: grass/trunk/gui/icons/Makefile
===================================================================
--- grass/trunk/gui/icons/Makefile	2008-03-16 15:45:31 UTC (rev 30584)
+++ grass/trunk/gui/icons/Makefile	2008-03-16 16:27:15 UTC (rev 30585)
@@ -5,8 +5,12 @@
 default:
 	if [ ! -d $(GISBASE)/etc/gui ] ; then $(MKDIR) $(GISBASE)/etc/gui ; fi
 	if [ ! -d $(GISBASE)/etc/gui/icons ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons ; fi
+	@# if [ ! -d $(GISBASE)/etc/gui/icons/silk ] ; then $(MKDIR) $(GISBASE)/etc/gui/icons/silk ; fi
 	for icon in *.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/etc/gui/icons ; done
+	@# for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(GISBASE)/etc/gui/icons/silk ; done
 	if [ ! -d $(GISBASE)/docs ] ; then $(MKDIR) $(GISBASE)/docs ; fi
 	if [ ! -d $(GISBASE)/docs/html ] ; then $(MKDIR) $(GISBASE)/docs/html ; fi
 	if [ ! -d $(GISBASE)/docs/html/icons ] ; then $(MKDIR) $(GISBASE)/docs/html/icons ; fi
+	if [ ! -d $(GISBASE)/docs/html/icons/silk ] ; then $(MKDIR) $(GISBASE)/docs/html/icons/silk ; fi
 	for icon in *.gif ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons ; done
+	for icon in silk/*.png ; do $(INSTALL_DATA) $$icon $(GISBASE)/docs/html/icons/silk ; done

Copied: grass/trunk/gui/icons/silk/application.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/application.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/application_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/application_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/application_delete.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/application_delete.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/application_lightning.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/application_lightning.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/application_view_columns.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/application_view_columns.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/application_view_icons.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/application_view_icons.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/arrow_inout.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/arrow_inout.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/arrow_out.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/arrow_out.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/arrow_refresh.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/arrow_refresh.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/arrow_undo.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/arrow_undo.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/bin_closed.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/bin_closed.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/bullet_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/bullet_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/bullet_go.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/bullet_go.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_bar.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_bar.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_line.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_line.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_line_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_line_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_line_delete.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_line_delete.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_line_edit.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_line_edit.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_line_link.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_line_link.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_organisation.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_organisation.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/chart_organisation_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/chart_organisation_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/cog_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/cog_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/color_swatch.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/color_swatch.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/cross.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/cross.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/cursor.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/cursor.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/door_in.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/door_in.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/folder.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/folder.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/folder_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/folder_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/font.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/font.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/grid.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/grid.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/his.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/his.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/image_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/image_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/images.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/images.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/information.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/information.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/layout_content.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/layout_content.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/map.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/map.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/map_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/map_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/map_go.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/map_go.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/map_magnify.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/map_magnify.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/map_magnify_menu.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/map_magnify_menu.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/overlays.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/overlays.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/page_green.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/page_green.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/page_save.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/page_save.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/page_white.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/page_white.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/page_white_get.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/page_white_get.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/page_white_picture.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/page_white_picture.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/picture_empty.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/picture_empty.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/picture_save.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/picture_save.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/plugin.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/plugin.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/plugin_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/plugin_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/printer.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/printer.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/rgb.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/rgb.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/shape_handles.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/shape_handles.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/shape_square_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/shape_square_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/sum.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/sum.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/table.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/table.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/table_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/table_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/tag_blue_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/tag_blue_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/tag_green.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/tag_green.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/textfield_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/textfield_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/thematic.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/thematic.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/vector_add.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/vector_add.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/vector_delete.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/vector_delete.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/wand.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/wand.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/zoom.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/zoom.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/zoom_back.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/zoom_back.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/zoom_in.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/zoom_in.png)
===================================================================
(Binary files differ)

Copied: grass/trunk/gui/icons/silk/zoom_out.png (from rev 30582, grass/trunk/gui/wxpython/icons/silk/zoom_out.png)
===================================================================
(Binary files differ)

Modified: grass/trunk/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.html	2008-03-16 15:45:31 UTC (rev 30584)
+++ grass/trunk/gui/wxpython/docs/wxGUI.html	2008-03-16 16:27:15 UTC (rev 30585)
@@ -83,62 +83,62 @@
 
 <dl>
 
-<dt><img src="../../etc/wxpython/icons/silk/application_add.png">&nbsp;
+<dt><img src="icons/silk/application_add.png">&nbsp;
   <img src="icons/gui-startmon.gif"> Open new Map Display Window</dt>
 <dd>Opens a new map display and creates empty layer tree tab in Layer Manager.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/page_white.png">&nbsp;
+<dt><img src="icons/silk/page_white.png">&nbsp;
   <img src="icons/file-new.gif">Creates new workspace file</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="../../etc/wxpython/icons/silk/page_white_get.png">&nbsp;
+<dt><img src="icons/silk/page_white_get.png">&nbsp;
   <img src="icons/file-new.gif">Load map layers (raster, vector) into workspace</dt>
 <dd>Loads selected raster or vector maps into current layer tree.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/folder.png">&nbsp;
+<dt><img src="icons/silk/folder.png">&nbsp;
   <img src="icons/file-open.gif">Open an existing workspace file</dt>
 <dd>Opens an previously saved workspace file, containing a set of display
 layers and their option settings.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/page_save.png">&nbsp;
+<dt><img src="icons/silk/page_save.png">&nbsp;
   <img src="icons/file-save.gif"> Save layers composition to workspace
   file</dt>
 <dd>Saves current set of layers and their options to a workspace
   file.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/image_add.png">&nbsp;
+<dt><img src="icons/silk/image_add.png">&nbsp;
   <img src="icons/element-cell.gif"> Add raster-based map layer</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>
 
-<dt><img src="../../etc/wxpython/icons/silk/picture_empty.png">&nbsp;
+<dt><img src="icons/silk/picture_empty.png">&nbsp;
   <img src="icons/module-d.shadedmap.gif"> Add shaded relief map layer</dt>
 <dd>Adds shaded relief raster map layer,
 see <em><a href="d.shadedmap.html">d.shadedmap</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/rgb.png">&nbsp;
+<dt><img src="icons/silk/rgb.png">&nbsp;
   <img src="icons/channel-rgb.gif"> Add RGB raster layer</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>
 
-<dt><img src="../../etc/wxpython/icons/silk/his.png">&nbsp;
+<dt><img src="icons/silk/his.png">&nbsp;
   <img src="icons/channel-his.gif"> Add HIS raster layer</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="../../etc/wxpython/icons/silk/arrow_out.png">&nbsp;
+<dt><img src="icons/silk/arrow_out.png">&nbsp;
   <img src="icons/module-d.rast.arrow.gif"> 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,
 see <em><a href="d.rast.arrow.html">d.rast.arrow</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/map_add.png">&nbsp;
+<dt><img src="icons/silk/map_add.png">&nbsp;
   <img src="icons/element-vector.gif"> Add vector-based map layer</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>
 
-<dt><img src="../../etc/wxpython/icons/silk/thematic.png">&nbsp;
+<dt><img src="icons/silk/thematic.png">&nbsp;
   <img src="icons/module-d.vect.thematic.gif"> Add thematic map layer
   (for all vector types)</dt>
 <dd>Adds layer for thematic display values from a numeric attribute
@@ -151,7 +151,7 @@
 printing,
 see <em><a href="d.vect.thematic.html">d.vect.thematic</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/chart_bar.png">&nbsp;
+<dt><img src="icons/silk/chart_bar.png">&nbsp;
   <img src="icons/module-d.vect.chart.gif"> Add thematic charts layer
 (for vector points)</dt>
 <dd>Adds layer in which pie or bar charts can be automatically created
@@ -161,7 +161,7 @@
 on attribute column),
 see <em><a href="d.vect.chart.html">d.vect.chart</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/cog_add.png">&nbsp;
+<dt><img src="icons/silk/cog_add.png">&nbsp;
   <img src="icons/gui-cmd.gif"> 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.
@@ -178,16 +178,16 @@
 </pre></div>
 </dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/folder_add.png">&nbsp;
+<dt><img src="icons/silk/folder_add.png">&nbsp;
   <img src="icons/gui-group.gif"> Add layer group</dt>
 <dd>Adds an empty layer group. Layers can then be added to the group.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/images.png">&nbsp;
+<dt><img src="icons/silk/images.png">&nbsp;
   <img src="icons/module-d.grid.gif"> Add overlay grids and lines</dt>
 <dd>Adds layer to display regular grid (for all locations), or geodesic and
 rhumblines (for latitude/longitude locations only), see <em><a href="d.grid.html">d.grid</a>, <a href="d.geodesic.html">d.geodesic</a>, <a href="d.rhumbline.html">d.rhumbline</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/tag_blue_add.png">&nbsp;
+<dt><img src="icons/silk/tag_blue_add.png">&nbsp;
   <img src="icons/module-d.labels.gif"> Add labels layer for vector
 objects (from existing labels file)</dt>
 <dd>Add raster text layer from a labels file for vector objects
@@ -196,11 +196,11 @@
 created with a text editor,
 see <em><a href="d.labels.html">d.labels</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/bin_closed.png">&nbsp;
+<dt><img src="icons/silk/bin_closed.png">&nbsp;
   <img src="icons/edit-cut.gif"> Remove layer for layer tree</dt>
 <dd>Removes selected layer or layer group from layer tree.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/application_view_columns.png">&nbsp;
+<dt><img src="icons/silk/application_view_columns.png">&nbsp;
   <img src="icons/db-values.gif"> Open <a href="wxGUI.Attribute_Table_Manager.html">Attribute Table Manager</a> for selected vector map</dt>
 <dd>Displays attribute data of selected vector map.</dd>
 
@@ -238,29 +238,29 @@
 
 <dl>
 
-<dt><img src="../../etc/wxpython/icons/silk/map_go.png">&nbsp;
+<dt><img src="icons/silk/map_go.png">&nbsp;
   <img src="icons/gui-display.gif"> Display active layers (current region)</dt>
 <dd>Displays all active layers from layer tree at current resolution
 and region extents for that map display window.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/arrow_refresh.png">&nbsp;
+<dt><img src="icons/silk/arrow_refresh.png">&nbsp;
   <img src="icons/gui-redraw.gif"> Re-render and display all active
 layers and zoom to current region</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="../../etc/wxpython/icons/silk/cross.png">&nbsp;
+<dt><img src="icons/silk/cross.png">&nbsp;
   <img src="icons/gui-erase.gif"> Erase display content</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="../../etc/wxpython/icons/silk/cursor.png">&nbsp;
+<dt><img src="icons/silk/cursor.png">&nbsp;
   <img src="icons/gui-pointer.gif"> Arrow cursor</dt>
 <dd>Select arrow cursor for map display.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/information.png">&nbsp;
+<dt><img src="icons/silk/information.png">&nbsp;
   <img src="icons/gui-query.gif"> Query tool (select a map first)</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
@@ -269,7 +269,7 @@
 window,
 see <em><a href="r.what.html">r.what</a>, <a href="v.what.html">v.what</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/arrow_out.png">&nbsp;
+<dt><img src="icons/silk/arrow_out.png">&nbsp;
   <img src="icons/gui-pan.gif"> 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
@@ -278,7 +278,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="../../etc/wxpython/icons/silk/zoom_in.png">&nbsp;
+<dt><img src="icons/silk/zoom_in.png">&nbsp;
   <img src="icons/gui-zoom_in.gif"> Zoom in</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
@@ -290,7 +290,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="../../etc/wxpython/icons/silk/zoom_out.png">&nbsp;
+<dt><img src="icons/silk/zoom_out.png">&nbsp;
   <img src="icons/gui-zoom_out.gif"> Zoom out</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
@@ -303,12 +303,12 @@
 other GIS processes,
 see <em><a href="g.region.html">g.region</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/zoom_back.png">&nbsp;
+<dt><img src="icons/silk/zoom_back.png">&nbsp;
   <img src="icons/gui-zoom_back.gif"> Revert zoom</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="../../etc/wxpython/icons/silk/zoom.png">&nbsp;
+<dt><img src="icons/silk/zoom.png">&nbsp;
   <img src="icons/gui-mapzoom.gif"> Zoom menu</dt>
 <dd>Automatic zoom settings menu. Zoom to match the extents of a selected
 map, zoom to match the computational region (set with
@@ -318,12 +318,12 @@
 current display extents (does not change the resolution).
 See <em><a href="g.region.html">g.region</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/application_lightning.png">&nbsp;
+<dt><img src="icons/silk/application_lightning.png">&nbsp;
   <img src="icons/gui-rastanalyze.gif"> Analyze menu</dt>
 <dd>Contains functions for distance measurement, creating histogram or
 profile tool.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/sum.png">&nbsp;
+<dt><img src="icons/silk/sum.png">&nbsp;
   <img src="icons/gui-measure.gif"> 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
@@ -331,7 +331,7 @@
 measured in the current measurement unit,
 see <em><a href="d.measure.html">d.measure</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/wand.png">&nbsp;
+<dt><img src="icons/silk/wand.png">&nbsp;
   <img src="icons/gui-profile.gif"> 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
@@ -339,39 +339,39 @@
 see <em><a href="gm_profile.html">Profile Tool help
 page</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/chart_bar.png">&nbsp;
+<dt><img src="icons/silk/chart_bar.png">&nbsp;
   <img src="icons/module-d.histogram.gif"> Display histogram of selected raster map</td>
 <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="../../etc/wxpython/icons/silk/overlays.png">&nbsp;
+<dt><img src="icons/silk/overlays.png">&nbsp;
   <img src="icons/gui-rastanalyze.gif"> Add overlay</dt>
 <dd>Adds overlay to map display like barscale, north arrow, text.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/page_white_picture.png">&nbsp;
+<dt><img src="icons/silk/page_white_picture.png">&nbsp;
   <img src="icons/module-d.barscale.gif"> Add scalebar and north arrow</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="../../etc/wxpython/icons/silk/page_green.png">&nbsp;
+<dt><img src="icons/silk/page_green.png">&nbsp;
   <img src="icons/module-d.legend.gif"> Add legend of raster map</dt>
 <dd>Adds layer to display with legend of selected raster map,
 see <a href="d.legend.html">d.legend</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/textfield_add.png">&nbsp;
+<dt><img src="icons/silk/textfield_add.png">&nbsp;
   <img src="icons/module-d.text.gif"> 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, bolding,
 and color, see <em><a href="d.text.html">d.text</a></em>.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/picture_save.png">&nbsp;
+<dt><img src="icons/silk/picture_save.png">&nbsp;
   <img src="icons/file-save.gif"> Export map display</dt>
 <dd>Exports visible map display to different raster graphic formats.</dd>
 
-<dt><img src="../../etc/wxpython/icons/silk/printer.png">&nbsp;
+<dt><img src="icons/silk/printer.png">&nbsp;
   <img src="icons/file-print.gif"> 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

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2008-03-16 15:45:31 UTC (rev 30584)
+++ grass/trunk/gui/wxpython/icons/icon.py	2008-03-16 16:27:15 UTC (rev 30585)
@@ -34,7 +34,7 @@
 #    iconpath = os.getenv("GRASS_ICONPATH")
 iconTheme = UserSettings.Get(group='advanced', key='iconTheme', subkey='type')
 if iconTheme and iconTheme == 'silk':
-    iconpath = os.path.join(globalvar.ETCWXDIR, "icons", "silk")
+    iconpath = os.path.join(os.getenv("GISBASE"), "docs", "html", "icons", "silk")
 else:
     iconpath = None
 

Deleted: grass/trunk/gui/wxpython/icons/silk/application.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/application_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/application_delete.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/application_lightning.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/application_view_columns.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/application_view_icons.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/arrow_inout.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/arrow_out.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/arrow_refresh.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/arrow_undo.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/bin_closed.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/bullet_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/bullet_go.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_bar.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_line.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_line_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_line_delete.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_line_edit.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_line_link.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_organisation.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/chart_organisation_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/cog_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/color_swatch.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/cross.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/cursor.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/door_in.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/folder.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/folder_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/font.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/grid.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/his.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/image_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/images.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/information.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/layout_content.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/map.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/map_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/map_go.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/map_magnify.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/map_magnify_menu.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/overlays.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/page_green.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/page_save.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/page_white.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/page_white_get.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/page_white_picture.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/picture_empty.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/picture_save.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/plugin.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/plugin_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/printer.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/rgb.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/shape_handles.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/shape_square_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/sum.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/table.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/table_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/tag_blue_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/tag_green.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/textfield_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/thematic.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/vector_add.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/vector_delete.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/wand.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/zoom.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/zoom_back.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/zoom_in.png
===================================================================
(Binary files differ)

Deleted: grass/trunk/gui/wxpython/icons/silk/zoom_out.png
===================================================================
(Binary files differ)



More information about the grass-commit mailing list