Add 2 missing icons; Change align and distribute icon naming to be more

consistent; add Makefile.am generation script for the hicolor directory

(bzr r7293)

21 files changed, 237 insertions, 33 deletions

diff --git a/share/icons/hicolor/Makefile.am b/share/icons/hicolor/Makefile.am
index 79eec6c9b..4d135e17f 100644
--- a/share/icons/hicolor/Makefile.am
+++ b/share/icons/hicolor/Makefile.am
@@ -1 +1,2 @@
 SUBDIRS = scalable
+EXTRA_DIST = update-makefiles.sh
diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am
index eb04aff9c..5be4e82d0 100644
--- a/share/icons/hicolor/scalable/actions/Makefile.am
+++ b/share/icons/hicolor/scalable/actions/Makefile.am
@@ -4,21 +4,24 @@ context = actions
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-# To update this list, run:
-# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info
-# and paste the contents of the dialog box here
+# Auto-generated by update-makefiles.sh
+# Re-run the script to update.
 
 icons_DATA = \
-	align-bottom.svg \
-	align-bottom-to-anchor.svg \
-	align-center-horizontal.svg \
-	align-center-vertical.svg \
-	align-left.svg \
-	align-left-to-anchor.svg \
-	align-right.svg \
-	align-right-to-anchor.svg \
-	align-top.svg \
-	align-top-to-anchor.svg \
+	align-horizontal-baseline.svg \
+	align-horizontal-center.svg \
+	align-horizontal-left.svg \
+	align-horizontal-left-to-anchor.svg \
+	align-horizontal-nodes.svg \
+	align-horizontal-right.svg \
+	align-horizontal-right-to-anchor.svg \
+	align-vertical-baseline.svg \
+	align-vertical-bottom.svg \
+	align-vertical-bottom-to-anchor.svg \
+	align-vertical-center.svg \
+	align-vertical-nodes.svg \
+	align-vertical-top.svg \
+	align-vertical-top-to-anchor.svg \
 	bitmap-trace.svg \
 	color-fill.svg \
 	color-gradient.svg \
@@ -92,8 +95,6 @@ icons_DATA = \
 	layer-rename.svg \
 	layer-top.svg \
 	node-add.svg \
-	node-align-horizontal.svg \
-	node-align-vertical.svg \
 	node-break.svg \
 	node-delete-segment.svg \
 	node-delete.svg \
@@ -150,9 +151,9 @@ icons_DATA = \
 	show-dialogs.svg \
 	show-grid.svg \
 	show-guides.svg \
+	show-node-handles.svg \
+	show-path-outline.svg \
 	stroke-to-path.svg \
-	text-align-baseline-horizontal.svg \
-	text-align-baseline-vertical.svg \
 	text-convert-to-regular.svg \
 	text-distribute-baseline-horizontal.svg \
 	text-distribute-baseline-vertical.svg \
@@ -190,6 +191,6 @@ icons_DATA = \
 	zoom-original.svg \
 	zoom-out.svg \
 	zoom-previous.svg \
-	zoom.svg
+	zoom.svg 
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/share/icons/hicolor/scalable/actions/text-align-baseline-horizontal.svg b/share/icons/hicolor/scalable/actions/align-horizontal-baseline.svg
index 2736ee12c..2736ee12c 100644
--- a/share/icons/hicolor/scalable/actions/text-align-baseline-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-baseline.svg
diff --git a/share/icons/hicolor/scalable/actions/align-center-horizontal.svg b/share/icons/hicolor/scalable/actions/align-horizontal-center.svg
index c0f6fa4ab..c0f6fa4ab 100644
--- a/share/icons/hicolor/scalable/actions/align-center-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-center.svg
diff --git a/share/icons/hicolor/scalable/actions/align-left-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-horizontal-left-to-anchor.svg
index 66919b266..66919b266 100644
--- a/share/icons/hicolor/scalable/actions/align-left-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-left-to-anchor.svg
diff --git a/share/icons/hicolor/scalable/actions/align-left.svg b/share/icons/hicolor/scalable/actions/align-horizontal-left.svg
index f5562482b..f5562482b 100644
--- a/share/icons/hicolor/scalable/actions/align-left.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-left.svg
diff --git a/share/icons/hicolor/scalable/actions/node-align-horizontal.svg b/share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg
index 7c37e1533..7c37e1533 100644
--- a/share/icons/hicolor/scalable/actions/node-align-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg
diff --git a/share/icons/hicolor/scalable/actions/align-right-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-horizontal-right-to-anchor.svg
index f90d37ad9..f90d37ad9 100644
--- a/share/icons/hicolor/scalable/actions/align-right-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-right-to-anchor.svg
diff --git a/share/icons/hicolor/scalable/actions/align-right.svg b/share/icons/hicolor/scalable/actions/align-horizontal-right.svg
index 3164777ab..3164777ab 100644
--- a/share/icons/hicolor/scalable/actions/align-right.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-right.svg
diff --git a/share/icons/hicolor/scalable/actions/text-align-baseline-vertical.svg b/share/icons/hicolor/scalable/actions/align-vertical-baseline.svg
index 0d8cbea45..0d8cbea45 100644
--- a/share/icons/hicolor/scalable/actions/text-align-baseline-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-baseline.svg
diff --git a/share/icons/hicolor/scalable/actions/align-bottom-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-vertical-bottom-to-anchor.svg
index 81bed261f..81bed261f 100644
--- a/share/icons/hicolor/scalable/actions/align-bottom-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-bottom-to-anchor.svg
diff --git a/share/icons/hicolor/scalable/actions/align-bottom.svg b/share/icons/hicolor/scalable/actions/align-vertical-bottom.svg
index b347a7f69..b347a7f69 100644
--- a/share/icons/hicolor/scalable/actions/align-bottom.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-bottom.svg
diff --git a/share/icons/hicolor/scalable/actions/align-center-vertical.svg b/share/icons/hicolor/scalable/actions/align-vertical-center.svg
index 34660618d..34660618d 100644
--- a/share/icons/hicolor/scalable/actions/align-center-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-center.svg
diff --git a/share/icons/hicolor/scalable/actions/node-align-vertical.svg b/share/icons/hicolor/scalable/actions/align-vertical-nodes.svg
index df4980b17..df4980b17 100644
--- a/share/icons/hicolor/scalable/actions/node-align-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-nodes.svg
diff --git a/share/icons/hicolor/scalable/actions/align-top-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-vertical-top-to-anchor.svg
index f0a959165..f0a959165 100644
--- a/share/icons/hicolor/scalable/actions/align-top-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-top-to-anchor.svg
diff --git a/share/icons/hicolor/scalable/actions/align-top.svg b/share/icons/hicolor/scalable/actions/align-vertical-top.svg
index 3a19b6332..3a19b6332 100644
--- a/share/icons/hicolor/scalable/actions/align-top.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-top.svg
diff --git a/share/icons/hicolor/scalable/actions/show-node-handles.svg b/share/icons/hicolor/scalable/actions/show-node-handles.svg
new file mode 100644
index 000000000..d799fdaec
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/show-node-handles.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg7100"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20666"
+   sodipodi:docname="show-node-handles.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs7102" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.4748737"
+     inkscape:cx="9.7740056"
+     inkscape:cy="26.815935"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="679"
+     inkscape:window-height="470"
+     inkscape:window-x="335"
+     inkscape:window-y="137" />
+  <metadata
+     id="metadata7105">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       y="0"
+       x="0"
+       height="48"
+       width="48"
+       id="rect3742"
+       style="opacity:0;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path4641"
+       d="m 45.999999,1.9999982 c -14,2 -34,15.9999998 -34,31.9999998"
+       style="color:#000000;fill:none;stroke:#909090;stroke-width:4.00000143;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path4638"
+       d="m 10.000001,9.9999982 0,23.9999998"
+       style="color:#000000;fill:none;stroke:#646464;stroke-width:4.00000143;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline" />
+    <rect
+       rx="4.0441041"
+       ry="4.0441041"
+       y="1.9998474"
+       x="5.9118676"
+       height="8.1066484"
+       width="8.0882082"
+       id="use3738"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#0000ff;stroke-width:4.00000286;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+    <rect
+       style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#0000ff;stroke-width:4.00000143;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+       id="use4635"
+       width="15.829972"
+       height="15.88266"
+       x="2.1699219"
+       y="30" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/show-path-outline.svg b/share/icons/hicolor/scalable/actions/show-path-outline.svg
new file mode 100644
index 000000000..8c29612b9
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/show-path-outline.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg7100"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20666"
+   sodipodi:docname="show-path-outline.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs7102" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.4748737"
+     inkscape:cx="9.7740056"
+     inkscape:cy="26.815935"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="679"
+     inkscape:window-height="470"
+     inkscape:window-x="335"
+     inkscape:window-y="137" />
+  <metadata
+     id="metadata7105">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:nodetypes="csc"
+       id="path4756"
+       d="M 7.4327743,40.350987 C 7.4327743,23.878433 9.456594,1.4792808 40.383274,7.4004871 45.807855,8.4390269 41.386287,42.573049 7.4327743,40.350987"
+       style="fill:#ffffff;fill-opacity:0.75;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.9955008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       style="fill:none;stroke:none;stroke-width:1;marker:none;display:inline"
+       id="rect4758"
+       width="47.928001"
+       height="47.928001"
+       x="0"
+       y="0.071998596" />
+    <rect
+       style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#0000ff;stroke-width:2.99550104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+       id="use4760"
+       width="11.854671"
+       height="11.894127"
+       x="1.6964871"
+       y="34.359985" />
+    <rect
+       style="color:#000000;fill:#6464ff;fill-opacity:0.39215692;fill-rule:evenodd;stroke:#0000ff;stroke-width:2.99550104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+       id="use4762"
+       width="11.854671"
+       height="11.894127"
+       x="34.519554"
+       y="1.4973474" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/places/Makefile.am b/share/icons/hicolor/scalable/places/Makefile.am
index b6e964f9c..c55665b2d 100644
--- a/share/icons/hicolor/scalable/places/Makefile.am
+++ b/share/icons/hicolor/scalable/places/Makefile.am
@@ -4,12 +4,8 @@ context = places
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-# To update this list, run:
-# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info
-# and paste the contents of the dialog box here
-#
-# To vacuum defs in all documents, simply execute
-# inkscape --vacuum-defs *
+# Auto-generated by update-makefiles.sh
+# Re-run the script to update.
 
 icons_DATA = \
 	dialog-align-and-distribute.svg \
@@ -28,6 +24,6 @@ icons_DATA = \
 	dialog-xml-editor.svg \
 	grid-axonometric.svg \
 	grid-rectangular.svg \
-	guides.svg
+	guides.svg 
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/share/icons/hicolor/scalable/status/Makefile.am b/share/icons/hicolor/scalable/status/Makefile.am
index fe794bf5e..36c7ecea1 100644
--- a/share/icons/hicolor/scalable/status/Makefile.am
+++ b/share/icons/hicolor/scalable/status/Makefile.am
@@ -4,12 +4,8 @@ context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-# To update this list, run:
-# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info
-# and paste the contents of the dialog box here
-#
-# To vacuum defs in all documents, simply execute
-# inkscape --vacuum-defs *
+# Auto-generated by update-makefiles.sh
+# Re-run the script to update.
 
 icons_DATA = \
 	connector-avoid.svg \
@@ -40,8 +36,8 @@ icons_DATA = \
 	object-unlocked.svg \
 	object-visible.svg \
 	path-mode-bezier.svg \
-	path-mode-polyline.svg \
 	path-mode-polyline-paraxial.svg \
+	path-mode-polyline.svg \
 	path-mode-spiro.svg \
 	perspective-parallel.svg \
 	snap-bounding-box-center.svg \
@@ -71,6 +67,6 @@ icons_DATA = \
 	transform-affect-gradient.svg \
 	transform-affect-pattern.svg \
 	transform-affect-rounded-corners.svg \
-	transform-affect-stroke.svg
+	transform-affect-stroke.svg 
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/share/icons/hicolor/update-makefiles.sh b/share/icons/hicolor/update-makefiles.sh
new file mode 100755
index 000000000..b802df053
--- /dev/null
+++ b/share/icons/hicolor/update-makefiles.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# update-makefiles.sh
+# (c) 2009 Krzysztof Kosiński
+# Licensed under GNU GPL; see the file COPYING for details
+#
+# This script regenerates the makefiles for the subdirectories of hicolor.
+
+OLD_IFS=$IFS
+IFS=$'\0'
+
+for dir_size in *; do
+if test -d $dir_size; then
+
+for dir in $dir_size/*; do
+if test -d $dir; then
+	ICONS_DATA=$(find $dir -name '*.svg' -and -not -name '*.svn*' -printf '\t%f \\\n' \
+		| sort \
+		| sed -e '$s|\\||')
+SIZE=$(echo $dir_size | sed -e 's|x.*||')
+CONTEXT=$(echo $dir | sed -e 's|^.*/||')
+echo \
+'themedir = $(pkgdatadir)/icons/hicolor
+size = '$SIZE'
+context = '$CONTEXT'
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+# Auto-generated by update-makefiles.sh
+# Re-run the script to update.
+
+icons_DATA = \
+'$ICONS_DATA'
+
+EXTRA_DIST = $(icons_DATA)' > $dir/Makefile.am
+	fi
+done
+
+fi
+done
+
+IFS=$OLD_IFS