Merge pull request #26 from awesome-iwb/beta

ICC CE 1.5.1 （Bate1.5.5）
2025-06-12 19:19:18 +08:00
parent ad18277223 862ac27212
commit 4d9fa754e8
31 changed files with 6006 additions and 5696 deletions
@@ -2,6 +2,9 @@
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
 using System;
+using System.Diagnostics;
+using System.Threading;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows;
@@ -21,23 +24,51 @@ namespace Ink_Canvas
        public static string[] StartArgs = null;
        public static string RootPath = Environment.GetEnvironmentVariable("APPDATA") + "\\Ink Canvas\\";

+        // 新增：保存看门狗进程对象
+        private static Process watchdogProcess = null;
+        // 新增：标记是否为软件内主动退出
+        public static bool IsAppExitByUser = false;
+        // 新增：退出信号文件路径
+        private static string watchdogExitSignalFile = Path.Combine(Path.GetTempPath(), "icc_watchdog_exit_" + System.Diagnostics.Process.GetCurrentProcess().Id + ".flag");
+
        public App()
        {
            this.Startup += new StartupEventHandler(App_Startup);
            this.DispatcherUnhandledException += App_DispatcherUnhandledException;
+            StartHeartbeatMonitor();
+            StartWatchdogIfNeeded();
+            this.Exit += App_Exit; // 注册退出事件
        }

+        // 增加字段保存崩溃后操作设置
+        public static CrashActionType CrashAction = CrashActionType.SilentRestart;
+
        private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
        {
            Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。", true);
            LogHelper.NewLog(e.Exception.ToString());
            e.Handled = true;
+
+            // 新增：根据设置自动处理崩溃
+            if (CrashAction == CrashActionType.SilentRestart)
+            {
+                try
+                {
+                    // 静默重启：启动新进程并退出当前进程
+                    string exePath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
+                    System.Diagnostics.Process.Start(exePath);
+                }
+                catch { }
+                Environment.Exit(1);
+            }
+            // CrashActionType.NoAction 时不做处理
        }

        private TaskbarIcon _taskbar;

        void App_Startup(object sender, StartupEventArgs e)
        {
+            RunWatchdogIfNeeded();
            /*if (!StoreHelper.IsStoreApp) */RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;

            LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version.ToString()));
@@ -75,5 +106,107 @@ namespace Ink_Canvas
            }
            catch {  }
        }
+
+        // 新增：用于设置崩溃后操作类型
+        public enum CrashActionType
+        {
+            SilentRestart,
+            NoAction
+        }
+
+        // 心跳相关
+        private static Timer heartbeatTimer;
+        private static DateTime lastHeartbeat = DateTime.Now;
+        private static Timer watchdogTimer;
+
+        private void StartHeartbeatMonitor()
+        {
+            // 主线程定时更新心跳
+            heartbeatTimer = new Timer(_ => lastHeartbeat = DateTime.Now, null, 0, 1000);
+            // 辅助线程检测心跳超时
+            watchdogTimer = new Timer(_ =>
+            {
+                if ((DateTime.Now - lastHeartbeat).TotalSeconds > 10)
+                {
+                    LogHelper.NewLog("检测到主线程无响应，自动重启。");
+                    if (CrashAction == CrashActionType.SilentRestart)
+                    {
+                        try
+                        {
+                            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                            Process.Start(exePath);
+                        }
+                        catch { }
+                        Environment.Exit(1);
+                    }
+                }
+            }, null, 0, 3000);
+        }
+
+        // 看门狗进程
+        private void StartWatchdogIfNeeded()
+        {
+            // 避免递归启动
+            if (Environment.GetCommandLineArgs().Contains("--watchdog")) return;
+            // 启动看门狗进程
+            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+            var psi = new ProcessStartInfo
+            {
+                FileName = exePath,
+                Arguments = "--watchdog " + Process.GetCurrentProcess().Id + " \"" + watchdogExitSignalFile + "\"",
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                WindowStyle = ProcessWindowStyle.Hidden
+            };
+            watchdogProcess = Process.Start(psi);
+        }
+
+        // 看门狗主逻辑（在 Main 函数或 App_Startup 入口前加判断）
+        public static void RunWatchdogIfNeeded()
+        {
+            var args = Environment.GetCommandLineArgs();
+            if (args.Length >= 4 && args[1] == "--watchdog")
+            {
+                int pid = int.Parse(args[2]);
+                string exitSignalFile = args[3];
+                try
+                {
+                    var proc = Process.GetProcessById(pid);
+                    while (!proc.HasExited)
+                    {
+                        // 检查退出信号文件
+                        if (File.Exists(exitSignalFile))
+                        {
+                            try { File.Delete(exitSignalFile); } catch { }
+                            Environment.Exit(0);
+                        }
+                        Thread.Sleep(2000);
+                    }
+                    // 主进程异常退出，自动重启
+                    string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                    Process.Start(exePath);
+                }
+                catch { }
+                Environment.Exit(0);
+            }
+        }
+
+        private void App_Exit(object sender, ExitEventArgs e)
+        {
+            // 仅在软件内主动退出时关闭看门狗，并写入退出信号
+            try
+            {
+                if (IsAppExitByUser)
+                {
+                    // 写入退出信号文件，通知看门狗正常退出
+                    File.WriteAllText(watchdogExitSignalFile, "exit");
+                    if (watchdogProcess != null && !watchdogProcess.HasExited)
+                    {
+                        watchdogProcess.Kill();
+                    }
+                }
+            }
+            catch { }
+        }
    }
 }
@@ -221,6 +221,80 @@
                                    </ui:SimpleStackPanel>
                                </ui:SimpleStackPanel>
                            </Border>
+                            <Border Margin="0,0,0,10" Height="100" CornerRadius="5" BorderBrush="#a1a1aa"
+                                    BorderThickness="1">
+                                <ui:SimpleStackPanel VerticalAlignment="Center">
+                                    <TextBlock Foreground="#fafafa" HorizontalAlignment="Center"
+                                               VerticalAlignment="Center" FontSize="15" Margin="0,0,0,10"
+                                               Text="开发中..." />
+                                    <ui:SimpleStackPanel Spacing="5">
+                                        <ui:SimpleStackPanel Spacing="5" Orientation="Horizontal"
+                                                             HorizontalAlignment="Center">
+                                            <Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
+                                                    Click="BtnRestart_Click">
+                                                <Button.Resources>
+                                                </Button.Resources>
+                                                <ui:SimpleStackPanel Orientation="Horizontal"
+                                                                     VerticalAlignment="Center"
+                                                                     HorizontalAlignment="Center" Spacing="0">
+                                                    <Image RenderOptions.BitmapScalingMode="HighQuality"
+                                                           Margin="0,0,6,0" Height="20" Width="20">
+                                                        <Image.Source>
+                                                            <DrawingImage>
+                                                                <DrawingImage.Drawing>
+                                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M6.34315,6.34315C7.84299,4.8433 9.87707,4.0005 11.9981,4 14.2527,4.00897 16.4167,4.88785 18.039,6.45324L18.5858,7 16,7C15.4477,7 15,7.44772 15,8 15,8.55228 15.4477,9 16,9L21,9C21.1356,9 21.2649,8.97301 21.3828,8.92412 21.5007,8.87532 21.6112,8.80298 21.7071,8.70711 21.8902,8.52405 21.9874,8.28768 21.9989,8.04797 21.9996,8.03199 22,8.016 22,8L22,3C22,2.44772 21.5523,2 21,2 20.4477,2 20,2.44772 20,3L20,5.58579 19.4471,5.03289 19.435,5.02103C17.4405,3.09289,14.7779,2.01044,12.0038,2L12,2C9.34784,2 6.8043,3.05357 4.92893,4.92893 3.05357,6.8043 2,9.34784 2,12 2,12.5523 2.44772,13 3,13 3.55228,13 4,12.5523 4,12 4,9.87827 4.84285,7.84344 6.34315,6.34315z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M22,12C22,14.6522 20.9464,17.1957 19.0711,19.0711 17.1957,20.9464 14.6522,22 12,22L11.9962,22C9.22213,21.9896,6.55946,20.9071,4.56496,18.979L4.55289,18.9671 4,18.4142 4,21C4,21.5523 3.55228,22 3,22 2.44772,22 2,21.5523 2,21L2,16.0002C2,15.8646 2.02699,15.7351 2.07588,15.6172 2.12432,15.5001 2.19595,15.3904 2.29078,15.295 2.29219,15.2936 2.2936,15.2922 2.29502,15.2908 2.48924,15.0977 2.74301,15.0008 2.997,15 2.998,15 2.999,15 3,15L8,15C8.55228,15 9,15.4477 9,16 9,16.5523 8.55228,17 8,17L5.41421,17 5.96095,17.5467C7.5833,19.1122 9.74736,19.9911 12.002,20 14.123,19.9995 16.157,19.1567 17.6569,17.6569 19.1571,16.1566 20,14.1217 20,12 20,11.4477 20.4477,11 21,11 21.5523,11 22,11.4477 22,12z" />
+                                                                    </DrawingGroup>
+                                                                </DrawingImage.Drawing>
+                                                            </DrawingImage>
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label FontSize="16" Foreground="#fafafa"
+                                                           VerticalAlignment="Center" FontFamily="Microsoft YaHei UI"
+                                                           FontWeight="Bold">
+                                                        测试
+                                                    </Label>
+                                                </ui:SimpleStackPanel>
+                                            </Button>
+                                            <Button Width="116" Height="45" FontFamily="Microsoft YaHei UI"
+                                                    Click="BtnResetToSuggestion_Click"
+                                                    Margin="0,0,0,0">
+                                                <ui:SimpleStackPanel Orientation="Horizontal"
+                                                                     VerticalAlignment="Center"
+                                                                     HorizontalAlignment="Center" Spacing="0">
+                                                    <Image
+                                                        Margin="0,0,4,0" RenderOptions.BitmapScalingMode="HighQuality"
+                                                        Height="20" Width="20">
+                                                        <Image.Source>
+                                                            <DrawingImage>
+                                                                <DrawingImage.Drawing>
+                                                                    <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M2,6C2,5.44772,2.44772,5,3,5L21,5C21.5523,5 22,5.44772 22,6 22,6.55228 21.5523,7 21,7L3,7C2.44772,7,2,6.55228,2,6z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M2,12C2,11.4477,2.44772,11,3,11L7,11C7.55228,11 8,11.4477 8,12 8,12.5523 7.55228,13 7,13L3,13C2.44772,13,2,12.5523,2,12z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M3,17C2.44772,17 2,17.4477 2,18 2,18.5523 2.44772,19 3,19L7,19C7.55228,19 8,18.5523 8,18 8,17.4477 7.55228,17 7,17L3,17z" />
+                                                                        <GeometryDrawing Brush="White"
+                                                                            Geometry="F1 M24,24z M0,0z M12.3829,11.2029C13.4335,10.1522 14.8952,9.5 16.5,9.5 17.9587,9.5 19.3576,10.0795 20.3891,11.1109 21.4205,12.1424 22,13.5413 22,15 22,16.2593 21.6038,17.4867 20.8675,18.5083 20.1311,19.5299 19.092,20.2939 17.8974,20.6921 16.7027,21.0903 15.413,21.1026 14.211,20.7271 13.009,20.3516 11.9556,19.6074 11.2,18.6 10.8686,18.1582 10.9582,17.5314 11.4,17.2 11.8418,16.8686 12.4686,16.9582 12.8,17.4 13.3037,18.0716 14.006,18.5677 14.8073,18.8181 15.6087,19.0684 16.4685,19.0602 17.2649,18.7947 18.0614,18.5292 18.7541,18.0199 19.245,17.3388 19.7359,16.6578 20,15.8395 20,15 20,14.0717 19.6313,13.1815 18.9749,12.5251 18.3185,11.8687 17.4283,11.5 16.5,11.5 15.4448,11.5 14.4865,11.9278 13.7971,12.6171L13.4142,13 15,13C15.5523,13 16,13.4477 16,14 16,14.5523 15.5523,15 15,15L11.0007,15C10.9997,15 10.998,15 10.997,15 10.8625,14.9996 10.7343,14.9727 10.6172,14.9241 10.5001,14.8757 10.3904,14.804 10.295,14.7092 10.2936,14.7078 10.2922,14.7064 10.2908,14.705 10.196,14.6096 10.1243,14.4999 10.0759,14.3828 10.027,14.2649 10,14.1356 10,14L10,10C10,9.44772 10.4477,9 11,9 11.5523,9 12,9.44772 12,10L12,11.5858 12.3829,11.2029z" />
+                                                                    </DrawingGroup>
+                                                                </DrawingImage.Drawing>
+                                                            </DrawingImage>
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label Margin="2,0,0,0" FontSize="16" VerticalAlignment="Center"
+                                                           FontFamily="Microsoft YaHei UI">
+                                                        测试
+                                                    </Label>
+                                                </ui:SimpleStackPanel>
+                                            </Button>
+                                        </ui:SimpleStackPanel>
+                                    </ui:SimpleStackPanel>
+                                </ui:SimpleStackPanel>
+                            </Border>
                            <GroupBox>
                                <GroupBox.Header>
                                    <TextBlock Margin="0,12,0,0" Text="启动" FontWeight="Bold" Foreground="#fafafa"
@@ -361,6 +435,25 @@
                                    </ui:SimpleStackPanel>
                                </ui:SimpleStackPanel>
                            </GroupBox>
+                            <!-- 新增：崩溃后操作设置 -->
+                            <GroupBox>
+                                <GroupBox.Header>
+                                    <TextBlock Margin="0,12,0,0" Text="崩溃后操作" FontWeight="Bold" Foreground="#fafafa"
+                                               FontSize="26" />
+                                </GroupBox.Header>
+                                <ui:SimpleStackPanel Spacing="6">
+                                    <TextBlock Text="请选择软件发生未处理异常时的自动操作：" Foreground="#a1a1aa" />
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,4,0,0">
+                                        <RadioButton x:Name="RadioCrashSilentRestart" GroupName="CrashAction"
+                                                     Content="静默重启软件" FontSize="14" Margin="0,0,24,0"
+                                                     Checked="RadioCrashAction_Checked"/>
+                                        <RadioButton x:Name="RadioCrashNoAction" GroupName="CrashAction"
+                                                     Content="无操作" FontSize="14"
+                                                     Checked="RadioCrashAction_Checked"/>
+                                    </StackPanel>
+                                    <TextBlock Text="# 静默重启：崩溃后自动重启软件，无提示。无操作：崩溃后仅记录日志，不自动重启。" Foreground="#a1a1aa" />
+                                </ui:SimpleStackPanel>
+                            </GroupBox>
                            <GroupBox>
                                <GroupBox.Header>
                                    <TextBlock Margin="0,12,0,0" Text="手势" FontWeight="Bold" Foreground="#fafafa"
@@ -99,6 +99,12 @@ namespace Ink_Canvas {

            CheckColorTheme(true);
            CheckPenTypeUIState();
+
+            // 注册输入事件
+            inkCanvas.PreviewMouseDown += inkCanvas_PreviewMouseDown;
+            inkCanvas.StylusDown += inkCanvas_StylusDown;
+            inkCanvas.TouchDown += inkCanvas_TouchDown;
+            inkCanvas.TouchUp += inkCanvas_TouchUp;
        }

        #endregion
@@ -214,6 +220,12 @@ namespace Ink_Canvas {
            {
                FoldFloatingBar_MouseUp(null, null);
            }
+
+            // 恢复崩溃后操作设置
+            if (App.CrashAction == App.CrashActionType.SilentRestart)
+                RadioCrashSilentRestart.IsChecked = true;
+            else
+                RadioCrashNoAction.IsChecked = true;
        }

        private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e) {
@@ -321,6 +333,46 @@ namespace Ink_Canvas {
            }
        }

+        // 新增：崩溃后操作设置按钮事件
+        private void RadioCrashAction_Checked(object sender, RoutedEventArgs e)
+        {
+            if (RadioCrashSilentRestart != null && RadioCrashSilentRestart.IsChecked == true)
+            {
+                App.CrashAction = App.CrashActionType.SilentRestart;
+            }
+            else if (RadioCrashNoAction != null && RadioCrashNoAction.IsChecked == true)
+            {
+                App.CrashAction = App.CrashActionType.NoAction;
+            }
+            SaveSettingsToFile();
+        }
+
+        // 鼠标输入
+        private void inkCanvas_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            inkCanvas.Cursor = Cursors.Arrow;
+        }
+
+        // 手写笔输入
+        private void inkCanvas_StylusDown(object sender, StylusDownEventArgs e)
+        {
+            var sri = Application.GetResourceStream(new Uri("Resources/Cursors/Pen.cur", UriKind.Relative));
+            if (sri != null)
+                inkCanvas.Cursor = new Cursor(sri.Stream);
+        }
+
+        // 触摸输入，通常隐藏光标
+        private void inkCanvas_TouchDown(object sender, TouchEventArgs e)
+        {
+            System.Windows.Forms.Cursor.Show();
+        }
+
+        // 触摸结束，恢复光标
+        private void inkCanvas_TouchUp(object sender, TouchEventArgs e)
+        {
+            System.Windows.Forms.Cursor.Show();
+        }
+
        #endregion Definations and Loading
    }
 }
@@ -1577,8 +1577,10 @@ namespace Ink_Canvas {
        public static bool CloseIsFromButton = false;

        public void BtnExit_Click(object sender, RoutedEventArgs e) {
-            CloseIsFromButton = true;
-            Close();
+            App.IsAppExitByUser = true;
+            Application.Current.Shutdown();
+            // CloseIsFromButton = true;
+            // Close();
        }

        public void BtnRestart_Click(object sender, RoutedEventArgs e) {
@@ -31,7 +31,24 @@ namespace Ink_Canvas {
            try {
                if (pptApplication != null) {
                    //获得演示文稿对象
-                    presentation = pptApplication.ActivePresentation;
+                    try {
+                        presentation = pptApplication.ActivePresentation;
+                    }
+                    catch (COMException) {
+                        // ActivePresentation 可能因只读等原因抛异常，遍历 Presentations
+                        presentation = null;
+                        foreach (Presentation pres in pptApplication.Presentations) {
+                            try {
+                                if (pres.ReadOnly == MsoTriState.msoFalse) {
+                                    presentation = pres;
+                                    break;
+                                }
+                            } catch { }
+                        }
+                        // 如果没有可编辑的，选择第一个只读的
+                        if (presentation == null && pptApplication.Presentations.Count > 0)
+                            presentation = pptApplication.Presentations[1];
+                    }
                    pptApplication.SlideShowBegin += PptApplication_SlideShowBegin;
                    pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide;
                    pptApplication.SlideShowEnd += PptApplication_SlideShowEnd;
@@ -90,45 +107,37 @@ namespace Ink_Canvas {
                // 检查是否已有初始化的 PowerPoint 实例
                if (!isPowerPointInitialized)
                {
-                    // 检查 WPS 进程（如果不支持则返回）
+                    // 优先检测WPS进程
                    var wpsProcesses = Process.GetProcessesByName("wpp");
-                    if (wpsProcesses.Length > 0 && !isWPSSupportOn)
-                        return;
+                    var pptProcesses = Process.GetProcessesByName("POWERPNT");

-                    try
+                    // 优先获取WPS实例
+                    if (isWPSSupportOn && wpsProcesses.Length > 0)
                    {
-                        if (isWPSSupportOn && wpsProcesses.Length > 0)
+                        try
                        {
-                            // 优先获取WPS实例
-                            try
-                            {
-                                pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
-                            }
-                            catch (COMException)
-                            {
-                                // WPS未启动或未注册
-                                pptApplication = null;
-                            }
+                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application");
                        }
-                        if (pptApplication == null)
+                        catch (COMException)
                        {
-                            // 获取PowerPoint实例
-                            try
-                            {
-                                pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
-                            }
-                            catch (COMException)
-                            {
-                                pptApplication = null;
-                            }
+                            pptApplication = null;
                        }
                    }
-                    catch (Exception)
+
+                    // 如果未获取到WPS实例，尝试获取PowerPoint实例
+                    if (pptApplication == null && pptProcesses.Length > 0)
                    {
-                        pptApplication = null;
+                        try
+                        {
+                            pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
+                        }
+                        catch (COMException)
+                        {
+                            pptApplication = null;
+                        }
                    }

-                    // 如果没有找到运行中的实例，则自动创建PowerPoint进程（仅在未启用WPS支持时）
+                    // 如果都没有找到，且未启用WPS支持，则自动创建PowerPoint进程
                    if (pptApplication == null && !isWPSSupportOn)
                    {
                        try
@@ -144,12 +153,14 @@ namespace Ink_Canvas {
                    isPowerPointInitialized = true;
                    return;
                }
-                
-                // 检查 PowerPoint 进程是否还在
-                var pptProcesses = Process.GetProcessesByName("POWERPNT");
+
+                // 检查进程是否还在
+                var pptProcessesCheck = Process.GetProcessesByName("POWERPNT");
                var wpsProcessesCheck = Process.GetProcessesByName("wpp");
                bool isWpsMode = isWPSSupportOn && wpsProcessesCheck.Length > 0;
-                if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0))
+                bool isPptMode = !isWPSSupportOn && pptProcessesCheck.Length > 0;
+
+                if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcessesCheck.Length == 0))
                {
                    // 进程已关闭，清理对象
                    if (pptApplication != null)
@@ -364,8 +375,6 @@ namespace Ink_Canvas {
                pptApplication.SlideShowNextSlide -= PptApplication_SlideShowNextSlide;
                pptApplication.SlideShowEnd -= PptApplication_SlideShowEnd;
                
-                // 释放COM对象
-                ReleasePptResources();
                
                timerCheckPPT.Start();
                
@@ -815,389 +824,306 @@ namespace Ink_Canvas {

        private bool _isPptClickingBtnTurned = false;

-        private void BtnPPTSlidesUp_Click(object sender, RoutedEventArgs e) {
+       private void BtnPPTSlidesUp_Click(object sender, RoutedEventArgs e) {
+            if (currentMode == 1) {
+                GridBackgroundCover.Visibility = Visibility.Collapsed;
+                AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
+                currentMode = 0;
+            }
+
+            _isPptClickingBtnTurned = true;
+
+            if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
+                Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
+                SaveScreenShot(true,
+                    pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
+                    pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
+
            try {
-                if (currentMode == 1) {
-                    GridBackgroundCover.Visibility = Visibility.Collapsed;
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
-                    currentMode = 0;
-                }
-
-                _isPptClickingBtnTurned = true;
-
-                if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
-                    Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
-                    SaveScreenShot(true,
-                        pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
-                        pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
-
                new Thread(new ThreadStart(() => {
                    try {
                        pptApplication.SlideShowWindows[1].Activate();
+                    }
+                    catch {
+                        // ignored
+                    }
+
+                    try {
                        pptApplication.SlideShowWindows[1].View.Previous();
                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                        Application.Current.Dispatcher.Invoke(() => {
-                            StackPanelPPTControls.Visibility = Visibility.Collapsed;
-                            LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                        });
-                    }
+                    catch {
+                        // ignored
+                    } // Without this catch{}, app will crash when click the pre-page button in the fir page in some special env.
                })).Start();
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            catch {
+                StackPanelPPTControls.Visibility = Visibility.Collapsed;
+                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
            }
        }

        private void BtnPPTSlidesDown_Click(object sender, RoutedEventArgs e) {
-            try {
-                if (currentMode == 1) {
-                    GridBackgroundCover.Visibility = Visibility.Collapsed;
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
-                    AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
-                    currentMode = 0;
-                }
+            if (currentMode == 1) {
+                GridBackgroundCover.Visibility = Visibility.Collapsed;
+                AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
+                AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
+                currentMode = 0;
+            }

-                _isPptClickingBtnTurned = true;
-                if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
-                    Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
-                    SaveScreenShot(true,
-                        pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
-                        pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
-                
+            _isPptClickingBtnTurned = true;
+            if (inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber &&
+                Settings.PowerPointSettings.IsAutoSaveScreenShotInPowerPoint)
+                SaveScreenShot(true,
+                    pptApplication.SlideShowWindows[1].Presentation.Name + "/" +
+                    pptApplication.SlideShowWindows[1].View.CurrentShowPosition);
+            try {
                new Thread(new ThreadStart(() => {
                    try {
                        pptApplication.SlideShowWindows[1].Activate();
+                    }
+                    catch {
+                        // ignored
+                    }
+
+                    try {
                        pptApplication.SlideShowWindows[1].View.Next();
                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                        Application.Current.Dispatcher.Invoke(() => {
-                            StackPanelPPTControls.Visibility = Visibility.Collapsed;
-                            LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                            RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
-                        });
+                    catch {
+                        // ignored
                    }
                })).Start();
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            catch {
+                StackPanelPPTControls.Visibility = Visibility.Collapsed;
+                LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
+                RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
            }
        }

-        private void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
+        private async void PPTNavigationBtn_MouseDown(object sender, MouseButtonEventArgs e)
        {
-            try
+            lastBorderMouseDownObject = sender;
+            if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
+            if (sender == PPTLSPageButton)
            {
-                lastBorderMouseDownObject = sender;
-                if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
-
-                if (sender == PPTLSPageButton)
-                {
-                    PPTLSPageButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRSPageButton)
-                {
-                    PPTRSPageButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTLBPageButton)
-                {
-                    PPTLBPageButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRBPageButton)
-                {
-                    PPTRBPageButtonFeedbackBorder.Opacity = 0.15;
-                }
+                PPTLSPageButtonFeedbackBorder.Opacity = 0.15;
            }
-            catch (Exception ex)
+            else if (sender == PPTRSPageButton)
            {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                PPTRSPageButtonFeedbackBorder.Opacity = 0.15;
+            }
+            else if (sender == PPTLBPageButton)
+            {
+                PPTLBPageButtonFeedbackBorder.Opacity = 0.15;
+            }
+            else if (sender == PPTRBPageButton)
+            {
+                PPTRBPageButtonFeedbackBorder.Opacity = 0.15;
            }
        }

-        private void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
+        private async void PPTNavigationBtn_MouseLeave(object sender, MouseEventArgs e)
        {
-            try
+            lastBorderMouseDownObject = null;
+            if (sender == PPTLSPageButton)
            {
-                lastBorderMouseDownObject = null;
-                if (sender == PPTLSPageButton)
-                {
-                    PPTLSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRSPageButton)
-                {
-                    PPTRSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTLBPageButton)
-                {
-                    PPTLBPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPageButton)
-                {
-                    PPTRBPageButtonFeedbackBorder.Opacity = 0;
-                }
+                PPTLSPageButtonFeedbackBorder.Opacity = 0;
            }
-            catch (Exception ex)
+            else if (sender == PPTRSPageButton)
            {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+                PPTRSPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTLBPageButton)
+            {
+                PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTRBPageButton)
+            {
+                PPTRBPageButtonFeedbackBorder.Opacity = 0;
            }
        }

        private async void PPTNavigationBtn_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                if (lastBorderMouseDownObject != sender) return;
+            if (lastBorderMouseDownObject != sender) return;

-                if (sender == PPTLSPageButton)
-                {
-                    PPTLSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRSPageButton)
-                {
-                    PPTRSPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTLBPageButton)
-                {
-                    PPTLBPageButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPageButton)
-                {
-                    PPTRBPageButtonFeedbackBorder.Opacity = 0;
-                }
-
-                if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
-
-                GridTransparencyFakeBackground.Opacity = 1;
-                GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
-                CursorIcon_Click(null, null);
-                
-                try {
-                    pptApplication.SlideShowWindows[1].SlideNavigation.Visible = true;
-                }
-                catch (Exception ex) {
-                    LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                }
-
-                // 控制居中
-                if (!isFloatingBarFolded) {
-                    await Task.Delay(100);
-                    ViewboxFloatingBarMarginAnimation(60);
-                }
+            if (sender == PPTLSPageButton)
+            {
+                PPTLSPageButtonFeedbackBorder.Opacity = 0;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRSPageButton)
+            {
+                PPTRSPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTLBPageButton)
+            {
+                PPTLBPageButtonFeedbackBorder.Opacity = 0;
+            }
+            else if (sender == PPTRBPageButton)
+            {
+                PPTRBPageButtonFeedbackBorder.Opacity = 0;
+            }
+
+            if (!Settings.PowerPointSettings.EnablePPTButtonPageClickable) return;
+
+            GridTransparencyFakeBackground.Opacity = 1;
+            GridTransparencyFakeBackground.Background = new SolidColorBrush(StringToColor("#01FFFFFF"));
+            CursorIcon_Click(null, null);
+            try {
+                pptApplication.SlideShowWindows[1].SlideNavigation.Visible = true;
+            }
+            catch { }
+
+            // 控制居中
+            if (!isFloatingBarFolded) {
+                await Task.Delay(100);
+                ViewboxFloatingBarMarginAnimation(60);
            }
        }

        private void BtnPPTSlideShow_Click(object sender, RoutedEventArgs e) {
-            try {
-                new Thread(new ThreadStart(() => {
-                    try {
-                        presentation.SlideShowSettings.Run();
-                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                    }
-                })).Start();
-            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-            }
+            new Thread(new ThreadStart(() => {
+                try {
+                    presentation.SlideShowSettings.Run();
+                }
+                catch { }
+            })).Start();
        }

        private async void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) {
-            try {
-                Application.Current.Dispatcher.Invoke(() => {
-                    try {
-                        var ms = new MemoryStream();
-                        inkCanvas.Strokes.Save(ms);
-                        ms.Position = 0;
-                        memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms;
-                        timeMachine.ClearStrokeHistory();
-                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                    }
-                });
-                
-                new Thread(new ThreadStart(() => {
-                    try {
-                        pptApplication.SlideShowWindows[1].View.Exit();
-                    }
-                    catch (Exception ex) {
-                        LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                    }
-                })).Start();
+            Application.Current.Dispatcher.Invoke(() => {
+                try {
+                    var ms = new MemoryStream();
+                    inkCanvas.Strokes.Save(ms);
+                    ms.Position = 0;
+                    memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms;
+                    timeMachine.ClearStrokeHistory();
+                }
+                catch {
+                    // ignored
+                }
+            });
+            new Thread(new ThreadStart(() => {
+                try {
+                    pptApplication.SlideShowWindows[1].View.Exit();
+                }
+                catch {
+                    // ignored
+                }
+            })).Start();

-                HideSubPanels("cursor");
-                await Task.Delay(150);
-                ViewboxFloatingBarMarginAnimation(100, true);
-            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-            }
+            HideSubPanels("cursor");
+            await Task.Delay(150);
+            ViewboxFloatingBarMarginAnimation(100, true);
        }

        private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)
        {
-            try {
-                lastBorderMouseDownObject = sender;
-                if (sender == PPTLSPreviousButtonBorder) {
-                    PPTLSPreviousButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTRSPreviousButtonBorder) {
-                    PPTRSPreviousButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTLBPreviousButtonBorder)
-                {
-                    PPTLBPreviousButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRBPreviousButtonBorder)
-                {
-                    PPTRBPreviousButtonFeedbackBorder.Opacity = 0.15;
-                }
+            lastBorderMouseDownObject = sender;
+            if (sender == PPTLSPreviousButtonBorder) {
+                PPTLSPreviousButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTRSPreviousButtonBorder) {
+                PPTRSPreviousButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTLBPreviousButtonBorder)
+            {
+                PPTLBPreviousButtonFeedbackBorder.Opacity = 0.15;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBPreviousButtonBorder)
+            {
+                PPTRBPreviousButtonFeedbackBorder.Opacity = 0.15;
            }
        }
-        
        private void GridPPTControlPrevious_MouseLeave(object sender, MouseEventArgs e)
        {
-            try {
-                lastBorderMouseDownObject = null;
-                if (sender == PPTLSPreviousButtonBorder) {
-                    PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSPreviousButtonBorder) {
-                    PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBPreviousButtonBorder)
-                {
-                    PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPreviousButtonBorder)
-                {
-                    PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
+            lastBorderMouseDownObject = null;
+            if (sender == PPTLSPreviousButtonBorder) {
+                PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSPreviousButtonBorder) {
+                PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBPreviousButtonBorder)
+            {
+                PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBPreviousButtonBorder)
+            {
+                PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
            }
        }
-        
        private void GridPPTControlPrevious_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                if (lastBorderMouseDownObject != sender) return;
-                if (sender == PPTLSPreviousButtonBorder) {
-                    PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSPreviousButtonBorder) {
-                    PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBPreviousButtonBorder)
-                {
-                    PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBPreviousButtonBorder)
-                {
-                    PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
-                }
-                BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
+            if (lastBorderMouseDownObject != sender) return;
+            if (sender == PPTLSPreviousButtonBorder) {
+                PPTLSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSPreviousButtonBorder) {
+                PPTRSPreviousButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBPreviousButtonBorder)
+            {
+                PPTLBPreviousButtonFeedbackBorder.Opacity = 0;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBPreviousButtonBorder)
+            {
+                PPTRBPreviousButtonFeedbackBorder.Opacity = 0;
            }
+            BtnPPTSlidesUp_Click(BtnPPTSlidesUp, null);
        }


        private void GridPPTControlNext_MouseDown(object sender, MouseButtonEventArgs e) {
-            try {
-                lastBorderMouseDownObject = sender;
-                if (sender == PPTLSNextButtonBorder) {
-                    PPTLSNextButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTRSNextButtonBorder) {
-                    PPTRSNextButtonFeedbackBorder.Opacity = 0.15;
-                } else if (sender == PPTLBNextButtonBorder)
-                {
-                    PPTLBNextButtonFeedbackBorder.Opacity = 0.15;
-                }
-                else if (sender == PPTRBNextButtonBorder)
-                {
-                    PPTRBNextButtonFeedbackBorder.Opacity = 0.15;
-                }
+            lastBorderMouseDownObject = sender;
+            if (sender == PPTLSNextButtonBorder) {
+                PPTLSNextButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTRSNextButtonBorder) {
+                PPTRSNextButtonFeedbackBorder.Opacity = 0.15;
+            } else if (sender == PPTLBNextButtonBorder)
+            {
+                PPTLBNextButtonFeedbackBorder.Opacity = 0.15;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBNextButtonBorder)
+            {
+                PPTRBNextButtonFeedbackBorder.Opacity = 0.15;
            }
        }
-        
        private void GridPPTControlNext_MouseLeave(object sender, MouseEventArgs e)
        {
-            try {
-                lastBorderMouseDownObject = null;
-                if (sender == PPTLSNextButtonBorder) {
-                    PPTLSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSNextButtonBorder) {
-                    PPTRSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBNextButtonBorder)
-                {
-                    PPTLBNextButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBNextButtonBorder)
-                {
-                    PPTRBNextButtonFeedbackBorder.Opacity = 0;
-                }
+            lastBorderMouseDownObject = null;
+            if (sender == PPTLSNextButtonBorder) {
+                PPTLSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSNextButtonBorder) {
+                PPTRSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBNextButtonBorder)
+            {
+                PPTLBNextButtonFeedbackBorder.Opacity = 0;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBNextButtonBorder)
+            {
+                PPTRBNextButtonFeedbackBorder.Opacity = 0;
            }
        }
-        
        private void GridPPTControlNext_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                if (lastBorderMouseDownObject != sender) return;
-                if (sender == PPTLSNextButtonBorder) {
-                    PPTLSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTRSNextButtonBorder) {
-                    PPTRSNextButtonFeedbackBorder.Opacity = 0;
-                } else if (sender == PPTLBNextButtonBorder)
-                {
-                    PPTLBNextButtonFeedbackBorder.Opacity = 0;
-                }
-                else if (sender == PPTRBNextButtonBorder)
-                {
-                    PPTRBNextButtonFeedbackBorder.Opacity = 0;
-                }
-                BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
+            if (lastBorderMouseDownObject != sender) return;
+            if (sender == PPTLSNextButtonBorder) {
+                PPTLSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTRSNextButtonBorder) {
+                PPTRSNextButtonFeedbackBorder.Opacity = 0;
+            } else if (sender == PPTLBNextButtonBorder)
+            {
+                PPTLBNextButtonFeedbackBorder.Opacity = 0;
            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
+            else if (sender == PPTRBNextButtonBorder)
+            {
+                PPTRBNextButtonFeedbackBorder.Opacity = 0;
            }
+            BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null);
        }

        private void ImagePPTControlEnd_MouseUp(object sender, MouseButtonEventArgs e) {
-            try {
-                BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
-            }
-            catch (Exception ex) {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-            }
-        }
-
-        // 统一释放PPT相关COM对象，防止内存泄漏
-        private void ReleasePptResources()
-        {
-            try { if (slide != null) Marshal.ReleaseComObject(slide); } catch { }
-            slide = null;
-            try { if (slides != null) Marshal.ReleaseComObject(slides); } catch { }
-            slides = null;
-            try { if (presentation != null) Marshal.ReleaseComObject(presentation); } catch { }
-            presentation = null;
-            try { if (pptApplication != null) Marshal.ReleaseComObject(pptApplication); } catch { }
-            pptApplication = null;
+            BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
        }
    }
 }
@@ -54,7 +54,11 @@ namespace Ink_Canvas

        private void CloseAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
            var mainWin = (MainWindow)Application.Current.MainWindow;
-            if (mainWin.IsLoaded) mainWin.BtnExit_Click(null,null);
+            if (mainWin.IsLoaded) {
+                App.IsAppExitByUser = true;
+                Application.Current.Shutdown();
+                // mainWin.BtnExit_Click(null,null);
+            }
        }

        private void RestartAppTrayIconMenuItem_Clicked(object sender, RoutedEventArgs e) {
@@ -65,7 +65,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -87,7 +87,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -162,7 +162,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
@@ -190,7 +190,7 @@ namespace Ink_Canvas {
        /// </summary>
        [System.STAThreadAttribute()]
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public static void Main() {
            Ink_Canvas.App app = new Ink_Canvas.App();
            app.InitializeComponent();
@@ -65,7 +65,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -87,7 +87,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -162,7 +162,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
@@ -190,7 +190,7 @@ namespace Ink_Canvas {
        /// </summary>
        [System.STAThreadAttribute()]
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public static void Main() {
            Ink_Canvas.App app = new Ink_Canvas.App();
            app.InitializeComponent();
@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
    /// GeneratedInternalTypeHelper
    /// </summary>
    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
        
@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
    /// GeneratedInternalTypeHelper
    /// </summary>
    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
        
@@ -249,7 +249,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -265,14 +265,14 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
            return System.Delegate.CreateDelegate(delegateType, this, handler);
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -249,7 +249,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -265,14 +265,14 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
            return System.Delegate.CreateDelegate(delegateType, this, handler);
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -65,7 +65,7 @@ namespace Ink_Canvas.ProcessBars {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas.ProcessBars {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -65,7 +65,7 @@ namespace Ink_Canvas.ProcessBars {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas.ProcessBars {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -65,7 +65,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -65,7 +65,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -81,7 +81,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -72,7 +72,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -72,7 +72,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -104,7 +104,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -104,7 +104,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -192,7 +192,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -208,7 +208,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -192,7 +192,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -208,7 +208,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -72,7 +72,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -72,7 +72,7 @@ namespace Ink_Canvas {
        /// InitializeComponent
        /// </summary>
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        public void InitializeComponent() {
            if (_contentLoaded) {
                return;
@@ -88,7 +88,7 @@ namespace Ink_Canvas {
        }
        
        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.6.0")]
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
@@ -83,7 +83,7 @@
              "version": "[0.9.27, )"
            }
          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.301\\RuntimeIdentifierGraph.json"
        }
      },
      "runtimes": {
@@ -1201,7 +1201,7 @@
            "version": "[0.9.27, )"
          }
        },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.301\\RuntimeIdentifierGraph.json"
      }
    },
    "runtimes": {
@@ -1,6 +1,6 @@
 {
  "version": 2,
-  "dgSpecHash": "asCIyEp3RNM=",
+  "dgSpecHash": "aYvBApY9Dj0=",
  "success": true,
  "projectFilePath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj",
  "expectedPackageFiles": [