"Align nodes" icons fixed

(bzr r7513)

6 files changed, 18 insertions, 76 deletions

diff --git a/share/icons/hicolor/scalable/Makefile.am b/share/icons/hicolor/scalable/Makefile.am
index 9628ba147..3b78f064b 100644
--- a/share/icons/hicolor/scalable/Makefile.am
+++ b/share/icons/hicolor/scalable/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = actions places status
+SUBDIRS =  actions places status
 
 size = scalable
 hicolorthemedir = $(datadir)/icons/hicolor
diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am
index 43a957afc..3eac06cdf 100644
--- a/share/icons/hicolor/scalable/actions/Makefile.am
+++ b/share/icons/hicolor/scalable/actions/Makefile.am
@@ -12,14 +12,14 @@ icons_DATA = \
 	align-horizontal-center.svg \
 	align-horizontal-left.svg \
 	align-horizontal-left-to-anchor.svg \
-	align-horizontal-nodes.svg \
+	align-horizontal-node.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-node.svg \
 	align-vertical-top.svg \
 	align-vertical-top-to-anchor.svg \
 	bitmap-trace.svg \
@@ -27,7 +27,6 @@ icons_DATA = \
 	color-gradient.svg \
 	color-management.svg \
 	color-picker.svg \
-	color-remove.svg \
 	distribute-graph-directed.svg \
 	distribute-graph.svg \
 	distribute-horizontal-baseline.svg \
diff --git a/share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
index 7c37e1533..7c37e1533 100644
--- a/share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
diff --git a/share/icons/hicolor/scalable/actions/align-vertical-nodes.svg b/share/icons/hicolor/scalable/actions/align-vertical-node.svg
index df4980b17..df4980b17 100644
--- a/share/icons/hicolor/scalable/actions/align-vertical-nodes.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-node.svg
diff --git a/share/icons/hicolor/scalable/actions/color-remove.svg b/share/icons/hicolor/scalable/actions/color-remove.svg
deleted file mode 100644
index 5bbae66d6..000000000
--- a/share/icons/hicolor/scalable/actions/color-remove.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel r20659"
-   version="1.0"
-   sodipodi:docname="color-remove.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/felipe/devel/inkscape/share/icons/remove-color.png"
-   inkscape:export-xdpi="300"
-   inkscape:export-ydpi="300">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="25.328957"
-     inkscape:cy="22.551241"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1024"
-     inkscape:window-height="736"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:snap-page="true" />
-  <metadata
-     id="metadata7">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Camada 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3616"
-       id="use3707"
-       transform="matrix(-1,0,0,1,48,0)"
-       width="32"
-       height="32" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-       d="M 0,0 0,6.375 41.625,48 48,48 48,41.625 6.375,0 0,0 z"
-       id="path3616" />
-  </g>
-</svg>
diff --git a/share/icons/hicolor/update-makefiles.sh b/share/icons/hicolor/update-makefiles.sh
index 50f7f966a..e9f6a3ee4 100755
--- a/share/icons/hicolor/update-makefiles.sh
+++ b/share/icons/hicolor/update-makefiles.sh
@@ -11,6 +11,8 @@ IFS=$'\0'
 for dir_size in *; do
 if test -d $dir_size; then
 
+SUBDIRS=''
+
 for dir in $dir_size/*; do
 if test -d $dir; then
 	ICONS_DATA=$(find $dir \( -name '*.svg' -o -name '*.png' \) -printf '\t%f \\\n' \
@@ -32,9 +34,22 @@ icons_DATA = \
 '$ICONS_DATA'
 
 EXTRA_DIST = $(icons_DATA)' > $dir/Makefile.am
+SUBDIRS="$SUBDIRS $CONTEXT"
 fi
 done
 
+if test $dir_size = 'scalable'; then EXTENSION='svg'; else EXTENSION='png'; fi
+
+echo \
+'SUBDIRS = '$SUBDIRS'
+
+size = '$dir_size'
+hicolorthemedir = $(datadir)/icons/hicolor
+inkscapeicondir = $(hicolorthemedir)/$(size)/apps
+
+inkscapeicon_DATA = inkscape.'$EXTENSION'
+EXTRA_DIST = $(inkscapeicon_DATA)' > $dir_size/Makefile.am
+
 fi
 done