The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Use icon font in tab bar

These changes was commited to the Birdfont repository Tue, 17 Mar 2015 13:40:12 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Tue, 17 Mar 2015 13:40:12 +0000 (14:40 +0100)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Tue, 17 Mar 2015 13:40:12 +0000 (14:40 +0100)
commit c7f90d0a52066bb94851f9d2eea8ba9445a12da6
tree 78cc4b92ac1fbbd04a566bb8804a6c5f229707e5
parent f1581db629d01eae7aa02a9a50f4113cf0a04fb1
Use icon font in tab bar

icons/next_tab.png [deleted ]
icons/previous_tab.png [deleted ]
icons/progress_wheel.png [deleted ]
libbirdfont/LabelTool.vala
libbirdfont/TabBar.vala
libbirdfont/Theme.vala
resources/icons.bf
diff --git icons/next_tab.png(deleted)
--- a/icons/next_tab.png +++ /dev/null @@ -1,14 +1,1 @@ - PNG -  - IHDR99sBIT|d pHYs11tEXtSoftwarewww.inkscape.org<IDATh[ml~εہIЌҖP(HU5[Iɴ`nU(Ubj<H@ - #q8 _۴IT۴Ica - [ŠQ${~8!yk_{=y|cbf8-yb)yej (<PM@B`ri>]sȣ=)7~a%@ڱ?;͖@ U]C>#v4N"C5L`6LV952MLh.j9qfDMO`Y - ;[W:bH.&[$V> - ӈh>SI%IYֽH"q^'_=OVL ޡULX 0\|WxC6-j0=?&B4<N,C]C|ۅmx3#uC DR))}κ\XОrb㶝w Mnc <vJH<΄]e\#B#},k(=6#twu6Yd(Xį6|ݮǏli&$j@2pOg뱉W'kt's )[ѦHۀhɑk/N{\H jS 03tĉ(g6cezD# < Axw[J[ۧo z*iZ3ĕܡOR`WW-6L&o 0QG {Kd(f/VJ(TP7l6[t\Q.F#D2i/}7Ӗ1C$^z}4a54+?wl{! k\1Bc0r OŪ<CmӷC-c+ɮա\ .^fz7^&j - R"Nb`T6B?W6dP3Hǯ3mp3R>27+'"Kz61 -  1 ,#!·Nd(b!%_UB]28kᛛ6~V &%/8"K`,[Lm+8iʤ`UtsYfZ,>40pcNܦ2Z& - s9J0JR - EڊA7Jǃz䳽&j!>o< *diM0]7{Zr 2{'x^8;tHG;Y݀(DRAPݕþ;Y,'+l(L7Oc..CpW\wvl%fA]](XigrC0^Mv&rk*T;xQ^0pv,Պ;+C. ~opk<WEoqyosT5O*̗rn AGϋKg%]~ !ujی3 CB}+c'8@ - %h死7Bj˦Bé'FE{`7Z - %j`jL?o+6osc'Tx,I/f=3c̠!@2Sى]Φn,|(/8ETۅ^0sKd>&61E`vݬP3s[-;zC!jd86 6EܠpzbϤҝD!s!ljԿCWI"KLn4kw-<L \-!M @zL=\';ҿ55ͅ=jGݙlf- 5?iWp8D!8Vc ̂YCDD6z5.sYX[*i)eF_Qr_#<QI?(FFjk5j\""H|gQ@y(uʹ>_.K.J 6@▰ψ| - [h@2! E.%9J\ٷ[y&V38z:*4l9?6>|EČ@Fr0_ `q3c'XwR^k>HBs`r4;Qȟ瓪Np^~ `%bq8Us1Q-5rphw)yQ?2~fwr;{7IENDB` +
diff --git icons/previous_tab.png(deleted)
--- a/icons/previous_tab.png +++ /dev/null @@ -1,13 +1,1 @@ - PNG -  - IHDR99sBIT|d pHYs11tEXtSoftwarewww.inkscape.org<IDAThślSǿNlQQE6vUzP~ <HJ8dJh(DIlUEnU3"J&1J; XGݳ? 7yٰ_qι瞣{}}3TЧBVJrLP)/Ky@4.v~XlXAC`&,@N0!N%R - 2P &Vá,$}N$?6 ;58Hud-] ,q: 9k~`AnBLX >&9t8[Ajcp'v,"7'ڛ; u],e#|DHH< `@eȜ!hWyOAAOs =0xg~PxmSU"\x.@f@]@XyeDDjAc!=#~.98 - \k 3z}?ie[j"s#A8,]r*_*Bi#̧[ յLNJG{>Bg0ƞX4j.3 _S xӳX`;d_u-V* bZtfh|ySR[w,Z _L~SN`ڕ52 - 3ֆIr PqaBzFm~ҐcO 䕖N6O<xjy;Aj^Dm:|Vu+::nI)Y]weofR| \gQ!h"_͎J’@'>fo j|_GNءnof__kxG%ϼeV?}r3bǁ|4E~gf$_Tk*([I\`okkҮVT-4[+Mg[Y - n`4[A~ԉh4 FeCLX (ҍ[mM̖B8-Άy,9n`u8dl4MsM` QEZ=`$AV - )YJ=]T*{:^ BJ&%D - ֆN&^= nLɣ/P]LxV/d3 3 - q]wL ~/6|Iٛ X)v1X*ILj0 g"2M d҄`SF@~qQ`b^Ḋ&ZKz B{~$%RK'ٝ5hLGv;% z<_!$2p߱cm{:aa1z_). Y踕h? E*$P_ ) u3gx9-Ԗ - )R%,TNJD?Xt+` ʠ,cPE灆.j0HEw[ҥX6UU|pl!O_,&ڛ6nj-rSĢKy,h2Qq]7= - `c#rj~.=K0d&3=09ci{IUx)9uI^)1ݸ=]'%kJ뾟ow5 y3m]4B5-Tz>OCZ \9XwE@۹gv - \1~d"}7S-յUp `.=`''$^D7PQ.>Ju] n|dϡ U<Pﯩ3-] քUvk59ld30>7ŽcB1VzV}= u]\KٿC IQoz v}dW!G%NVU`0Iz&>L 'xu|w=#;c͕VYDDk_ʣgl0o)1"uU+t]_wI3ѷx̧r1s`O!>ASAXJ[ IDmɧoKr/w+0QaZxUho>"Z]N  (s9P]z[DY+;D,k^25a u.J~M~6y2Ʃ\dϼNт̦b[d>{HJ^(0"dgcIf2D&{NCxώ朊dH IENDB` +
diff --git icons/progress_wheel.png(deleted)
--- a/icons/progress_wheel.png +++ /dev/null @@ -1,15 +1,1 @@ - PNG -  - IHDR79ѳ6sBIT|d pHYs11tEXtSoftwarewww.inkscape.org<IDATh՚ol[Wqե@NI&(*0nlEZ-iXJ!ykD]4Sh - SILT5!4Є:("!$[D:K!IzS-'s}9*“ڪUETVU UFaQFTX.H)DDB-կ+BtsTN{ó6mUI<X!s/oߵN#rA]`"K^Ȏͅkbl[aJ |.{+s:޳q]g;%h.HoUpY-lꤓe?zgW@wU^h_`b,;Rܒk1VK`p030>\Ylj - X#g`JFJ ̉&+@2A%c^ Z^%^FUmޱb6* 52tF*Zսoߘ3Tu8п~"s}UMONZVl Y+{:1QT`SS 0T{Y - Hw|9$ sIpt:wAţt{uQnԿN#`¿j>녯bw]7{v&Bg.(%] - XK@+z.YWS{2>{:l/1\:kLp(7{iDt:: - =]mvMTyQD2SE>[fwͽ\ȥSYDsn8[%ү;*qTqs%v`SS`d囂|)G&ޔ~g:/3'j*w40]0pQs.+'v|`0 T}OlvHI%mN-MI"|烈:*ٲf{Ro.zWRfay-s_[DՅ9Y[,<Z7)s"rX[S - #k̜:6 s3˘G歸Qq1s`IU`Dv-XQ]GNeR)ID".tjo p&52m33LMgHv!7UСṙK${[c%iV32 IJG.<.un A5SF}O{:="T<|ۖ;y 09 ΌhULD~cjb|; - XMhU>YU G[~k曹k LՅ,P>>Ql#(_DBϵm_ x3EZ;j9<겈W(^ރOF]鯈wx L7̽Ei2F6z٠BXWيxԩ 2}W| qgq7.PfH&Tl`*"eUe3giݷT}MW(0m6/Wdn_F%J}L*%W USU\ LEW - X@ĺwk VH` - ED$2_mFQEt*$Y^y駴R1fU/UoF>u5:(D`lwc T60h' #^׏kñxZB}!N)Ç>TZxNW(0F^g.G HYOVk.E>%J - LU+l: - " - {g'9qu7@WnIENDB` +
--- a/libbirdfont/LabelTool.vala +++ b/libbirdfont/LabelTool.vala @@ -85,7 +85,7 @@ bgy = y + 2; if (is_selected ()) { - Theme.color (cr, "Background 6"); + Theme.color (cr, "Glyph Count Background"); } else { Theme.color (cr, "Background 3"); }
--- a/libbirdfont/TabBar.vala +++ b/libbirdfont/TabBar.vala @@ -1,5 +1,5 @@ /* - Copyright (C) 2012, 2014 Johan Mattsson + Copyright (C) 2012, 2014, 2015 Johan Mattsson This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -45,8 +45,6 @@ ImageSurface? next_tab; ImageSurface? to_previous_tab; - ImageSurface? menu_icon; - double scale = 1; // scale images in 320 dpi bool processing = false; @@ -55,6 +53,11 @@ double background_r = 51 /255.0; double background_g = 54 /255.0; double background_b = 59 /255.0; + + Text menu_icon; + Text progress_icon; + Text left_arrow; + Text right_arrow; public TabBar () { tabs = new Gee.ArrayList<Tab> (); @@ -63,8 +66,18 @@ to_previous_tab = Icons.get_icon ("previous_tab.png"); progress = Icons.get_icon ("progress_wheel.png"); + + menu_icon = new Text ("menu_icon"); + menu_icon.load_font (Theme.get_icon_file ()); + + progress_icon = new Text ("progress"); + progress_icon.load_font (Theme.get_icon_file ()); + + left_arrow = new Text ("left_arrow"); + left_arrow.load_font (Theme.get_icon_file ()); - menu_icon = Icons.get_icon ("menu.png"); + right_arrow = new Text ("right_arrow"); + right_arrow.load_font (Theme.get_icon_file ()); } public void redraw (int x, int y, int w, int h) { @@ -496,7 +509,7 @@ private void scroll_to_tab (int index, bool send_signal_selected = true) { double offset = 19; int i = 0; - double end = (has_progress_wheel ()) ? width - 28 : width - 19; + double end = (has_progress_wheel ()) ? width - 68 : width - 40; if (index < first_tab) { first_tab = index; @@ -637,54 +650,78 @@ if (has_scroll () && !has_progress_wheel ()) { // left arrow - cr.set_source_surface ((!) to_previous_tab, 2 / scale, h / 2.0 - ((!) to_previous_tab).get_height () / 2); - cr.paint (); + Theme.text_color (left_arrow, "Foreground 2"); + left_arrow.set_font_size (40 / scale); + left_arrow.widget_x = 2 / scale; + left_arrow.widget_y = h / 2.0 - (40 / scale ) / 2; + left_arrow.draw (cr); // right arrow + Theme.text_color (right_arrow, "Foreground 2"); next_tab_x = (has_progress_wheel ()) ? w - (2 * 19 + 3) / scale : w - 19 / scale; next_tab_x-= 32 / scale; - cr.set_source_surface ((!) next_tab, next_tab_x, h / 2.0 - ((!) next_tab).get_height () / 2.0); - cr.paint (); + + right_arrow.set_font_size (40 / scale); + right_arrow.widget_x = next_tab_x; + right_arrow.widget_y = h / 2.0 - (40 / scale ) / 2; + right_arrow.draw (cr); } // progress wheel if (has_progress_wheel ()) { - ImageSurface p = (!) progress; - Surface s = new Surface.similar (p, p.get_content (), p.get_width (), p.get_height ()); + + // FIXME: make text rendering thread safe and update position + double progress_size = 40 / scale; + Surface s = new Surface.similar (cr.get_target (), Cairo.Content.COLOR_ALPHA, (int) progress_size, (int) progress_size); Context c = new Context (s); + if (MainWindow.get_menu ().show_menu) { + Theme.text_color (menu_icon, "Foreground Inverted"); + } else { + Theme.text_color (menu_icon, "Foreground 2"); + } + + progress_icon.set_font_size (progress_size); + progress_icon.widget_x = 0; + progress_icon.widget_y = 0; + c.save (); - c.rectangle (0, 0, p.get_width (), p.get_height ()); + c.rectangle (0, 0, progress_size, progress_size); c.set_line_width (0); c.set_source_rgba (background_r, background_g, background_b, 1); c.fill_preserve (); - c.translate (p.get_width () / 2.0, p.get_height () / 2.0); + c.translate (progress_size / 2.0, progress_size / 2.0); c.rotate (wheel_rotation); - c.translate (-p.get_width () / 2.0, -p.get_height () / 2.0); + c.translate (-progress_size / 2.0, -progress_size / 2.0); - c.set_source_surface ((!) progress, 0 ,0); + progress_icon.draw (c); - c.translate (p.get_width () / 2.0, p.get_height () / 2.0); + c.translate (progress_size / 2.0, progress_size / 2.0); c.paint (); c.restore (); - progress_y = (has_scroll ()) ? h - ((!) progress).get_height () - 5 / scale : (h - ((!) progress).get_height ()) / 2; + progress_y = (has_scroll ()) ? h - progress_size - 5 / scale : (h - progress_size) / 2; cr.set_source_surface (c.get_target (), w - 19 / scale, progress_y); cr.paint (); } else { // menu icon - if (menu_icon != null) { - - if (MainWindow.get_menu ().show_menu) { - Theme.color (cr, "Background 3"); - cr.rectangle (w - 32 / scale, 0, 32 / scale, h); - cr.fill (); - } - - cr.set_source_surface ((!) menu_icon, w - 25 / scale, h / 2.0 - ((!) menu_icon).get_height () / 2.0); - cr.paint (); + if (MainWindow.get_menu ().show_menu) { + Theme.color (cr, "Background 3"); + cr.rectangle (w - 32 / scale, 0, 32 / scale, h); + cr.fill (); } + + if (MainWindow.get_menu ().show_menu) { + Theme.text_color (menu_icon, "Foreground Inverted"); + } else { + Theme.text_color (menu_icon, "Foreground 2"); + } + + menu_icon.set_font_size (40 / scale); + menu_icon.widget_x = w - 25 / scale; + menu_icon.widget_y = 3 / scale; + menu_icon.draw (cr); } draw_tabs (cr);
--- a/libbirdfont/Theme.vala +++ b/libbirdfont/Theme.vala @@ -167,6 +167,7 @@ Theme.set_default_color ("Overview Selected Foreground", 45 / 255.0, 45 / 255.0, 45 / 255.0, 1); Theme.set_default_color ("Overview Foreground", 45 / 255.0, 45 / 255.0, 45 / 255.0, 1); + Theme.set_default_color ("Glyph Count Background", 101 / 255.0, 108 / 255.0, 116 / 255.0, 1); if (BirdFont.has_argument ("--test")) { current_theme = "generated_theme.theme"; @@ -230,6 +231,8 @@ t_("Overview Selected Foreground"); t_("Overview Foreground"); + + t_("Glyph Count Background"); } }
--- a/resources/icons.bf +++ b/resources/icons.bf @@ -450,11 +450,27 @@ <collection unicode="U+6c"> <selected id="1"/> <glyph id="1" left="-28" right="28"> + </glyph> + </collection> + <collection name="left_arrow"> + <selected id="1"/> + <glyph id="1" left="-28" right="25.184466019417457"> + <path stroke="0" skew="0" data="S 16.3457544910,11.1720448618 D 12.9964458443,7.8227362151 3.5780616609,3.9215137507 -1.1585760518,3.9215137507 T D -5.8952137645,3.9215137507 -15.3135979479,7.8227362151 -18.6629065945,11.1720448618 T D -22.0122152412,14.5213535084 -25.9134377056,23.9397376918 -25.9134377056,28.6763754045 T D -25.9134377056,33.4130131172 -22.0122152412,42.8313973006 -18.6629065945,46.1807059473 T D -15.3135979479,49.5300145940 -5.8952137645,53.4312370584 -1.1585760518,53.4312370584 T D 3.5780616609,53.4312370584 12.9964458443,49.5300145940 16.3457544910,46.1807059473 T D 19.6950631377,42.8313973006 23.5962856021,33.4130131172 23.5962856021,28.6763754045 T D 23.5962856021,23.9397376918 19.6950631377,14.5213535084 16.3457544910,11.1720448618 T" /> + <path stroke="0" skew="0" data="S 19.0193836125,28.5566343042 D 19.0193836125,32.3716968002 15.8771953315,39.9576103638 13.1795387700,42.6552669253 T D 10.4818822084,45.3529234869 2.8959686448,48.4951117679 -0.9190938511,48.4951117679 T D -4.7341563471,48.4951117679 -12.3200699107,45.3529234869 -15.0177264722,42.6552669253 T D -17.7153830338,39.9576103638 -20.8575713148,32.3716968002 -20.8575713148,28.5566343042 T D -20.8575713148,24.7415718082 -17.7153830338,17.1556582447 -15.0177264722,14.4580016831 T D -12.3200699107,11.7603451216 -4.7341563471,8.6181568405 -0.9190938511,8.6181568405 T D 2.8959686448,8.6181568405 10.4818822084,11.7603451216 13.1795387700,14.4580016831 T D 15.8771953315,17.1556582447 19.0193836125,24.7415718082 19.0193836125,28.5566343042 T" /> + <path stroke="0" skew="0" data="B 3.6031455894,42.2522867907 M -11.4649549106,27.1840862907 M 3.8796255894,14.8808862907 M 3.6031455894,42.2522867907" /> </glyph> </collection> <collection unicode="U+6d"> <selected id="1"/> <glyph id="1" left="-28" right="28"> + </glyph> + </collection> + <collection name="menu_icon"> + <selected id="1"/> + <glyph id="1" left="-28" right="28"> + <path stroke="0" skew="0" data="S -20.0000000000,54.0582524272 L 24.0000000000,54.0582524272 L 24.0000000000,50.0582524272 L -20.0000000000,50.0582524272 L -20.0000000000,54.0582524272" /> + <path stroke="0" skew="0" data="S -20.0000000000,42.0582524272 L 24.0000000000,42.0582524272 L 24.0000000000,38.0582524272 L -20.0000000000,38.0582524272 L -20.0000000000,42.0582524272" /> + <path stroke="0" skew="0" data="S -20.0000000000,30.0582524272 L 24.0000000000,30.0582524272 L 24.0000000000,26.0582524272 L -20.0000000000,26.0582524272 L -20.0000000000,30.0582524272" /> </glyph> </collection> <collection name="move"> @@ -577,6 +593,12 @@ <selected id="1"/> <glyph id="1" left="-28" right="28"> <path stroke="0" skew="0" data="B 7.2272862394,15.0689835207 M -8.1172942606,27.3721835207 M 6.9508062394,42.4403840207 M 7.2272862394,15.0689835207" /> + </glyph> + </collection> + <collection name="progress"> + <selected id="1"/> + <glyph id="1" left="-28" right="28"> + <path stroke="0" skew="0" data="S 15.2459546926,42.3268608414 D 12.7256932529,44.8471222811 5.6386215657,47.7826834915 2.0744336570,47.7826834915 T D -1.4897542518,47.7826834915 -8.5768259390,44.8471222811 -11.0970873786,42.3268608414 T D -13.6173488183,39.8065994017 -16.5529100287,32.7195277146 -16.5529100287,29.1553398058 T D -16.5529100287,25.5911518971 -13.6173488183,18.5040802099 -11.0970873786,15.9838187702 T D -8.5768259390,13.4635573305 -1.4897542518,10.5279961202 2.0744336570,10.5279961202 T D 5.6386215657,10.5279961202 12.7256932529,13.4635573305 15.2459546926,15.9838187702 L 19.7155857659,11.2747054963 D 16.2484515754,7.8075713058 6.4987374504,3.7691074859 1.5954692557,3.7691074859 D -3.3077989391,3.7691074859 -13.0575130641,7.8075713058 -16.5246472546,11.2747054963 T D -19.9917814450,14.7418396868 -24.0302452649,24.4915538117 -24.0302452649,29.3948220065 T D -24.0302452649,34.2980902012 -19.9917814450,44.0478043262 -16.5246472546,47.5149385167 T D -13.0575130641,50.9820727072 -3.3077989391,55.0205365270 1.5954692557,55.0205365270 T D 6.4987374504,55.0205365270 16.0036116558,51.6997601095 19.7155857659,47.5149385167 L 15.2459546926,42.3268608414" /> </glyph> </collection> <collection unicode="U+71"> @@ -617,6 +639,14 @@ <path stroke="0" skew="0" data="B 24.7000424278,52.6385195962 C 24.7000424278,52.6385195962 28.2755400756,50.9915601345 32.0454982193,48.2024125779 C 35.8155024524,45.4132650213 39.9659472235,41.4500354888 40.7736828072,36.3343860095 C 41.5782382208,31.2389236976 39.1082138330,25.7194386890 36.5968287965,21.3841753294 C 35.0178420166,18.6583546408 33.6301632161,16.7582720649 32.6216160139,15.4500698664 M 40.5432356894,13.1168388877 M 44.7200897001,11.8781395399 M 40.5432356894,10.5531607913 M 17.2104650087,3.2076128209 M 15.4533057353,2.6602548266 M 15.4821577144,4.5038317693 M 15.5973812733,22.3923353805 M 15.5973812733,24.8408820969 M 17.6714053338,23.4869591902 M 24.3831776407,19.0797041511 C 25.3474974321,20.7321943437 29.0147038150,27.2707165074 27.6094372904,33.4537970365 C 26.8754908738,36.6830985882 23.3230471556,39.5523495629 19.7742352841,41.4905941816 C 16.2254234125,43.4289309791 12.8608217491,44.4576469131 12.8608217491,44.4576469131 M 9.7209797686,45.3794353844 M 12.6303746312,46.9061014507 M 23.5478068386,52.5809078167 M 24.1239246332,52.8977265143 M 24.7000424278,52.6385195962" /> <path stroke="0" skew="0" data="B 24.1814903232,49.9019139825 M 16.5479295450,45.9267933787 C 17.8507669346,45.4070890386 19.3636891347,44.7692114164 21.0416483427,43.8527693182 C 24.8695869813,41.7619687075 29.1583184588,38.6504717225 30.2019212766,34.0587668103 C 32.1653399384,25.4198574358 26.0250672659,16.4007103169 26.0250672659,16.4007103169 M 25.3049200227,15.2773267068 M 24.1814903232,16.0261876610 M 18.2186711493,19.9437886641 M 18.1322995695,6.2898891113 M 35.6174746351,11.7917679602 M 30.0003261379,13.4625095645 M 28.0415256363,14.0386273591 M 29.3665965639,15.5941454044 C 29.3665965639,15.5941454044 31.9122352600,18.6003741460 34.2924037076,22.7091540781 C 36.6725721552,26.8180261891 38.7410654849,31.9916561633 38.1235870416,35.9023437529 C 37.5092887685,39.7928441751 33.9790878062,43.4681069891 30.4612203736,46.0707767379 C 27.4211988667,48.3199406080 24.9171143949,49.5519108999 24.1815364126,49.9019139825 M 24.1814903232,49.9019139825" /> <path stroke="0" skew="0" data="B 2.0546235781,52.3710516520 M 1.9262535781,32.9589516520 M -5.6495264219,38.0974516520 C -5.6495264219,38.0974516520 -12.9863064219,29.1023516520 -11.0580064219,20.6176516520 C -9.1296364219,12.1329516520 5.9114635781,7.6333516520 5.9114635781,7.6333516520 M -5.9157164219,1.4627516520 C -5.9157164219,1.4627516520 -20.9643867219,8.2750516520 -22.4995067219,18.0464516520 C -24.4057467319,30.1802516520 -13.0213164219,41.2527516520 -13.0213164219,41.2527516520 M -23.2708067219,44.4005516520 M 2.0546235781,52.3710516520" /> + </glyph> + </collection> + <collection name="right_arrow"> + <selected id="1"/> + <glyph id="1" left="-28" right="25.184466019417457"> + <path stroke="0" skew="0" data="S -25.9134377056,28.6763754045 D -25.9134377056,33.4130131172 -22.0122152412,42.8313973006 -18.6629065945,46.1807059473 T D -15.3135979478,49.5300145940 -5.8952137644,53.4312370584 -1.1585760517,53.4312370584 T D 3.5780616610,53.4312370584 12.9964458444,49.5300145940 16.3457544910,46.1807059473 T D 19.6950631376,42.8313973006 23.5962856021,33.4130131172 23.5962856021,28.6763754045 T D 23.5962856021,23.9397376918 19.6950631377,14.5213535084 16.3457544910,11.1720448618 T D 12.9964458443,7.8227362152 3.5780616610,3.9215137507 -1.1585760517,3.9215137507 T D -5.8952137644,3.9215137507 -15.3135979478,7.8227362151 -18.6629065945,11.1720448618 T D -22.0122152412,14.5213535084 -25.9134377056,23.9397376918 -25.9134377056,28.6763754045 T" /> + <path stroke="0" skew="0" data="S -15.1374675725,14.3382605828 D -12.4398110110,11.6406040213 -4.8538974474,8.4984157402 -1.0388349514,8.4984157402 T D 2.7762275446,8.4984157402 10.3621411081,11.6406040213 13.0597976697,14.3382605828 T D 15.7574542313,17.0359171443 18.8996425123,24.6218307079 18.8996425123,28.4368932039 T D 18.8996425123,32.2519556999 15.7574542312,39.8378692635 13.0597976697,42.5355258250 T D 10.3621411081,45.2331823866 2.7762275446,48.3753706676 -1.0388349514,48.3753706676 T D -4.8538974474,48.3753706676 -12.4398110110,45.2331823866 -15.1374675725,42.5355258250 T D -17.8351241340,39.8378692634 -20.9773124151,32.2519556999 -20.9773124151,28.4368932039 T D -20.9773124151,24.6218307079 -17.8351241341,17.0359171444 -15.1374675725,14.3382605828 T" /> + <path stroke="0" skew="0" data="B -6.1967776929,14.8808862907 M 9.1478028071,27.1840862907 M -5.9202976929,42.2522867907 M -6.1967776929,14.8808862907" /> </glyph> </collection> <collection name="rotation"> @@ -953,11 +983,14 @@ <ligature sequence="s p i n _ b u t t o n" replacement="spin_button"/> <ligature sequence="c r e a t e _ l i n e" replacement="create_line"/> <ligature sequence="b e z i e r _ l i n e" replacement="bezier_line"/> + <ligature sequence="r i g h t _ a r r o w" replacement="right_arrow"/> <ligature sequence="f u l l _ g l y p h" replacement="full_glyph"/> <ligature sequence="p o i n t _ t o o l" replacement="point_tool"/> <ligature sequence="s e l e c t _ a l l" replacement="select_all"/> <ligature sequence="m o v e _ l a y e r" replacement="move_layer"/> <ligature sequence="h e l p _ l i n e s" replacement="help_lines"/> + <ligature sequence="l e f t _ a r r o w" replacement="left_arrow"/> + <ligature sequence="m e n u _ i c o n" replacement="menu_icon"/> <ligature sequence="t t f _ u n i t s" replacement="ttf_units"/> <ligature sequence="r e c t a n g l e" replacement="rectangle"/> <ligature sequence="z o o m _ t o o l" replacement="zoom_tool"/> @@ -968,6 +1001,7 @@ <ligature sequence="a u t o t r a c e" replacement="autotrace"/> <ligature sequence="s h o w _ g r i d" replacement="show_grid"/> <ligature sequence="i n f o _ i c o n" replacement="info_icon"/> + <ligature sequence="p r o g r e s s" replacement="progress"/> <ligature sequence="z o o m _ 1 _ 1" replacement="zoom_1_1"/> <ligature sequence="p e n _ t o o l" replacement="pen_tool"/> <ligature sequence="r o t a t i o n" replacement="rotation"/>