The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Merge icon in color theme

These changes was commited to the Birdfont repository Wed, 18 Mar 2015 11:57:43 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Wed, 18 Mar 2015 11:57:43 +0000]

Updated Files

icons/active_edit_point.png
icons/active_edit_point_cubic.png
icons/active_edit_point_handle.png
icons/active_selected_edit_point.png
icons/active_selected_edit_point_cubic.png
icons/edit_point.png
icons/edit_point_cubic.png
icons/edit_point_handle.png
icons/selected_edit_point.png
icons/selected_edit_point_cubic.png
icons/selected_edit_point_handle.png
icons/tie_is_active.png
libbirdfont/Path.vala
libbirdfont/PenTool.vala
libbirdfont/Theme.vala
resources/default.theme
diff --git icons/active_edit_point.png(deleted)
--- a/icons/active_edit_point.png +++ /dev/null @@ -1,20 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org< =IDATx[lY$8nqpPBKBpKXJ[PPUUTUhJ})HH$h& iu`8Ns}a/>s朙MS)s9l曒h, -  ¶Pp-g#d7Wk6Dc - !`+ X2&]N@*N= - h,xxhxx3L?Ӎ(h,+kLT3&nlzW J&ڧдDcE/t;3C<L+Dc'@C'e<J&S_!?:\PTDcJuLˢ<~FSDƸ_M֔74/o᎖̝?ںzjk**bOYʥ>:?)`?K%}&Dc2%Kn莳Y:3ң#S - I` _0X<|<<AV]oGTUc '!]LHGc016UР2(V ፛or2nbÕo=q0'>=:pAy`4 k3mlm/r%IKXp$+* \lUSotZ0X1],57\ne58SJS*Hztw/L 螳`80 Y槶bYB_(/r߳46e5L3t7xc?؅xb]T 9)OiV }03K\[v \d˶B Et!IqU{7ɉcTKL%'Dż[,eS[H?ʗWLS#cw&`* - :;&%S̝dz/a*p*,*.+ UP - ڭ*knQDV] ;O,g_hF C!_8#5<I%0ojߵ^,Z"T) - \Rش;WP`<W"6?@wnxB.ؽ60+1Dcq xگkSS - 8~8sXPF_Eg95sYjV/A.(Yh%b#: \WZ\ݽQ%0[j\IUTҹȄ?q?a?5K,`|[t*±;\Pp+yPiY mh, * v7R8$nuPR~QXB˂Ty~\ŗ08yP DBP40wŬ`877 pOɯTz7R)5J;._.n6rFs;_x@AZp/Ë.e Y.얅A`_ںRuc@Ҿ BK*r_YSofzw 1p-;]E~،DN:k5qT d1*8.(B9 TUVtu `҅c_(p'Qq1MRLi2|" `5~nU:Uҕ}J ߕ.CNbʋJ+VN:( ?.t$CZxC0y,3󪇳D&F| LPuFIr?*sb9o-S3ۢ5 V%oe( - mS;C`zJ]7^"pY :y - cŋ2p ŞrTǤr(r<ո@ 9$?S 3! MZ(1-1BxnЏH4u4J&:RϜ.uBt+ml@:6p;y>.#Lt+} HyҼ^tIcXߗFn&_m+BdP(TP~cr<6:̥:%94聽QFh$5H?K63"&L~}#: &tVV4id0:xޓx%MZG>WƲ )>$:Vny1.(-B(eb I.3C_'&PWqڶm;v)!]. p0_!P+`RA yNյ[*#$Unfܷ!; D5g_y8.O :(ryG3P@RǻhgC\` - s0iOq>-Y֣4C;7w*r~-rٜ+^y h!(rs9z>~Ovt2fltͬPerP2F~8Z3)syk\0-8Z( - H Wsp;o`|QͲz?+DeMӵ~.GG'L^O%,L>,pm8~u(j - 4}'R\:};[ֲ - BP8¢ewӴyae=g' 錄8W?#;?^UXW - s--p - 'ö*YF`= ;E6s-+l- EjWIO5f-5E:?M%#kQ/HHW<LkEr\(p^hII# - F_֗S wIENDB` +
diff --git icons/active_edit_point_cubic.png(deleted)
--- a/icons/active_edit_point_cubic.png +++ /dev/null @@ -1,4 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<HIDATxMKA^G1JAP<T - UzZV("_Kbѳ=Tzj{ &agcw&;3? $<ϏٝyS"B^RJMa`D.ꯝIwDWnf F)UڏRyubeRJ ^CFF&Tt""b HbP`:`Xj@ ]1Y,%+`ٱZT{3k$ܮ׀LtHSoE`Aȁ4$eU1T`%KJtGܩk@-0AvYrhb>% #?-%uIzŁ`v% ́ my. 7mf|T7%"h)}9uXcfP `0/E{8cEL?;ۣ,ӶpPn&ӽnT,r7kטh=hy01**v$oWլS&ZL<y01`btZvmGvÁ=Yrh{PePOc3gH}D]vcrBEL亥`\ҧ;?_w_ /J㗚%@yy嬣ɔ/Q/n',bm9 pCJCLmj5zW(mi.VДOcSN% h8EpW:TqqJlCƍd@i\29qH)`KcѺ|5]xG1) Z{"e?$3sϔzH]#k'D޵+"yE dIENDB` +
--- a/icons/active_edit_point_handle.png +++ /dev/null @@ -1,20 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org< IDATx[l;ۉq@6@ eKCTB -PVURT$*PSU!J})J<PHp YH - Iq8qkeagfgΜ3sloIs~ssr]O`-p5&=]vN{I`xT,ʫu9 ,E~`"< - <Z*E&_ |X,GRN'Q0Bn ֎%jfJ˝J#`NiE'8 xX~w - - L~|,632iX>D &_} 0Ї_f._ cj*AB</ ; y2%P0;WõoqL3/in[Xޠ붰i5 ҥ}X .# - 3K\LL|HQ_&rC榧klgƭ@&u@KІpNMNp~>|pm'L^Oͮ)OO6007z;ɡq| - pg[ y@,mc_wYE @HR ڀM>kvu{o>1L?H,GRB/Mb`MV}€d(2Z"D:+LiV)˿ҝԂr_ - dMnFm+P SPX= - CVϱ՗8i8Wu,%|!84y®cwE\@bYgduoxd<T,O't1gB#'7 C=9(ZJ;dW'brbB7_Am'B - U-"߲,:PqbpK ё H+!IuNi8>.}uD 044V >%(&_4|Xҳ4%JIuJ zƿ^ /咿#+鴻-;B}bjmݷ=öJomwۮ(I%7 - e8Or+]aC}wQt+Xv (;,=z(^qE{TpjL)@nݺLh%`rp_]v)lR|  -  :=K~0y,Jz0vc>" JB(Ñt7`9#BMͦv X`OcmtuuGjBL9Ah]I_ٮ,C`Hzkb@b - +dPř0Zc;_mOҶmFGַBBX&|`(ʈYj@5<j5uERqrm ^l$F - (EKCuGh;0˵L&*Ο$Ȼl`4 6k[' rt}(Ci,CWIP^q@Υb P> }<Hz{҉60vUoo15J8)n" XQwbvW 30Kԅz1`,jJ ƪ83] ۲,l3`{v8)B@ Ʋ,L|0bӞɤ~ %VwIt8B_=]&6x} VZ ^rOu/~6ybӚ֯RkM@tXԮdR+z36p - v=FL6R - H0VF9&o/O`RS$*&I93F-7ް4굴L_25 1U_I"L3Rd(kQWw/zd)M`ֹФuU&Xl ʼn6qx=<iW%% j)ȄL_23aӚ - orFAABj)j%O)@ߕ\!J9)GėD۷N:X3m4(vtKQO<|\,ɽB<V!GvebZ1>Ү>1qZ> @Χbq]Fԍ^OJTo?|P[@@aN1_!x,Hc?S*]Ŵ`jw#\\`uhԩ^4r=7ϥ%áq7iɝRe5.)OsLnA[7'qa|4OtrtqF:^QTL ^_>vc/Zi@exqGJ(ŕfFce懤V o!H!B@1(ZWc NxQyDh110=AkU; h?2~o}e - )KXJ`Eq>!=kGXh[FZ- 5WO%RcJsxJ;%Ϟ53{"\pY-I;%0ާ9SY1AI %oCĉck4r G4Iqq839*j/$,fL?j>f*^Pm%drl - O5fַGVߚ> -G]le#sD|3@4ܹRdɏm@q]3' exrۖ fBWD YUC,[1H_2\B84j5s5DfM|:˷N,d/vwOIѠllԩL;:?.bQmm\i6N- )>;u?)Ƌ| ]c Khmg<\(Z7):WL`dCEdIENDB` +
--- a/icons/active_selected_edit_point.png +++ /dev/null @@ -1,4 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<HIDATxMKA^G1JAP<T - UzZV("_Kbѳ=Tzj{ &agcw&;3? $<ϏٝyS"B^RJMa`D.ꯝIwDWnf F)UڏRyubeRJ ^CFF&Tt""b HbP`:`Xj@ ]1Y,%+`ٱZT{3k$ܮ׀LtHSoE`Aȁ4$eU1T`%KJtGܩk@-0AvYrhb>% #?-%uIzŁ`v% ́ my. 7mf|T7%"h)}9uXcfP `0/E{8cEL?;ۣ,ӶpPn&ӽnT,r7kטh=hy01**v$oWլS&ZL<y01`btZvmGvÁ=Yrh{PePOc3gH}D]vcrBEL亥`\ҧ;?_w_ /J㗚%@yy嬣ɔ/Q/n',bm9 pCJCLmj5zW(mi.VДOcSN% h8EpW:TqqJlCƍd@i\29qH)`KcѺ|5]xG1) Z{"e?$3sϔzH]#k'D޵+"yE dIENDB` +
--- a/icons/active_selected_edit_point_cubic.png +++ /dev/null @@ -1,4 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<HIDATxMKA^G1JAP<T - UzZV("_Kbѳ=Tzj{ &agcw&;3? $<ϏٝyS"B^RJMa`D.ꯝIwDWnf F)UڏRyubeRJ ^CFF&Tt""b HbP`:`Xj@ ]1Y,%+`ٱZT{3k$ܮ׀LtHSoE`Aȁ4$eU1T`%KJtGܩk@-0AvYrhb>% #?-%uIzŁ`v% ́ my. 7mf|T7%"h)}9uXcfP `0/E{8cEL?;ۣ,ӶpPn&ӽnT,r7kטh=hy01**v$oWլS&ZL<y01`btZvmGvÁ=Yrh{PePOc3gH}D]vcrBEL亥`\ҧ;?_w_ /J㗚%@yy嬣ɔ/Q/n',bm9 pCJCLmj5zW(mi.VДOcSN% h8EpW:TqqJlCƍd@i\29qH)`KcѺ|5]xG1) Z{"e?$3sϔzH]#k'D޵+"yE dIENDB` +
diff --git icons/edit_point.png(deleted)
--- a/icons/edit_point.png +++ /dev/null @@ -1,27 +1,1 @@ - PNG -  - IHDRGGUZsBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<[IDATx՜y$}߿UUw==ۻKQ{H$uD - )ȖZ")rD Xpb  1AÀ )l PdZykwc]ǫdzxޮ67_p/8A;ڽ,SM5]QU5S`l]eo%<ZkoX|36uZm8TTF.fFf(xLіμe%pjseŇ:kKb6WOZ*kqMtYx\ӀgpYHxi;]X+{~X{kʫ gwێ - 67_$|{/;f!ئW 7q#HFc8c - i"8$1uyLb~$<X[Bg} i .M+;'_\8Ӽ[8,w4/k/6Ud#7yP<斊98*4MRJSBQxBqn;.wۮmFT[F'3m`6VY_c2{|+?^\8c?SO|/Zc(=B)r!gUJy{T],d]= UBo#"2ӲNO7Ze;Fch]R Y[ֹ!)?|9U{yqé͗#[ֵzAdKb'*J-j`g`,п>PfB+虖RoZֶ;^oS֍PE䑯Nؗlmpjs峏m\Hi!FRg'G;'#fV=H}P'{3mHX\4ۆk\~B2٧&Og/?.pjs @̗KOs^= ӓX˸}O  @I Leec;}}u+]2lono"^=пMyvqጸpjs~翴WS<k(c;ǻBa}aCC0K)7ֶVrkev%(\r߭z7Xw Nmn^sMjwꬖ-aO463f893Y5UE$Ȱ Q"(2HF)a}>{zfg ř{<~NJ/?n^ݛbO\qj[ך,X(0p/qa[o*m•ײNWm/D3zPxݼ732}#ulvsfF%41bPAh9N`޹r~#,c[^-[2ߒgԺ{L S}#u؁cZFR 1`@}wcD60"b>!T]U聙}H`g`plc陿ySpjsecih(UFcgZͶs! "W @AD,P - (o0zS4k|-ZS;S׬6 - Fil;o}A0 LP% - n8D. - tJ^FOw~^Xw-?ZCgNW=qwjxgm_Ṙ4L_$7ꯈ IśJ׌@I0R"etqdߞԘJh꾏C˖ݸ魳?;7^ֵzeij;qtkZ!`!BZW %j W|@- - 3ɱYLz1cm˵pV9޼||9z`zgvjtT v3F~R cOG +D AK(8H=8;isY7SEn0N+7S/4.=ZO֐KnX%PhlE$`c$7msLWKQ8` +x#7*C$Ni0Q.dR!<`Evbq%<6%ewNs? 1@m4=1j y7UEq\Ә|/EoNmn\w:BiIdK439ڝ1$790"Wà - lJ@, - ƫewj|TG?n]\w0i/*G?J)or?mSh`%0Q0CQ2'$@}7D?>OSgTW (1ͫ/}nNgNYȎ퇖X7=Y5XPG`h LDl - ߲B9wIk#%wZr8T~6YZRG 7yY=퍍{̔(X\%I:U4eQc.RȠl¤ÈXJS\̻Y=-DqLѲ%r:˓V7+' ?qBΪ?K0 bmB-g D~χ}廊\ [$ 9Q,d=Ma$<}O[͵֨^UϡR#†F +ۃ 4Ίɢ0 - QҔ!:^Bմ W<qݩ?jmn^ BnT)坬8?" {V#0a'D5I - p3U$. r(􂔦XytJ,ӸG3+ ?yB)liz; ~W0QR a Swb8!g ~݂ BVY1!o/sG<ᚎTal-NxxД{U€k'f tT&DjJ( ڭm`LF2Lu9*)13wR41 -IRqbL07 - \ w 3ZR~좞,4M%MS ӪXZT4)N1!9 \`?XrPn c& BCXLU8TEANއLn=4UgCIn|X(t KEm WzQv [X|+1b*9#<gLuMc& (\h*T5EҝJ%t]k$97pH 7l.F=p-1FLUB"eq댪ݝ5*iI@EAw%ꘄb Pj M9JFr]_)C@B )zggus9F5aHVPTq& r?NL,C A%)~& Hų8cop87s `Rl` @1z#3]2>ء`B7b/>PnɈXU1! &ƸÕTv\ˀzv\^8p )Cu@JR#r]DAl - cY0|=RB0-b@I iѷu]z4T+2xq<>nFH|`*b0U34J bPt>:$}?vRPHWe1 1WfW: "8e)("$՘jtj@ 99{ sb Q0y1!DmZt1.\v\n;.4KFrdvҲ&4>̐TiV2;XbX}pE]VyJ7]i92TxtbhT<ʠP;5Y!3I7f9ׇ7F;7o[{K.bYɝda[Ŧp>ǿÍ}IYk}8Vy-[<jwzM_x0ST#W-hP`70;(v\E;F%T pW,V-#3-4RL(jD`T+GH:cEa]4]u m.7-yvMs+/s(xr5mw֗@4jbTл,lܠ>P_5Umu EUnA&yb;xeD@E琹_Nϻ҇44[Kz0~c Rp&t=a| - kbfP谶`.(_pδԓY_BϴNӳQ( nHd &SDY-|b - 6d;k]޳lFU(6OSd\EAlm^ݬD!ɱŇ ($UCHA;V BY‚-כ;\epL)ʏ.M6Y[BsHXԍ*A5-'uadݬT(n,c*Ӳ3mo7Vи5Z™fqs?zlyc;&uy\<MЈ.wROL`DM"kX[Xj'@i#36Z7^CUonfv:]5jod GФKE5Րt K`6neD[g`L V_ ™v)[xV6+z0HI, cMq - ]s*#@Q'cIFm֛;_ip-[[c 1姎4;{iqE;=F=MIb܈"!ǛaYclp!Brmlymw:=&<~,Wl<d[,.1+G\K4l5vIJN;$X)0go$*Q>lη-.PyVkvnl'GC͌̾;µ·`&9fn**݄y]JX7@IBi[۬y4.=ǸZTgðpƙ|#_Gf~dlbars-tu%YY[! u]mlVkk<N+^DKCɷ gTn䊱zBk*KVdfНu-ᣊ]@R mO2amnNbozyH&l\~zRWϮW(N}q]╛v0;s$ Q)X_=Aiٴ+Wxa$V^m%UI?nۺG~ϱSTw8;lG[o8\+ - WqUa\+sK`8EU5aM'.-+7Vxm@x_y\eE~Cz ; eXzN.ymoA |{xSNGNx$BE㟠N[_A(CAb͝6׷̲xv/|o*J*s8{}϶ - kW*\[8Gj D)9]1!o#!DlطlJ7 gYlb|bގ'sm^}q'61/=՗k#35zyzJTKZ):rMk %'!!91 y - ӶY6|d^ A-a!<k=W^oW8Gk~ >-ҩ_ V!bޭVNTE{ɪLPSb#&H bz82von7yeT_z1Tqv)8pW]eX~;>ISQ&\et/EVO{Ky!@D#"%,aFw.1:;s= Bƫ>cY]m+]zuo7 /Wk_qzCqAǑ@DPtJ锗IE6tg,g @y1`F]t1Ӳ›:g - ֲֵWެ} Rvſ^=38ali'@$ - MS3/u<fm¶fY67:]fNt#P۾1eJ ګ~Q - `9K7_cc4>MN<'G Dcmö8.\σzٸl\pm^I*?ͫ/ܢ?rW}>sv{;;)zHSGO#HJ2yhzLM<zp]m`-X,e}S"(Zk?v%p67ʹ1cܧNN~\Q)+B9n\;z'5_Rw-??v[sc3C#\g<gTxvEvqdm)*2Kj:D{շ"wFIENDB` +
diff --git icons/edit_point_cubic.png(deleted)
--- a/icons/edit_point_cubic.png +++ /dev/null @@ -1,7 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<IDATx͋SWƟ,J]7-v1u Hh .! 3a!aPЅKN.Zڍd"﯋h&sܙ>B8wsr?ι@IZyIc@oXtG xr…*k&n0+++B;1 D MI͋/gcS&3@AҸOs]˟M~ҥ)z>a*`䳨 z4vE mtʕV:h4S= 8KnC-|i4G|XĔk/Ya/AavvA1F# ,E)5[]fGh Tic/ggg L tWXT - ghn>^(b8TJz]E' `qX6ZvVJGӈx_]~}7Zv/yw YWW0Zm/])iL\ 8X.\!14>.~mQujqړcVVVnB;r1:ƶy7(isF-i~c'lRuIƘ %ُ+6zZΒc*QPg$Wnj1kL: - QTZ^^9*Ƒ ?KVl.qZ\TAj7%zQ܅MI2LΝ;y9iCI!9`Ȍ"Q@:HYذPy`|9(I3btI|`倨r h,vgRֶ - ƛ - fsHmFLܹ-Q;#.70IRVX;~ˣ̥DHZ^|<WNP*Ezliu53R0I>LR 7o WқO2| m~5^q6pvLOUFҪw~S,W^\:X7=輷v(LZш_ZbM`wr6"IwH.#YW;?蕤ޅ[<n\ѭwRQ8C=wbҭ$Q`J !1u\߹sss;?yc̣~Ɂ,+"I Ƙʠ>fh.la+y555΄O? $7Ƽɢr%pܓG(YKKK/%t#`FN{"wmYjCƘ OH,39AjɹN<H&KR%圙hCN"E ˲$+鵤ےJƘ~We9['#۩7ݗ4eIgRzeYք I39kucL?&˲TtT5[ҪMcS?YOa9dc.!I.ђǻ^xIENDB` +
diff --git icons/edit_point_handle.png(deleted)
--- a/icons/edit_point_handle.png +++ /dev/null @@ -1,15 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org< IDATx[lދ/qLB;vlBBHTbJ\ - ,ԾV*XUOUoԗRԗMrQi(iBBwbWaggΜ9 R>{s9s93g ˲,Nv6`3"|7Fa` LWUVc5 8б,ǁcL|mU#GWe - ҙ(T:y?kk2ճSsLpEɽ@xxٙ-^Lr3ZT: - - !YnaVLO/R3Y2T:(gi'_efro-%]T: - `T:RJ1t2`)'S0m`MC#3Sd[??fr-@*lwieX,NǶz45gM}#kD"XX-Ldiff}W( K=5 l&wM'T:xYmiZvlk RSS **qmY*=q - jp8'L*o)A&ʾ;kaZecqPsIΝB5xv[E52U@1{w޻ih,Wݲ**9#nbqq]t\51]a*)3޴v=}(7@".Fy;wIݢ<~L*|x9ֶ{)Z% p)MϽ:(g)`"ya pÐ@ R\F% 4M}\xF@g6wu~&;-C,ǴLLL2˞4v0 'wޮ<IshН{Gծ)Έ-+-Z;y\u/Yf3Fb^@ʖvZuT |W$Y!>9xLinnSce.ŤԴvG|:BJ-JQcFX(aff*Jfr8+b2aG#~ Œqƒ mJ&O^?x@Խ} Zwɦ - O,e08nr)PDz,֭@{0ln0Ѱ#kj%A"+Sy9yZD}]D"Z#,T:io=464A 5~tԊQ)I_Wm;:u<f(_K$j ]VJ3>pTbU%Mܶsh, fEaGֱx6ЍB iʅ ZZUDX[o[4\OA:pTDRĤm'tr;;(e4c떎@7Rv41T./,.+Lg˰0,MۈD"TݩtǶuPSu~9Q$YbĠ_T=kFclV]"TvxU](-i} - 0&-z%JHkԴ>\%A6*rU }Fŝj=ZR57z*l\yqҨ`Bb1XX$:`Z7T_ 0J񺺕'Ec:~nڄRql.؃gXX,|1LsP5 nB ӄL40*8뉺00͡O,멬;-)W]re,!byu,J5~ fg}J|J>!pd(]| ?s$ - RˏVY,ijp_WR*o3@)-,0lh3S]Σ_R=hfq# TfƵ7yRd,.8G6˰#B!邉P~6&'}$H1t* ~TUKȖe13=f(B@.WFC-idUN7|m(TQʯ@/ BJ f dI$^caP/1qmL̙H6.Z(-08o׺Yćj: - W]-p`\,+p,B6 KwYlZj8. βR=(**ȃѿaϳ{ša~FY;~AoJK*xBQ0E0igϞ҂Q֬za@(EL7M:'cfQ,.\o0_ ~˪&\1r=;?%#}/+6 דȗÎ*J>)Xqg_PƔmb=p+xàƞq"ȞOՃ#6.NeUIf& - '+tіeq7)J(7nQ穧e~3@~?$鞙;oVTF 1 - Ϩ4=s\^1~N@?^5~JQĘOzkɮ<`w^ɱy>pUYbU\ 7,أ٠ p}@+$om>OUP;s$?z-WP48֒IAX×zܫSt:>ڡc.˽UKP^QӉExbaPE&Ft]TBD.gu5&*t)¢Uknz?>Ĵnq }3tf[۷c$j<7{rT|'b>D{1NЙ}v4gXE_ezh߾yO tͅzъ.:ڪObmeVnڸ0]wJTbS_1=:FiyJ[5(7oj qYS(28c łjL0k`A1g~~(dQ/g%gLN{2c7&ؒx6{ |]̤\K7~nLaSL>`dMIENDB` +
diff --git icons/selected_edit_point.png(deleted)
--- a/icons/selected_edit_point.png +++ /dev/null @@ -1,4 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<HIDATxMKA^G1JAP<T - UzZV("_Kbѳ=Tzj{ &agcw&;3? $<ϏٝyS"B^RJMa`D.ꯝIwDWnf F)UڏRyubeRJ ^CFF&Tt""b HbP`:`Xj@ ]1Y,%+`ٱZT{3k$ܮ׀LtHSoE`Aȁ4$eU1T`%KJtGܩk@-0AvYrhb>% #?-%uIzŁ`v% ́ my. 7mf|T7%"h)}9uXcfP `0/E{8cEL?;ۣ,ӶpPn&ӽnT,r7kטh=hy01**v$oWլS&ZL<y01`btZvmGvÁ=Yrh{PePOc3gH}D]vcrBEL亥`\ҧ;?_w_ /J㗚%@yy嬣ɔ/Q/n',bm9 pCJCLmj5zW(mi.VДOcSN% h8EpW:TqqJlCƍd@i\29qH)`KcѺ|5]xG1) Z{"e?$3sϔzH]#k'D޵+"yE dIENDB` +
--- a/icons/selected_edit_point_cubic.png +++ /dev/null @@ -1,4 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<HIDATxMKA^G1JAP<T - UzZV("_Kbѳ=Tzj{ &agcw&;3? $<ϏٝyS"B^RJMa`D.ꯝIwDWnf F)UڏRyubeRJ ^CFF&Tt""b HbP`:`Xj@ ]1Y,%+`ٱZT{3k$ܮ׀LtHSoE`Aȁ4$eU1T`%KJtGܩk@-0AvYrhb>% #?-%uIzŁ`v% ́ my. 7mf|T7%"h)}9uXcfP `0/E{8cEL?;ۣ,ӶpPn&ӽnT,r7kטh=hy01**v$oWլS&ZL<y01`btZvmGvÁ=Yrh{PePOc3gH}D]vcrBEL亥`\ҧ;?_w_ /J㗚%@yy嬣ɔ/Q/n',bm9 pCJCLmj5zW(mi.VДOcSN% h8EpW:TqqJlCƍd@i\29qH)`KcѺ|5]xG1) Z{"e?$3sϔzH]#k'D޵+"yE dIENDB` +
--- a/icons/selected_edit_point_handle.png +++ /dev/null @@ -1,14 +1,1 @@ - PNG -  - IHDRFFq.sBIT|d pHYs B(xtEXtSoftwarewww.inkscape.org<kIDATxml[Wvت榱8n":q.PQ§I64J!1 >0 i1  >#!mLe 6QU! !ib&vUII|nsn'i~Ulν=(t - i +h{"2)_v - rJhE.KLJ"Rh<--F)eOc - qh s xWDZz!-F)peUeUD'_b֔nقF)uMլ3-@D-aaR_͛8z{{qc9[#F) j%b{*up8L80jZ'"uBF)~ |l62Lz} - b՚wD$_kQJE1_f"o߮ՏgttcǎbO+"RqM("G'<Щa pԩZE(Nv+++R(1"HŪ^Mj8opX,r fff& - @P`vvjIkrı(^~Kfjj;wT;OG9q8}WD~K - z+ZY__8s @@gRwmQJ #vrJN9wSxԮ{(b}/ - SSSNϜG%TԣЈ677R]044D"%Ox]5J(KKKR)] sd2J7cט/wTmx4TfoͨP"LӤ{cggd2dZi%Rv9I-s[itg/X_vטr,,,tNV_><2ͶI2 w%/iQ1;p Ԣ,;bj=2LpftHn'SҴi0=[p'ĕR]8LȢʵuq2r܁(6J.#钣.4sC5hkC.LH{p$~YpS>îtk\9ƞ#a4 A/L w篸kp8U횫 v!憈X v`ǺIOOǏ%_CA(jk% - 9|@0>*aցɓ[Z”8.YA"ۙI$!ԮپdED,:޷A<n;o,;@ p(nX,6 - o};.nyﺄfdd1O#"\Xe||%Nvq{{c^\~UA4exx90Ѩ@%ZqT#"tߨNJ7p-/]aLNNf `rr鍚o`+,ϡ<O]Zxt&@eĦomm1==p-PJ|[n-ߺyf5;cccoNLba111սD(1ɑz>[H|d2I:h ###S'[eQtAB"x֗e૵z1ϜdYRLeKּ^/pA^^^նFË_^bkYl#~p8\23%fҟH雛`tFy^|>_ojU- mKlo?)jӋqpe"قZMۤT}s˘)mЖR - 3`K,[_Ej 3K&qջ E)u - ]֠rͻB|?W/IENDB` +
diff --git icons/tie_is_active.png(deleted)
--- a/icons/tie_is_active.png +++ /dev/null @@ -1,31 +1,1 @@ - PNG -  - IHDRjlx'sBIT|d pHYs11tEXtSoftwarewww.inkscape.org<IDATxݝ{p}ǿA >D$RLJ(#;(ɲkYq=I&vN$4nvI=Mm3&I=v%VʡbӶR$flіHQEJ$E ]8"(oI| - |\^3Tw|)ySI!G8~J#3*jƱj/RJO)-u - Q - TQYY)!(r.9"E's?||[^iir]]ґ#G&X /裔i D *e<XTTx<+{z90(6oP) iqG1q+6RȠgϞnծRJRoTeLhnny({7oxRڒl^ *Q@`AC<,:t׮]C.ծM) - ]s'yE)UKKKcȄo>[^^~IF)mI!r(yGQJx_>aAbcI[om(M7IBrSRZ &(!dF|sp8O<qlcirrԩ2!sQ&= e0#Zi:jJJJ9K Yv`I#Gv̙恁Iv)_ <BQJ Vf9hT|>_ =>3XZp8={iӦў/,,(!PJ?󄐛yýPLrɂ(߿ޞD&(%8r񞞞H$҂.R'dRA(PZX-BD(˥w}׻ CQ@`IP,@n7:::lڴʙ3g>_Ui_&̲؆L-S0`|<^YY#+%ӧKdf^@}Fe_e`ImƑڣNV& pRw6fج˕(--動Knہ$6(is###L2 /L*;eeeH(5 v_ J (q.^8ۻoee'V3qT\\PZZ ֭6?m3ֹ!#./PMN0m@z픲mT,hnn=y 4q:q?]VV6 - fnUWWy<Aȍ1]Tʑ(**Zv8Zl0,ϗ8t}b2 7ʦ***nVWWOsa - ki7>>^adj]Xj`Јt:%$+Cv2 Gu4Lש|>5(NvJC8pUPZdux]v3&4AUX)CbAyѨ9WР>(;,0@ )RvdA%W$sP<Jel WFvF!SX`vIIV=_:*6( - E Ɏ 43!>-ªq ʒ*e - ;*q'&PFi(=g A4mX30+&PKފ#iyFFFʙ/Bt(C - djY;Ŋ#Z'oX& Ϧ)jT1`~[;YuRoqzzxaahZQ@ - mf,;e䒫͞^zt:ӑH~)4%(.R3db :-%N$%\~}W!+:ijJ5jBB[H -few2sifhVVV\G[f!(J`8! - "{j&PUW{V<>)!SMg+<P?g76698+NeڠgjFGG35!IeȚ'8Njnnݻ - 2FNVeUFAi=Uabbmm$!&z<ݻww755pzXi(ٳErzxjYP'3~0WAX-3u<@i԰:ywD" L:3Nל*(Jix=pa޽gGrZF.#=+ 6>>΂:Ak2SV Orp:]vݶmehCQ1eIo:J'g7 -..(;<+(J|er>on߾}oVUU N؁eU,PpQVMyP$I[.2L#P[ - - Ko-A{L<#`V`5JMf&&HF&sId)YxqR[[ۅ{JL LDhJ˿$ITnft琜 z+<^y[Bc7+ - 0e"Z jV|uxuM'Y-PG0waeeet>OyPcYf0̝.6r - ;`ۚjQ,xwpGz`Dz~iOZ Sbi(F@ȔFX%t;s` nڳgqZ0m+Ӫ@e_uO[CQN7۽ĔӕfLAQJ$-wvvn޼}+]y;sfQ dg^ Q,Sרˢ||xrV^xm뭤cI -  iڔwֈλ;-Da ,E)݀$!Sp\wdoWQQ],@ Zck׮ט2ۂf>ay䑛껁]3²Nںߨ~9Uyےdכ{0ׯ_zWcdV۶{6{7`w}ǏHDr`#d Hmmm+?aBbzoѺ칐⊻p{V ji|Jf1Tk]Cqz<m^c<oiiY8hXl[߹t\ - wmYlͱʛ;drXOL0]DNqÆ fbW+MdA(^JeϦ_hĆۥK0>I)6D\JVVVw% 6w\ WrS$3}}t9$[Brԓx<k׮9ܢ("t:|Yj瓭(Jl(]cj].ŤIehis8y$pvwwO<p8| - IXD".\\EEE\^je-$#r** ZmTXMMŋI$p{<+Χz -  `=!#A |bey}WV(=siIv@X6?CXZ<oVNPNSڼy;vL NY6ViA#EW^plkƒ$=|H%[ !ʃVMIiZxyp8cAr I755U|…h4 BK^ad4Zm9zfIOk[q,]zUib<kX(+`RJ P-qqƛ;vVXm+:j^ ,[Ьcǎ=43380` !dAu5J-<O<b8~F}7nEyDd9v%փaUz{6햡˗/+W?%O,5e)5D9O}F{{@mmMXZ&hQZQeUL꥗^Ą,z+tZ(<?p ]jE - ׻ `Ͷ&Y(EZf7  6,yfVkfyN|̂B۷߼y{sj-IFYRb+nLѬԱW^ 2U_NRH󥥥S}yef BVt#Xzmݐlvv6 /̋n? lsK`UOoݺAyiP@:,#i^i,{7Z:Bck=>E}Vssso{{{?kqޜs3Ѭe\Xu b1ѣG?/8!3-O"U}޽{{ (vJ_eeN{{{7{=@ +;BB3H~1f^reg,h;ȎuΎMjROȣ; [?!?C޽sN&u2d9;o# ϟ_9=?B9PTaxxɒgsLOQ - 6Tm6-L|m.d_ecff֭[nКLiNKcL SX۹s n,P~@]pdVHڤE 03W - 8Kڵe˖P(c)J7m" O=?ED&Hz;CH$<x(HA$ n9xAp)(Ap1S_se[,? j~~b||fJu - U8š#asϟon#[$(nQ]v*NQLZk!_*PHU "ngaZeH*'O|C]UHA>~.|S)=iF.ֳ/=7ŋA#9Q-|õ c$FiAdڜsε xh]hU - FRz=qơP$-GBS=|q_~ BpY166AU6rӵ\o-;m0i @gA - 3F<\t(+ `MUV|rr (y3~$mm2Luk4D"N>}XE|8k-JbŰnLntt6EQ&,!9([R~HDQt ^[z;A`<!(p)8PtԈz$1eɑyfxvӓ^B(YR#ӡY ƦuV/+++7!¬*Ԉ$I@-쏜'Nx0DEf - R_z۔2}%]]]Wd Aɒ2R]]]g?4D:)dP 9tR5;nx<p4-c1*_%f?<<\cDsĉ!&lWH.)XP7KKK  Q=oMNN_>8!uIA"PʡM$^}fWpA+Aɒr*FFF GɓM###,2zn - T<w  ӳAų~BIR )nٳXM !D=9殖%Kʩ~zwީgBr5%!(\$  kƑt5?Y\[)9FB)=KKK5b*wTlM]9,8!<'r׀R#9_0!'OYʩ-΄"_CRB󜟜fz//IENDB` +
--- a/libbirdfont/Path.vala +++ b/libbirdfont/Path.vala @@ -63,25 +63,9 @@ public delegate bool RasterIterator (double x, double y, double step); public delegate bool SegmentIterator (EditPoint start, EditPoint stop); - - public static ImageSurface? edit_point_image = null; - public static ImageSurface? active_edit_point_image = null; - - public static ImageSurface? edit_point_handle_image = null; - public static ImageSurface? active_edit_point_handle_image = null; - public static ImageSurface? selected_edit_point_handle_image = null; - - public static ImageSurface? selected_edit_point_image = null; - public static ImageSurface? active_selected_edit_point_image = null; - - public static ImageSurface? cubic_edit_point_image = null; - public static ImageSurface? cubic_active_edit_point_image = null; - - public static ImageSurface? cubic_selected_edit_point_image = null; - public static ImageSurface? cubic_active_selected_edit_point_image = null; /** The stroke of an outline when the path is not filled. */ - public static double stroke_width = 1; + public static double stroke_width = 0; public static bool show_all_line_handles = true; public static bool fill_open_path = false; @@ -95,24 +79,16 @@ public Path () { string width; - - if (edit_point_image == null) { - edit_point_image = Icons.get_icon ("edit_point.png"); - active_edit_point_image = Icons.get_icon ("active_edit_point.png"); - edit_point_handle_image = Icons.get_icon ("edit_point_handle.png"); - active_edit_point_handle_image = Icons.get_icon ("active_edit_point_handle.png"); - selected_edit_point_handle_image = Icons.get_icon ("selected_edit_point_handle.png"); - selected_edit_point_image = Icons.get_icon ("selected_edit_point.png"); - active_selected_edit_point_image = Icons.get_icon ("active_selected_edit_point.png"); - cubic_edit_point_image = Icons.get_icon ("edit_point_cubic.png"); - cubic_active_edit_point_image = Icons.get_icon ("active_edit_point_cubic.png"); - cubic_selected_edit_point_image = Icons.get_icon ("selected_edit_point_cubic.png"); - cubic_active_selected_edit_point_image = Icons.get_icon ("active_selected_edit_point_cubic.png"); - + + if (unlikely (stroke_width < 1)) { width = Preferences.get ("stroke_width"); if (width != "") { stroke_width = double.parse (width); } + } + + if (stroke_width < 1) { + stroke_width = 1; } } @@ -504,7 +480,7 @@ } } - static void draw_control_point (Context cr, double x, double y, string color) { + public static void draw_control_point (Context cr, double x, double y, string color, double size = 3.5) { Glyph g = MainWindow.get_current_glyph (); double ivz = 1 / g.view_zoom; double width = size * Math.sqrt (stroke_width) * ivz;
--- a/libbirdfont/PenTool.vala +++ b/libbirdfont/PenTool.vala @@ -62,9 +62,7 @@ // The pixel where the user pressed the mouse button public static int begin_action_x = 0; public static int begin_action_y = 0; - - private static ImageSurface? tie_icon = null; - + /* First move action must move the current point in to the grid. */ bool first_move_action = false; @@ -94,8 +92,6 @@ selected_point = new EditPoint (); clockwise = new Gee.ArrayList<Path> (); counter_clockwise = new Gee.ArrayList<Path> (); - - tie_icon = Icons.get_icon ("tie_is_active.png"); select_action.connect ((self) => { }); @@ -1191,34 +1187,21 @@ /** Higlight the selected point on Android. */ void draw_point_selection_circle (Context cr) { - ImageSurface img; - ImageSurface? i = null; - double x, y; - double ratio; PointSelection ps; if (active_handle.active) { - i = Path.edit_point_handle_image; + Path.draw_control_point (cr, Glyph.path_coordinate_x (begin_action_x), + Glyph.path_coordinate_y (begin_action_y), "Control Point Handle"); } else if (selected_points.size > 0) { ps = selected_points.get (selected_points.size - 1); - i = (ps.point.type == PointType.CUBIC) - ? Path.cubic_edit_point_image : Path.edit_point_image; - } - - if (i != null) { - img = (!) i; - - cr.save (); - ratio = 60 * MainWindow.units / img.get_width (); - cr.scale (ratio, ratio); - x = begin_action_x - ratio * img.get_width () / 2; - x /= ratio; - y = begin_action_y - ratio * img.get_height () / 2; - y /= ratio; - cr.set_source_surface (img, x, y); - cr.paint (); - cr.restore (); + if (ps.point.type == PointType.CUBIC) { + Path.draw_control_point (cr, Glyph.path_coordinate_x (begin_action_x), + Glyph.path_coordinate_y (begin_action_y), "Selected Cubic Control Point"); + } else { + Path.draw_control_point (cr, Glyph.path_coordinate_x (begin_action_x), + Glyph.path_coordinate_y (begin_action_y), "Selected Quadratic Control Point"); + } } } @@ -1239,37 +1222,14 @@ } public static void draw_join_icon (Context cr, double x, double y) { - double scale = (BirdFont.android) ? 5 : 1; - draw_icon (tie_icon, cr, x, y, scale); + cr.save (); + Theme.color (cr, "Merge"); + cr.move_to (x, y); + cr.arc (x, y, 15, 0, 2 * Math.PI); + cr.close_path (); + cr.fill (); + cr.restore (); } - - public static void draw_icon (ImageSurface? i, Context cr, double x, double y, double scale = 1) { - ImageSurface img; - double px, py, ratio; - - if (i != null) { - img = (!) tie_icon; - - cr.save (); - - ratio = scale; - ratio *= 0.23; // 72 to 320 dpi - ratio *= MainWindow.units; - cr.scale (ratio, ratio); - - px = x - ratio * img.get_width () / 2; - py = y - ratio * img.get_height () / 2; - px /= ratio; - py /= ratio; - - cr.set_source_surface (img, px, py); - cr.paint (); - cr.restore (); - } else { - warning ("No image."); - } - } - void draw_merge_icon (Context cr) { double x, y;
--- a/libbirdfont/Theme.vala +++ b/libbirdfont/Theme.vala @@ -173,17 +173,19 @@ Theme.set_default_color ("Selected Active Cubic Control Point", 0, 0, 0, 1); Theme.set_default_color ("Selected Cubic Control Point", 0, 0, 0, 1); - Theme.set_default_color ("Active Cubic Control Point", 160 / 255.0, 160 / 255.0, 160 / 255.0, 1); + Theme.set_default_color ("Active Cubic Control Point", 70 / 255.0, 70 / 255.0, 70 / 255.0, 1); Theme.set_default_color ("Cubic Control Point", 116 / 255.0, 116 / 255.0, 116 / 255.0, 1); Theme.set_default_color ("Selected Active Quadratic Control Point", 0, 0, 0, 1); Theme.set_default_color ("Selected Quadratic Control Point", 0, 0, 0, 1); - Theme.set_default_color ("Active Quadratic Control Point", 131 / 255.0, 182 / 255.0, 255 / 255.0, 1); + Theme.set_default_color ("Active Quadratic Control Point", 85 / 255.0, 115 / 255.0, 149 / 255.0, 1); Theme.set_default_color ("Quadratic Control Point", 123 / 255.0, 151 / 255.0, 184 / 255.0, 1); Theme.set_default_color ("Selected Control Point Handle", 0, 0, 0, 1); - Theme.set_default_color ("Active Control Point Handle", 80 / 255.0, 118 / 255.0, 64 / 255.0, 1); - Theme.set_default_color ("Control Point Handle", 56 / 255.0, 62 / 255.0, 45 / 255.0, 1); + Theme.set_default_color ("Active Control Point Handle", 81 / 255.0, 147 / 255.0, 90 / 255.0, 1); + Theme.set_default_color ("Control Point Handle", 81 / 255.0, 147 / 255.0, 90 / 255.0, 1); + + Theme.set_default_color ("Merge", 101 / 255.0, 108 / 255.0, 116 / 255.0, 0.3); if (BirdFont.has_argument ("--test")) { current_theme = "generated_theme.theme"; @@ -266,6 +268,7 @@ t_("Active Control Point Handle"); t_("Control Point Handle"); + t_("Merge"); } }
--- a/resources/default.theme +++ b/resources/default.theme @@ -3,7 +3,7 @@ <color name="Highlighted 1" red="0.91764705882352937" green="0.30196078431372547" blue="0.10196078431372549" alpha="1"/> <color name="Guide 1" red="0.69999999999999996" green="0.69999999999999996" blue="0.80000000000000004" alpha="1"/> <color name="Foreground 6" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/> - <color name="Active Quadratic Control Point" red="0.51372549019607838" green="0.71372549019607845" blue="1" alpha="1"/> + <color name="Active Quadratic Control Point" red="0.33333333333333331" green="0.45098039215686275" blue="0.58431372549019611" alpha="1"/> <color name="Background 1" red="1" green="1" blue="1" alpha="1"/> <color name="Guide 2" red="0.69999999999999996" green="0" blue="0" alpha="0.5"/> <color name="Foreground 7" red="0.85882352941176465" green="0.8666666666666667" blue="0.9137254901960784" alpha="1"/> @@ -20,7 +20,7 @@ <color name="Selected Active Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Selected Cubic Control Point" red="0" green="0" blue="0" alpha="1"/> <color name="Background 7" red="0.2196078431372549" green="0.23137254901960785" blue="0.25490196078431371" alpha="1"/> - <color name="Control Point Handle" red="0.2196078431372549" green="0.24313725490196078" blue="0.17647058823529413" alpha="1"/> + <color name="Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/> <color name="Background 8" red="0.21568627450980393" green="0.21568627450980393" blue="0.21568627450980393" alpha="1"/> <color name="Fill Color" red="0.5" green="0.5" blue="0.5" alpha="1"/> <color name="Background 9" red="0.28235294117647058" green="0.28235294117647058" blue="0.28235294117647058" alpha="1"/> @@ -51,9 +51,10 @@ <color name="Overview Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/> <color name="Tool Foreground" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> <color name="Selected Quadratic Control Point" red="0" green="0" blue="0" alpha="1"/> - <color name="Active Cubic Control Point" red="0.62745098039215685" green="0.62745098039215685" blue="0.62745098039215685" alpha="1"/> + <color name="Active Cubic Control Point" red="0.27450980392156865" green="0.27450980392156865" blue="0.27450980392156865" alpha="1"/> <color name="Foreground 1" red="0" green="0" blue="0" alpha="1"/> - <color name="Active Control Point Handle" red="0.31372549019607843" green="0.46274509803921571" blue="0.25098039215686274" alpha="1"/> + <color name="Active Control Point Handle" red="0.31764705882352939" green="0.57647058823529407" blue="0.35294117647058826" alpha="1"/> + <color name="Merge" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="0.29999999999999999"/> <color name="Foreground 2" red="0.396078431372549" green="0.42352941176470588" blue="0.45490196078431372" alpha="1"/> <color name="Foreground 3" red="0.10196078431372549" green="0.11764705882352941" blue="0.12549019607843137" alpha="1"/> <color name="Overview Selected Foreground" red="0.17647058823529413" green="0.17647058823529413" blue="0.17647058823529413" alpha="1"/>