From 25f899a4a8700bd0ccfb90233dafa328e1a29d57 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:06:27 -0500 Subject: [PATCH 1/9] Feature: Added color icons to context menu --- .../Assets/Custom Glyphs/Colored-Icons.ttf | Bin 6508 -> 8504 bytes .../Assets/Custom Glyphs/Colored_Icons.sfd | 674 +++++++++++++++--- .../Helpers/ContextFlyoutItemHelper.cs | 35 +- 3 files changed, 610 insertions(+), 99 deletions(-) diff --git a/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf b/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf index 90a77fa41d7ab0fb4b7e87ef1577e619af8a4de0..eb5e28c657b028e5d6b254cbb4c690b7c6939524 100644 GIT binary patch delta 3059 zcmb_eeQaA-6+h=bKl^wViZj zAU28j?EB8S_q_AYJ?D3S_uk51+EfPw03A+(06VvA`Q-Lfw+fE~L|y82cicCU-?HcD zKLfx|lfHY;!P?x=pQgqE*dX;iy=VSN1fuLXfbe4)_w1`3o?BTVPZ0H!F6}#T{Gngo zIK732vH$^h|K8e6#QpBqXzX|NFYn*Kw_fwj2nlk=Us$*Q;E`kL7uAiVUm|_>z@a_0 zuPlCJ6MbNj^!*2G$L3%G&e8ZN>5TRN*GQ2d}d4{fa+tm><2o0I)JD+!P|DOTc(HUG$O=Ss8`<+b>Yd z^Yq@!)9NWe9i+x4j5}9o@T=?zMo+u}IV4XEM7eRA+5VjmZJvRXOVOpB9j6gkY-e|NaNBj>5S}`XOuqWfby)esAkj$)gNhH=f5MoBGp%`Fanza zdJB1b0Hb+3gvnHL1e2u<4q-Ibjq#Y*XE?TF7oyZS(O9x%6w6{X#SLQK5SGWVQZ7XE zP6kiS7CtlJ;uosZvhDM-9xSIK%@?|qq2@qIVPda4h-pQ$0?kHsx<1X8nvaY)6N%YW zC0+bOz}XLsVfmT zHjpX}ohl}IfHVWYJ%*Ow&X+f0Azv;ghfv7hJp1~YGq0b0 z*X%QQ>Ak)Bu9je$`mXp{J|x}QNu%d4>*KyUgU9G&bA;b2Y$X&JexH}$LpY8V@?IIo zl2IzA;xS55D!CDpLyU6Rg+7ZiS*(=#J%)KoCQ?QdekY6$#g`K16vZ%XJNULSpkLA* zNmlTOeYPD{6vjM%;~g?a>fw&nTS3P$5lvZXE_y^m)%34l!_!SOXxoONC|v`FB1?{r zw>*p~YRq) zD$>*{^>TrS&SQ3L%TG`tkWhm2_pD~vp*$BE^G{{7l}c?gZCPAe7mJ0$S%boTbY6Cq zqe`!^v=_7%i3U@CkSTz6d7>$g5c|@1O`X#Dki##T7kIBYZ-oGt$djXE195r zlkSao2uu)`F9c(;Alnv*$CppBZMn^xbITW~Wyj)y+hb#$-W<2!tD}yzWel;aOdv`J zXd{Vxju9@9Gf#yW2lp8|CJC}ZqxqB^FlBt?x{kjI5Qdw-X^ zCp7<`srW-Nas7i+F_mGJiW9`d{()60_O5>M&n&9;M`+!bD@L113(-Q0kEzlr+RIXWzp9jP^8(Q? zSyC2x9?3HPoZ8*yPkifuq;UdnN~`p!Y|RX&?l$Ohb)CdUg5BrZF}+IQ&Y?b&ci^A|cndG%aKpJa7*kHU1)8Wv|g8Aw)a> zF!k9^uiZsEuaF#PmGT`Lv^TSG3tF_P?Z%KJEO_*w?O9;Vt9Tbl5VRn5G9(piZmPdO z<(_Ik*lW7h+^RV~UBmBtHB~~-zjrj(ll|%spz)5s(4T;pIwv6y$f$H=5xTM1*kaw) zzZD+mCnS$d(=p*69a)4h`WsKLjpKX9x!fLq!@6qZXlEIQeCwa3XQA;EJ1pl)!};NS zHeYCLbRrGS3HQLK_J02G!-r-g*=#P8&1Pw!iiO4r=UzV!;(AQeA!Gv%V+Kbsi@EbJ zIrCVTKTgNg?Rzto+?teMlL~86aZM_%N#!-EvL=nLNq4PEqjbEc3+Wt4IBaL<`pYlo Oc;~C?+F|$d!oL6{iXwFY delta 1026 zcmYjPU1$?o6h7zP`AJMSY0@;KG>J1!ljus@>7>6_yGzj6m(pNLl_&x!2%d!vqu=w}jTVKSV>O&O;6&1vX)*l2#MN45_@L|d9nWTt!m~+neou7N| zJ@<0*gHZ$ofNx+LIHXglfxh2AZ*2ltmnJsYpJ_HyJ&*nZz}0^x?aMLgNLUMOiy<%lm8-sH(eOc4TW27ek9)#{q2Rq za4{#Vd@*{dFQ5gf5(Cj` zYCPaiAJ{$w(<|CaimO&9WNEYW=6T%CGx*6|#%P;elC5shYF{8NKM0_b7U-jPR#J4e zu%cO(=T#-ryvF*d{8>}yYt36+k1vR8#I$%)JS*N4m!)meG3k`_Sb8IGk$;r`mY3xJ z97)H1$Hh5aSacLK)^q+FI|1K97j7OBfefGAWj4!tj&z zGrxg@AOp=8jDTONkF|D0sLk3 GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "Open".GetLocalizedResource(), - Glyph = "\uE8E5", + ColoredIcon = new ColoredIconModel() + { + BaseLayerGlyph = "\uF047", + OverlayLayerGlyph = "\uF048", + }, Command = commandsViewModel.OpenItemCommand, ShowInSearchPage = true, ShowInFtpPage = true, @@ -689,7 +692,11 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutOpenItemWith/Text".GetLocalizedResource(), - Glyph = "\uE17D", + ColoredIcon = new ColoredIconModel() + { + BaseLayerGlyph = "\uF049", + OverlayLayerGlyph = "\uF04A", + }, Command = commandsViewModel.OpenItemWithApplicationPickerCommand, Tag = "OpenWith", CollapseLabel = true, @@ -699,7 +706,11 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutOpenItemWith/Text".GetLocalizedResource(), - Glyph = "\uE17D", + ColoredIcon = new ColoredIconModel() + { + BaseLayerGlyph = "\uF049", + OverlayLayerGlyph = "\uF04A", + }, Tag = "OpenWithOverflow", IsHidden = true, CollapseLabel = true, @@ -860,8 +871,8 @@ public static List GetBaseItemMenuItems(BaseLayo Text = "CopyLocation".GetLocalizedResource(), ColoredIcon = new ColoredIconModel() { - BaseLayerGlyph = "\uF02F", - OverlayLayerGlyph = "\uF030" + BaseLayerGlyph = "\uF04F", + OverlayLayerGlyph = "\uF050" }, Command = commandsViewModel.CopyPathOfSelectedItemCommand, SingleItemOnly = true, @@ -906,8 +917,11 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutShortcut/Text".GetLocalizedResource(), - Glyph = "\uF10A", - GlyphFontFamilyName = "CustomGlyph", + ColoredIcon = new ColoredIconModel() + { + BaseLayerGlyph = "\uF04B", + OverlayLayerGlyph = "\uF04C" + }, Command = commandsViewModel.CreateShortcutCommand, ShowItem = !selectedItems.FirstOrDefault()?.IsShortcut ?? false, SingleItemOnly = true, @@ -937,7 +951,6 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutShare/Text".GetLocalizedResource(), - //Glyph = "\uF72D", IsPrimary = true, ColoredIcon = new ColoredIconModel() { @@ -950,7 +963,6 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "Delete".GetLocalizedResource(), - //Glyph = "\uF74D", IsPrimary = true, ColoredIcon = new ColoredIconModel() { @@ -971,7 +983,6 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutProperties/Text".GetLocalizedResource(), - //Glyph = "\uF946", IsPrimary = true, ColoredIcon = new ColoredIconModel() { From a157cef30550566dd9744eebf34a325a488a0869 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:36:09 -0500 Subject: [PATCH 2/9] Updated icons --- .../Assets/Custom Glyphs/Colored-Icons.ttf | Bin 8504 -> 8796 bytes .../Assets/Custom Glyphs/Colored_Icons.sfd | 935 ++++++++++-------- .../Helpers/ContextFlyoutItemHelper.cs | 7 +- 3 files changed, 517 insertions(+), 425 deletions(-) diff --git a/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf b/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf index eb5e28c657b028e5d6b254cbb4c690b7c6939524..d78a0d25fadc0b0c53f62d0dac49300c370f2519 100644 GIT binary patch delta 2585 zcmZ8jeT);w6`wb2@7lXwuf6ND&mZTHwa-g%&v)lr+Xr{C??`gNu5vj z_09U4ruEu0^FHS7n>WArp3krQ;QkB&LWoQb5{}GFO+E6^vD?)fgy<8p4joVCuWneUww?S5Aavofec|gmmvfKNN0BJ z*|&dH!}SNG&m-O3{nWN6UV8kf_s9wT(Y`rC=Zl8qI*a6ZZ z6*x;O%l=bBJXGTJ4+HMBcuaia*|YNfxJd4XDEFewyr1NC0B?A zUxn+`N7vH*^fbNBdAOf*SGe1bb&iXUkDW8l!_MnYi_i0q^85L#d`IvIL&84cw=U5& z6yt!Oh34Z9hs8O@>y;dmuz2j7_E7jH)}Q1 zTEJ22kHCB+lZjXhk$x^&GnZauGP>8S9awsi3FzKPe?MBNERS*nT$1F;S`3ArHPSlY zgFcKwFqGDfJQV$AX$&eb28Cc~q!8?bbkWS_0A0*7wL*zeILZ$l}km_FpDNzl}juvEeN2JzzZoBH6vRQ#Z)j9zJYJm7u02VmKJmB~c5j;C8!0^3qkWz)yk1!r-ELlR zaH_o7-Xa3C&|`3mY|pCILZ3R zqrCT?ruxWV5SQ-4pB)Vy-z!QVvm$bH_9-A9Xl!r{l4Dyp&tOXq5$6_EZzV(3E z*CTC~`b2tjMbKj~t#`$EfJsqjizpIu=AZ64+9J$NO!n2}5kh<`;AH?Vgb)JVCt%;d zje<0m1N+IC-IH-uuzLC8iCoS!$HxzijTg<;xkTLWSAB^%W46Y} zCnon7M{>yJ>WVjtC1_y4H0O#V`GNjSH0o6tvp$d?DbAVZz(743@q&10eB3m1xp>0o z_pew&^W$S(Lw>&=Ppn4k&#*1|O#h0RXn!WpY_Hf+yk6zuNVJac!@`Mme~vn6i3o@t zLd;Sj7~plT$QFGN@In?&MvYj^kkqio67f?;M6L53kEVG#ET?f>`_1ql+kcT8Esi9x zBVESGCJ>3k-5M3(bHH^Axxry52f-|jq`JYjqd1Z^oEpY2h1sRiA3z_oo!-DdIB4w~ ze30Lemi!bn5A?b9fkOlOH>RVC@T#C#J7>5|2)-Z6a5MBc*2tySeM8mi5dF0x@v@pv zQ%e^!Ykdv z`Nbk?ubDk;!=u=SlVnyQQT#_xs8BOcbuSIX!I8{^uL8+9_;@(_%a@;?ntJ->?gZbn z?%aCrxm)1F@rBRXOnP{QdkZx%h}gXg^b?w8*41`PiDo;PieEg7O*;Uu!2&mk|272Hyg}fy6)dHoRUnQ8yq#Ti@xibF znfHZou*JI;;jJ~WT?%`hlJzRgNKS89vVMa9TkI};3U-kg$&fFxyGa0RDu~G})@Vb( z@{CKwPa#yMSQYp{u#j1q;jg;;aBdina;!PHXU`x`&FSIX;cc}Ywb~APuRXy|UB1}c kJc^>J;)xT*DO5k&?7e7h+g__}uh;GI%w7LFg(Z(NGM%fWy+c?t4Ht(QW%9T zVo=o>Y1LK%QWGqYI-)8Q5mmObO#&pUqKazOlraU?l`bn|Ev?omi}q8rOr4PYvU8o3 zvB|=YrJ$0z{ zH&QRkmr>rg_xW8rk1x*j&&)?g{5uGt#r@BJck1secjJTveu45t4G&`CkM8R)*dO~h zk+>B+N&ZCN_<+rKoNtu~S?}UjxDbj)LYWr-@C+AP@2dFWhq$v?IS1jMMQA4_m?JNe zFUTakOa|cBP#_U9Ob3A{!(5bAQ*NSju_?)i-uJpC+riB3fF~C#V+xX_?q|! z@ju3_@mb@%$!#i{edfL9IrE~_DNRUkTWpmC|Fyow^;!CJ`Z%!@;!0_mI=3eowm}<2 zl=NbwcPIs2w$8>+26w|+W2a3gsUdIU?mFH_FZ{lcblA&F0 zYLfMvaudCRS_|8QwU(ZuZebg+h9f4fw0@kcr%R-pU_n9kc$2Cp2yVfSzT@eX5^n7j!$sjqY-NKLh)st%D zsKp5=lq_}BX)QHtTrwsO@#)yflUAqG$_BcWh^fs2+HIa~ZFNX|bqN)Cm(_^}XcBLZ zCHkB`C;pHyFo!{uC*ghKB1obdz&aK}coSkD7{XuTPli=3gSeGAXWamx-^KgTC)oA7 z2o~KTMurpKPc{qs6pI5FaDpxR5WYTz_;H34IM-cZHjAMnFDt$6iF)~HWqzs})2O%K;p7=8^9!j-K~ z#2|0%!-;a=7>D)zf*j#a(*@E2vz+zIw0O2gAOYmQU#C6Zv$lvEk+QGW{m~urg*0KQuolIUG_t&Bp&N z>4y%Fqw2%~fAk+XRL&Y#%7yhY?pN>*CWJI6W!6}##>(FYX;vuY2`fe#3Rz8oq@roc z_;_w~G^a1+#-18yGSgRDtLelj>n*l;LvyI~nMOy7{(GM^qc%`LVZjjRvLAE9hVOIcZ4MY3dv+e58o}o|7cDvcXg@07h-&G#vxA;vqYB$q;)jK)b zX;r^?d1*s|#RPoTi}VVtG0u|88Aqc6?RN8N4DB>a z#l`|6|0gni<+kHrmV@g*|8ZR(NZomqBh!aWN;QiI(fRbOMa un?Dvn0M5|62u>u#2XTDz0wB_@$|=z&3nI*RtxAH;XTDJH>bKLkO8*6aa`p`X diff --git a/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd b/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd index f77b634bf996..3d491e5e6dac 100644 --- a/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd +++ b/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd @@ -22,7 +22,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1625095253 -ModificationTime: 1676479229 +ModificationTime: 1676482390 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -36,7 +36,6 @@ HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 HheadDOffset: 1 -OS2Vendor: 'PfEd' DEI: 91125 Encoding: Custom UnicodeInterp: none @@ -54,17 +53,17 @@ Flags: H LayerCount: 2 Fore SplineSet -200 499.999023438 m 2 - 200 537.013671875 220.110351562 569.330078125 250 586.62109375 c 1 - 250 75 l 2 - 250 5.96484375 305.96484375 -50 375 -50 c 2 - 686.620117188 -50 l 1 - 669.330078125 -79.8896484375 637.014648438 -100 600 -100 c 2 - 375 -100 l 2 - 278.349609375 -100 200 -21.650390625 200 75 c 2 - 200 499.999023438 l 2 +125 549.999023438 m 2 + 125 596.266601562 150.137695312 636.663085938 187.5 658.276367188 c 1 + 187.5 18.75 l 2 + 187.5 -67.5439453125 257.456054688 -137.5 343.75 -137.5 c 2 + 733.275390625 -137.5 l 1 + 711.662109375 -174.862304688 671.268554688 -200 625 -200 c 2 + 343.75 -200 l 2 + 222.9375 -200 125 -102.0625 125 18.75 c 2 + 125 549.999023438 l 2 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: copy_overlay @@ -74,26 +73,26 @@ Flags: H LayerCount: 2 Fore SplineSet -400 700 m 2 - 700 700 l 2 - 755.23046875 700 800 655.228515625 800 600 c 2 - 800 100 l 2 - 800 44.76953125 755.23046875 0 700 0 c 2 - 400 0 l 2 - 344.771484375 0 300 44.76953125 300 100 c 2 - 300 600 l 2 - 300 655.228515625 344.771484375 700 400 700 c 2 -350 600 m 2 - 350 100 l 2 - 350 72.384765625 372.385742188 50 400 50 c 2 - 700 50 l 2 - 727.615234375 50 750 72.384765625 750 100 c 2 - 750 600 l 2 - 750 627.614257812 727.615234375 650 700 650 c 2 - 400 650 l 2 - 372.385742188 650 350 627.614257812 350 600 c 2 +375 800 m 2 + 750 800 l 2 + 819.037109375 800 875 744.03515625 875 675 c 2 + 875 50 l 2 + 875 -19.037109375 819.037109375 -75 750 -75 c 2 + 375 -75 l 2 + 305.96484375 -75 250 -19.037109375 250 50 c 2 + 250 675 l 2 + 250 744.03515625 305.96484375 800 375 800 c 2 +312.5 675 m 2 + 312.5 50 l 2 + 312.5 15.4814453125 340.482421875 -12.5 375 -12.5 c 2 + 750 -12.5 l 2 + 784.518554688 -12.5 812.5 15.4814453125 812.5 50 c 2 + 812.5 675 l 2 + 812.5 709.517578125 784.518554688 737.5 750 737.5 c 2 + 375 737.5 l 2 + 340.482421875 737.5 312.5 709.517578125 312.5 675 c 2 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: paste_base @@ -103,49 +102,41 @@ Flags: H LayerCount: 2 Fore SplineSet -531.387695312 716.666992188 m 2 - 579.62109375 716.666992188 619.337890625 680.1875 624.446289062 633.314453125 c 2 - 697.916992188 633.333007812 l 2 - 747.537109375 633.333007812 788.150390625 594.78515625 791.450195312 546.001953125 c 2 - 791.666992188 539.583007812 l 2 - 791.666992188 523.784179688 779.924804688 510.7265625 764.69140625 508.66015625 c 2 - 760.375 508.375 l 2 - 744.575195312 508.375 731.516601562 520.116210938 729.450195312 535.348632812 c 2 - 729.166992188 539.583007812 l 2 - 729.166992188 555.404296875 717.408203125 568.478515625 702.158203125 570.547851562 c 2 - 697.916992188 570.833007812 l 1 - 609.06640625 570.798828125 l 2 - 592.25390625 545.852539062 563.737304688 529.446289062 531.387695312 529.446289062 c 2 - 385.27734375 529.446289062 l 2 - 352.9296875 529.446289062 324.4140625 545.852539062 307.598632812 570.798828125 c 2 - 218.75 570.833007812 l 2 - 202.928710938 570.833007812 189.854492188 559.077148438 187.78515625 543.82421875 c 2 - 187.5 539.583007812 l 1 - 187.5 -23.1083984375 l 2 - 187.5 -38.9287109375 199.255859375 -52.00390625 214.509765625 -54.0712890625 c 2 - 218.75 -54.3583984375 l 1 - 343.75 -54.337890625 l 2 - 359.568359375 -54.337890625 372.642578125 -66.087890625 374.713867188 -81.337890625 c 2 - 375 -85.5830078125 l 2 - 375 -102.841796875 361.009765625 -116.837890625 343.75 -116.837890625 c 2 - 218.75 -116.858398438 l 2 - 169.130859375 -116.858398438 128.514648438 -78.30859375 125.215820312 -29.525390625 c 2 - 125 -23.1083984375 l 1 - 125 539.583007812 l 2 - 125 589.202148438 163.547851562 629.818359375 212.331054688 633.1171875 c 2 - 218.75 633.333007812 l 1 - 292.221679688 633.314453125 l 2 - 297.331054688 680.1875 337.043945312 716.666992188 385.27734375 716.666992188 c 2 - 531.387695312 716.666992188 l 2 -531.387695312 654.166992188 m 2 - 385.27734375 654.166992188 l 2 - 368.095703125 654.166992188 354.166992188 640.23828125 354.166992188 623.056640625 c 0 - 354.166992188 605.874023438 368.095703125 591.946289062 385.27734375 591.946289062 c 2 - 531.387695312 591.946289062 l 2 - 548.571289062 591.946289062 562.5 605.874023438 562.5 623.056640625 c 0 - 562.5 640.23828125 548.571289062 654.166992188 531.387695312 654.166992188 c 2 +343.75 612.5 m 2 + 302.930664062 612.5 268.204101562 638.587890625 255.333984375 675 c 2 + 156.25 675 l 2 + 138.991210938 675 125 661.008789062 125 643.75 c 2 + 125 -106.25 l 2 + 125 -123.505859375 138.991210938 -137.5 156.25 -137.5 c 2 + 378.125976562 -137.5 l 2 + 382.8125 -160.587890625 392.590820312 -181.831054688 406.23828125 -200 c 1 + 156.25 -200 l 2 + 149.778320312 -200 143.458984375 -199.34375 137.356445312 -198.09375 c 0 + 94.6357421875 -189.356445312 62.5 -151.556640625 62.5 -106.25 c 2 + 62.5 643.75 l 2 + 62.5 695.52734375 104.47265625 737.5 156.25 737.5 c 2 + 255.333984375 737.5 l 2 + 268.204101562 773.912109375 302.930664062 800 343.75 800 c 2 + 531.25 800 l 2 + 572.069335938 800 606.795898438 773.912109375 619.666015625 737.5 c 2 + 718.75 737.5 l 2 + 770.525390625 737.5 812.5 695.52734375 812.5 643.75 c 2 + 812.5 550 l 1 + 750 550 l 1 + 750 643.75 l 2 + 750 661.008789062 736.005859375 675 718.75 675 c 2 + 619.666015625 675 l 2 + 606.795898438 638.587890625 572.069335938 612.5 531.25 612.5 c 2 + 343.75 612.5 l 2 +312.5 706.25 m 0 + 312.5 688.991210938 326.491210938 675 343.75 675 c 2 + 531.25 675 l 2 + 548.508789062 675 562.5 688.991210938 562.5 706.25 c 0 + 562.5 723.508789062 548.508789062 737.5 531.25 737.5 c 2 + 343.75 737.5 l 2 + 326.491210938 737.5 312.5 723.508789062 312.5 706.25 c 0 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: paste_overlay @@ -155,34 +146,26 @@ Flags: H LayerCount: 2 Fore SplineSet -781.25 466.666992188 m 2 - 830.87109375 466.666992188 871.483398438 428.118164062 874.783203125 379.333007812 c 2 - 875 372.916992188 l 1 - 875 -22.9169921875 l 2 - 875 -72.537109375 836.450195312 -113.150390625 787.666992188 -116.450195312 c 2 - 781.25 -116.666992188 l 1 - 510.416992188 -116.666992188 l 2 - 460.795898438 -116.666992188 420.18359375 -78.1162109375 416.883789062 -29.3330078125 c 2 - 416.666992188 -22.9169921875 l 1 - 416.666992188 372.916992188 l 2 - 416.666992188 422.536132812 455.216796875 463.151367188 504 466.450195312 c 2 - 510.416992188 466.666992188 l 1 - 781.25 466.666992188 l 2 -781.25 404.166992188 m 1 - 510.416992188 404.166992188 l 2 - 494.595703125 404.166992188 481.520507812 392.41015625 479.450195312 377.158203125 c 2 - 479.166992188 372.916992188 l 1 - 479.166992188 -22.9169921875 l 2 - 479.166992188 -38.7373046875 490.924804688 -51.8125 506.174804688 -53.8837890625 c 2 - 510.416992188 -54.1669921875 l 1 - 781.25 -54.1669921875 l 2 - 797.071289062 -54.1669921875 810.145507812 -42.408203125 812.216796875 -27.158203125 c 2 - 812.5 -22.9169921875 l 1 - 812.5 372.916992188 l 2 - 812.5 388.737304688 800.741210938 401.8125 785.491210938 403.880859375 c 2 - 781.25 404.166992188 l 1 +531.25 487.5 m 2 + 843.75 487.5 l 2 + 895.525390625 487.5 937.5 445.52734375 937.5 393.75 c 2 + 937.5 -106.25 l 2 + 937.5 -158.025390625 895.525390625 -200 843.75 -200 c 2 + 531.25 -200 l 2 + 479.47265625 -200 437.5 -158.025390625 437.5 -106.25 c 2 + 437.5 393.75 l 2 + 437.5 445.52734375 479.47265625 487.5 531.25 487.5 c 2 +500 393.75 m 2 + 500 -106.25 l 2 + 500 -123.505859375 513.991210938 -137.5 531.25 -137.5 c 2 + 843.75 -137.5 l 2 + 861.005859375 -137.5 875 -123.505859375 875 -106.25 c 2 + 875 393.75 l 2 + 875 411.008789062 861.005859375 425 843.75 425 c 2 + 531.25 425 l 2 + 513.991210938 425 500 411.008789062 500 393.75 c 2 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: share_base @@ -192,37 +175,51 @@ Flags: H LayerCount: 2 Fore SplineSet -281.107421875 633.33203125 m 1 - 425.450195312 633.33203125 l 2 - 442.708007812 633.33203125 456.700195312 619.340820312 456.700195312 602.08203125 c 0 - 456.700195312 586.26171875 444.94140625 573.186523438 429.69140625 571.1171875 c 2 - 425.450195312 570.83203125 l 1 - 281.107421875 570.83203125 l 2 - 231.48828125 570.83203125 190.872070312 532.284179688 187.57421875 483.500976562 c 2 - 187.357421875 477.08203125 l 1 - 187.357421875 81.25 l 2 - 187.357421875 31.62890625 225.90625 -8.9873046875 274.688476562 -12.283203125 c 2 - 281.107421875 -12.5 l 1 - 676.970703125 -12.5 l 2 - 726.591796875 -12.5 767.208007812 26.0458984375 770.50390625 74.8291015625 c 2 - 770.720703125 81.25 l 1 - 770.720703125 101.991210938 l 2 - 770.720703125 119.25 784.712890625 133.241210938 801.970703125 133.241210938 c 0 - 817.791992188 133.241210938 830.866210938 121.483398438 832.9375 106.229492188 c 2 - 833.220703125 101.991210938 l 1 - 833.220703125 81.25 l 2 - 833.220703125 -2.2626953125 767.708007812 -70.470703125 685.270507812 -74.783203125 c 2 - 676.970703125 -75 l 1 - 281.107421875 -75 l 2 - 197.596679688 -75 129.387695312 -9.4873046875 125.07421875 72.9501953125 c 2 - 124.857421875 81.25 l 1 - 124.857421875 477.08203125 l 2 - 124.857421875 560.592773438 190.372070312 628.801757812 272.809570312 633.115234375 c 2 - 281.107421875 633.33203125 l 1 - 425.450195312 633.33203125 l 1 - 281.107421875 633.33203125 l 1 +62.5 -14.943359375 m 2 + 62.5 550 l 2 + 62.5 566.6015625 65.7548828125 582.389648438 72.265625 597.36328125 c 0 + 78.7763671875 612.662109375 87.5654296875 626.009765625 98.6328125 637.40234375 c 0 + 109.700195312 648.795898438 122.55859375 657.91015625 137.20703125 664.74609375 c 0 + 152.181640625 671.58203125 168.130859375 675 185.05859375 675 c 2 + 406.25 675 l 2 + 414.713867188 675 422.037109375 671.907226562 428.22265625 665.72265625 c 0 + 434.407226562 659.537109375 437.5 652.213867188 437.5 643.75 c 0 + 437.5 635.286132812 434.407226562 627.962890625 428.22265625 621.77734375 c 0 + 422.037109375 615.592773438 414.713867188 612.5 406.25 612.5 c 2 + 187.5 612.5 l 2 + 178.7109375 612.5 170.573242188 610.872070312 163.0859375 607.6171875 c 0 + 155.598632812 604.362304688 148.92578125 599.8046875 143.06640625 593.9453125 c 0 + 137.532226562 588.411132812 133.137695312 581.901367188 129.8828125 574.4140625 c 0 + 126.627929688 566.926757812 125 558.7890625 125 550 c 2 + 125 -12.5 l 2 + 125 -21.287109375 126.627929688 -29.587890625 129.8828125 -37.400390625 c 0 + 133.137695312 -44.8876953125 137.532226562 -51.400390625 143.06640625 -56.931640625 c 0 + 148.599609375 -62.46875 155.110351562 -66.8623046875 162.59765625 -70.119140625 c 0 + 170.41015625 -73.375 178.7109375 -75 187.5 -75 c 2 + 750 -75 l 2 + 767.25 -75 781.900390625 -68.974609375 793.943359375 -56.931640625 c 0 + 802.081054688 -48.7939453125 807.293945312 -38.869140625 809.568359375 -27.150390625 c 0 + 812.174804688 -15.431640625 813.474609375 -3.0625 813.474609375 9.962890625 c 0 + 813.474609375 19.400390625 813.150390625 28.681640625 812.5 37.7939453125 c 0 + 812.174804688 46.90625 812.012695312 55.693359375 812.012695312 64.162109375 c 0 + 812.012695312 70.994140625 812.337890625 77.34375 812.987304688 83.2001953125 c 0 + 813.962890625 89.0625 815.59375 94.1064453125 817.869140625 98.337890625 c 0 + 820.150390625 102.900390625 823.244140625 106.3125 827.150390625 108.59375 c 0 + 831.380859375 111.200195312 836.912109375 112.5 843.75 112.5 c 0 + 852.212890625 112.5 859.537109375 109.40625 865.724609375 103.224609375 c 0 + 871.90625 97.037109375 875 89.712890625 875 81.25 c 2 + 875 -12.5 l 2 + 875 -29.099609375 871.744140625 -45.0498046875 865.237304688 -60.349609375 c 0 + 858.724609375 -75.3251953125 849.9375 -88.505859375 838.869140625 -99.900390625 c 0 + 827.799804688 -111.293945312 814.78125 -120.412109375 799.806640625 -127.244140625 c 0 + 785.15625 -134.081054688 769.369140625 -137.5 752.443359375 -137.5 c 2 + 187.5 -137.5 l 2 + 170.8984375 -137.5 154.948242188 -134.244140625 139.6484375 -127.737304688 c 0 + 124.674804688 -121.224609375 111.490234375 -112.4375 100.09765625 -101.369140625 c 0 + 88.7041015625 -90.2998046875 79.58984375 -77.443359375 72.75390625 -62.7939453125 c 0 + 65.91796875 -47.818359375 62.5 -31.869140625 62.5 -14.943359375 c 2 EndSplineSet -Validated: 5 +Validated: 524289 EndChar StartChar: share_overlay @@ -232,38 +229,54 @@ Flags: H LayerCount: 2 Fore SplineSet -604.19140625 528.337890625 m 1 - 604.19140625 643.749023438 l 2 - 604.19140625 669.747070312 633.641601562 683.750976562 653.650390625 669.173828125 c 2 - 657.071289062 666.30078125 l 1 - 906.845703125 426.717773438 l 2 - 918.50390625 415.537109375 919.56640625 397.577148438 910.029296875 385.162109375 c 2 - 906.849609375 381.616210938 l 1 - 657.075195312 141.954101562 l 2 - 638.31640625 123.954101562 607.821289062 135.512695312 604.487304688 160.045898438 c 2 - 604.19140625 164.50390625 l 1 - 604.19140625 278.05859375 l 1 - 589.87890625 276.803710938 l 2 - 489.891601562 266.375 394.056640625 221.337890625 301.772460938 140.94140625 c 0 - 280.142578125 122.099609375 246.678710938 139.916992188 250.236328125 168.37890625 c 0 - 277.935546875 390.028320312 393.846679688 512.194335938 591.716796875 527.51953125 c 2 - 604.19140625 528.337890625 l 1 - 604.19140625 643.749023438 l 1 - 604.19140625 528.337890625 l 1 -666.69140625 570.471679688 m 1 - 666.69140625 497.915039062 l 2 - 666.69140625 480.65625 652.700195312 466.665039062 635.44140625 466.665039062 c 0 - 474.049804688 466.665039062 374.022460938 396.827148438 330.8046875 251.783203125 c 2 - 327.510742188 240.174804688 l 1 - 342.184570312 250.041992188 l 2 - 435.37109375 310.950195312 533.262695312 341.666992188 635.44140625 341.666992188 c 0 - 651.262695312 341.666992188 664.337890625 329.908203125 666.404296875 314.654296875 c 2 - 666.69140625 310.416992188 l 1 - 666.69140625 237.799804688 l 1 - 840.075195312 404.162109375 l 1 - 666.69140625 570.471679688 l 1 +660.643554688 112.5 m 0 + 650.880859375 112.5 642.412109375 116.081054688 635.255859375 123.244140625 c 0 + 628.418945312 130.731445312 625 139.193359375 625 148.630859375 c 2 + 625 279.4921875 l 1 + 614.583007812 279.4921875 604.00390625 278.515625 593.26171875 276.5625 c 0 + 582.844726562 274.934570312 572.590820312 272.981445312 562.5 270.703125 c 0 + 534.1796875 264.84375 507.974609375 257.193359375 483.88671875 247.75390625 c 0 + 459.797851562 238.313476562 436.686523438 227.24609375 414.55078125 214.55078125 c 0 + 392.740234375 202.181640625 371.418945312 188.346679688 350.5859375 173.049804688 c 0 + 329.752929688 157.75 308.431640625 141.143554688 286.62109375 123.244140625 c 0 + 283.041015625 120.3125 279.296875 118.03125 275.390625 116.40625 c 0 + 271.484375 114.78125 267.08984375 113.962890625 262.20703125 113.962890625 c 0 + 252.44140625 113.962890625 243.978515625 117.380859375 236.81640625 124.21875 c 0 + 229.98046875 131.380859375 226.5625 139.84375 226.5625 149.612304688 c 2 + 226.5625 153.512695312 l 2 + 234.375 212.760742188 247.55859375 266.958984375 266.11328125 316.11328125 c 0 + 284.994140625 365.592773438 310.384765625 408.3984375 342.28515625 444.53125 c 0 + 374.51171875 480.6640625 413.737304688 509.47265625 459.9609375 530.95703125 c 0 + 506.510742188 552.44140625 561.5234375 564.811523438 625 568.06640625 c 2 + 625 701.3671875 l 2 + 625 711.458007812 628.418945312 719.921875 635.255859375 726.7578125 c 0 + 642.087890625 733.918945312 650.556640625 737.5 660.643554688 737.5 c 0 + 669.755859375 737.5 677.737304688 734.08203125 684.568359375 727.24609375 c 2 + 965.331054688 450.87890625 l 2 + 968.912109375 447.297851562 971.681640625 443.391601562 973.630859375 439.16015625 c 0 + 975.587890625 435.25390625 976.5625 430.534179688 976.5625 425 c 0 + 976.5625 414.909179688 972.981445312 406.282226562 965.818359375 399.12109375 c 2 + 684.568359375 122.755859375 l 2 + 677.081054688 115.918945312 669.106445312 112.5 660.643554688 112.5 c 0 +687.5 213.0859375 m 1 + 902.831054688 425 l 1 + 687.5 636.9140625 l 1 + 687.5 509.9609375 l 2 + 675.456054688 509.309570312 663.412109375 508.49609375 651.369140625 507.51953125 c 0 + 639.650390625 506.869140625 627.768554688 506.0546875 615.72265625 505.078125 c 0 + 570.80078125 501.823242188 530.76171875 492.87109375 495.60546875 478.22265625 c 0 + 460.775390625 463.57421875 430.500976562 443.879882812 404.78515625 419.140625 c 0 + 379.068359375 394.401367188 357.583984375 364.778320312 340.33203125 330.2734375 c 0 + 323.405273438 296.09375 310.221679688 257.682617188 300.78125 215.0390625 c 1 + 322.590820312 231.315429688 345.377929688 246.452148438 369.140625 260.44921875 c 0 + 393.229492188 274.771484375 417.96875 287.3046875 443.359375 298.046875 c 0 + 468.75 309.114257812 494.62890625 318.229492188 520.99609375 325.390625 c 0 + 547.688476562 332.877929688 574.70703125 337.922851562 602.05078125 340.52734375 c 0 + 616.374023438 341.829101562 630.53125 342.96875 644.53125 343.9453125 c 0 + 658.856445312 345.247070312 673.174804688 346.549804688 687.5 347.8515625 c 1 + 687.5 213.0859375 l 1 EndSplineSet -Validated: 37 +Validated: 524289 EndChar StartChar: rename_b @@ -273,34 +286,34 @@ Flags: H LayerCount: 2 Fore SplineSet -223.213867188 585.014648438 m 2 - 437.5 585.014648438 l 1 - 437.5 531.443359375 l 1 - 223.213867188 531.443359375 l 2 - 188.696289062 531.443359375 160.713867188 503.461914062 160.713867188 468.943359375 c 2 - 160.713867188 129.657226562 l 2 - 160.713867188 95.1396484375 188.696289062 67.1572265625 223.213867188 67.1572265625 c 2 - 437.5 67.1572265625 l 1 - 437.5 13.5859375 l 1 - 223.213867188 13.5859375 l 2 - 159.109375 13.5859375 107.142578125 65.5537109375 107.142578125 129.657226562 c 2 - 107.142578125 468.943359375 l 2 - 107.142578125 533.047851562 159.109375 585.014648438 223.213867188 585.014648438 c 2 -776.786132812 67.1572265625 m 2 - 811.303710938 67.1572265625 839.286132812 95.1396484375 839.286132812 129.657226562 c 2 - 839.286132812 468.943359375 l 2 - 839.286132812 503.461914062 811.303710938 531.443359375 776.786132812 531.443359375 c 2 - 562.5 531.443359375 l 1 - 562.5 585.014648438 l 1 - 776.786132812 585.014648438 l 2 - 840.889648438 585.014648438 892.857421875 533.047851562 892.857421875 468.943359375 c 2 - 892.857421875 129.657226562 l 2 - 892.857421875 65.5537109375 840.889648438 13.5859375 776.786132812 13.5859375 c 2 - 562.5 13.5859375 l 1 - 562.5 67.1572265625 l 1 - 776.786132812 67.1572265625 l 2 +156.25 675 m 2 + 406.25 675 l 1 + 406.25 612.5 l 1 + 156.25 612.5 l 2 + 104.47265625 612.5 62.5 570.52734375 62.5 518.75 c 2 + 62.5 81.25 l 2 + 62.5 29.474609375 104.47265625 -12.5 156.25 -12.5 c 2 + 406.25 -12.5 l 1 + 406.25 -75 l 1 + 156.25 -75 l 2 + 69.9560546875 -75 0 -5.0439453125 0 81.25 c 2 + 0 518.75 l 2 + 0 605.043945312 69.9560546875 675 156.25 675 c 2 +843.75 -12.5 m 2 + 895.525390625 -12.5 937.5 29.474609375 937.5 81.25 c 2 + 937.5 518.75 l 2 + 937.5 570.52734375 895.525390625 612.5 843.75 612.5 c 2 + 593.75 612.5 l 1 + 593.75 675 l 1 + 843.75 675 l 2 + 930.043945312 675 1000 605.043945312 1000 518.75 c 2 + 1000 81.25 l 2 + 1000 -5.0439453125 930.043945312 -75 843.75 -75 c 2 + 593.75 -75 l 1 + 593.75 -12.5 l 1 + 843.75 -12.5 l 2 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: rename_o @@ -310,25 +323,25 @@ Flags: H LayerCount: 2 Fore SplineSet -419.642578125 728.571289062 m 2 - 580.357421875 728.571289062 l 2 - 595.150390625 728.571289062 607.142578125 716.579101562 607.142578125 701.786132812 c 0 - 607.142578125 686.9921875 595.150390625 675 580.357421875 675 c 2 - 526.786132812 675 l 1 - 526.786132812 -75 l 1 - 580.357421875 -75 l 2 - 595.150390625 -75 607.142578125 -86.9931640625 607.142578125 -101.786132812 c 0 - 607.142578125 -116.578125 595.150390625 -128.571289062 580.357421875 -128.571289062 c 2 - 419.642578125 -128.571289062 l 2 - 404.849609375 -128.571289062 392.857421875 -116.578125 392.857421875 -101.786132812 c 0 - 392.857421875 -86.9931640625 404.849609375 -75 419.642578125 -75 c 2 - 473.213867188 -75 l 1 - 473.213867188 675 l 1 - 419.642578125 675 l 2 - 404.849609375 675 392.857421875 686.9921875 392.857421875 701.786132812 c 0 - 392.857421875 716.579101562 404.849609375 728.571289062 419.642578125 728.571289062 c 2 +406.25 800 m 2 + 593.75 800 l 2 + 611.008789062 800 625 786.008789062 625 768.75 c 0 + 625 751.491210938 611.008789062 737.5 593.75 737.5 c 2 + 531.25 737.5 l 1 + 531.25 -137.5 l 1 + 593.75 -137.5 l 2 + 611.008789062 -137.5 625 -151.494140625 625 -168.75 c 0 + 625 -186.005859375 611.008789062 -200 593.75 -200 c 2 + 406.25 -200 l 2 + 388.991210938 -200 375 -186.005859375 375 -168.75 c 0 + 375 -151.494140625 388.991210938 -137.5 406.25 -137.5 c 2 + 468.75 -137.5 l 1 + 468.75 737.5 l 1 + 406.25 737.5 l 2 + 388.991210938 737.5 375 751.491210938 375 768.75 c 0 + 375 786.008789062 388.991210938 800 406.25 800 c 2 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: sort_b @@ -415,25 +428,25 @@ Flags: HW LayerCount: 2 Fore SplineSet -351.295898438 80.208984375 m 1 - 412.7109375 80.208984375 l 1 - 412.7109375 -11.9140625 l 2 - 412.7109375 -62.7666015625 453.982421875 -104.038085938 504.834960938 -104.038085938 c 2 - 811.9140625 -104.038085938 l 2 - 862.766601562 -104.038085938 904.037109375 -62.7666015625 904.037109375 -11.9140625 c 2 - 904.037109375 295.1640625 l 2 - 904.037109375 346.016601562 862.766601562 387.288085938 811.9140625 387.288085938 c 2 - 719.790039062 387.288085938 l 1 - 719.790039062 448.704101562 l 1 - 811.9140625 448.704101562 l 2 - 896.729492188 448.704101562 965.453125 379.979492188 965.453125 295.1640625 c 2 - 965.453125 -11.9140625 l 2 - 965.453125 -96.7294921875 896.729492188 -165.454101562 811.9140625 -165.454101562 c 2 - 504.834960938 -165.454101562 l 2 - 420.01953125 -165.454101562 351.295898438 -96.7294921875 351.295898438 -11.9140625 c 2 - 351.295898438 80.208984375 l 1 +312.5 112.5 m 1 + 375 112.5 l 1 + 375 18.75 l 2 + 375 -33.025390625 416.97265625 -75 468.75 -75 c 2 + 781.25 -75 l 2 + 833.025390625 -75 875 -33.025390625 875 18.75 c 2 + 875 331.25 l 2 + 875 383.02734375 833.025390625 425 781.25 425 c 2 + 687.5 425 l 1 + 687.5 487.5 l 1 + 781.25 487.5 l 2 + 867.543945312 487.5 937.5 417.543945312 937.5 331.25 c 2 + 937.5 18.75 l 2 + 937.5 -67.5439453125 867.543945312 -137.5 781.25 -137.5 c 2 + 468.75 -137.5 l 2 + 382.456054688 -137.5 312.5 -67.5439453125 312.5 18.75 c 2 + 312.5 112.5 l 1 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: selection_o @@ -443,32 +456,27 @@ Flags: HW LayerCount: 2 Fore SplineSet -533.244140625 765.45703125 m 2 - 588.30078125 765.45703125 632.984375 720.7734375 632.984375 665.716796875 c 2 - 632.984375 266.755859375 l 2 - 632.984375 211.69921875 588.30078125 167.015625 533.244140625 167.015625 c 2 - 134.283203125 167.015625 l 2 - 79.2265625 167.015625 34.54296875 211.69921875 34.54296875 266.755859375 c 2 - 34.54296875 665.716796875 l 2 - 34.54296875 720.7734375 79.2265625 765.45703125 134.283203125 765.45703125 c 2 - 533.244140625 765.45703125 l 2 -267.2734375 295.677734375 m 0 - 277.640625 295.677734375 287.033203125 299.88671875 293.833007812 306.686523438 c 2 - 526.560546875 539.4140625 l 2 - 533.361328125 546.213867188 537.569335938 555.606445312 537.569335938 565.973632812 c 0 - 537.569335938 586.708984375 520.735351562 603.54296875 500.000976562 603.54296875 c 0 - 489.633789062 603.54296875 480.241210938 599.333984375 473.440429688 592.534179688 c 2 - 267.345703125 386.438476562 l 2 - 242.846679688 410.936523438 215.818359375 437.89453125 194.073242188 459.567382812 c 2 - 194.073242188 459.567382812 215.188476562 470.555664062 167.533203125 470.555664062 c 0 - 162.215820312 470.555664062 153.05859375 469.48828125 144.137695312 462.375 c 0 - 132.26953125 452.911132812 129.963867188 439.509765625 129.963867188 432.987304688 c 0 - 129.963867188 423.889648438 132.02734375 420.444335938 132.994140625 418.193359375 c 0 - 135.567382812 412.198242188 136.938476562 410.561523438 140.631835938 406.772460938 c 0 - 140.973632812 406.426757812 240.713867188 306.686523438 240.713867188 306.686523438 c 2 - 247.513671875 299.88671875 256.90625 295.677734375 267.2734375 295.677734375 c 0 +156.25 737.5 m 2 + 531.25 737.5 l 2 + 583.02734375 737.5 625 695.52734375 625 643.75 c 2 + 625 268.75 l 2 + 625 216.97265625 583.02734375 175 531.25 175 c 2 + 156.25 175 l 2 + 104.47265625 175 62.5 216.97265625 62.5 268.75 c 2 + 62.5 643.75 l 2 + 62.5 695.52734375 104.47265625 737.5 156.25 737.5 c 2 +524.859375 525.140625 m 2 + 538.588867188 538.870117188 538.588867188 561.129882812 524.859375 574.859375 c 0 + 511.129882812 588.588867188 488.870117188 588.588867188 475.140625 574.859375 c 2 + 281.25 380.96875 l 1 + 212.359375 449.859375 l 2 + 198.629882812 463.588867188 176.370117188 463.588867188 162.640625 449.859375 c 0 + 148.911132812 436.129882812 148.911132812 413.870117188 162.640625 400.140625 c 2 + 256.390625 306.390625 l 2 + 270.120117188 292.661132812 292.379882812 292.661132812 306.109375 306.390625 c 2 + 524.859375 525.140625 l 2 EndSplineSet -Validated: 1 +Validated: 524321 EndChar StartChar: setas_b @@ -649,47 +657,91 @@ EndChar StartChar: properties_b Encoding: 49 57393 16 Width: 1000 -Flags: H +Flags: HW LayerCount: 2 Fore SplineSet -500 716.70703125 m 0 - 730.154296875 716.70703125 916.729492188 530.130859375 916.729492188 299.974609375 c 0 - 916.729492188 69.8212890625 730.154296875 -116.75390625 500 -116.75390625 c 0 - 269.84375 -116.75390625 83.2666015625 69.8212890625 83.2666015625 299.974609375 c 0 - 83.2666015625 530.130859375 269.84375 716.70703125 500 716.70703125 c 0 -500 654.20703125 m 0 - 304.362304688 654.20703125 145.766601562 495.612304688 145.766601562 299.974609375 c 0 - 145.766601562 104.337890625 304.362304688 -54.25390625 500 -54.25390625 c 0 - 695.633789062 -54.25390625 854.229492188 104.337890625 854.229492188 299.974609375 c 0 - 854.229492188 495.612304688 695.633789062 654.20703125 500 654.20703125 c 0 +0 331.25 m 0 + 0 374.543945312 5.5341796875 416.047851562 16.6015625 455.76171875 c 0 + 27.6689453125 495.80078125 43.2939453125 533.235351562 63.4765625 568.06640625 c 0 + 83.984375 602.896484375 108.3984375 634.47265625 136.71875 662.79296875 c 0 + 165.364257812 691.438476562 197.103515625 715.853515625 231.93359375 736.03515625 c 0 + 266.764648438 756.54296875 304.036132812 772.331054688 343.75 783.3984375 c 0 + 383.7890625 794.465820312 425.456054688 800 468.75 800 c 0 + 512.043945312 800 553.547851562 794.465820312 593.26171875 783.3984375 c 0 + 633.299804688 772.331054688 670.737304688 756.54296875 705.568359375 736.03515625 c 0 + 740.400390625 715.853515625 771.974609375 691.438476562 800.293945312 662.79296875 c 0 + 828.9375 634.47265625 853.349609375 602.896484375 873.537109375 568.06640625 c 0 + 894.043945312 533.235351562 909.831054688 495.80078125 920.900390625 455.76171875 c 0 + 931.96875 416.047851562 937.5 374.543945312 937.5 331.25 c 0 + 937.5 287.956054688 931.806640625 246.2890625 920.412109375 206.25 c 0 + 909.34375 166.537109375 893.556640625 129.262695312 873.049804688 94.431640625 c 0 + 852.862304688 59.931640625 828.450195312 28.349609375 799.806640625 -0.2939453125 c 0 + 771.487304688 -28.6123046875 739.90625 -53.025390625 705.075195312 -73.537109375 c 0 + 670.575195312 -93.71875 633.299804688 -109.505859375 593.26171875 -120.900390625 c 0 + 553.22265625 -131.96875 511.71875 -137.5 468.75 -137.5 c 0 + 425.456054688 -137.5 383.7890625 -131.96875 343.75 -120.900390625 c 0 + 303.7109375 -109.831054688 266.276367188 -94.2060546875 231.4453125 -74.025390625 c 0 + 196.940429688 -53.5126953125 165.364257812 -29.099609375 136.71875 -0.78125 c 0 + 108.3984375 27.8623046875 83.984375 59.4375 63.4765625 93.943359375 c 0 + 43.2939453125 128.775390625 27.6689453125 166.212890625 16.6015625 206.25 c 0 + 5.5341796875 246.2890625 0 287.956054688 0 331.25 c 0 +875 331.25 m 0 + 875 368.684570312 870.119140625 404.655273438 860.349609375 439.16015625 c 0 + 850.912109375 473.990234375 837.237304688 506.379882812 819.337890625 536.328125 c 0 + 801.755859375 566.6015625 780.599609375 593.9453125 755.862304688 618.359375 c 0 + 731.443359375 643.098632812 704.099609375 664.2578125 673.825195312 681.8359375 c 0 + 643.880859375 699.739257812 611.490234375 713.411132812 576.66015625 722.8515625 c 0 + 542.155273438 732.6171875 506.184570312 737.5 468.75 737.5 c 0 + 431.315429688 737.5 395.182617188 732.6171875 360.3515625 722.8515625 c 0 + 325.846679688 713.411132812 293.45703125 699.739257812 263.18359375 681.8359375 c 0 + 233.235351562 664.2578125 205.891601562 643.098632812 181.15234375 618.359375 c 0 + 156.73828125 593.9453125 135.579101562 566.6015625 117.67578125 536.328125 c 0 + 100.09765625 506.379882812 86.42578125 473.990234375 76.66015625 439.16015625 c 0 + 67.2197265625 404.655273438 62.5 368.684570312 62.5 331.25 c 0 + 62.5 293.815429688 67.2197265625 257.682617188 76.66015625 222.8515625 c 0 + 86.42578125 188.346679688 100.09765625 155.956054688 117.67578125 125.681640625 c 0 + 135.25390625 95.7373046875 156.412109375 68.3935546875 181.15234375 43.650390625 c 0 + 205.891601562 18.912109375 233.235351562 -2.244140625 263.18359375 -19.8251953125 c 0 + 293.45703125 -37.400390625 325.846679688 -51.0751953125 360.3515625 -60.837890625 c 0 + 395.182617188 -70.28125 431.315429688 -75 468.75 -75 c 0 + 506.184570312 -75 542.155273438 -70.28125 576.66015625 -60.837890625 c 0 + 611.490234375 -51.0751953125 643.880859375 -37.400390625 673.825195312 -19.8251953125 c 0 + 704.099609375 -2.244140625 731.606445312 18.912109375 756.349609375 43.650390625 c 0 + 781.087890625 68.3935546875 802.244140625 95.7373046875 819.825195312 125.681640625 c 0 + 837.400390625 155.956054688 850.912109375 188.346679688 860.349609375 222.8515625 c 0 + 870.119140625 257.682617188 875 293.815429688 875 331.25 c 0 EndSplineSet -Validated: 1 EndChar StartChar: properties_o Encoding: 50 57394 17 Width: 1000 -Flags: H +Flags: HO LayerCount: 2 Fore SplineSet -499.845703125 362.516601562 m 0 - 515.666992188 362.525390625 528.75 350.779296875 530.829101562 335.529296875 c 2 - 531.116210938 331.287109375 l 1 - 531.266601562 102.053710938 l 2 - 531.279296875 84.7958984375 517.295898438 70.7958984375 500.037109375 70.783203125 c 0 - 484.216796875 70.775390625 471.133789062 82.5205078125 469.053710938 97.7705078125 c 2 - 468.766601562 102.012695312 l 1 - 468.616210938 331.24609375 l 2 - 468.604492188 348.50390625 482.587890625 362.50390625 499.845703125 362.516601562 c 0 -500.016601562 508.256835938 m 0 - 523 508.256835938 541.62890625 489.626953125 541.62890625 466.645507812 c 0 - 541.62890625 443.665039062 523 425.034179688 500.016601562 425.034179688 c 0 - 477.037109375 425.034179688 458.404296875 443.665039062 458.404296875 466.645507812 c 0 - 458.404296875 489.626953125 477.037109375 508.256835938 500.016601562 508.256835938 c 0 +421.875 518.75 m 0 + 421.875 531.770507812 426.432617188 542.838867188 435.546875 551.953125 c 0 + 444.661132812 561.067382812 455.729492188 565.625 468.75 565.625 c 0 + 481.770507812 565.625 492.838867188 561.067382812 501.953125 551.953125 c 0 + 511.067382812 542.838867188 515.625 531.770507812 515.625 518.75 c 0 + 515.625 505.729492188 511.067382812 494.661132812 501.953125 485.546875 c 0 + 492.838867188 476.432617188 481.770507812 471.875 468.75 471.875 c 0 + 455.729492188 471.875 444.661132812 476.432617188 435.546875 485.546875 c 0 + 426.432617188 494.661132812 421.875 505.729492188 421.875 518.75 c 0 +437.5 143.75 m 2 + 437.5 393.75 l 2 + 437.5 402.213867188 440.592773438 409.537109375 446.77734375 415.72265625 c 0 + 452.962890625 421.907226562 460.286132812 425 468.75 425 c 0 + 477.213867188 425 484.537109375 421.907226562 490.72265625 415.72265625 c 0 + 496.907226562 409.537109375 500 402.213867188 500 393.75 c 2 + 500 143.75 l 2 + 500 135.287109375 496.907226562 127.962890625 490.72265625 121.775390625 c 0 + 484.537109375 115.59375 477.213867188 112.5 468.75 112.5 c 0 + 460.286132812 112.5 452.962890625 115.59375 446.77734375 121.775390625 c 0 + 440.592773438 127.962890625 437.5 135.287109375 437.5 143.75 c 2 EndSplineSet -Validated: 33 EndChar StartChar: newfolder_b @@ -744,6 +796,7 @@ SplineSet 878.924804688 550 911.387695312 538.375976562 937.5 518.76171875 c 1 937.494140625 570.532226562 895.525390625 612.5 843.75 612.5 c 2 EndSplineSet +Validated: 524289 EndChar StartChar: newfolder_o @@ -780,6 +833,7 @@ SplineSet 750 112.5 l 1 750 206.25 l 2 EndSplineSet +Validated: 524289 EndChar StartChar: delete_b @@ -789,64 +843,81 @@ Flags: H LayerCount: 2 Fore SplineSet -575 600 m 1 - 575 641.421875 541.419921875 675 500 675 c 0 - 458.578125 675 425 641.421875 425 600 c 1 - 375 600 l 1 - 375 669.03515625 430.96484375 725 500 725 c 0 - 569.03515625 725 625 669.03515625 625 600 c 1 - 850 600 l 2 - 863.8046875 600 875 588.806640625 875 575 c 0 - 875 561.193359375 863.8046875 550 850 550 c 2 - 822.299804688 550 l 1 - 757.495117188 -11.4599609375 l 2 - 751.674804688 -61.919921875 708.950195312 -100 658.155273438 -100 c 2 - 341.84375 -100 l 2 - 291.049804688 -100 248.325195312 -61.919921875 242.502929688 -11.4599609375 c 2 - 177.650390625 550 l 1 - 150 550 l 2 - 137.7265625 550 127.51953125 558.84375 125.403320312 570.505859375 c 2 - 125 575 l 2 - 125 588.806640625 136.193359375 600 150 600 c 2 - 575 600 l 1 -771.900390625 550 m 1 - 228.049804688 550 l 1 - 292.173828125 -5.73046875 l 2 - 295.084960938 -30.9599609375 316.447265625 -50 341.84375 -50 c 2 - 658.155273438 -50 l 2 - 683.5546875 -50 704.915039062 -30.9599609375 707.825195312 -5.73046875 c 2 - 771.900390625 550 l 1 +653.09375 675 m 2 + 937.5 675 l 2 + 945.787109375 675 953.737304688 671.70703125 959.599609375 665.846679688 c 0 + 965.456054688 659.987304688 968.75 652.038085938 968.75 643.75 c 0 + 968.75 635.461914062 965.456054688 627.512695312 959.599609375 621.653320312 c 0 + 953.737304688 615.79296875 945.787109375 612.5 937.5 612.5 c 2 + 902.875 612.5 l 1 + 821.875 -89.375 l 2 + 818.349609375 -119.837890625 803.75 -147.9375 780.849609375 -168.337890625 c 0 + 757.950195312 -188.737304688 728.356445312 -200.005859375 697.6875 -200 c 2 + 302.3125 -200 l 2 + 271.646484375 -200.005859375 242.049804688 -188.737304688 219.151367188 -168.337890625 c 0 + 196.252929688 -147.9375 181.651367188 -119.837890625 178.125 -89.375 c 2 + 97.0625 612.5 l 1 + 62.5 612.5 l 2 + 55.185546875 612.497070312 48.1025390625 615.060546875 42.4833984375 619.743164062 c 0 + 36.865234375 624.42578125 33.06640625 630.930664062 31.75 638.125 c 2 + 31.25 643.75 l 2 + 31.25 652.038085938 34.5419921875 659.987304688 40.4033203125 665.846679688 c 0 + 46.263671875 671.70703125 54.2119140625 675 62.5 675 c 2 + 346.90625 675 l 2 + 352.98828125 704.794921875 367.690429688 732.411132812 389.514648438 754.235351562 c 0 + 418.81640625 783.538085938 458.559570312 800 500 800 c 0 + 541.440429688 800 581.18359375 783.538085938 610.485351562 754.235351562 c 0 + 632.3125 732.411132812 647.012695312 704.794921875 653.09375 675 c 2 +500 737.5 m 0 + 475.13671875 737.5 451.290039062 727.622070312 433.708984375 710.041015625 c 0 + 423.727539062 700.059570312 416.229492188 688.059570312 411.612304688 675 c 1 + 588.387695312 675 l 1 + 583.770507812 688.059570312 576.272460938 700.059570312 566.291015625 710.041015625 c 0 + 548.709960938 727.622070312 524.86328125 737.5 500 737.5 c 0 +160.0625 612.5 m 1 + 240.25 -82.1875 l 2 + 242.012695312 -97.412109375 249.30859375 -111.462890625 260.750976562 -121.65625 c 0 + 272.193359375 -131.856445312 286.985351562 -137.494140625 302.3125 -137.5 c 2 + 697.6875 -137.5 l 2 + 713.012695312 -137.494140625 727.806640625 -131.856445312 739.25 -121.65625 c 0 + 750.693359375 -111.462890625 757.987304688 -97.412109375 759.75 -82.1875 c 2 + 839.875 612.5 l 1 + 160.0625 612.5 l 1 EndSplineSet -Validated: 5 +Validated: 524321 EndChar StartChar: delete_o Encoding: 54 57398 21 Width: 1000 -Flags: H +Flags: HW LayerCount: 2 Fore SplineSet -425 425 m 0 - 437.2734375 425 447.48046875 417.26171875 449.596679688 407.056640625 c 2 - 450 403.125 l 1 - 450 96.875 l 2 - 450 84.794921875 438.806640625 75 425 75 c 0 - 412.7265625 75 402.51953125 82.740234375 400.403320312 92.9453125 c 2 - 400 96.875 l 1 - 400 403.125 l 2 - 400 415.206054688 411.193359375 425 425 425 c 0 -575 425 m 0 - 587.275390625 425 597.48046875 417.26171875 599.594726562 407.056640625 c 2 - 600 403.125 l 1 - 600 96.875 l 2 - 600 84.794921875 588.8046875 75 575 75 c 0 - 562.724609375 75 552.51953125 82.740234375 550.405273438 92.9453125 c 2 - 550 96.875 l 1 - 550 403.125 l 2 - 550 415.206054688 561.1953125 425 575 425 c 0 +406.25 425 m 4 + 414.538085938 425 422.487304688 421.70703125 428.346679688 415.846679688 c 4 + 434.20703125 409.987304688 437.5 402.038085938 437.5 393.75 c 6 + 437.5 81.25 l 6 + 437.5 72.962890625 434.20703125 65.0126953125 428.346679688 59.150390625 c 4 + 422.487304688 53.2939453125 414.538085938 50 406.25 50 c 4 + 397.961914062 50 390.012695312 53.2939453125 384.153320312 59.150390625 c 4 + 378.29296875 65.0126953125 375 72.962890625 375 81.25 c 6 + 375 393.75 l 6 + 375 402.038085938 378.29296875 409.987304688 384.153320312 415.846679688 c 4 + 390.012695312 421.70703125 397.961914062 425 406.25 425 c 4 +593.75 425 m 4 + 602.038085938 425 609.987304688 421.70703125 615.846679688 415.846679688 c 4 + 621.70703125 409.987304688 625 402.038085938 625 393.75 c 6 + 625 81.25 l 6 + 625 72.962890625 621.70703125 65.0126953125 615.846679688 59.150390625 c 4 + 609.987304688 53.2939453125 602.038085938 50 593.75 50 c 4 + 585.461914062 50 577.512695312 53.2939453125 571.653320312 59.150390625 c 4 + 565.79296875 65.0126953125 562.5 72.962890625 562.5 81.25 c 6 + 562.5 393.75 l 6 + 562.5 402.038085938 565.79296875 409.987304688 571.653320312 415.846679688 c 4 + 577.512695312 421.70703125 585.461914062 425 593.75 425 c 4 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: new_b @@ -856,18 +927,17 @@ Flags: H LayerCount: 2 Fore SplineSet -500 -100 m 0 - 279.0859375 -100 100 79.0849609375 100 300 c 0 - 100 520.9140625 279.0859375 700 500 700 c 0 - 720.915039062 700 900 520.9140625 900 300 c 0 - 900 79.0849609375 720.915039062 -100 500 -100 c 0 -500 -50 m 0 - 693.299804688 -50 850 106.700195312 850 300 c 0 - 850 493.299804688 693.299804688 650 500 650 c 0 - 306.700195312 650 150 493.299804688 150 300 c 0 - 150 106.700195312 306.700195312 -50 500 -50 c 0 +500 -137.5 m 4 + 741.625 -137.5 937.5 58.375 937.5 300 c 4 + 937.5 541.624023438 741.625 737.5 500 737.5 c 4 + 258.375976562 737.5 62.5 541.624023438 62.5 300 c 4 + 62.5 58.375 258.375976562 -137.5 500 -137.5 c 4 +500 -200 m 4 + 223.857421875 -200 0 23.8564453125 0 300 c 4 + 0 576.142578125 223.857421875 800 500 800 c 4 + 776.143554688 800 1000 576.142578125 1000 300 c 4 + 1000 23.8564453125 776.143554688 -200 500 -200 c 4 EndSplineSet -Validated: 1 EndChar StartChar: new_o @@ -877,25 +947,25 @@ Flags: H LayerCount: 2 Fore SplineSet -300 300 m 0 - 300 313.806640625 311.193359375 325 325 325 c 2 - 475 325 l 1 - 475 475 l 2 - 475 488.806640625 486.193359375 500 500 500 c 0 - 513.8046875 500 525 488.806640625 525 475 c 2 - 525 325 l 1 - 675 325 l 2 - 688.8046875 325 700 313.806640625 700 300 c 0 - 700 286.1953125 688.8046875 275 675 275 c 2 - 525 275 l 1 - 525 125 l 2 - 525 111.1953125 513.8046875 100 500 100 c 0 - 486.193359375 100 475 111.1953125 475 125 c 2 - 475 275 l 1 - 325 275 l 2 - 311.193359375 275 300 286.1953125 300 300 c 0 +250 300 m 0 + 250 317.258789062 263.991210938 331.25 281.25 331.25 c 2 + 468.75 331.25 l 1 + 468.75 518.75 l 2 + 468.75 536.008789062 482.741210938 550 500 550 c 0 + 517.258789062 550 531.25 536.008789062 531.25 518.75 c 2 + 531.25 331.25 l 1 + 718.75 331.25 l 2 + 736.005859375 331.25 750 317.258789062 750 300 c 0 + 750 282.741210938 736.005859375 268.75 718.75 268.75 c 2 + 531.25 268.75 l 1 + 531.25 81.25 l 2 + 531.25 63.994140625 517.258789062 50 500 50 c 0 + 482.741210938 50 468.75 63.994140625 468.75 81.25 c 2 + 468.75 268.75 l 1 + 281.25 268.75 l 2 + 263.991210938 268.75 250 282.741210938 250 300 c 0 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: branch_b @@ -972,7 +1042,7 @@ EndChar StartChar: pane_b Encoding: 59 57403 26 Width: 1000 -Flags: H +Flags: HW LayerCount: 2 Back Image2: image/png 70241 0 800 1.99601 1.99601 @@ -2150,44 +2220,44 @@ X8k4m&H&@UeKSB5YR">6dQugk"6g*8Ih51+E<#t=!(fUS7'8jaJcGcN EndImage2 Fore SplineSet -282.107421875 681.3125 m 2 - 717.893554688 681.3125 l 2 - 808.15625 681.3125 881.313476562 608.155273438 881.313476562 517.892578125 c 1 - 826.840820312 517.892578125 l 1 - 826.840820312 578.0859375 778.086914062 626.83984375 717.893554688 626.83984375 c 2 - 282.107421875 626.83984375 l 2 - 221.9140625 626.83984375 173.16015625 578.0859375 173.16015625 517.892578125 c 2 - 173.16015625 463.419921875 l 1 - 500 463.419921875 l 1 - 500 408.946289062 l 1 - 173.16015625 408.946289062 l 1 - 173.16015625 82.1064453125 l 2 - 173.16015625 21.9130859375 221.9140625 -26.8408203125 282.107421875 -26.8408203125 c 2 - 500 -26.8408203125 l 1 - 500 -81.3134765625 l 1 - 282.107421875 -81.3134765625 l 2 - 191.844726562 -81.3134765625 118.6875 -8.15625 118.6875 82.1064453125 c 2 - 118.6875 517.892578125 l 2 - 118.6875 608.155273438 191.844726562 681.3125 282.107421875 681.3125 c 2 +250 737.5 m 2 + 750 737.5 l 2 + 853.556640625 737.5 937.5 653.552734375 937.5 550 c 1 + 875 550 l 1 + 875 619.03515625 819.037109375 675 750 675 c 2 + 250 675 l 2 + 180.96484375 675 125 619.03515625 125 550 c 2 + 125 487.5 l 1 + 500 487.5 l 1 + 500 425 l 1 + 125 425 l 1 + 125 50 l 2 + 125 -19.037109375 180.96484375 -75 250 -75 c 2 + 500 -75 l 1 + 500 -137.5 l 1 + 250 -137.5 l 2 + 146.447265625 -137.5 62.5 -53.556640625 62.5 50 c 2 + 62.5 550 l 2 + 62.5 653.552734375 146.447265625 737.5 250 737.5 c 2 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: pane_o Encoding: 60 57404 27 Width: 1000 -Flags: H +Flags: HW LayerCount: 2 Fore SplineSet -881.314453125 464.265625 m 1 - 881.314453125 77.36328125 l 2 - 881.314453125 -10.2783203125 822.119140625 -81.3115234375 749.083984375 -81.3115234375 c 2 - 554.485351562 -81.3115234375 l 1 - 554.485351562 464.265625 l 1 - 881.314453125 464.265625 l 1 +937.5 487.5 m 1 + 937.5 50 l 2 + 937.5 -53.556640625 853.556640625 -137.5 750 -137.5 c 2 + 562.5 -137.5 l 1 + 562.5 487.5 l 1 + 937.5 487.5 l 1 EndSplineSet -Validated: 1 +Validated: 524289 EndChar StartChar: cut_b @@ -2197,40 +2267,20 @@ Flags: H LayerCount: 2 Fore SplineSet -505.87109375 410.770507812 m 1 - 544.116210938 354.583007812 l 1 - 544.0625 354.5 l 1 - 645.987304688 204.608398438 l 2 - 665.24609375 212.383789062 686.291992188 216.662109375 708.333007812 216.662109375 c 0 - 800.37890625 216.662109375 875 142.041992188 875 49.99609375 c 0 - 875 -42.0537109375 800.37890625 -116.670898438 708.333007812 -116.670898438 c 0 - 616.287109375 -116.670898438 541.666992188 -42.0537109375 541.666992188 49.99609375 c 0 - 541.666992188 97.50390625 561.545898438 140.375 593.44140625 170.733398438 c 2 - 507.416992188 297.241210938 l 1 - 418.43359375 158.204101562 l 2 - 443.3125 129.087890625 458.333007812 91.2958984375 458.333007812 49.99609375 c 0 - 458.333007812 -42.0537109375 383.713867188 -116.670898438 291.666992188 -116.670898438 c 0 - 199.619140625 -116.670898438 125 -42.0537109375 125 49.99609375 c 0 - 125 142.041992188 199.619140625 216.662109375 291.666992188 216.662109375 c 0 - 319.725585938 216.662109375 346.165039062 209.729492188 369.366210938 197.479492188 c 2 - 469.19140625 353.454101562 l 1 - 255.407226562 667.838867188 l 2 - 245.703125 682.110351562 249.405273438 701.547851562 263.676757812 711.252929688 c 0 - 277.94921875 720.95703125 297.385742188 717.255859375 307.090820312 702.983398438 c 2 - 505.833007812 410.713867188 l 1 - 505.87109375 410.770507812 l 1 -187.5 49.99609375 m 0 - 187.5 -7.533203125 234.13671875 -54.1708984375 291.666992188 -54.1708984375 c 0 - 349.196289062 -54.1708984375 395.833007812 -7.533203125 395.833007812 49.99609375 c 0 - 395.833007812 107.525390625 349.196289062 154.162109375 291.666992188 154.162109375 c 0 - 234.13671875 154.162109375 187.5 107.525390625 187.5 49.99609375 c 0 -604.166992188 49.99609375 m 0 - 604.166992188 -7.533203125 650.803710938 -54.1708984375 708.333007812 -54.1708984375 c 0 - 765.862304688 -54.1708984375 812.5 -7.533203125 812.5 49.99609375 c 0 - 812.5 107.525390625 765.862304688 154.162109375 708.333007812 154.162109375 c 0 - 650.803710938 154.162109375 604.166992188 107.525390625 604.166992188 49.99609375 c 0 +462.73828125 450.418945312 m 1 + 425.477539062 393.041992188 l 1 + 192.544921875 751.7265625 l 2 + 183.145507812 766.201171875 187.259765625 785.5546875 201.733398438 794.955078125 c 0 + 216.208007812 804.354492188 235.5625 800.241210938 244.961914062 785.766601562 c 2 + 462.73828125 450.418945312 l 1 +537.26171875 450.418945312 m 1 + 755.037109375 785.766601562 l 2 + 764.4375 800.241210938 783.793945312 804.354492188 798.268554688 794.955078125 c 0 + 812.744140625 785.5546875 816.856445312 766.201171875 807.456054688 751.7265625 c 2 + 574.5234375 393.041992188 l 1 + 537.26171875 450.418945312 l 1 EndSplineSet -Validated: 33 +Validated: 524321 EndChar StartChar: cut_o @@ -2240,14 +2290,35 @@ Flags: H LayerCount: 2 Fore SplineSet -580.75390625 411.830078125 m 1 - 542.508789062 468.018554688 l 1 - 692.420898438 702.258789062 l 2 - 701.724609375 716.794921875 721.053710938 721.037109375 735.587890625 711.733398438 c 0 - 750.125 702.430664062 754.366210938 683.104492188 745.0625 668.567382812 c 2 - 580.75390625 411.830078125 l 1 +500.002929688 362.5 m 0 + 510.452148438 362.5 520.208984375 357.278320312 526.004882812 348.583984375 c 2 + 657.84375 150.825195312 l 2 + 685.056640625 166.21875 716.505859375 175 750 175 c 0 + 853.556640625 175 937.5 91.056640625 937.5 -12.5 c 0 + 937.5 -116.056640625 853.556640625 -200 750 -200 c 0 + 646.443359375 -200 562.5 -116.056640625 562.5 -12.5 c 0 + 562.5 34.912109375 580.099609375 78.21875 609.122070312 111.237304688 c 2 + 500.002929688 274.913085938 l 1 + 390.881835938 111.231445312 l 2 + 419.90234375 78.212890625 437.5 34.912109375 437.5 -12.5 c 0 + 437.5 -116.056640625 353.552734375 -200 250 -200 c 0 + 146.447265625 -200 62.5 -116.056640625 62.5 -12.5 c 0 + 62.5 91.056640625 146.447265625 175 250 175 c 0 + 283.498046875 175 314.9453125 166.212890625 342.162109375 150.825195312 c 2 + 474.001953125 348.583984375 l 2 + 479.797851562 357.278320312 489.5546875 362.5 500.002929688 362.5 c 0 +375 -12.5 m 0 + 375 56.537109375 319.03515625 112.5 250 112.5 c 0 + 180.96484375 112.5 125 56.537109375 125 -12.5 c 0 + 125 -81.537109375 180.96484375 -137.5 250 -137.5 c 0 + 319.03515625 -137.5 375 -81.537109375 375 -12.5 c 0 +875 -12.5 m 0 + 875 56.537109375 819.037109375 112.5 750 112.5 c 0 + 680.962890625 112.5 625 56.537109375 625 -12.5 c 0 + 625 -81.537109375 680.962890625 -137.5 750 -137.5 c 0 + 819.037109375 -137.5 875 -81.537109375 875 -12.5 c 0 EndSplineSet -Validated: 33 +Validated: 524289 EndChar StartChar: NameMe.63 @@ -2305,6 +2376,7 @@ SplineSet 182.271484375 556.288085938 l 1 182.272460938 556.288085938 l 1 EndSplineSet +Validated: 524293 EndChar StartChar: NameMe.64 @@ -2360,6 +2432,7 @@ SplineSet 704.51171875 386.303710938 l 1 704 450 l 1 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.65 @@ -2390,6 +2463,7 @@ SplineSet 299.0078125 582.912109375 l 1 219.135742188 365.82421875 l 1 EndSplineSet +Validated: 524293 EndChar StartChar: NameMe.66 @@ -2434,6 +2508,7 @@ SplineSet 495.616210938 109.82421875 l 1 741.375976562 109.82421875 l 1 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.67 @@ -2458,6 +2533,7 @@ SplineSet 192.51171875 -39.6796875 l 1 700.416015625 -39.6796875 l 1 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.68 @@ -2506,6 +2582,7 @@ SplineSet 641.024414062 578.814453125 l 1 641.024414062 578.81640625 l 1 EndSplineSet +Validated: 524325 EndChar StartChar: NameMe.69 @@ -2531,6 +2608,7 @@ SplineSet 831.48828125 253.182617188 l 1 323.583984375 -39.6796875 l 1 EndSplineSet +Validated: 524321 EndChar StartChar: NameMe.70 @@ -2579,6 +2657,7 @@ SplineSet 382.9765625 578.817382812 l 1 382.975585938 578.81640625 l 1 EndSplineSet +Validated: 524293 EndChar StartChar: NameMe.71 @@ -2640,6 +2719,7 @@ SplineSet 567.5 693.5546875 l 1 567.5 550 l 2 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.72 @@ -2690,6 +2770,7 @@ SplineSet 418.428710938 56.0703125 421.645507812 63.888671875 421.645507812 73.076171875 c 0 421.645507812 82.2705078125 418.428710938 90.08203125 411.995117188 96.51171875 c 2 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.73 @@ -2798,6 +2879,7 @@ SplineSet 241.498046875 43.6650390625 l 1 123.8515625 43.6650390625 l 1 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.74 @@ -2848,6 +2930,7 @@ SplineSet 709.176757812 -59.4296875 712.087890625 -52.53515625 712.087890625 -44.5703125 c 2 712.087890625 114.435546875 l 1 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.75 @@ -2876,6 +2959,7 @@ SplineSet 65.02734375 573.076171875 l 2 65.02734375 638.05078125 117.700195312 690.723632812 182.674804688 690.723632812 c 2 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.76 @@ -2900,6 +2984,7 @@ SplineSet 388.556640625 455.4296875 l 2 372.313476562 455.4296875 359.145507812 468.59765625 359.145507812 484.840820312 c 0 EndSplineSet +Validated: 524321 EndChar StartChar: NameMe.77 @@ -2954,6 +3039,7 @@ SplineSet 878.924804688 550 911.387695312 538.375976562 937.5 518.76171875 c 1 937.494140625 570.532226562 895.525390625 612.5 843.75 612.5 c 2 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.78 @@ -2987,6 +3073,7 @@ SplineSet 878.049804688 71.3564453125 878.049804688 91.1435546875 865.849609375 103.349609375 c 2 740.849609375 228.346679688 l 2 EndSplineSet +Validated: 524321 EndChar StartChar: NameMe.79 @@ -3035,6 +3122,7 @@ SplineSet 668.130859375 -131.96875 647.462890625 -137.5 625 -137.5 c 2 218.75 -137.5 l 2 EndSplineSet +Validated: 524289 EndChar StartChar: NameMe.80 @@ -3091,6 +3179,7 @@ SplineSet 963.818359375 308.73046875 968.755859375 296.806640625 968.755859375 284.375 c 0 968.755859375 271.943359375 963.818359375 260.01953125 955.03125 251.229492188 c 0 EndSplineSet +Validated: 524289 EndChar EndChars EndSplineFont diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs index cd4de1b3cce2..71f5f1d979ef 100644 --- a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs +++ b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs @@ -756,8 +756,11 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "OpenInNewPane".GetLocalizedResource(), - Glyph = "\xF117", - GlyphFontFamilyName = "CustomGlyph", + ColoredIcon = new ColoredIconModel() + { + BaseLayerGlyph = "\uF03B", + OverlayLayerGlyph = "\uF03C", + }, Command = commandsViewModel.OpenDirectoryInNewPaneCommand, ShowItem = userSettingsService.PreferencesSettingsService.ShowOpenInNewPane && areAllItemsFolders, SingleItemOnly = true, From 676371200ed15d28f1712dd70eab4d75553f413c Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:55:08 -0500 Subject: [PATCH 3/9] Update ColoredIcon.xaml --- src/Files.App/UserControls/ColoredIcon.xaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Files.App/UserControls/ColoredIcon.xaml b/src/Files.App/UserControls/ColoredIcon.xaml index 5c34b47a0143..56a8c4f3b6de 100644 --- a/src/Files.App/UserControls/ColoredIcon.xaml +++ b/src/Files.App/UserControls/ColoredIcon.xaml @@ -31,22 +31,22 @@ - @@ -66,5 +66,5 @@ - + \ No newline at end of file From 8a533317fb03d96357b1302e3c08afce45942867 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:55:22 -0500 Subject: [PATCH 4/9] Update Colored_Icons.sfd --- src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd b/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd index 3d491e5e6dac..6ae81f00eef2 100644 --- a/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd +++ b/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd @@ -712,12 +712,13 @@ SplineSet 837.400390625 155.956054688 850.912109375 188.346679688 860.349609375 222.8515625 c 0 870.119140625 257.682617188 875 293.815429688 875 331.25 c 0 EndSplineSet +Validated: 524289 EndChar StartChar: properties_o Encoding: 50 57394 17 Width: 1000 -Flags: HO +Flags: H LayerCount: 2 Fore SplineSet @@ -742,6 +743,7 @@ SplineSet 460.286132812 112.5 452.962890625 115.59375 446.77734375 121.775390625 c 0 440.592773438 127.962890625 437.5 135.287109375 437.5 143.75 c 2 EndSplineSet +Validated: 524289 EndChar StartChar: newfolder_b @@ -938,6 +940,7 @@ SplineSet 776.143554688 800 1000 576.142578125 1000 300 c 4 1000 23.8564453125 776.143554688 -200 500 -200 c 4 EndSplineSet +Validated: 524289 EndChar StartChar: new_o From af350fc85e980fcac6b614602fb7590487b43d3f Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 13:18:53 -0500 Subject: [PATCH 5/9] Icon backdrops --- .../Assets/Custom Glyphs/Colored-Icons.ttf | Bin 8796 -> 9280 bytes .../Assets/Custom Glyphs/Colored_Icons.sfd | 204 ++++++++++++++---- src/Files.App/UserControls/ColoredIcon.xaml | 7 + .../UserControls/ColoredIcon.xaml.cs | 10 + .../UserControls/InnerNavigationToolbar.xaml | 16 +- 5 files changed, 192 insertions(+), 45 deletions(-) diff --git a/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf b/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf index d78a0d25fadc0b0c53f62d0dac49300c370f2519..98910b828b5c268a76de77e1f5330e12307f3d19 100644 GIT binary patch delta 857 zcmZuvUr1A76hG&?!~fUx-sNn~{k`lamg#nPC#;4+j3rq@LJ^j(Z92&5!nyQ8R}d80 zOI|1_AH;f!ph%KHAL^lp2qL2($|8F5Au7mv7}z>@(n9FMch32p-*?aXeuuNN|8Y1A z2mm~s0}i@Eq3+I^F9#+8B#E+?!$)>|Lb2s#06a#xFPe;``Yud<17Izbn~P@Bc5tw9 z0PZ#MhJnaPDxarHAXx~P4GfO=AAgy45fuh7uO#A;nBDSZintXzY9bNOMoI@bYKBHi zNQq>6tkG0{pYS8XnZe;`kl|!l`6rECuI5=i3O|ha$=N^>B`g+o%SMrG`h+ z&*c}r0FFz9rwigp;MK}Cd+(M#KcSLarT^dqyZc7>p9Hpib{hAhUkl<1?AB&*YF7{@ zU>1Tp53EoDU`7{3pAif|mB|`(=6knxkew;@f&xBJwIz1c;8lF8=HPB?EnJ26lsjEk z^@_LhDnB&eV%WDW%OIG~aCg{e*a9}H;|VgQnK`SO(Ta4~UyOM3!Q5ylG&;B87K@Rd zxV#DBvrSj&sT27O`$|0;pphO1=yH~n8n@OO>#_lK`)U<6fIh|Dgw@!DPPe3o&Jtr? z06p%4RSOx&N2>%B_>Wvq`+I?pR76CxYpit zk{2v4SF>3Z&B9KzAecpcdI;HBQXghSTi>GwraBX4NYl>|7CN=n>KoU>#TM!c4j{eC&O^dD!*v6w3V?vPbg#s%H} xi(!7K;Uc3|_+{%aLl1gULEn6j{T=QoKSYbx8ESV7#Jgf{DkD( z!~*T-9(D{2Od3G3S;=K33Ji)&l?)8bM}YDy>50V!|NjF`VoS;S%^oa{lABfK XTbO|6tx` + (string)GetValue(BaseBackdropPathProperty); + set => SetValue(BaseBackdropPathProperty, value); + } + public string BaseLayerGlyph { get => (string)GetValue(BaseLayerPathProperty); @@ -20,6 +26,10 @@ public string OverlayLayerGlyph set => SetValue(OverlayLayerPathProperty, value); } + // Using a DependencyProperty as the backing store for BaseBackdropPath. This enables animation, styling, binding, etc... + public static readonly DependencyProperty BaseBackdropPathProperty = + DependencyProperty.Register(nameof(BaseBackdropGlyph), typeof(string), typeof(ColoredIcon), new PropertyMetadata(null)); + // Using a DependencyProperty as the backing store for OverlayLayerPath. This enables animation, styling, binding, etc... public static readonly DependencyProperty OverlayLayerPathProperty = DependencyProperty.Register(nameof(OverlayLayerGlyph), typeof(string), typeof(ColoredIcon), new PropertyMetadata(null)); diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index ce4745542d1c..e5e0d8e3b251 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -100,6 +100,7 @@ @@ -148,7 +149,10 @@ IsEnabled="False" Modifiers="Control" /> - + - + - + Date: Wed, 15 Feb 2023 13:41:23 -0500 Subject: [PATCH 6/9] Rename --- src/Files.App/UserControls/ColoredIcon.xaml | 2 ++ src/Files.App/UserControls/InnerNavigationToolbar.xaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Files.App/UserControls/ColoredIcon.xaml b/src/Files.App/UserControls/ColoredIcon.xaml index 6efa34940a90..c49a4b04f55c 100644 --- a/src/Files.App/UserControls/ColoredIcon.xaml +++ b/src/Files.App/UserControls/ColoredIcon.xaml @@ -64,11 +64,13 @@ + + diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index e5e0d8e3b251..26dcc42840c9 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -166,7 +166,7 @@ LabelPosition="Collapsed" ToolTipService.ToolTip="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutRename/Text}"> - + Date: Wed, 15 Feb 2023 14:39:06 -0500 Subject: [PATCH 7/9] BaseBackdropGlyph --- .../Assets/Custom Glyphs/Colored-Icons.ttf | Bin 9280 -> 9520 bytes .../Assets/Custom Glyphs/Colored_Icons.sfd | 73 ++++++++++++++++-- .../Helpers/ContextFlyoutItemHelper.cs | 8 +- .../UserControls/InnerNavigationToolbar.xaml | 15 +++- .../ContextMenuFlyoutItemViewModel.cs | 3 + 5 files changed, 88 insertions(+), 11 deletions(-) diff --git a/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf b/src/Files.App/Assets/Custom Glyphs/Colored-Icons.ttf index 98910b828b5c268a76de77e1f5330e12307f3d19..cbf922b8e0f87aa271bcf672fd932d302c191bbb 100644 GIT binary patch delta 609 zcmX@$vB9gJfsuiMftR6yftew|%`L=t&YNf#1_o6Tps0+0u)dL7%EikJ42%&#enN6? zV!@2v^%)EdOeR3FWyxhF3Ji)&l?)8bcYyLN>50V!|NjF`Vo>D)@;TCTD$_nE*zW^M zg)lHkugFMEOi_@z90-&HsW;2WNUcv~PiIyE8V0gZB_p?_LURh26Og|H$gj%DPfpw` zbvO@b!2=+_Bsa05fT5XT15n-q$XCcq%uSu{@ymmOLH-ZWQ7Hxa#U++!ZGm1=N&xa# zfjtN0eLX6s6VGq+m4Tc21yCQuU8XfxLG%M5rpLCE7;PCXC)+W`GKNi_!#G)U5<@LW zj)4iRn}J~g$U{IN!ob4N1Eg7i5NPIyu*o4zmCWW07L(5~MKhUOOg3a*GTDKdWAatz zViw*VyjM1Ru-uiZXJ(l6e=Bn~QvfiOBf&RS&%zYWGMg-= Iq5=$A0O9YDMF0Q* delta 360 zcmdnsb-<&ZfsuiMftR6yftew|%`L=t&Ku7<1_l)sps0+0u)dL7%EgNe42%&#enN6? zVnISn-FpTGCIg_@qU5p?1qMZ?N(KhzD?oXc^u*$V|Nns|F{sD@`5fsvm1$8IN|b?8 z9t;dpcQR5FQxs$lb_3<^0I^v{MrwT`dpa}FGDZ=gfJ#PgNrk33=LR5u2asQulb@Wp zK56SLpanO8{DR!XiUNj429Uf3kgt%Jn43D?;}_6yd7v3gDFyk(C8yQT#WOG{b^!U4 zz@7toa3c2?g?N6OuMFJGFM#?O?lP^p3ZfqfFZ%QdI$3008STSx5i? diff --git a/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd b/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd index e4bf904a4b2e..c1e918328cac 100644 --- a/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd +++ b/src/Files.App/Assets/Custom Glyphs/Colored_Icons.sfd @@ -22,7 +22,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1625095253 -ModificationTime: 1676484855 +ModificationTime: 1676489405 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -44,7 +44,7 @@ DisplaySize: -48 AntiAlias: 1 FitToEm: 0 WinInfo: 0 57 21 -BeginChars: 256 52 +BeginChars: 256 54 StartChar: copy_base Encoding: 33 57377 0 @@ -3203,7 +3203,7 @@ SplineSet 937.5 541.625 741.625 737.5 500 737.5 c 0 258.375 737.5 62.5 541.625 62.5 300 c 0 EndSplineSet -Validated: 524293 +Validated: 5 EndChar StartChar: NameMe.82 @@ -3245,7 +3245,7 @@ SplineSet 343.75 737.5 l 2 326.491210938 737.5 312.5 723.508789062 312.5 706.25 c 0 EndSplineSet -Validated: 524293 +Validated: 5 EndChar StartChar: NameMe.83 @@ -3265,7 +3265,7 @@ SplineSet 839.875 612.5 l 1 160.0625 612.5 l 1 EndSplineSet -Validated: 524297 +Validated: 9 EndChar StartChar: NameMe.84 @@ -3302,7 +3302,68 @@ SplineSet 593.75 612.5 l 1 593.75 -12.5 l 1 EndSplineSet -Validated: 524299 +Validated: 11 +EndChar + +StartChar: NameMe.85 +Encoding: 85 -1 52 +Width: 1000 +Flags: HW +LayerCount: 2 +Fore +SplineSet +375 112.5 m 1 + 375 18.75 l 2 + 375 -33.025390625 416.97265625 -75 468.75 -75 c 2 + 781.25 -75 l 2 + 833.025390625 -75 875 -33.025390625 875 18.75 c 2 + 875 331.25 l 2 + 875 383.02734375 833.025390625 425 781.25 425 c 2 + 687.5 425 l 1025 +375 112.5 m 1 + 375 18.75 l 2 + 375 -33.025390625 416.97265625 -75 468.75 -75 c 2 + 781.25 -75 l 2 + 833.025390625 -75 875 -33.025390625 875 18.75 c 2 + 875 331.25 l 2 + 875 383.02734375 833.025390625 425 781.25 425 c 2 + 687.5 425 l 1 + 687.5 268.75 l 2 + 687.5 182.456054688 617.543945312 112.5 531.25 112.5 c 2 + 375 112.5 l 1 +475.145507812 574.854492188 m 2 + 497.219726562 596.928710938 535.15625 581.125 535.15625 550 c 0 + 535.15625 540.298828125 531.217773438 531.509765625 524.854492188 525.145507812 c 2 + 306.104492188 306.395507812 l 2 + 292.369140625 292.66015625 270.130859375 292.66015625 256.395507812 306.395507812 c 2 + 162.645507812 400.145507812 l 2 + 140.571289062 422.219726562 156.375 460.15625 187.5 460.15625 c 0 + 197.201171875 460.15625 205.990234375 456.217773438 212.354492188 449.854492188 c 2 + 281.25 380.958984375 l 1 + 475.145507812 574.854492188 l 2 +EndSplineSet +Validated: 524331 +EndChar + +StartChar: NameMe.86 +Encoding: 86 -1 53 +Width: 1000 +Flags: H +LayerCount: 2 +Fore +SplineSet +500 425 m 1 + 125 425 l 1 + 125 50 l 2 + 125 -19.037109375 180.96484375 -75 250 -75 c 2 + 500 -75 l 1 + 500 425 l 1 +500 425 m 1 + 125 425 l 1 + 125 50 l 2 + 125 -19.037109375 180.96484375 -75 250 -75 c 2 + 500 -75 l 1025 +EndSplineSet EndChar EndChars EndSplineFont diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs index 71f5f1d979ef..09c9baeca77d 100644 --- a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs +++ b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs @@ -523,11 +523,11 @@ public static List GetBaseLayoutMenuItems(Curren { Text = "BaseLayoutContextFlyoutPaste/Text".GetLocalizedResource(), IsPrimary = true, - // Glyph = "\uF16D", ShowInFtpPage = true, ShowInZipPage = true, ColoredIcon = new ColoredIconModel() { + BaseBackdropGlyph = "\uF052", BaseLayerGlyph = "\uF023", OverlayLayerGlyph = "\uF024", }, @@ -551,6 +551,7 @@ public static List GetBaseLayoutMenuItems(Curren Text = "BaseLayoutContextFlyoutNew/Label".GetLocalizedResource(), ColoredIcon = new ColoredIconModel() { + BaseBackdropGlyph = "\uF051", BaseLayerGlyph = "\uF037", OverlayLayerGlyph = "\uF038" }, @@ -758,6 +759,7 @@ public static List GetBaseItemMenuItems(BaseLayo Text = "OpenInNewPane".GetLocalizedResource(), ColoredIcon = new ColoredIconModel() { + BaseBackdropGlyph = "\uF056", BaseLayerGlyph = "\uF03B", OverlayLayerGlyph = "\uF03C", }, @@ -890,6 +892,7 @@ public static List GetBaseItemMenuItems(BaseLayo IsPrimary = true, ColoredIcon = new ColoredIconModel() { + BaseBackdropGlyph = "\uF052", BaseLayerGlyph = "\uF023", OverlayLayerGlyph = "\uF024", }, @@ -933,10 +936,10 @@ public static List GetBaseItemMenuItems(BaseLayo new ContextMenuFlyoutItemViewModel() { Text = "BaseLayoutItemContextFlyoutRename/Text".GetLocalizedResource(), - //Glyph = "\uF8AC", IsPrimary = true, ColoredIcon = new ColoredIconModel() { + BaseBackdropGlyph = "\uF054", BaseLayerGlyph = "\uF027", OverlayLayerGlyph = "\uF028", }, @@ -969,6 +972,7 @@ public static List GetBaseItemMenuItems(BaseLayo IsPrimary = true, ColoredIcon = new ColoredIconModel() { + BaseBackdropGlyph = "\uF053", BaseLayerGlyph = "\uF035", OverlayLayerGlyph = "\uF036" }, diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index 26dcc42840c9..c8ee2aad1680 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -166,7 +166,10 @@ LabelPosition="Collapsed" ToolTipService.ToolTip="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutRename/Text}"> - + - + - + diff --git a/src/Files.App/ViewModels/ContextMenuFlyoutItemViewModel.cs b/src/Files.App/ViewModels/ContextMenuFlyoutItemViewModel.cs index 12bd472ae1b1..91f0118ed519 100644 --- a/src/Files.App/ViewModels/ContextMenuFlyoutItemViewModel.cs +++ b/src/Files.App/ViewModels/ContextMenuFlyoutItemViewModel.cs @@ -98,10 +98,13 @@ public struct ColoredIconModel public string BaseLayerGlyph { get; set; } + public string BaseBackdropGlyph { get; set; } + public ColoredIcon ToColoredIcon() => new() { OverlayLayerGlyph = OverlayLayerGlyph, BaseLayerGlyph = BaseLayerGlyph, + BaseBackdropGlyph = BaseBackdropGlyph, }; public bool IsValid => !string.IsNullOrEmpty(BaseLayerGlyph); From 47e48a7ef42a6ee63d42edd23b77a6dc2e7e710a Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:14:01 -0500 Subject: [PATCH 8/9] Fix settings in dark mode --- src/Files.App/Dialogs/SettingsDialog.xaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml b/src/Files.App/Dialogs/SettingsDialog.xaml index 1c7919093933..fd8535084e0d 100644 --- a/src/Files.App/Dialogs/SettingsDialog.xaml +++ b/src/Files.App/Dialogs/SettingsDialog.xaml @@ -13,6 +13,18 @@ 1100 0 + + + + + + + + + + + + @@ -22,7 +34,7 @@ MaxHeight="790" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - Background="{ThemeResource CardBackgroundFillColorSecondary}"> + Background="{ThemeResource Local.CardBackgroundFillColorSecondary}"> From baf5a62a22a4bdb4d6a6426f7ca98312762cff9c Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:37:25 -0500 Subject: [PATCH 9/9] Revert "Fix settings in dark mode" This reverts commit 47e48a7ef42a6ee63d42edd23b77a6dc2e7e710a. --- src/Files.App/Dialogs/SettingsDialog.xaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml b/src/Files.App/Dialogs/SettingsDialog.xaml index fd8535084e0d..1c7919093933 100644 --- a/src/Files.App/Dialogs/SettingsDialog.xaml +++ b/src/Files.App/Dialogs/SettingsDialog.xaml @@ -13,18 +13,6 @@ 1100 0 - - - - - - - - - - - - @@ -34,7 +22,7 @@ MaxHeight="790" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - Background="{ThemeResource Local.CardBackgroundFillColorSecondary}"> + Background="{ThemeResource CardBackgroundFillColorSecondary}">