From e210f5592cc2a6e6b17c8feb198c0e5274c5bd0f Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Fri, 21 Jan 2022 00:01:50 -0800 Subject: [PATCH] Add "hexagon" to shapes tool How'd we last so long without one!? --- data/images/shapes/hexagon.png | Bin 0 -> 4977 bytes data/images/shapes/hexagon_f.png | Bin 0 -> 4790 bytes docs/CHANGES.txt | 4 ++++ src/shapes.h | 26 ++++++++++++++++++++++++-- 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 data/images/shapes/hexagon.png create mode 100644 data/images/shapes/hexagon_f.png diff --git a/data/images/shapes/hexagon.png b/data/images/shapes/hexagon.png new file mode 100644 index 0000000000000000000000000000000000000000..7c97b24a824bf420c7227b2ce121cd2e805fbcd7 GIT binary patch literal 4977 zcmeHLXH-+!7LJMrBS;&NHW-2pCA~*tj0r--ASDWn^5iDD2@z6E0z@BUTa-bC5ycS@ z6&Y|uK}0}BP{e|wgVJ;<7HkwT-8$D_iKw$4udQ0sb^KPxBYmg_ zwx9YoZ^l4Gv)inVcd-Uh1=9A|PeG1LgKln2EJd}Wo={6Xe#xB^u(#Lgj}JRs`o=Cg zfxCm;e(>qwv1taiW8#?vRKt3a)CK)v<(7@3-IGqc~rtF7tAcdq|~y1ny_l}Gg5scSOn;l)t%wt@FMb&smL zHiwJSG_kk0oe-|v-gF2upUgsLIsBY>H4jsA>|SHoweS6*)8j4Gzs<8)wk>nq;vD^< znvj&#OY(b(qjmD|GhV3^27H3w7d8ksS~Q^BC&e|@+?p4CL;LdZ{L7B3taC_Qr@<43 z0n2A`S*`2sN|F)=QE|lTawvJ*i|-oeCU(Ugz#=>Dc3-GMndkiX<}ttZl3RuOPVYCH z9hp1(KfE=)+y#oyT8>KtvY5meh>{d~m%e2sKm9;!7w)5Uy?la*t`OxwC?HcjBXwJgDmw5+*0pIef)lcIF^A*QHv$q&6@b0Vr= z-3YmQ@+He~aqc_El?55TPOl2={2#ZqUNP(=@98YI^H(m&VkzshWxL_)vn$hHwZ0uk zZErJVJWqZcVA+zXntAbTDwB+Om}mB&!6uShPM%FFI|Kz$$Z)q)VU+(gE;+fZX52Tydj5Pxn@N*X&InDvREi_E-g0#OaFO9KU8$wt#v&aSiT9U(KCEjwML!Y|@`8i6;Z1V&Vg8CRIAXNEp+>pWKDw_SqyL#zxnsIXI{uo+faTv!C4xM{l0F_xI;+c@@g7 zF8XrL5Z#0+uPVgDKY0g1e zcUI`r@@Y|l_uR&9sGQeuH<#={pTa9NODV8PE$x5ZTd~G7qP{IF_%ic0H>h>6?)|fY z_6y#s%s96B(d+?{=V*I;+r^0o(oOL-pxA<+Ar z6`;q32^X>?Y9$Vms>LwQpwxgKh(LIA3>ruh4eQZjSgug9G0&=NF=&O9jR~a+2|^7I zj#Buo*1{pH14NS5(GsQjIYv9x`B6Iu9eo5CkQ~NqRC3dTQE(PFP{78JaD>k@fiaL?1`ODkg$h-y;q!t>p@c*9 zkWoz{jY6VRi3|dXNF)=;)X$(LuvP~u(a1?8;K)O~#%*DNWPq@cu}%Sj$pYlU;%Q+> zuhxpx>KHc07!ulOX)15D_t2*JDRcm_%2@HkH6H@692yNBff$8p35_STm!H|Ke+SFaAXjfcl%0uhRFM zT;JsSDh0j@{H?ma$@NtVd=>axb^YJuLVbSVfmPsFP&{~?sm}Zk2Ofn+i~W812*iOj z4-y!S*Z76&5QquZ#%olG$H`bQiPQ^(KFF?7_DIIeJ!5M(f~nU6K3C*-p?CYq6{CZ! zlWMDq{Vg19TaXz^-icA}kFZnBZ6=?+Vn3PZF1|n8%zo#(*f2p(SgPYY_v&LUm>c^u zVndI%w>D~CJ9bU%o>y#M&{DCo*XV;&HT4WR$auCC%z72B#{-T zOV%E|>{nc#KHZh};lim-dtqqH^j{xl*x)M9!S2(XlHZA4=*Y)+c&))jkxMVVIG_7u zIg~}wJig33E}zwZcDm02udFS#SFml(UNg>5j-#}X64lVX($izXe`pAVz$buzXkO%o F{{ag`c{l(7 literal 0 HcmV?d00001 diff --git a/data/images/shapes/hexagon_f.png b/data/images/shapes/hexagon_f.png new file mode 100644 index 0000000000000000000000000000000000000000..cc07b3faf0c9d01227c06f542411f0df327851ea GIT binary patch literal 4790 zcmeHKX;f257LLd!iXt{NB1;U2(oOa~5*CvP2#G9FHn*4LB|OMx5+tH1$e@U#XbU3> zf(tfdx3q{fYPSoDAgF){YU4fvE+gxx=s1mC38-+U|9H;yKXcAYUR8bfyZ3%|>z>r+ zP(gsTm7^63g|ZF`@r<>=bjSrYS*O`^&PMfGAC84fpxukvRs#9+5OK+&mcBE#6Tc#B2cE2C0 zxG?3b1$pT)4dpfZ;<)Pf+UW0(Zl*#vvTxu7dKPQna(bUv0yJk+yj@{Fyn&giwy^v_%X>KB^9WOYZ#XVO4BKUDGH#RqW z=Hwi={ItIX)mUFa3&#bwsn_k47VM7~#Y?Z}OgI{qZA*>WO5`ofq6W3(cwO2RE|}Hk z6ndt%x^3p{fYkBV8ed#K)F5cgcfO=8BowUex zIyB6EC9TDA%lnAZ*nd^M1F|=~xRwHM94uiVr1 zn_9Y~!{V~rlZ$TgWs0HRN5Ls?j-;tL4>k_Da^CIBOI;8Yb9=A2tl<7ZQQj@v)^ zdV_Dqk{uUbpRX0tzMp5~o!M`CaFLR}Y1401$sl9x_y=6qE-U}OscTVY3Fory?Uj$u z6MQ%3_uh#{Z~bQf)d82{6N;VkoaJ4SVNa~b{oL%o^_b0JmqX7yf9-$UfYb&*K;AwX z+G-c=Sbcg$d>Gx{a`NT=yEnJx-~QDZ4(PDZxaa0|%pNEcwv^wwCZtaD-P1!&C^^eW zN|8>PARutFEX7v|JhLr6KS-bKj_j%Mhzot_V!okrUj6+7vOV3MQ)0U5(A3R8^}p#p zvCea8ZR_svE6lt8VK?4Z|K2;;UKjn#bUFU{0nhfEw&a44)WLuiYzx}Hw6=upk%NPZ zefcK~-#*D+-ulnbSk6!=1p1UC0{T%DKZGS#DR7WPC4zB!g&OoL6w2FIuZF}4unsMP zWr&iE>HXy#28~GAm`Ez0z*lqNI3zGx14kqagyQ4`F;jx^^|A8SvjBkt)2zuq9-owygi9jhR2mtc$Ye6{1QMP^!U6gj;kMv6IhzdXtydF~Hi8umYp}>!}(CT=r0Le%|e`=u>g0_wi zhqbCijTq*wf|WYA(G(K#M|*XmMs7?;BF4jVSOK6~;FUPWWk3)=^rMAA0vV!E8?AuY zV~{#T`bn%Yu^Cp3>5L8pn1AFQgZ_}a5e!g#K8vdoCmO;F;<7OY|1610j7V6Y9v3{$W$ zoep6sB(VewF{C6c3=`;70+U9C2%=FG3pEI+N=QCBDg%`SP)S5Ei6W&^uym;ughUa; zSSFDw!b)irSi%(3Xb^RnN+M>>S7{Uw*iJ+N$zZ%%DKq*o2+r~k4Ps+RIKroyP&uTN z0s}TC1W_jHKP?Cm1stJ+3~CZ-6cU|EWKbv+29rXfd;%?oHCj-K22LUYM;_)iYzqq{ z1B8VPbqWZK79bZEM*~ATl}4yi$=Mh~NN9tlvAogV!TfVMjOkP1&N29XrWcG#OMgv4KIn~Af*fj=X<1}KFlM3vRN=mETWO_)B$tk?XS*_$=_3>iWOQW%cR811rJ5pd@ge z@vJ(30$hbmM8N@E)cZ}_ubu;=3F^RTEebW!#_)_g>UJg(Oj_uI_&kfQads9=2SNRV zU@)~Ki0dy5tP`(rFw>zzOeSraK1BYn>`hZ?U^#>dnbd7_u~;Fir>vEdKS5hBR| literal 0 HcmV?d00001 diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index a7968b1dd..1bee125ac 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -27,6 +27,10 @@ http://www.tuxpaint.org/ Closes https://sourceforge.net/p/tuxpaint/bugs/244/ (h/t Areti Tsolakidou for the suggestion) + * Improvements to "Shapes" tool: + ------------------------------ + * Added hexagon (6-sided polygon) shape. + * Localization Updates: --------------------- * Albanian translation diff --git a/src/shapes.h b/src/shapes.h index cbb8ec068..bb1287a8d 100644 --- a/src/shapes.h +++ b/src/shapes.h @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA (See COPYING.txt) - June 14, 2002 - August 15, 2021 + June 14, 2002 - January 20, 2022 $Id$ */ @@ -49,6 +49,8 @@ enum SHAPE_TRIANGLE_FILL, SHAPE_PENTAGON, SHAPE_PENTAGON_FILL, + SHAPE_HEXAGON, + SHAPE_HEXAGON_FILL, SHAPE_RHOMBUS, SHAPE_RHOMBUS_FILL, SHAPE_OCTAGON, @@ -78,6 +80,8 @@ const int shape_sides[NUM_SHAPES] = { 3, /* Triangle */ 5, /* Pentagon */ 5, /* Pentagon */ + 6, /* Hexagon */ + 6, /* Hexagon */ 4, /* Rhombus */ 4, /* Rhombus */ 8, /* Octagon */ @@ -106,6 +110,8 @@ const int shape_locked[NUM_SHAPES] = { 0, /* Triangle */ 0, /* Pentagon */ 0, /* Pentagon */ + 0, /* Hexagon */ + 0, /* Hexagon */ 0, /* Rhombus */ 0, /* Rhombus */ 1, /* Octagon */ @@ -163,6 +169,8 @@ const int shape_init_ang[NUM_SHAPES] = { 210, /* Triangle */ 162, /* Pentagon */ 162, /* Pentagon */ + 150, /* Hexagon */ + 150, /* Hexagon */ 0, /* Rhombus */ 0, /* Rhombus */ 22, /* Octagon */ @@ -191,6 +199,8 @@ const int shape_no_rotate[NUM_SHAPES] = { 0, /* Triangle */ 0, /* Pentagon */ 0, /* Pentagon */ + 0, /* Hexagon */ + 0, /* Hexagon */ 0, /* Rhombus */ 0, /* Rhombus */ 0, /* Octagon */ @@ -218,6 +228,8 @@ const int shape_valley[NUM_SHAPES] = { 100, /* Triangle */ 100, /* Pentagon */ 100, /* Pentagon */ + 100, /* Hexagon */ + 100, /* Hexagon */ 100, /* Rhombus */ 100, /* Rhombus */ 100, /* Octagon */ @@ -254,10 +266,14 @@ const char *const shape_names[NUM_SHAPES] = { gettext_noop("Triangle"), gettext_noop("Triangle"), - // Pentagone shape tool (5 sides) + // Pentagon shape tool (5 sides) gettext_noop("Pentagon"), gettext_noop("Pentagon"), + // Hexagon shape tool (6 sides) + gettext_noop("Hexagon"), + gettext_noop("Hexagon"), + // Rhombus shape tool (4 sides, not at right angles) gettext_noop("Rhombus"), gettext_noop("Rhombus"), @@ -313,6 +329,10 @@ const char *const shape_tips[NUM_SHAPES] = { gettext_noop("A pentagon has five sides."), gettext_noop("A pentagon has five sides."), + // Description of a hexagon + gettext_noop("A hexagon has six sides."), + gettext_noop("A hexagon has six sides."), + // Description of a rhombus gettext_noop("A rhombus has four equal sides, and opposite sides are parallel."), gettext_noop("A rhombus has four equal sides, and opposite sides are parallel."), @@ -345,6 +365,8 @@ const char *const shape_img_fnames[NUM_SHAPES] = { DATA_PREFIX "images/shapes/triangle_f.png", DATA_PREFIX "images/shapes/pentagon.png", DATA_PREFIX "images/shapes/pentagon_f.png", + DATA_PREFIX "images/shapes/hexagon.png", + DATA_PREFIX "images/shapes/hexagon_f.png", DATA_PREFIX "images/shapes/diamond.png", DATA_PREFIX "images/shapes/diamond_f.png", DATA_PREFIX "images/shapes/octagon.png",