From d8f25371336c6fd5c5856deff69ab493669ca108 Mon Sep 17 00:00:00 2001 From: tweenk Date: Mon, 13 Apr 2009 23:42:51 +0000 Subject: [PATCH] Really fix node alignment icons; add clarifying comment to source. --- .../16x16/actions/align-horizontal-node.png | Bin 585 -> 602 bytes .../16x16/actions/align-vertical-node.png | Bin 602 -> 585 bytes .../24x24/actions/align-horizontal-node.png | Bin 751 -> 783 bytes .../24x24/actions/align-vertical-node.png | Bin 783 -> 751 bytes .../actions/align-horizontal-node.svg | 65 ++++++++---------- .../scalable/actions/align-vertical-node.svg | 65 ++++++++++-------- src/ui/dialog/align-and-distribute.cpp | 11 +-- 7 files changed, 72 insertions(+), 69 deletions(-) diff --git a/share/icons/hicolor/16x16/actions/align-horizontal-node.png b/share/icons/hicolor/16x16/actions/align-horizontal-node.png index 173fd183024977597c06ecf3be368e85d0c12e6e..8b82d9262d35112c7f583e30ea428c6a1b1ba43e 100644 GIT binary patch delta 560 zcmV-00?+-)1lk0UHGcvRNklX9Hu0 zXS)CFnfqVD;qW*SaZQ4H(Ht(TcyLdSX6IWiPjl(|?f4@%GoLg~bD&ameI|g>>b(%+ ziV&i=`b?_#Sby=DlR@w2?&i&g?%rUWN+c2zfR1vxT&PJ}&tPlYpPiTQDJ}ZcVoNT& zaM$bgeq-jxkx1l?t$`52YgyI+5gh{{4GXhrRm;BL|LoPvBX{fy5i^qz;wFH0Ns>kb zfxyIS3!U!i-CvEpKMe!H<)ZVoZB$Lu;+m%Q*lBBrXn%(U;CLt$8e8vTT>~QG%7p(5 zs>BZw(Q^QAB}tm``~8OOuvQLr=FHjoR;!Sg`vH1kYXAW0blP1imAZ)N1T*gg;7pBN z>K(k5Z`7w0Fb*u12E@uxjy=Qz8^IPb~J4=moE4h8}+P$!uR5hSnTO1B5G&m yqeQd~z$pTN2mk1fd#b+k#!TzH%F-uWHwd4wUyah#-5Dkp{oD5Y*O^Fm-)01?Fv!+)sv08G;iN-48K2v^tj zw}Z@*6kM-brUXq%$6p`&Z>N z#2+RDA12ybV&rpV8K||-!F}J5&Ui?l@-T<_IRJcSWLIlza=Q6b3;G)Xhr?0-)qyE* zEp_x)GaOYPdkPHrTZfPR*o=&|)&b4}0BqZywQc)cpMURq+^@uLT>ti2DRQj zj^k(mwtE1+?@ttq#kHM}iRhhWStq+SW=;`NCrp^886={={nChN5x})>&G-EiM6}!i zXqtAOnP2n+=(_$LK;5#e3jk27)g*w6p-^b417PMWu~=+z(9VWo+y^jOsZ^de8jUAJ h^q^2E{1|E9{{x02#rz<5x;y{?002ovPDHLkV1m|w0t)~D diff --git a/share/icons/hicolor/16x16/actions/align-vertical-node.png b/share/icons/hicolor/16x16/actions/align-vertical-node.png index 8b82d9262d35112c7f583e30ea428c6a1b1ba43e..173fd183024977597c06ecf3be368e85d0c12e6e 100644 GIT binary patch delta 543 zcmV+)0^t4H1jz)DHGcvANkl!TzH%F-uWHwd4wUyah#-5Dkp{oD5Y*O^Fm-)01?Fv!+)sv08G;iN-48K2v^tj zw}Z@*6kM-brUXq%$6p`&Z>N z#2+RDA12ybV&rpV8K||-!F}J5&Ui?l@-T<_IRJcSWLIlza=Q6b3;G)Xhr?0-)qyE* zEp_x)GaOYPdkPHrTZfPR*o=&|)&b4}0BqZywQc)cpMURq+^@uLT>ti2DRQj zj^k(mwtE1+?@ttq#kHM}iRhhWStq+SW=;`NCrp^886={={nChN5x})>&G-EiM6}!i zXqtAOnP2n+=(_$LK;5#e3jk27)g*w6p-^b417PMWu~=+z(9VWo+y^jOsZ^de8jUAJ h^q^2E{1|E9{{x02#rz<5x;y{?002ovPDHLkV1m|w0t)~D delta 560 zcmV-00?+-)1lk0UHGcvRNklX9Hu0 zXS)CFnfqVD;qW*SaZQ4H(Ht(TcyLdSX6IWiPjl(|?f4@%GoLg~bD&ameI|g>>b(%+ ziV&i=`b?_#Sby=DlR@w2?&i&g?%rUWN+c2zfR1vxT&PJ}&tPlYpPiTQDJ}ZcVoNT& zaM$bgeq-jxkx1l?t$`52YgyI+5gh{{4GXhrRm;BL|LoPvBX{fy5i^qz;wFH0Ns>kb zfxyIS3!U!i-CvEpKMe!H<)ZVoZB$Lu;+m%Q*lBBrXn%(U;CLt$8e8vTT>~QG%7p(5 zs>BZw(Q^QAB}tm``~8OOuvQLr=FHjoR;!Sg`vH1kYXAW0blP1imAZ)N1T*gg;7pBN z>K(k5Z`7w0Fb*u12E@uxjy=Qz8^IPb~J4=moE4h8}+P$!uR5hSnTO1B5G&m yqeQd~z$pTN2mk1fd#b+k#Qyc8>A1Bl{e_B*_F83 zeeY3DPV5+fhktIjyQ86@;p>I~DGsxGdvALT!w8BczDG|5dmm zkw``~8XYES*tUJJrKM#$MIQtf*R;~{+?D{*Xw*k?tJmwTs;#ZH*CTcW0MMkhZrzOH zz@iWK8-IrJZZnDlfD)09@p$~mW&zmO*LRrYW0FHksez`ZrcbL=!~l?DTj*%m1OU@C zcaUraP%R?)Bwvfj7=Wqi>4I-Pw`zv3k4(D%h%TJm?HJ$!fIuKH1)v>3yJcBV+*pyy(Em8zvaDwSz5w`4ast4Z*X#Y5yk0C0x{xg{x6Irane?o@K`0b1*II8U zxf4LK*1Ce^UI6a_JQb1QKp-&X1mJiEgM)*{{QP_c$r_Sp0o+}eE7#-Xa5!9`wXXUN XIPMxk@;nlpMR-Y( zA|oL|5XNQjuuF7{27?Zk5rg~ACFmx&VTX#KLmld3kOm=jiAsxVVJCzZWrTg7F1yP% zGy8F9|1gJn{?GIL-shcnUP6N;rJMoqo*L2Iahxt)*H<)6>wgiA0BD*vN<{OfX=WP& zAfh1v4*}r618m#Y0UQ=WyaNC|DoIM&!OUYsv_}Z>YI1V&S-pT*EY?dzpG?!-1R^Go zQg#4X5<(nd=4?KnpLJdLO1%If#BpYRTY3*BF!MAsKZ?iWCiaw|~x8o=p# z0L;7>z_(C1;%Tq#mFjmy=arqJnI~UL>Go)MZu5`U3Sgs_S5UKVuzzduYjZJhZEzm| zKwkp5KQPZu&b7>=cWpO-YF<$}v||XrLff?ju-*?40Dmqwwx}gHjJ1ORt=I4h+Gx|k z834`YxrN?9g?;X*?G;t|8l?csQkd!hhrJSwg13)U3IxnSMERU6rDKqy7 zAwE>8Uj}fj8bAoq#mwI$0RVcGQWXKrybR!|ZQB(uNM`OLqA! zkFN&JD0OyrI-cj9@;vXQ>$*1#!&vrx{|qyaDL$q8g82f#RRC5!%>iI!WF()-WG*YE r7L-!Aec%5{MAwOEcxr0uM=<{{S|UWKJTMfA00000NkvXXu0mjf>Nr8L diff --git a/share/icons/hicolor/24x24/actions/align-vertical-node.png b/share/icons/hicolor/24x24/actions/align-vertical-node.png index 303fb06aa88b4ce7ab9d0d4ad1586a8d36ca52a7..8aa9ba36e3b955c8eb3017b146770b5531859a8d 100644 GIT binary patch delta 709 zcmV;$0y_PV2JZ!sHh-i^L_t(YiM5nXNEBfh$N$ee<5(bm&;nlpMR-Y( zA|oL|5XNQjuuF7{27?Zk5rg~ACFmx&VTX#KLmld3kOm=jiAsxVVJCzZWrTg7F1yP% zGy8F9|1gJn{?GIL-shcnUP6N;rJMoqo*L2Iahxt)*H<)6>wgiA0BD*vN<{OfX=WP& zAfh1v4*}r618m#Y0UQ=WyaNC|DoIM&!OUYsv_}Z>YI1V&S-pT*EY?dzpG?!-1R^Go zQg#4X5<(nd=4?KnpLJdLO1%If#BpYRTY3*BF!MAsKZ?iWCiaw|~x8o=p# z0L;7>z_(C1;%Tq#mFjmy=arqJnI~UL>Go)MZu5`U3Sgs_S5UKVuzzduYjZJhZEzm| zKwkp5KQPZu&b7>=cWpO-YF<$}v||XrLff?ju-*?40Dmqwwx}gHjJ1ORt=I4h+Gx|k z834`YxrN?9g?;X*?G;t|8l?csQkd!hhrJSwg13)U3IxnSMERU6rDKqy7 zAwE>8Uj}fj8bAoq#mwI$0RVcGQWXKrybR!|ZQB(uNM`OLqA! zkFN&JD0OyrI-cj9@;vXQ>$*1#!&vrx{|qyaDL$q8g82f#RRC5!%>iI!WF()-WG*YE r7L-!Aec%5{MAwOEcxr0uM=<{{S|UWKJTMfA00000NkvXXu0mjf>Nr8L delta 741 zcmVQyc8>A1Bl{e_B*_F83 zeeY3DPV5+fhktIjyQ86@;p>I~DGsxGdvALT!w8BczDG|5dmm zkw``~8XYES*tUJJrKM#$MIQtf*R;~{+?D{*Xw*k?tJmwTs;#ZH*CTcW0MMkhZrzOH zz@iWK8-IrJZZnDlfD)09@p$~mW&zmO*LRrYW0FHksez`ZrcbL=!~l?DTj*%m1OU@C zcaUraP%R?)Bwvfj7=Wqi>4I-Pw`zv3k4(D%h%TJm?HJ$!fIuKH1)v>3yJcBV+*pyy(Em8zvaDwSz5w`4ast4Z*X#Y5yk0C0x{xg{x6Irane?o@K`0b1*II8U zxf4LK*1Ce^UI6a_JQb1QKp-&X1mJiEgM)*{{QP_c$r_Sp0o+}eE7#-Xa5!9`wXXUN XIPMxk@ @@ -52,47 +53,41 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> + id="node_valign" + inkscape:label="#node_valign" + transform="matrix(1.9995417,0,0,1.9995417,-2349.4501,-279.92484)"> - + d="m 1186.5,140.5008 0,22.9992 0,0" + id="path5262" /> - - + 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" /> + + diff --git a/share/icons/hicolor/scalable/actions/align-vertical-node.svg b/share/icons/hicolor/scalable/actions/align-vertical-node.svg index 7c37e1533..df4980b17 100644 --- a/share/icons/hicolor/scalable/actions/align-vertical-node.svg +++ b/share/icons/hicolor/scalable/actions/align-vertical-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"> @@ -53,41 +52,47 @@ inkscape:label="Layer 1" inkscape:groupmode="layer"> + id="node_halign" + transform="matrix(1.9995416,0,0,1.9995416,-2349.4554,-279.93061)" + inkscape:label="#node_halign"> + d="m 1175.498,152.4972 22.999,0 0,0" + id="path5318" /> + + - - + height="4.0071669" + x="1183.5219" + y="150.50192" /> + diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 09fe89cff..a39a09628 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -892,12 +892,15 @@ AlignAndDistribute::AlignAndDistribute() 0, 0); //Node Mode buttons + // NOTE: "align nodes vertically" means "move nodes vertically until they align on a common + // _horizontal_ line". This is analogous to what the "align-vertical-center" means. + // There is no doubt some ambiguity. For this reason the descriptions are different. addNodeButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_NODES, - _("Align selected nodes horizontally"), - 0, Geom::X, false); + _("Align selected nodes to a common vertical line"), + 0, Geom::Y, false); addNodeButton(INKSCAPE_ICON_ALIGN_VERTICAL_NODES, - _("Align selected nodes vertically"), - 1, Geom::Y, false); + _("Align selected nodes to a common horizontal line"), + 1, Geom::X, false); addNodeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_NODE, _("Distribute selected nodes horizontally"), 2, Geom::X, true); -- 2.30.2