From 95e5aa995599b9e1e85f8fa8c254594803a6ef38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=80=A1=E9=A3=9E?= <363301617@qq.com> Date: Sat, 13 Apr 2024 23:02:41 +0800 Subject: [PATCH] Add SystemTrayService 1.Add SystemTrayService to manage shell notifyicon 2.Update Readme.md --- Description/README_EN-US.md | 1 - Description/README_ZH-CN.md | 1 - README.md | 1 - WindowsTools/App.xaml.cs | 10 +- WindowsTools/Assets/ControlIcon/ShellMenu.png | Bin 2553 -> 9253 bytes .../LoafWallpaper.jpg} | Bin WindowsTools/Program.cs | 9 - WindowsTools/Properties/AssemblyInfo.cs | 6 +- .../Services/Root/SystemTrayService.cs | 63 ++++++ WindowsTools/Strings/ShellMenu.Designer.cs | 90 +++++++++ WindowsTools/Strings/ShellMenu.en-us.resx | 30 +++ WindowsTools/Strings/ShellMenu.resx | 30 +++ WindowsTools/Strings/ShellMenu.zh-hans.resx | 30 +++ WindowsTools/Strings/SystemTray.Designer.cs | 81 ++++++++ WindowsTools/Strings/SystemTray.en-us.resx | 126 ++++++++++++ WindowsTools/Strings/SystemTray.resx | 126 ++++++++++++ WindowsTools/Strings/SystemTray.zh-hans.resx | 126 ++++++++++++ WindowsTools/Views/Pages/CodeScannerPage.xaml | 2 +- WindowsTools/Views/Pages/LoafPage.xaml | 2 +- WindowsTools/Views/Pages/LoafPage.xaml.cs | 11 +- WindowsTools/Views/Pages/ShellMenuPage.xaml | 184 ++++++++++++++++++ .../Views/Pages/ShellMenuPage.xaml.cs | 83 +++++++- .../Views/Pages/SimulateUpdatePage.xaml.cs | 4 + WindowsTools/Views/Pages/SystemTrayPage.xaml | 38 ++++ .../Views/Pages/SystemTrayPage.xaml.cs | 45 +++++ WindowsTools/Views/Windows/LoafWindow.cs | 11 +- WindowsTools/Views/Windows/MainWindow.cs | 53 ++++- .../Views/Windows/SystemTrayWindow.cs | 77 ++++++++ .../PInvoke/User32/WindowLongIndexFlags.cs | 63 ++++++ WindowsTools/WindowsTools.csproj | 20 +- .../Commands/EnumExplorerCommand.cs | 85 ++++++++ ...tItemCommand.cs => RootExplorerCommand.cs} | 19 +- .../Commands/SubExplorerCommand.cs | 51 +++++ WindowsToolsShellExtension/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Controls/Settings/FileShellMenuService.cs | 2 +- .../Services/Root/LocalSettingsService.cs | 4 +- 37 files changed, 1441 insertions(+), 51 deletions(-) rename WindowsTools/Assets/{Wallpapers/LoafLocalImage.jpg => Images/LoafWallpaper.jpg} (100%) create mode 100644 WindowsTools/Services/Root/SystemTrayService.cs create mode 100644 WindowsTools/Strings/SystemTray.Designer.cs create mode 100644 WindowsTools/Strings/SystemTray.en-us.resx create mode 100644 WindowsTools/Strings/SystemTray.resx create mode 100644 WindowsTools/Strings/SystemTray.zh-hans.resx create mode 100644 WindowsTools/Views/Pages/SystemTrayPage.xaml create mode 100644 WindowsTools/Views/Pages/SystemTrayPage.xaml.cs create mode 100644 WindowsTools/Views/Windows/SystemTrayWindow.cs create mode 100644 WindowsTools/WindowsAPI/PInvoke/User32/WindowLongIndexFlags.cs create mode 100644 WindowsToolsShellExtension/Commands/EnumExplorerCommand.cs rename WindowsToolsShellExtension/Commands/{RootItemCommand.cs => RootExplorerCommand.cs} (85%) create mode 100644 WindowsToolsShellExtension/Commands/SubExplorerCommand.cs diff --git a/Description/README_EN-US.md b/Description/README_EN-US.md index 2476dfd..d34f15d 100644 --- a/Description/README_EN-US.md +++ b/Description/README_EN-US.md @@ -144,6 +144,5 @@ Unpackaged version ### Other content -> * The project began on March 20, 2023, and ended on July 29, 2023, lasting a total of 4 months and 9 days. > * This project is an open source project licensed under the MIT license, and you may modify, distribute, or merge copies with new copies. If you use the project, please do not use it for illegal purposes, and the developer will not be held responsible. > * [Tool prototype](https://github.com/Gaoyifei1011/WindowsToolbox/blob/main/Description/RawApplicationDescription.md)  diff --git a/Description/README_ZH-CN.md b/Description/README_ZH-CN.md index 872efcf..aa5d8bc 100644 --- a/Description/README_ZH-CN.md +++ b/Description/README_ZH-CN.md @@ -144,6 +144,5 @@ ### 其他内容 -> * 该项目自2023年3月20日起，到2023年7月29日结束，共历时4个月零9天。 > * 该项目是基于MIT协议许可的开源项目，您可以修改、分发该项目或将副本与新副本合并。如果您使用了该项目，请勿用于非法用途，本开发者不会承担任何责任。 > * [工具原型](https://github.com/Gaoyifei1011/WindowsToolbox/blob/main/Description/RawApplicationDescription.md)  diff --git a/README.md b/README.md index 04f1ef0..6033a3c 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,6 @@ ### 其他内容 -> * 该项目自2023年3月20日起，到2023年7月29日结束，共历时4个月零9天。 > * 该项目是基于MIT协议许可的开源项目，您可以修改、分发该项目或将副本与新副本合并。如果您使用了该项目，请勿用于非法用途，本开发者不会承担任何责任。 > * [工具原型](https://github.com/Gaoyifei1011/WindowsToolbox/blob/main/Description/RawApplicationDescription.md)  diff --git a/WindowsTools/App.xaml.cs b/WindowsTools/App.xaml.cs index 6c3177e..b43d152 100644 --- a/WindowsTools/App.xaml.cs +++ b/WindowsTools/App.xaml.cs @@ -1,8 +1,7 @@ -using Mile.Xaml.Interop; +using Mile.Xaml; using System; using System.Diagnostics.Tracing; using Windows.UI.Xaml; -using Windows.UI.Xaml.Hosting; using WindowsTools.Services.Root; using WindowsTools.Views.Windows; @@ -17,8 +16,7 @@ public partial class App : Application, IDisposable public App() { - WindowsXamlManager.InitializeForCurrentThread(); - Window.Current.GetInterop().TransparentBackground = true; + this.ThreadInitialize(); InitializeComponent(); UnhandledException += OnUnhandledException; } @@ -55,7 +53,9 @@ protected virtual void Dispose(bool disposing) { if (disposing) { - MainWindow.Current.Close(); + this.ThreadUninitialize(); + MainWindow.Current?.Close(); + //SystemTrayService.CloseSystemTray(); System.Windows.Forms.Application.Exit(); } diff --git a/WindowsTools/Assets/ControlIcon/ShellMenu.png b/WindowsTools/Assets/ControlIcon/ShellMenu.png index c4c9094d46d49456c6542baf667e7e6a1fb383b5..6ccdd3305fbdc5fc115f4b868bcbdc9661c2d525 100644 GIT binary patch literal 9253 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 diff --git a/WindowsTools/Assets/Wallpapers/LoafLocalImage.jpg b/WindowsTools/Assets/Images/LoafWallpaper.jpg similarity index 100% rename from WindowsTools/Assets/Wallpapers/LoafLocalImage.jpg rename to WindowsTools/Assets/Images/LoafWallpaper.jpg diff --git a/WindowsTools/Program.cs b/WindowsTools/Program.cs index eddac21..ce5e675 100644 --- a/WindowsTools/Program.cs +++ b/WindowsTools/Program.cs @@ -42,7 +42,6 @@ public static void Main(string[] args) Application.SetCompatibleTextRenderingDefault(false); Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException); - Application.ApplicationExit += OnApplicationExit; Application.ThreadException += OnThreadException; AppDomain.CurrentDomain.UnhandledException += OnUnhandledException; @@ -50,14 +49,6 @@ public static void Main(string[] args) Application.Run(new MainWindow()); } - /// - /// 在应用程序即将关闭时发生 - /// - private static void OnApplicationExit(object sender, EventArgs args) - { - (Windows.UI.Xaml.Application.Current as App).Dispose(); - } - /// /// 处理 Windows 窗体 UI 线程异常 /// diff --git a/WindowsTools/Properties/AssemblyInfo.cs b/WindowsTools/Properties/AssemblyInfo.cs index adc1948..441c0b1 100644 --- a/WindowsTools/Properties/AssemblyInfo.cs +++ b/WindowsTools/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ [assembly: AssemblyCompany("高怡飞")] [assembly: AssemblyCopyright("Copyright ©2024 高怡飞, All Rights Reserved.")] [assembly: AssemblyDescription("Windows 工具箱")] -[assembly: AssemblyFileVersion("2.2.410.0")] -[assembly: AssemblyInformationalVersion("2.2.410.0")] +[assembly: AssemblyFileVersion("2.3.413.0")] +[assembly: AssemblyInformationalVersion("2.3.413.0")] [assembly: AssemblyProduct("Windows 工具箱")] [assembly: AssemblyTitle("Windows 工具箱")] -[assembly: AssemblyVersion("2.2.410.0")] +[assembly: AssemblyVersion("2.3.413.0")] // 设置程序集对 COM 组件的访问权限 [assembly: ComVisible(false)] diff --git a/WindowsTools/Services/Root/SystemTrayService.cs b/WindowsTools/Services/Root/SystemTrayService.cs new file mode 100644 index 0000000..e6fee34 --- /dev/null +++ b/WindowsTools/Services/Root/SystemTrayService.cs @@ -0,0 +1,63 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace WindowsTools.Services.Root +{ + /// + /// 系统托盘菜单服务 + /// + public static class SystemTrayService + { + private static NotifyIcon notifyIcon; + + public static event MouseEventHandler MouseClick; + + public static event MouseEventHandler MouseDoubleClick; + + /// + /// 初始化系统托盘 + /// + public static void InitializeSystemTray(string content, string iconPath) + { + if (notifyIcon is null) + { + notifyIcon = new NotifyIcon(); + notifyIcon.Text = content; + notifyIcon.Icon = Icon.ExtractAssociatedIcon(iconPath); + notifyIcon.Visible = true; + notifyIcon.MouseClick += OnMouseClick; + notifyIcon.MouseDoubleClick += OnMouseDoubleClick; + } + } + + /// + /// 关闭托盘菜单 + /// + public static void CloseSystemTray() + { + if (notifyIcon is not null) + { + notifyIcon.Visible = false; + notifyIcon.MouseClick -= OnMouseClick; + notifyIcon.Dispose(); + notifyIcon = null; + } + } + + /// + /// 处理托盘菜单鼠标点击事件 + /// + private static void OnMouseClick(object sender, MouseEventArgs args) + { + MouseClick?.Invoke(sender, args); + } + + /// + /// 处理托盘菜单鼠标双击事件 + /// + private static void OnMouseDoubleClick(object sender, MouseEventArgs args) + { + MouseDoubleClick?.Invoke(sender, args); + } + } +} diff --git a/WindowsTools/Strings/ShellMenu.Designer.cs b/WindowsTools/Strings/ShellMenu.Designer.cs index 48fe989..4dcec1c 100644 --- a/WindowsTools/Strings/ShellMenu.Designer.cs +++ b/WindowsTools/Strings/ShellMenu.Designer.cs @@ -60,6 +60,96 @@ internal ShellMenu() { } } + /// + /// 查找类似 Add menu 的本地化字符串。 + /// + public static string AddMenu { + get { + return ResourceManager.GetString("AddMenu", resourceCulture); + } + } + + /// + /// 查找类似 Apply 的本地化字符串。 + /// + public static string Apply { + get { + return ResourceManager.GetString("Apply", resourceCulture); + } + } + + /// + /// 查找类似 Apply modify 的本地化字符串。 + /// + public static string ApplyModify { + get { + return ResourceManager.GetString("ApplyModify", resourceCulture); + } + } + + /// + /// 查找类似 Menu list 的本地化字符串。 + /// + public static string MenuList { + get { + return ResourceManager.GetString("MenuList", resourceCulture); + } + } + + /// + /// 查找类似 Modify 的本地化字符串。 + /// + public static string Modify { + get { + return ResourceManager.GetString("Modify", resourceCulture); + } + } + + /// + /// 查找类似 Refresh 的本地化字符串。 + /// + public static string Refresh { + get { + return ResourceManager.GetString("Refresh", resourceCulture); + } + } + + /// + /// 查找类似 Return default 的本地化字符串。 + /// + public static string ReturnDefault { + get { + return ResourceManager.GetString("ReturnDefault", resourceCulture); + } + } + + /// + /// 查找类似 Root menu icon 的本地化字符串。 + /// + public static string RootMenuIcon { + get { + return ResourceManager.GetString("RootMenuIcon", resourceCulture); + } + } + + /// + /// 查找类似 Root menu name 的本地化字符串。 + /// + public static string RootMenuName { + get { + return ResourceManager.GetString("RootMenuName", resourceCulture); + } + } + + /// + /// 查找类似 Root menu settings 的本地化字符串。 + /// + public static string RootMenuSettings { + get { + return ResourceManager.GetString("RootMenuSettings", resourceCulture); + } + } + /// /// 查找类似 Custom shell menu 的本地化字符串。 /// diff --git a/WindowsTools/Strings/ShellMenu.en-us.resx b/WindowsTools/Strings/ShellMenu.en-us.resx index 3018c27..2f31d6a 100644 --- a/WindowsTools/Strings/ShellMenu.en-us.resx +++ b/WindowsTools/Strings/ShellMenu.en-us.resx @@ -117,6 +117,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Add menu + + + Apply + + + Apply modify + + + Menu list + + + Modify + + + Refresh + + + Return default + + + Root menu icon + + + Root menu name + + + Root menu settings + Custom shell menu diff --git a/WindowsTools/Strings/ShellMenu.resx b/WindowsTools/Strings/ShellMenu.resx index 3018c27..2f31d6a 100644 --- a/WindowsTools/Strings/ShellMenu.resx +++ b/WindowsTools/Strings/ShellMenu.resx @@ -117,6 +117,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Add menu + + + Apply + + + Apply modify + + + Menu list + + + Modify + + + Refresh + + + Return default + + + Root menu icon + + + Root menu name + + + Root menu settings + Custom shell menu diff --git a/WindowsTools/Strings/ShellMenu.zh-hans.resx b/WindowsTools/Strings/ShellMenu.zh-hans.resx index 4ba5f85..ea85966 100644 --- a/WindowsTools/Strings/ShellMenu.zh-hans.resx +++ b/WindowsTools/Strings/ShellMenu.zh-hans.resx @@ -117,6 +117,36 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 添加菜单 + + + 应用 + + + 应用更改 + + + 菜单列表 + + + 修改 + + + 刷新 + + + 还原默认 + + + 根菜单图标 + + + 根菜单名称 + + + 根菜单设置 + 自定义扩展菜单 diff --git a/WindowsTools/Strings/SystemTray.Designer.cs b/WindowsTools/Strings/SystemTray.Designer.cs new file mode 100644 index 0000000..13feb0d --- /dev/null +++ b/WindowsTools/Strings/SystemTray.Designer.cs @@ -0,0 +1,81 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace WindowsTools.Strings { + using System; + + + /// + /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class SystemTray { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal SystemTray() { + } + + /// + /// 返回此类使用的缓存的 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WindowsTools.Strings.SystemTray", typeof(SystemTray).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// 查找类似 Exit 的本地化字符串。 + /// + public static string Exit { + get { + return ResourceManager.GetString("Exit", resourceCulture); + } + } + + /// + /// 查找类似 Show/hide window 的本地化字符串。 + /// + public static string ShowOrHideWindow { + get { + return ResourceManager.GetString("ShowOrHideWindow", resourceCulture); + } + } + } +} diff --git a/WindowsTools/Strings/SystemTray.en-us.resx b/WindowsTools/Strings/SystemTray.en-us.resx new file mode 100644 index 0000000..c87eaa7 --- /dev/null +++ b/WindowsTools/Strings/SystemTray.en-us.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Exit + + + Show/hide window + + \ No newline at end of file diff --git a/WindowsTools/Strings/SystemTray.resx b/WindowsTools/Strings/SystemTray.resx new file mode 100644 index 0000000..c87eaa7 --- /dev/null +++ b/WindowsTools/Strings/SystemTray.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Exit + + + Show/hide window + + \ No newline at end of file diff --git a/WindowsTools/Strings/SystemTray.zh-hans.resx b/WindowsTools/Strings/SystemTray.zh-hans.resx new file mode 100644 index 0000000..030153a --- /dev/null +++ b/WindowsTools/Strings/SystemTray.zh-hans.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 退出 + + + 显示/隐藏窗口 + + \ No newline at end of file diff --git a/WindowsTools/Views/Pages/CodeScannerPage.xaml b/WindowsTools/Views/Pages/CodeScannerPage.xaml index c2fa691..a479fa9 100644 --- a/WindowsTools/Views/Pages/CodeScannerPage.xaml +++ b/WindowsTools/Views/Pages/CodeScannerPage.xaml @@ -148,7 +148,7 @@ Grid.Column="0" Margin="0,0,12,0" FontSize="16" - Glyph="" /> + Glyph="" /> + Glyph="" /> /// 加载每日必应壁纸图片 /// @@ -181,7 +183,7 @@ private void OnLoaded(object sender, RoutedEventArgs args) } catch (Exception e) { - LoafImage = new BitmapImage(new Uri("ms-appx:///Assets/Wallpapers/LoafLocalImage.jpg")); + LoafImage = new BitmapImage(new Uri("ms-appx:///Assets/Images/LoafWallpaper.jpg")); LoadImageCompleted = true; LogService.WriteLog(EventLevel.Error, "Load bing wallpaper image failed", e); } @@ -191,7 +193,7 @@ private void OnLoaded(object sender, RoutedEventArgs args) { MainWindow.Current.BeginInvoke(() => { - LoafImage = new BitmapImage(new Uri("ms-appx:///Assets/Wallpapers/LoafLocalImage.jpg")); + LoafImage = new BitmapImage(new Uri("ms-appx:///Assets/Images/LoafWallpaper.jpg")); LoadImageCompleted = true; }); } @@ -201,7 +203,7 @@ private void OnLoaded(object sender, RoutedEventArgs args) LogService.WriteLog(EventLevel.Error, "Load bing wallpaper image failed", e); MainWindow.Current.BeginInvoke(() => { - LoafImage = new BitmapImage(new Uri("ms-appx:///Assets/Wallpapers/LoafLocalImage.jpg")); + LoafImage = new BitmapImage(new Uri("ms-appx:///Assets/Images/LoafWallpaper.jpg")); LoadImageCompleted = true; }); } @@ -224,7 +226,6 @@ private void OnStartLoafClicked(object sender, RoutedEventArgs args) private void OnClosed(object sender, FormClosedEventArgs args) { LoafWindow.Current.FormClosed -= OnClosed; - LoafWindow.Current = null; IsLoafing = false; } @@ -275,5 +276,7 @@ private void OnLockScreenAutomaticlyToggled(object sender, RoutedEventArgs args) LockScreenAutomaticly = toggleSwitch.IsOn; } } + + #endregion 第一部分：摸鱼页面——挂载的事件 } } diff --git a/WindowsTools/Views/Pages/ShellMenuPage.xaml b/WindowsTools/Views/Pages/ShellMenuPage.xaml index fc5e90f..ba8e38f 100644 --- a/WindowsTools/Views/Pages/ShellMenuPage.xaml +++ b/WindowsTools/Views/Pages/ShellMenuPage.xaml @@ -4,6 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:string="using:WindowsTools.Strings" NavigationCacheMode="Enabled" mc:Ignorable="d"> @@ -11,6 +12,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +