From 02af81799bd567cd57fdbacd350522cec3b06b1c Mon Sep 17 00:00:00 2001 From: Dani John Date: Sun, 30 Apr 2023 09:45:17 +0530 Subject: [PATCH] monitor icon with active wallpaper count --- .../Lively.UI.WinUI/Assets/CustomIcons.ttf | Bin 2584 -> 4508 bytes .../Lively.UI.WinUI/Views/MainWindow.xaml | 7 +++++-- .../Lively.UI.WinUI/Views/MainWindow.xaml.cs | 11 +++++++++++ .../Views/Pages/AboutView.xaml | 10 +++++----- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/Lively/Lively.UI.WinUI/Assets/CustomIcons.ttf b/src/Lively/Lively.UI.WinUI/Assets/CustomIcons.ttf index b3f13ca9d5d0e75dd580192f4ba3ccc98301f884..2cc4edbfed64a91cd42291c447dfd285b6363152 100644 GIT binary patch literal 4508 zcmb^!TWlOx_1w8TuO08~&dfgT^*-(0^=rMm<9*nPjT1Ys+L6;bPNXzxvbEPvT-zJj z4vMQN8xd%?C%ed-1E9;?m6e)bI$+)00pi9h0MfcZ_cR;GE#0~KQp~pKJPpB!M6ZN5b>jP<(2a| zx)5ihG`FxeJN(PQdx&2Ia4ejylxN!LQU`$gSL7GYB0+qQz7ODJ^V`lYu3pUFrW)eI zhz~DRr_26ddvwIFARb#RUpx;!_zB`~A|6>PFIIl|Gb4-mFYp~V&sSGgah=$-ON}{+Ekyjh3 zB^3l4l#p%*2{`-_h}>1SHnz5`S&_S7!DQ~Tl-e9l_Rkv*RVUbV)nUx{C&_xMG_0$e!w!Q{4F_3Q^^NuU zdGzxXbXm6c!a*2^$p@^B38LWkg~%@A%@xtyBHC0e^d-}zi`=)5-(jAJrinYvGPJlR z=8JXXWTy?AQ?5{+-l04<+aNq-U7g)9>*YhozH{F+S(G$Ul9(NmBx;fq<6aR};>pJQ3N?nA&3VzEo~)ZO#H{#aj`{t6 zzuctr0&BX`7y}lHeAaX`&tm`@s^ZxvbAC@k_2Buy zzusim>%R9o)Uc~H?Q&_jIo%GIPsBZ{>*-KSx2|a{I)>tKBQX?u%&=VT$5-i!qOo@i zyi-=26-7rxRUL^ylTWd`1YT2=W~V>tRM{`#w`-z+vv68V3t&cn@XQ~F=bv`OJebk& zG{lodCovnTt#R1D;OT#-qvOyu`d!=jk;n5GH~rDT#6-_OU%H3~UUA zv(|Bc@T}MOVev6}PqtOh;Z9Ly*~wA`FF0jcMc`VE$Uti!S?p^TUvgSRYYq|~&+p`h ztn&Cqo>yf_#Q_mj`afxyuJPWF!K?Jo+$R_{tYQpy36ZF%MKz)lykwH(IJu%_G;-zM z+j)9xb4~B@`+M}wHSUwm>n<0W>)!YkH?aAdhK($;`ePPM`Z_%Urx1y;1dLZXCIz3@ zmnMUx(^8ry$wYw>FY1@>B0^y0xKyRu!)mcv}^I;o-Z6YaM^U5fndQ+43)PAE z7BY0Vm-7vVTMGsi=y0ht=??__lcmxyqDG-LJm}-RZrupA*;WE!MV1^i5Y5HgasfA| zU^TP(7SH>NAz4?ns3Ix&k7|l8hl)O)-}*7*u9rbB(VTN1i>K5BG7Q=eV`G|-GoJx-U{>ugPr!~fpB17a(tfSN`?IC z&W>1W=sZV}M2{g%?q@CK`yE3eJmBCjJUoM|{B^GVzF}U9;Ds}ZmoIar?{L+}> zu~XHVjm0|L=|E;8K$`4??45B?tZNGgNP7n%$*$hawUZ}L2u*^KL7OfUR|U8^35Aki@lO zCNXN&eZA^MN3$JYUvDFautk!XwZwd%b$HC2Wr)Yk_P-FX?`|}wRyo#Gpv9}bqoci< z(a{OPCF9MG*SH|K?6Qm9=j7e-k&&5JY%?Px<2&IGQj3E_3#n9ZZz{DgG`MI%bbT~) z?_<=Jq5jP1(YmU8A8)Ire!FYqJJs(uCI;Y z*L-aTlN7OfV6)j*tO9%Munpnsb(lvuT89OMr|YmCn&Ic{+tnr`#fzL8%z+ADt-}=Q zhwHEn;Wz6rk8pP#77$*l!*)C|AC6pDS*MDw^9IGs^ zoU1NHvgr&Qg9&Y9IjTE(y-rJ-zr2S17DlmYTX(i4jd zfV2RR5288Jb1KvF8}A4L`4tQdY&;pMi76^fmJ=Bm*js?|W*I;M_WjJKfqam8DjB&Y z6|%<}-GKZDK)yy!ezIdC+Zq-ihl2wsAeNh0QNSR`FbBw20P+>`5_3}*Zx%KL@*RMd zY%9nwE&)0e2snR$yjGOy8g&6CZ7(yAcnO8H5 zGVn7fGcX8?h>6QFii??<+cDZQDvC-nDhjgmF#?gYlA5|6qq-WKXsB~nXgw=yQ^W+v zKdYF-dabKuq;*+XYJ!8Sm|0kveu|icnffv@dYeWWiOR|RtN8bei7Q;$M^I40)7aRD ziD`Nc&{b?e7pgJ;-MoTJlUW%Qx - + - + diff --git a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs index ceda55ca..764b849a 100644 --- a/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs +++ b/src/Lively/Lively.UI.WinUI/Views/MainWindow.xaml.cs @@ -226,6 +226,7 @@ private void DesktopCore_WallpaperChanged(object sender, EventArgs e) } } controlPanelLabel.Label = $"{desktopCore.Wallpapers.Count} {i18n.GetString("ActiveWallpapers/Label")}"; + controlPanelMonitor.Glyph = monitorGlyphs[desktopCore.Wallpapers.Count >= monitorGlyphs.Length ? monitorGlyphs.Length - 1 : desktopCore.Wallpapers.Count]; }); } @@ -815,6 +816,16 @@ public static string GetEnumMemberAttrValue(T enumVal) where T : Enum new FontIcon(){ Glyph = "\uE995" }, }; + private readonly string[] monitorGlyphs = + { + "\uE900", + "\uE901", + "\uE902", + "\uE903", + "\uE904", + "\uE905", + }; + private static NavigationViewItem CreateMenu(string menuName, string tag, string glyph = "") { var item = new NavigationViewItem diff --git a/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml b/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml index 4fa28ce7..816af7f2 100644 --- a/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml +++ b/src/Lively/Lively.UI.WinUI/Views/Pages/AboutView.xaml @@ -38,27 +38,27 @@ - + - + - + - + - +