Fix for bug #338521 - align node buttons did not match 0.46 ordering or names. IDs got swapped.

(bzr r7633)

4 files changed, 69 insertions, 69 deletions

diff --git a/share/icons/hicolor/scalable/actions/align-horizontal-node.svg b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
index 7c37e1533..df4980b17 100644
--- a/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
@@ -6,7 +6,6 @@
    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"
@@ -14,7 +13,7 @@
    id="svg12119"
    sodipodi:version="0.32"
    inkscape:version="0.46+devel r20659"
-   sodipodi:docname="node-align-horizontal.svg"
+   sodipodi:docname="node-align-vertical.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs12121" />
@@ -53,41 +52,47 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="node_valign"
-       inkscape:label="#node_valign"
-       transform="matrix(1.9995417,0,0,1.9995417,-2349.4501,-279.92484)">
+       id="node_halign"
+       transform="matrix(1.9995416,0,0,1.9995416,-2349.4554,-279.93061)"
+       inkscape:label="#node_halign">
       <path
          style="fill:none;stroke:#c80000;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         d="m 1186.5,140.5008 0,22.9992 0,0"
-         id="path5262" />
+         d="m 1175.498,152.4972 22.999,0 0,0"
+         id="path5318" />
+      <rect
+         y="1180.4969"
+         x="-163.9971"
+         height="16"
+         width="16"
+         id="rect5320"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline"
+         transform="matrix(0,-1,1,0,0,0)" />
       <path
-         style="fill:none;stroke:#969696;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1175.5,140.5 c 3,3.5 18.975,1.5988 17.5,7.5 -1,4 -17,1 -17.5,8.5 -0.366,5.4878 17,2.5 23,6.5"
-         id="path5249"
+         style="fill:none;stroke:#969696;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none"
+         d="m 1175.497,163.4972 c 3.5,-3 1.599,-18.9753 7.5,-17.5 4,1 1,17 8.5,17.5 5.488,0.3658 2.5,-17 6.5,-23"
+         id="path5322"
          sodipodi:nodetypes="cssc" />
       <rect
-         y="141.5"
-         x="1184.5"
+         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+         id="use5452"
+         width="4.0662079"
          height="4.0071669"
+         x="1176.5219"
+         y="150.50909" />
+      <rect
+         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+         id="use5455"
          width="4.0662079"
-         id="rect5251"
-         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#rect5251"
-         id="use5438"
-         transform="translate(0.0188999,6.991948)"
-         width="1250"
-         height="1250" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#rect5251"
-         id="use5440"
-         transform="translate(-0.0473082,16.99195)"
-         width="1250"
-         height="1250" />
+         height="4.0071669"
+         x="1183.5219"
+         y="150.50192" />
+      <rect
+         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
+         id="use5457"
+         width="4.0662079"
+         height="4.0071669"
+         x="1193.4556"
+         y="150.50192" />
     </g>
   </g>
 </svg>
diff --git a/share/icons/hicolor/scalable/actions/align-vertical-node.svg b/share/icons/hicolor/scalable/actions/align-vertical-node.svg
index df4980b17..7c37e1533 100644
--- a/share/icons/hicolor/scalable/actions/align-vertical-node.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-node.svg
@@ -6,6 +6,7 @@
    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"
@@ -13,7 +14,7 @@
    id="svg12119"
    sodipodi:version="0.32"
    inkscape:version="0.46+devel r20659"
-   sodipodi:docname="node-align-vertical.svg"
+   sodipodi:docname="node-align-horizontal.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs12121" />
@@ -52,47 +53,41 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="node_halign"
-       transform="matrix(1.9995416,0,0,1.9995416,-2349.4554,-279.93061)"
-       inkscape:label="#node_halign">
+       id="node_valign"
+       inkscape:label="#node_valign"
+       transform="matrix(1.9995417,0,0,1.9995417,-2349.4501,-279.92484)">
       <path
          style="fill:none;stroke:#c80000;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
-         d="m 1175.498,152.4972 22.999,0 0,0"
-         id="path5318" />
-      <rect
-         y="1180.4969"
-         x="-163.9971"
-         height="16"
-         width="16"
-         id="rect5320"
-         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline"
-         transform="matrix(0,-1,1,0,0,0)" />
+         d="m 1186.5,140.5008 0,22.9992 0,0"
+         id="path5262" />
       <path
-         style="fill:none;stroke:#969696;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1175.497,163.4972 c 3.5,-3 1.599,-18.9753 7.5,-17.5 4,1 1,17 8.5,17.5 5.488,0.3658 2.5,-17 6.5,-23"
-         id="path5322"
+         style="fill:none;stroke:#969696;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none"
+         d="m 1175.5,140.5 c 3,3.5 18.975,1.5988 17.5,7.5 -1,4 -17,1 -17.5,8.5 -0.366,5.4878 17,2.5 23,6.5"
+         id="path5249"
          sodipodi:nodetypes="cssc" />
       <rect
-         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
-         id="use5452"
-         width="4.0662079"
+         y="141.5"
+         x="1184.5"
          height="4.0071669"
-         x="1176.5219"
-         y="150.50909" />
-      <rect
-         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
-         id="use5455"
          width="4.0662079"
-         height="4.0071669"
-         x="1183.5219"
-         y="150.50192" />
-      <rect
-         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline"
-         id="use5457"
-         width="4.0662079"
-         height="4.0071669"
-         x="1193.4556"
-         y="150.50192" />
+         id="rect5251"
+         style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect5251"
+         id="use5438"
+         transform="translate(0.0188999,6.991948)"
+         width="1250"
+         height="1250" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect5251"
+         id="use5440"
+         transform="translate(-0.0473082,16.99195)"
+         width="1250"
+         height="1250" />
     </g>
   </g>
 </svg>
diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index 429080832..6f31731dd 100644
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -1770,14 +1770,14 @@ http://www.inkscape.org/</dc:description>
 <use transform="matrix(1,0,0,0.997921,1.24759,8.430751)" x="0" y="0" xlink:href="#text5563" id="use5955" width="1250" height="1250" />
 <use x="0" y="0" xlink:href="#text3357" id="use5961" transform="matrix(1,0,0,0.997921,-11.02206,-2.05535)" width="1250" height="1250" />
 </g>
-<g id="align-horizontal-node" inkscape:label="#node_valign" transform="translate(-205,77.992833)">
+<g id="align-vertical-node" inkscape:label="#node_valign" transform="translate(-205,77.992833)">
 <path style="fill:none;stroke:#c80000;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" d="m 1186.5,140.5008 0,22.9992 0,0" id="path5262" />
 <path style="fill:none;stroke:#969696;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m 1175.5,140.5 c 3,3.5 18.975,1.5988 17.5,7.5 -1,4 -17,1 -17.5,8.5 -0.366,5.4878 17,2.5 23,6.5" id="path5249" sodipodi:nodetypes="cssc" />
 <rect y="141.5" x="1184.5" height="4.0071669" width="4.0662079" id="rect5251" style="color:#000000;fill:#8ab3de;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;display:inline" />
 <use x="0" y="0" xlink:href="#rect5251" id="use5438" transform="translate(0.0188999,6.991948)" width="1250" height="1250" />
 <use x="0" y="0" xlink:href="#rect5251" id="use5440" transform="translate(-0.0473082,16.99195)" width="1250" height="1250" />
 </g>
-<g id="align-vertical-node" transform="translate(-171.0218,77.983746)" inkscape:label="#node_halign">
+<g id="align-horizontal-node" transform="translate(-171.0218,77.983746)" inkscape:label="#node_halign">
 <path style="fill:none;stroke:#c80000;stroke-width:1.00000036;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" d="m 1175.498,152.4972 22.999,0 0,0" id="path5318" />
 <rect y="1180.4969" x="-163.9971" height="16" width="16" id="rect5320" style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;display:inline" transform="matrix(0,-1,1,0,0,0)" />
 <path style="fill:none;stroke:#969696;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" d="m 1175.497,163.4972 c 3.5,-3 1.599,-18.9753 7.5,-17.5 4,1 1,17 8.5,17.5 5.488,0.3658 2.5,-17 6.5,-23" id="path5322" sodipodi:nodetypes="cssc" />
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 6d2ed20da..09fe89cff 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -894,10 +894,10 @@ AlignAndDistribute::AlignAndDistribute()
     //Node Mode buttons
     addNodeButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_NODES,
                   _("Align selected nodes horizontally"),
-                  0, Geom::Y, false);
+                  0, Geom::X, false);
     addNodeButton(INKSCAPE_ICON_ALIGN_VERTICAL_NODES,
                   _("Align selected nodes vertically"),
-                  1, Geom::X, false);
+                  1, Geom::Y, false);
     addNodeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_NODE,
                   _("Distribute selected nodes horizontally"),
                   2, Geom::X, true);