From a036e2bd5d781c1d15be552648a9d1ea9245a2c9 Mon Sep 17 00:00:00 2001 From: tweenk Date: Sat, 18 Apr 2009 01:24:27 +0000 Subject: [PATCH] Fix most icons in the geometry tool --- share/icons/hicolor/16x16/actions/Makefile.am | 9 + .../hicolor/16x16/actions/draw-geometry.png | Bin 0 -> 451 bytes .../16x16/actions/show-bounding-box.png | Bin 0 -> 333 bytes .../status/draw-geometry-angle-bisector.png | Bin 0 -> 523 bytes .../draw-geometry-circle-from-radius.png | Bin 0 -> 688 bytes ...draw-geometry-circle-from-three-points.png | Bin 0 -> 653 bytes .../16x16/status/draw-geometry-inactive.png | Bin 0 -> 311 bytes .../status/draw-geometry-line-parallel.png | Bin 0 -> 483 bytes .../draw-geometry-line-perpendicular.png | Bin 0 -> 426 bytes .../status/draw-geometry-line-segment.png | Bin 0 -> 390 bytes .../16x16/status/draw-geometry-mirror.png | Bin 0 -> 614 bytes share/icons/hicolor/24x24/actions/Makefile.am | 9 + .../hicolor/24x24/actions/draw-geometry.png | Bin 0 -> 693 bytes .../24x24/actions/show-bounding-box.png | Bin 0 -> 394 bytes .../status/draw-geometry-angle-bisector.png | Bin 0 -> 817 bytes .../draw-geometry-circle-from-radius.png | Bin 0 -> 1112 bytes ...draw-geometry-circle-from-three-points.png | Bin 0 -> 991 bytes .../24x24/status/draw-geometry-inactive.png | Bin 0 -> 391 bytes .../status/draw-geometry-line-parallel.png | Bin 0 -> 774 bytes .../draw-geometry-line-perpendicular.png | Bin 0 -> 674 bytes .../status/draw-geometry-line-segment.png | Bin 0 -> 616 bytes .../24x24/status/draw-geometry-mirror.png | Bin 0 -> 946 bytes .../hicolor/scalable/actions/Makefile.am | 2 + .../scalable/actions/draw-geometry.svg | 339 +++++++++++++ .../scalable/actions/show-bounding-box.svg | 64 +++ .../icons/hicolor/scalable/status/Makefile.am | 8 + .../status/draw-geometry-angle-bisector.svg | 71 +++ .../draw-geometry-circle-from-radius.svg | 80 +++ ...draw-geometry-circle-from-three-points.svg | 86 ++++ .../status/draw-geometry-inactive.svg | 79 +++ .../status/draw-geometry-line-parallel.svg | 71 +++ .../draw-geometry-line-perpendicular.svg | 71 +++ .../status/draw-geometry-line-segment.svg | 84 ++++ .../scalable/status/draw-geometry-mirror.svg | 71 +++ share/icons/icons.svg | 461 ++++++++++++++++-- src/lpe-tool-context.cpp | 23 +- src/lpe-tool-context.h | 7 +- src/widgets/toolbox.cpp | 10 +- 38 files changed, 1492 insertions(+), 53 deletions(-) create mode 100644 share/icons/hicolor/16x16/actions/draw-geometry.png create mode 100644 share/icons/hicolor/16x16/actions/show-bounding-box.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-angle-bisector.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-circle-from-radius.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-circle-from-three-points.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-inactive.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-line-parallel.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-line-perpendicular.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-line-segment.png create mode 100644 share/icons/hicolor/16x16/status/draw-geometry-mirror.png create mode 100644 share/icons/hicolor/24x24/actions/draw-geometry.png create mode 100644 share/icons/hicolor/24x24/actions/show-bounding-box.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-angle-bisector.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-circle-from-radius.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-circle-from-three-points.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-inactive.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-line-parallel.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-line-perpendicular.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-line-segment.png create mode 100644 share/icons/hicolor/24x24/status/draw-geometry-mirror.png create mode 100644 share/icons/hicolor/scalable/actions/draw-geometry.svg create mode 100644 share/icons/hicolor/scalable/actions/show-bounding-box.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-angle-bisector.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-circle-from-radius.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-circle-from-three-points.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-inactive.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-line-parallel.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-line-perpendicular.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-line-segment.svg create mode 100644 share/icons/hicolor/scalable/status/draw-geometry-mirror.svg diff --git a/share/icons/hicolor/16x16/actions/Makefile.am b/share/icons/hicolor/16x16/actions/Makefile.am index 1e385412c..10b722554 100644 --- a/share/icons/hicolor/16x16/actions/Makefile.am +++ b/share/icons/hicolor/16x16/actions/Makefile.am @@ -60,6 +60,13 @@ icons_DATA = \ draw-ellipse-whole.png \ draw-eraser.png \ draw-freehand.png \ + draw-geometry-angle-bisector.png \ + draw-geometry-circle-from-radius.png \ + draw-geometry-circle-from-three-points.png \ + draw-geometry-line-parallel.png \ + draw-geometry-line-perpendicular.png \ + draw-geometry-line-segment.png \ + draw-geometry-symmetry.png \ draw-path.png \ draw-polygon.png \ draw-polygon-star.png \ @@ -142,6 +149,7 @@ icons_DATA = \ path-tweak-roughen.png \ path-tweak-shrink.png \ path-union.png \ + randomize.png \ rectangle-make-corners-sharp.png \ selection-bottom.png \ selection-lower.png \ @@ -150,6 +158,7 @@ icons_DATA = \ selection-move-to-layer-below.png \ selection-raise.png \ selection-top.png \ + show-bounding-box.png \ show-dialogs.png \ show-grid.png \ show-guides.png \ diff --git a/share/icons/hicolor/16x16/actions/draw-geometry.png b/share/icons/hicolor/16x16/actions/draw-geometry.png new file mode 100644 index 0000000000000000000000000000000000000000..2865b25e0ee0a58a9118cb299b7b633a7d09508a GIT binary patch literal 451 zcmV;!0X+VRP)h7yq@L;hIOja) zecp%v!$~ACuu)|`pP#PR>*KfyxqfvxkMUZqrrmBYbi3UqUi2g0gZU&$-j~beb6CKI zv~w16IE_)Dm`wsT9deg5(Yzp3EaT9zskmOe6QJTPDN345obaV_TelZhG$&L zid`JsyrqNdR=S?XA>79;Ooc?Nv3=+6D|`1(%=`DR%wiXw9X>epWyiL{yY%G%eEs~X zxA^+yaV)P9SMUSJFx~6@T3%ZEd3$Yzoa~952_~1rerz4?YQ%9oHawDiz#M8>ysSaW t#Y4l7%A=K!cwlAvHiQFFv3Rr};%{J5QI@kxG}ZtB002ovPDHLkV1g+p%o_jz literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/16x16/actions/show-bounding-box.png b/share/icons/hicolor/16x16/actions/show-bounding-box.png new file mode 100644 index 0000000000000000000000000000000000000000..e3157a83137196fe691a16e453a2946c9a7a58f2 GIT binary patch literal 333 zcmV-T0kZyyP)M3Ja~5%)8h_ fExDGwQ*`cWi0q197-N73L3tgCKG#amsF_%T;G;q*b`@UMOUiu?K zsZ^TCX0tmYa>lH!MP0b3;Oh+BRUpH@APA0HYk$OER%`uCYkdXaBV=|zwH((QcLS7C zZQugH6ns}u2Z9f9b}WFkwha`0-%kL{LeGO`53YA$dK|zepi-&Ssi8Lm8xGci+dW9{ z31~K(7I-Nlg;D=F7=gDIZf!#HuK)n&+||Kg@OacyARgQY`e~R4_zkGVr{7Pi9xMO= N002ovPDHLkV1j$M<){Dv literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/16x16/status/draw-geometry-circle-from-radius.png b/share/icons/hicolor/16x16/status/draw-geometry-circle-from-radius.png new file mode 100644 index 0000000000000000000000000000000000000000..1a7c2f3aa347937606a6d63d105da06950d5c7e4 GIT binary patch literal 688 zcmV;h0#E&kP)Y9^6cN+X3v4ML?!Euthbf+B*VKpgIr zjNqbWnk}sRtMha z_q^}noL4ANOH0dU+qTaFhkFw>E&G+l2gX_Ags;cUW*18v{0$u=p zz>tV&pj~TyslL8`dUSO3?Gh)8UA1l7zK9$O!?2^Lr>DPgGS_ugI-PEB863P_IXg31 zHa9npp+o>2$GHZyS(eq<)z$T*5YE?#tv|mxu%~+K+|1+H+p${J+S>L@U~E#N3{ zE8qMHHU+{Hfyqe8y3y*IqCTbe0k=QaY&%nzPSby|>GGfA;w=`iO(~Vm56D2QL^J!V zHum%T+6{^I6VnmU=y~3-x9CY$RQxf<9Jc@!hG9@RvMA;!$}9F%{GJ`GoSMpco;RFd zkD{nlL{Pwli0oJfLy*aGxPEA4I`(0_94P&#fyktY^jjkGEQ+F&!2P9S9ejKbyTa_k zKgq&$VSq8_1kfpt<1_%TjWPRt-yd1w5thkuoKwI9V@zCmp7##u6cIm_N|mh!ClZMo z;GQw&y6^i_3LuxuT@aC(Y&QEcnM~HL1SgZpBTA`PBJ$k#{hP433jnE9YE34Sxg{cP zz(e4XG3JZb+6u#Pr-+;enndJAJRZO5x^A>AAn$$+KnDx!TmuBaSKujd*YmuweE(lV W=HY+|7%oQu0000H#Wwbvp=u>Y^mFA%w*OoGR}v0?d{J2bcsmZFpLX^VZ2;iTyy|{ zC9`Ro6}qlZRXa}8y~)XLO~t(Dp_RnLa~|RVU|Ci($uR((g+k$SGMU`^a|B)29{{M| z^ZN%3U>ELwLH$*!K(rerH%5fJ~Vq|2b#&Mig z5xK1bKrk4*OVY7z`_cc*0I;yIkPn4IRU`+sB?Y7Dxw)%>-Ctkst1yEulI4V`s`}dV zyjzL_gr%uUtE+T(D7aaU830_@)d8GT6k^-0tjO;9eFXx!asw1a$pL^?aM9P6`nahT ziftY+U2Xt?K9bV}fT5wGUeEL1h)Bo&Qyt3^F+-yD+lfF&-F8-003eY_q)5IX`4|U2 z*HI8~K3_b$zSh(6L#He&r9wWRj{)e6Mxzs^X;vR)4u`|qRv^%w5&cU4r_~7&)c(`W zvaAM@;{bX{j*7@DMN!s^#bQ0l0g`tvrI-EvE9rS(F1HO2xg*E5EbBVSD1d$dEhN8- nNJ>PWZES2jnVp?2mbAYCXwcme-FVA!00000NkvXXu0mjfJpLzH literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/16x16/status/draw-geometry-inactive.png b/share/icons/hicolor/16x16/status/draw-geometry-inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..e279569f0b0ad099414107df29fb8474c72efbf2 GIT binary patch literal 311 zcmV-70m%M|P)cMbEnZ5pB|K5_}Q-_1fr!rrD5hV84J}9AYu}BTXAjmDQ>cM>t5ebBs0(sE1r7AjTyo+TdD~ zr7^?T#rvjCF5tPWne~X*-%f|^mh~%~VeBV(D*^ZDr&=H5P4Gf$9AFwfoF;FlhTsb-0SF6==fDt%Xu%+SM0Sw&>0I=2` zDWzU(t+%5ndYGB)XgC~#H*%x!{{R3zfhG8GT6>NGKY{Nn!0HD+9ECa*k za``>LIJm5j={8Ih0$Q!sbr1xzB2tUvcqZ%PyN5ckb^(v`_v$t+0AtKc5lOYy6V}>u zfHuqn&lRjz;QCgBTpzn4^2vL@U8~g|08}6ae*A@%J735rP16s+Ww+bi%5=p+UBQ!6 zs1^bMan3D>$fPl53E(OG4q#ouw|hItCywK1-upf8{dA+z*w62Z3;?j!9*f8;t@YcR ZyMMUxjaAO$?4AGs002ovPDHLkV1mI>&qx3O literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/16x16/status/draw-geometry-line-perpendicular.png b/share/icons/hicolor/16x16/status/draw-geometry-line-perpendicular.png new file mode 100644 index 0000000000000000000000000000000000000000..ed96db694b7b8cfa2b5fba406dfd8f3492eeae52 GIT binary patch literal 426 zcmV;b0agBqP)B!)$JtRKSA(8rfG-NER7w{@Y)C0*N~O|;-i^Ld`CRzoFs4Dz10 zEMMC3_{B|Kw%_N+z=San09xx5a5B|uZ3NZoZ3I5%;5C#%I-OpVQl46CSBk}AEezBx kC4?9?#;lgh<)LAKFAY9s0ov2Z;M1& literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/16x16/status/draw-geometry-mirror.png b/share/icons/hicolor/16x16/status/draw-geometry-mirror.png new file mode 100644 index 0000000000000000000000000000000000000000..f81208b8965dbb5cb74759e5cbaaaea59bf3a38b GIT binary patch literal 614 zcmV-s0-61ZP)&5-rjCL8S*#yo!2FaW>+m z2M>xUDhR0{A`0TQ7ex$9Nty=n1M%V?pa(&yR7{(y6>7D5DOyUB-5n22!nS_U2L@&y zh9A%SzBAB}>$)e>>2wDXmEp`J^z$EC&5beUj#4TQNYfM86+&%Q0HxFcpigUkwFQOE z0-sg|@I3Fch-5@0tF=DTNH7QN9S7%M09k2ht+OI>Aq>O)H%CU=eHavI3t_XcyRM!BLQ5pWhL8+cWLryn4(tb|E88Ni-yxU99_Eg~<0bNPJ! z{>oCz@F;{ER@4l@*iZ*36bfU;nA5$<(sd*je1ur3DQmH})?8F}W=xdpc%@{k-*2EqjhRyNG@ycuImKX4_J$sA9?Y_c(#WmA}d+XmJO zJn`Xc9I7=~6N6Y1-ng!N2^b85pto2oPW=IR4;w7d2Kodx0dbZ-)6{l24~W)!6iE8M zf4EdC&BvmEZukk@ZLGh^Se7+ljCtWW&LQC0ZzTG#oL5`OQUCw|07*qoM6N<$f>yH! AJ^%m! literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/24x24/actions/Makefile.am b/share/icons/hicolor/24x24/actions/Makefile.am index 88b1f5047..452562436 100644 --- a/share/icons/hicolor/24x24/actions/Makefile.am +++ b/share/icons/hicolor/24x24/actions/Makefile.am @@ -60,6 +60,13 @@ icons_DATA = \ draw-ellipse-whole.png \ draw-eraser.png \ draw-freehand.png \ + draw-geometry-angle-bisector.png \ + draw-geometry-circle-from-radius.png \ + draw-geometry-circle-from-three-points.png \ + draw-geometry-line-parallel.png \ + draw-geometry-line-perpendicular.png \ + draw-geometry-line-segment.png \ + draw-geometry-symmetry.png \ draw-path.png \ draw-polygon.png \ draw-polygon-star.png \ @@ -142,6 +149,7 @@ icons_DATA = \ path-tweak-roughen.png \ path-tweak-shrink.png \ path-union.png \ + randomize.png \ rectangle-make-corners-sharp.png \ selection-bottom.png \ selection-lower.png \ @@ -150,6 +158,7 @@ icons_DATA = \ selection-move-to-layer-below.png \ selection-raise.png \ selection-top.png \ + show-bounding-box.png \ show-dialogs.png \ show-grid.png \ show-guides.png \ diff --git a/share/icons/hicolor/24x24/actions/draw-geometry.png b/share/icons/hicolor/24x24/actions/draw-geometry.png new file mode 100644 index 0000000000000000000000000000000000000000..db46125f59da63c546fbe72ec23e3cd4a271ee77 GIT binary patch literal 693 zcmV;m0!safP)>85le(k^T%R5uj`X`wY(O{5e-ky5KJjil5RB8oFw3~_N^ zAqk!MYT|(h_g(He_uTW{`?3Cb9MS)v3l3uur;u7t;X0fwm&@no=jZq0Z#=@s7jG^|DVVSI@5xIHj1a2?x){C`6G zTEzFn4u|jpey}{|D@ZRT)F%*q4nGT#wBQ*bg3s}taBKSTG9JU9_v5$+A7c)0#d9P0 z8n0qn$bJsL;)DAUZ@@9!Lp*!W--`)ZNuv6#!{`u;^6Cb1c1oa}xyGduWXZn4;rzKZc$q!I=a zi0{JLcszy9EnV454>dP@FVv%ElS|Sv2>JJ75bwovX`x;ZB-E&hew>TPlju%DO1x{X zx#i3HhE&s?JAV~~C{85d)oK;X&|c^q?6d}mzpnfDElsI__#DuaS!ZizWT0k*N{HQ)n=nV`O2KsiQ!KSKMr;D_n-jI oB6aJNYCnL5;rk(ho&Qz51D~mPgSws}PXGV_07*qoM6N<$f;8Q!SpWb4 literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/24x24/status/draw-geometry-angle-bisector.png b/share/icons/hicolor/24x24/status/draw-geometry-angle-bisector.png new file mode 100644 index 0000000000000000000000000000000000000000..69f0b6b7d91f15c5a0579f16f3ea1a119c351435 GIT binary patch literal 817 zcmV-11J3-3P)O#Sd+6GaiD+L>9^V6uS+7IYPjcMn(Ng%XU+mO3^ z=g#GDFYnF+AOTwv&>n*YlsGg17k(%x*Wk)~m|b!~4ZP9dHc&AO&Z`_RnE;>)9%=Ag z!O9dIE|owE4+^|VXp7X=ZXNLZ(_iPzIoj3L^{He6fDbUYwW(<+>-8ErbQielI8L${ z!K7JN!uMI(?5zTH02r`syVJ6)&B7H?fL}Aw;%|$Pv>t z1Ey&vqS5GJQ5^t`j*j*MKVyD>wlJM?1$8mOvNC4;pwz#hQ%C_y7wrw{~TOcA4fZsmfhH+>GMiiV(z*2zD z&d#XgIF_bq%Yb{pI^czE+r7=r&D+S`&`H-cAHiVIqwD$zkaQfUZUCx1a2@z1aI6Z3 z3%?JALX{qm=Pa-nFo3s)VKn|#0AN|x6A{^F7)Dupd;7NpYyi%=@W}%wsvtA5rlqCD zKQ=aY8ffr(y^Y>~34m^3XC{-W2Od|$t2ivwV2=xD6toJc!h(*DjxWIR{P}-BwFrQS zG~_`w+y`C@tWCnc|J46m5Dtg?MPv}zlxG4;piMyvXigR6W-I`dQYr#04+ewt^DsC2 zOA5ZZa54@x#R?!dCSBJX3gHqM0WJd~a3Kz5MG0Kj?a8&Wd17t}#9X)m%mXeZ!8c<; z?mbA0$Rq(k4MYSU2voapN=?|UX+4cfscv9VC={xkD!&-+3iJwWjDtO60q_tQ(sg~x vy%A8ua1BUn(2`ro(#JPf;%lg8pE`k^(gdA}J_H=Fau%@r9U`z3PP!36-gB%(--$ZdcvRu{*cj^XJ!# zdyS=cS7y(vhv)g8@AI7RdCv0)ir9)3EA(hI`Y5mphzTL0fDfDldc!dMHkC>pDaIiR z1ue^p7>4mG@D@;2i~#5pLUcHevj`f%sYo#V41kH_On`uh4l7eYK@cz$^I zi2*nLgGH3>A|?2rk}PFZUdMXldEu<;_haRTbQx$s9IKv(a&!-Phx#l!JM< zT?b5Z`=zM;F)w=mWizt8H1r26Gnq`)@ZbB|`undG!e+Bs&oB%Cbl^NtTL?JamW`%+ zOciWhG&VAD*7sg4Hfkj$CG}w#0;D8x8mMe1sOdc&e5@T!zw+lPZ%fu^ zSqN8WDxj2V&b$4(QtF@(;xXU%*8rbg4}JiC?SW;%v?&6(4Z3G45QgDuAp}aPAB1h& zG2kT7>v`T%*L8y;Z+}xuBofgu4EupG&-3bKGMPLD>;f7M!+7TZkmtMK49o#Oa$Pr& z`QS!!ntmFO$CunHc|0Dsf#-of&-1>3{IW}>QUgk<7s#!QgNa0<=@!V>Dy6;z#)S}1 zyRMss8xPKV!27^erPS-b?|*%>Z(>2~$8io^%inM^TU%ROg%Dqn z)3HY>wcRj`1D&0nXQ$&5i9}NvhHHS=fEwVhFbvnFQmJ32;|d=Awzjr=f*{xow33$* z7y;7c#f6t+XmX)=G;S|IvGWG$8h;Gp(OGq@CZcejF z>^bd}E4`Rrn0TQvCS);L^wR8V@dFK|ja(VBEzyJ^lNc3;X}0XcEE?%3kb$&(6wc{6 zuNML-N zWWVKd4WA6^FJ-gY(P%V!XFUU1Yw-$vWtIENZ|!+#OWN(N-!?Ysbx+RH)zY$5GAtrJ zBJycxXXoWSO|Gs`DD*_-#KimQK*_#4fk1`Fwh}ugCPzG}x%6Od?Z?1Ppb9vwlzOe9 zpG!<2c7-vDlA!4Hn^F0Dqq9>G{q-J$+Ij4WM8v@MS%`x=P}gl~SJpD5ai^Mx*in z7=**&#~jD`0T@?GJsyol$MPNFY6^uy2bEI2K(er~@X?Nrjwvm-z;T?ji=WSL6b=xH zLL@8z=USS0c`Iv3G|%o1O72m_A^CJ^Z{G6T>hr z10|Y*@`8Jc`xCVfFt>AiT!d+XU7Jk-GyydlfZOl-ZK~AIY}wWccL6u=0(@C6fPiVH z0Wt-y(!0pMAtH_oAf3!STW$Z50h-J##cNK$|Dj+oSOL^3rJ^q2t+@s6os=Tql+V}f z_RoJ_mP++*6dH$W4O#)N4GcUrT2?0hxw*0BW`n_Clcs6Eh{%OVByx1423O%71!oF9 z(w`{Ze!x4MDJV(JxRx(kEEXFQk(g5Ih_37UMhyVGMf6^4-e=$1TU}&T_`eYtSuu-j z+kP8Jh{z{~VI0cC$*aG%_^QS|z7}8Byk0kv90XWl5R1h|fD`<4-M`g!{dLxP^#EF1 zTfM*5)Eu*H*|lvdJ$dlPl?(H;PL+bds+)CPe?&yS1|9^4fHRh5UF`1eUh!Im!{PfJ z$2kGKyJvW~;`pUYD3RM5%2tXJf#36X*Vfh+SRA>h057nhl)A2IT0$vR1l$koUQ9Tq zlscVECeQWt^<{H8>&9Q~@|2y51{ss$8Xu5aRf0Y0L N002ovPDHLkV1nVV)h7S| literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/24x24/status/draw-geometry-inactive.png b/share/icons/hicolor/24x24/status/draw-geometry-inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..16703acb057cb5bb036e8ac98540679233861f11 GIT binary patch literal 391 zcmV;20eJq2P)CHO~U0TT%WC2XRh%GZQqz&jEP$Onc> z*e-(`u@mqd$KVys;5h&&Vk^+QL{F9g7{+5{o7%cXZ&r9kgSgKCzenFs;T84cCIWx* zeR)AeZx-j+kMtk$knv{|wJQCIPSE}v_(}$NrB2cD6Zld9^p1-_?+jg8;L`!X8^(M; z$4O+Hd<x7{Xj92+uaTExcjRkZE;FAg7791w{=VAeHP%|(e@#e5w<-I~@T0kBP lSVJMrTvh>7etE8cTwm@@s_rMUa0dVY002ovPDHLkV1nERrbYk& literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/24x24/status/draw-geometry-line-parallel.png b/share/icons/hicolor/24x24/status/draw-geometry-line-parallel.png new file mode 100644 index 0000000000000000000000000000000000000000..7002671b76794102f9ac8e552fb806bbad2402e6 GIT binary patch literal 774 zcmV+h1Nr=kP)K~zYIt(8wm6k!;LpKsS)3pYi=AP9UfvnVky-Gi!A!$}T)dFDaxGTDPX+TpWD08jyFfw4g3AI+%Wz>5%Ku3a z4u>}zhSA~#^)LhUD%g~TGqTEI@)C$hyNEn$YinzD!de&>FcmbVAzZYew6yf5Qfgc& zb;mG_dgq1!m;$d9=o7HJP=T^9LZQ$Ox7$4ge6lQSPa=_6u-O~fpr9WpTZYcxuP^@! z0OIlZxKgSE2zWf6+fI2Md~-vO0#6BaPeN(I0szxA?*o0nalepgYgptC3e zfMr>yfk6?uqU(CIllkFs7Lr*wn1&-o2@;9KvWT>b$Y&sK7{(SS{|@~M(gG(Zpsrv6 zKr9yf;&Qn{K!u3h3kHK;n>B%@;F1e|C^$b26$J|bOw)W0bOC$4UT>e1)xc~9t_o~i zhO=u8p?fWRDwP`2G%WyhXqxsel}e4;tRH3~Ai&`{@Z5mc1yx|j=kuKqkul&_I2>+t zGC#xwUJA5M!MPf8P1_1|G&D54cMhR5MO9$O=ks*}gV}7hcC|gf0IVhL7oZ5o$N&HU07*qoM6N<$ Eg34V?00000 literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/24x24/status/draw-geometry-line-perpendicular.png b/share/icons/hicolor/24x24/status/draw-geometry-line-perpendicular.png new file mode 100644 index 0000000000000000000000000000000000000000..062f7c0d611cde0ab50d8991ce8e7d049a2f78ef GIT binary patch literal 674 zcmV;T0$u%yP)t6C(39trh64hXmz>34 z6%J3*-3UNfxG_Ong0B$DoY=;rl>ib8H@cWnZT6Zb2B%qHPok+*s;MpjbaF4|GTO?V zT5Ph?>2y~nlX)CP(XF}x(8aH~j$L_<)w0QCGN};4AJ~YWYT5j!2lExPDqn5^4@yLfgCq; ze0!g@wQLq`@>1HyotPi+!5U7+HR7!Z0G(V3+(LJrBMk=x;(xh-34HvJo|VR|sXuAS zF*3=GJUiwk&^S%eUg68Q`ofQF<@t)QXujH+sxTCI8Pg1}0h7nIJI2Q9dH?_b07*qo IM6N<$f`nc>*#H0l literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/24x24/status/draw-geometry-line-segment.png b/share/icons/hicolor/24x24/status/draw-geometry-line-segment.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc918781665cb2c73bff4869896b054ebe53150 GIT binary patch literal 616 zcmV-u0+;=XP)mqT=7Q&WlfU0~{eyvlfkVcaaUd-s7q`M;mrK@Kr$nRx9J4H| z({Y@af7XPKD4WgJipV(7WQ^(bJa3{@U8sn()-@uM2bzFOe}hAah;q5yK_Cybh)9>~ zy7_wjs`wc*_)edVZbE~wAS%&i9}n~((3WnPoH0$_&B$240VwhXszQ) zsRxtI&HH1;wW;bai*t*s#0Bop!Ae*I0qE%Hu+!R0>#nPnk%CuI7e*IRf#^6p zGcHJwR9;AV;hh*1L=avD1zAJj?9_x8;YC3Z6i9~K5^3AImIYEsiP=`JGdpv-*qPYY znIZOf^SHh-=ogBGb z?zs@c>mh`RYPGtpQmOno$-%&*^XEnWp5waOEZ-*sd>M#c0g%t<-^BbPr!S+(A^jWv8&#^p3CBe4? z91M}v1VcUCXs`qu8|=Z%AbSF{g+k%+7~_W_gv<4MeQUW~{<#}uigE)R7)}IcH*vO~ zsR7On@Il~IVD;o&ogF`Z{3KqEF|JJ{67OX)nI+u-%_>CN9Mh(=7wTMZ*=n`g5qyjX z)9Li9oj!burIFQW zx6*8BbaeDL?8FTm%jI(SER0XH4U)~qY?r|nhDjJ;mcC;}f(IhEVPzl@_^ZxL zf~i&puy^m?Rn=;B40p#EpB^0@eT%t!yrYJgM%UZ3rDC!8dp@7vi4%!L;@{uuKbQC_ U=Y1f5CIA2c07*qoM6N<$f`iDx82|tP literal 0 HcmV?d00001 diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am index 19dc59a74..27ace5faa 100644 --- a/share/icons/hicolor/scalable/actions/Makefile.am +++ b/share/icons/hicolor/scalable/actions/Makefile.am @@ -60,6 +60,7 @@ icons_DATA = \ draw-ellipse-whole.svg \ draw-eraser.svg \ draw-freehand.svg \ + draw-geometry.svg \ draw-path.svg \ draw-polygon-star.svg \ draw-polygon.svg \ @@ -151,6 +152,7 @@ icons_DATA = \ selection-move-to-layer-below.svg \ selection-raise.svg \ selection-top.svg \ + show-bounding-box.svg \ show-dialogs.svg \ show-grid.svg \ show-guides.svg \ diff --git a/share/icons/hicolor/scalable/actions/draw-geometry.svg b/share/icons/hicolor/scalable/actions/draw-geometry.svg new file mode 100644 index 000000000..aa1ca90a0 --- /dev/null +++ b/share/icons/hicolor/scalable/actions/draw-geometry.svg @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/actions/show-bounding-box.svg b/share/icons/hicolor/scalable/actions/show-bounding-box.svg new file mode 100644 index 000000000..c46931a5a --- /dev/null +++ b/share/icons/hicolor/scalable/actions/show-bounding-box.svg @@ -0,0 +1,64 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/Makefile.am b/share/icons/hicolor/scalable/status/Makefile.am index e77495090..b8aa8285e 100644 --- a/share/icons/hicolor/scalable/status/Makefile.am +++ b/share/icons/hicolor/scalable/status/Makefile.am @@ -11,6 +11,14 @@ icons_DATA = \ connector-avoid.svg \ connector-ignore.svg \ draw-eraser-delete-objects.svg \ + draw-geometry-angle-bisector.svg \ + draw-geometry-circle-from-radius.svg \ + draw-geometry-circle-from-three-points.svg \ + draw-geometry-inactive.svg \ + draw-geometry-line-parallel.svg \ + draw-geometry-line-perpendicular.svg \ + draw-geometry-line-segment.svg \ + draw-geometry-mirror.svg \ draw-trace-background.svg \ draw-use-pressure.svg \ draw-use-tilt.svg \ diff --git a/share/icons/hicolor/scalable/status/draw-geometry-angle-bisector.svg b/share/icons/hicolor/scalable/status/draw-geometry-angle-bisector.svg new file mode 100644 index 000000000..319970564 --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-angle-bisector.svg @@ -0,0 +1,71 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-circle-from-radius.svg b/share/icons/hicolor/scalable/status/draw-geometry-circle-from-radius.svg new file mode 100644 index 000000000..4bfea854b --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-circle-from-radius.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-circle-from-three-points.svg b/share/icons/hicolor/scalable/status/draw-geometry-circle-from-three-points.svg new file mode 100644 index 000000000..60e67f577 --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-circle-from-three-points.svg @@ -0,0 +1,86 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-inactive.svg b/share/icons/hicolor/scalable/status/draw-geometry-inactive.svg new file mode 100644 index 000000000..98d20949f --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-inactive.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-line-parallel.svg b/share/icons/hicolor/scalable/status/draw-geometry-line-parallel.svg new file mode 100644 index 000000000..173145ca8 --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-line-parallel.svg @@ -0,0 +1,71 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-line-perpendicular.svg b/share/icons/hicolor/scalable/status/draw-geometry-line-perpendicular.svg new file mode 100644 index 000000000..6bb4b5a65 --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-line-perpendicular.svg @@ -0,0 +1,71 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-line-segment.svg b/share/icons/hicolor/scalable/status/draw-geometry-line-segment.svg new file mode 100644 index 000000000..ea50fe13d --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-line-segment.svg @@ -0,0 +1,84 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/status/draw-geometry-mirror.svg b/share/icons/hicolor/scalable/status/draw-geometry-mirror.svg new file mode 100644 index 000000000..12564b907 --- /dev/null +++ b/share/icons/hicolor/scalable/status/draw-geometry-mirror.svg @@ -0,0 +1,71 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/share/icons/icons.svg b/share/icons/icons.svg index fb8301ffb..c36c2d5db 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -8,7 +8,7 @@ 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" - inkscape:version="0.46+devel r21147 custom" + inkscape:version="0.46+devel r21165 custom" sodipodi:docname="icons.svg" height="540" width="1250" @@ -4758,6 +4758,170 @@ gradientUnits="userSpaceOnUse" id="linearGradient5828" inkscape:collect="always" /> + + + + + + + + + + + + + + + + + y="201.7701" /> x="0" /> height="1250" /> style="fill:none;stroke:#5a5a5a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" id="path4418-8-1-0-1" /> - - - - - inkscape:label="lpetool_show_bbox" /> id="path4418-8-1-0-1-4-4-6" /> style="color:#000000;fill:none;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline" /> + d="m 617.64905,102.88197 10.4519,-10.763857" + style="fill:none;stroke:#000000;stroke-width:4.23622561;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4.26999998;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:23.2" /> + d="M 628.25684,102.72593 617.49316,92.274104" + style="fill:none;stroke:#000000;stroke-width:4.23622561;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4.26999998;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:23.2" /> y="103.43147">none id="object-rows" y="0" x="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lpe-tool-context.cpp b/src/lpe-tool-context.cpp index d3fb332e5..be465e324 100644 --- a/src/lpe-tool-context.cpp +++ b/src/lpe-tool-context.cpp @@ -54,15 +54,16 @@ void sp_lpetool_context_selection_changed(Inkscape::Selection *selection, gpoint const int num_subtools = 8; -Inkscape::LivePathEffect::EffectType lpesubtools[] = { - Inkscape::LivePathEffect::INVALID_LPE, // this must be here to account for the "all inactive" action - Inkscape::LivePathEffect::LINE_SEGMENT, - Inkscape::LivePathEffect::CIRCLE_3PTS, - Inkscape::LivePathEffect::CIRCLE_WITH_RADIUS, - Inkscape::LivePathEffect::PARALLEL, - Inkscape::LivePathEffect::PERP_BISECTOR, - Inkscape::LivePathEffect::ANGLE_BISECTOR, - Inkscape::LivePathEffect::MIRROR_SYMMETRY, +SubtoolEntry lpesubtools[] = { + // this must be here to account for the "all inactive" action + {Inkscape::LivePathEffect::INVALID_LPE, "draw-geometry-inactive"}, + {Inkscape::LivePathEffect::LINE_SEGMENT, "draw-geometry-line-segment"}, + {Inkscape::LivePathEffect::CIRCLE_3PTS, "draw-geometry-circle-from-three-points"}, + {Inkscape::LivePathEffect::CIRCLE_WITH_RADIUS, "draw-geometry-circle-from-radius"}, + {Inkscape::LivePathEffect::PARALLEL, "draw-geometry-line-parallel"}, + {Inkscape::LivePathEffect::PERP_BISECTOR, "draw-geometry-line-perpendicular"}, + {Inkscape::LivePathEffect::ANGLE_BISECTOR, "draw-geometry-angle-bisector"}, + {Inkscape::LivePathEffect::MIRROR_SYMMETRY, "draw-geometry-mirror"} }; static SPPenContextClass *lpetool_parent_class = 0; @@ -285,7 +286,7 @@ sp_lpetool_context_root_handler(SPEventContext *event_context, GdkEvent *event) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int mode = prefs->getInt("/tools/lpetool/mode"); - EffectType type = lpesubtools[mode]; + EffectType type = lpesubtools[mode].type; //bool over_stroke = lc->shape_editor->is_over_stroke(Geom::Point(event->button.x, event->button.y), true); @@ -365,7 +366,7 @@ sp_lpetool_context_root_handler(SPEventContext *event_context, GdkEvent *event) int lpetool_mode_to_index(Inkscape::LivePathEffect::EffectType const type) { for (int i = 0; i < num_subtools; ++i) { - if (lpesubtools[i] == type) { + if (lpesubtools[i].type == type) { return i; } } diff --git a/src/lpe-tool-context.h b/src/lpe-tool-context.h index 320fa5189..8a52ba97c 100644 --- a/src/lpe-tool-context.h +++ b/src/lpe-tool-context.h @@ -30,7 +30,12 @@ class SPLPEToolContextClass; /* This is the list of subtools from which the toolbar of the LPETool is built automatically */ extern const int num_subtools; -extern Inkscape::LivePathEffect::EffectType lpesubtools[]; +struct SubtoolEntry { + Inkscape::LivePathEffect::EffectType type; + gchar const *icon_name; +}; + +extern SubtoolEntry lpesubtools[]; enum LPEToolState { LPETOOL_STATE_PEN, diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 0f880e1be..ce2260451 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -5347,7 +5347,7 @@ static void sp_lpetool_mode_changed(EgeSelectOneAction *act, GObject *tbl) g_object_set_data(tbl, "freeze", GINT_TO_POINTER(TRUE)); gint mode = ege_select_one_action_get_active(act); - EffectType type = lpesubtools[mode]; + EffectType type = lpesubtools[mode].type; SPLPEToolContext *lc = SP_LPETOOL_CONTEXT(desktop->event_context); bool success = lpetool_try_construction(lc, type); @@ -5566,17 +5566,17 @@ static void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActi gtk_list_store_set( model, &iter, 0, _("All inactive"), 1, _("No geometric tool is active"), - 2, _("all_inactive"), + 2, _("draw-geometry-inactive"), -1 ); Inkscape::LivePathEffect::EffectType type; for (int i = 1; i < num_subtools; ++i) { // we start with i = 1 because INVALID_LPE was already added - type = lpesubtools[i]; + type = lpesubtools[i].type; gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, 0, Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str(), 1, Inkscape::LivePathEffect::LPETypeConverter.get_label(type).c_str(), - 2, Inkscape::LivePathEffect::LPETypeConverter.get_key(type).c_str(), + 2, lpesubtools[i].icon_name, -1 ); } @@ -5600,7 +5600,7 @@ static void sp_lpetool_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActi InkToggleAction* act = ink_toggle_action_new( "LPEShowBBoxAction", _("Show limiting bounding box"), _("Show bounding box (used to cut infinite lines)"), - "lpetool_show_bbox", + "show-bounding-box", Inkscape::ICON_SIZE_DECORATION ); gtk_action_group_add_action( mainActions, GTK_ACTION( act ) ); g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(lpetool_toggle_show_bbox), desktop ); -- 2.30.2