Rename view-manage-colors to color-management; add object-rows and

object-columns; rename distribute icons for baselines and nodes to 
maintain consistency with align icons

(bzr r7328)

9 files changed, 308 insertions, 6 deletions

diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am
index 5be4e82d0..213a6ddc7 100644
--- a/share/icons/hicolor/scalable/actions/Makefile.am
+++ b/share/icons/hicolor/scalable/actions/Makefile.am
@@ -25,20 +25,25 @@ icons_DATA = \
 	bitmap-trace.svg \
 	color-fill.svg \
 	color-gradient.svg \
+	color-management.svg \
 	color-picker.svg \
 	color-remove.svg \
 	distribute-graph-directed.svg \
 	distribute-graph.svg \
+	distribute-horizontal-baseline.svg \
 	distribute-horizontal-center.svg \
 	distribute-horizontal-gaps.svg \
 	distribute-horizontal-left.svg \
+	distribute-horizontal-node.svg \
 	distribute-horizontal-right.svg \
 	distribute-randomize.svg \
 	distribute-remove-overlaps.svg \
 	distribute-unclump.svg \
+	distribute-vertical-baseline.svg \
 	distribute-vertical-bottom.svg \
 	distribute-vertical-center.svg \
 	distribute-vertical-gaps.svg \
+	distribute-vertical-node.svg \
 	distribute-vertical-top.svg \
 	document-cleanup.svg \
 	document-export-ocal.svg \
@@ -98,8 +103,6 @@ icons_DATA = \
 	node-break.svg \
 	node-delete-segment.svg \
 	node-delete.svg \
-	node-distribute-horizontal.svg \
-	node-distribute-vertical.svg \
 	node-join-segment.svg \
 	node-join.svg \
 	object-flip-horizontal.svg \
@@ -155,8 +158,6 @@ icons_DATA = \
 	show-path-outline.svg \
 	stroke-to-path.svg \
 	text-convert-to-regular.svg \
-	text-distribute-baseline-horizontal.svg \
-	text-distribute-baseline-vertical.svg \
 	text-flow-into-frame.svg \
 	text-put-on-path.svg \
 	text-remove-from-path.svg \
@@ -172,7 +173,6 @@ icons_DATA = \
 	transform-scale-vertical.svg \
 	transform-skew-horizontal.svg \
 	transform-skew-vertical.svg \
-	view-manage-colors.svg \
 	window-next.svg \
 	window-previous.svg \
 	xml-attribute-delete.svg \
diff --git a/share/icons/hicolor/scalable/actions/view-manage-colors.svg b/share/icons/hicolor/scalable/actions/color-management.svg
index 739d2ff56..739d2ff56 100644
--- a/share/icons/hicolor/scalable/actions/view-manage-colors.svg
+++ b/share/icons/hicolor/scalable/actions/color-management.svg
diff --git a/share/icons/hicolor/scalable/actions/text-distribute-baseline-horizontal.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-baseline.svg
index cb849237f..cb849237f 100644
--- a/share/icons/hicolor/scalable/actions/text-distribute-baseline-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-baseline.svg
diff --git a/share/icons/hicolor/scalable/actions/node-distribute-horizontal.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-node.svg
index 028b9a4cc..028b9a4cc 100644
--- a/share/icons/hicolor/scalable/actions/node-distribute-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-node.svg
diff --git a/share/icons/hicolor/scalable/actions/text-distribute-baseline-vertical.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-baseline.svg
index 011548093..011548093 100644
--- a/share/icons/hicolor/scalable/actions/text-distribute-baseline-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-baseline.svg
diff --git a/share/icons/hicolor/scalable/actions/node-distribute-vertical.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-node.svg
index 49528fc67..49528fc67 100644
--- a/share/icons/hicolor/scalable/actions/node-distribute-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-node.svg
diff --git a/share/icons/hicolor/scalable/places/Makefile.am b/share/icons/hicolor/scalable/places/Makefile.am
index c55665b2d..d81fe5f80 100644
--- a/share/icons/hicolor/scalable/places/Makefile.am
+++ b/share/icons/hicolor/scalable/places/Makefile.am
@@ -24,6 +24,8 @@ icons_DATA = \
 	dialog-xml-editor.svg \
 	grid-axonometric.svg \
 	grid-rectangular.svg \
-	guides.svg 
+	guides.svg \
+	object-columns.svg \
+	object-rows.svg 
 
 EXTRA_DIST = $(icons_DATA)
diff --git a/share/icons/hicolor/scalable/places/object-columns.svg b/share/icons/hicolor/scalable/places/object-columns.svg
new file mode 100644
index 000000000..c5b749604
--- /dev/null
+++ b/share/icons/hicolor/scalable/places/object-columns.svg
@@ -0,0 +1,150 @@
+<?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="48px"
+   height="48px"
+   id="svg5660"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20666"
+   sodipodi:docname="object-columns.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs5662">
+    <linearGradient
+       id="linearGradient5704">
+      <stop
+         style="stop-color:#5a5a5a;stop-opacity:1;"
+         offset="0"
+         id="stop5706" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5708" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5740">
+      <stop
+         id="stop5742"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop5744"
+         offset="1.0000000"
+         style="stop-color:#98b6d3;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5704"
+       id="linearGradient5821"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.629558,0,0,0.429186,88.20441,232.3331)"
+       x1="10.041666"
+       y1="203.36577"
+       x2="14.010839"
+       y2="209.27737" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5740"
+       id="linearGradient5823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.387116,0,0,0.200828,86.1208,278.4604)"
+       x1="15.242482"
+       y1="213.66309"
+       x2="18.528904"
+       y2="220.34749" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.5"
+     inkscape:cx="32.685869"
+     inkscape:cy="20.886456"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="679"
+     inkscape:window-height="436"
+     inkscape:window-x="5"
+     inkscape:window-y="59" />
+  <metadata
+     id="metadata5665">
+    <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">
+    <g
+       transform="matrix(3.0000015,0,0,2.9940195,-957.11272,-310.85498)"
+       style="display:inline"
+       id="object-columns"
+       inkscape:label="#clonetiler_per_column">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:0.53149599;marker:none;display:inline"
+         id="rect9056"
+         width="15.99999"
+         height="16.03196"
+         x="319.03741"
+         y="103.8253" />
+      <g
+         id="g9227">
+        <g
+           id="g9237">
+          <rect
+             style="color:#000000;fill:none;stroke:url(#linearGradient5821);stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+             id="rect9070"
+             width="13.03433"
+             height="3.0039289"
+             x="105.3283"
+             y="320.53519"
+             transform="matrix(0,1,1,0,0,0)" />
+          <rect
+             style="color:#000000;fill:none;stroke:url(#linearGradient5823);stroke-width:1.00100076;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+             id="rect9072"
+             width="11.05956"
+             height="1.0068099"
+             x="106.2927"
+             y="321.53751"
+             transform="matrix(0,1,1,0,0,0)" />
+        </g>
+        <use
+           x="0"
+           y="0"
+           xlink:href="#g9237"
+           id="use9241"
+           transform="translate(4.998223,3.261012e-5)"
+           width="1250"
+           height="1250" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#use9241"
+           id="use9243"
+           transform="translate(5.00393,-0.0083534)"
+           width="1250"
+           height="1250" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/places/object-rows.svg b/share/icons/hicolor/scalable/places/object-rows.svg
new file mode 100644
index 000000000..821615100
--- /dev/null
+++ b/share/icons/hicolor/scalable/places/object-rows.svg
@@ -0,0 +1,150 @@
+<?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="48px"
+   height="48px"
+   id="svg5660"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel r20666"
+   sodipodi:docname="object-rows.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs5662">
+    <linearGradient
+       id="linearGradient5704">
+      <stop
+         style="stop-color:#5a5a5a;stop-opacity:1;"
+         offset="0"
+         id="stop5706" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop5708" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5740">
+      <stop
+         id="stop5742"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop5744"
+         offset="1.0000000"
+         style="stop-color:#98b6d3;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5704"
+       id="linearGradient5846"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.629558,0,0,0.429186,88.20441,232.3331)"
+       x1="10.041666"
+       y1="203.36577"
+       x2="14.010839"
+       y2="209.27737" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5740"
+       id="linearGradient5848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.387116,0,0,0.200828,86.1208,278.4604)"
+       x1="15.242482"
+       y1="213.66309"
+       x2="18.528904"
+       y2="220.34749" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.5"
+     inkscape:cx="32.685869"
+     inkscape:cy="20.886456"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="679"
+     inkscape:window-height="436"
+     inkscape:window-x="5"
+     inkscape:window-y="59" />
+  <metadata
+     id="metadata5665">
+    <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">
+    <g
+       transform="matrix(0,3.0000015,-2.9940195,0,358.85498,-957.11272)"
+       style="display:inline"
+       id="object-columns"
+       inkscape:label="#clonetiler_per_column">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:0.53149599;marker:none;display:inline"
+         id="rect9056"
+         width="15.99999"
+         height="16.03196"
+         x="319.03741"
+         y="103.8253" />
+      <g
+         id="g9227">
+        <g
+           id="g9237">
+          <rect
+             style="color:#000000;fill:none;stroke:url(#linearGradient5846);stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+             id="rect9070"
+             width="13.03433"
+             height="3.0039289"
+             x="105.3283"
+             y="320.53519"
+             transform="matrix(0,1,1,0,0,0)" />
+          <rect
+             style="color:#000000;fill:none;stroke:url(#linearGradient5848);stroke-width:1.00100076;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+             id="rect9072"
+             width="11.05956"
+             height="1.0068099"
+             x="106.2927"
+             y="321.53751"
+             transform="matrix(0,1,1,0,0,0)" />
+        </g>
+        <use
+           x="0"
+           y="0"
+           xlink:href="#g9237"
+           id="use9241"
+           transform="translate(4.998223,3.261012e-5)"
+           width="1250"
+           height="1250" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#use9241"
+           id="use9243"
+           transform="translate(5.00393,-0.0083534)"
+           width="1250"
+           height="1250" />
+      </g>
+    </g>
+  </g>
+</svg>