From b891cb6fe3de3e9337eff9349a64c995b8639495 Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Thu, 23 Apr 2026 22:09:27 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"add:=E6=96=B0=E8=AE=BE=E7=BD=AE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b949b1651aa16642829894318df0d92f41a02722. --- Ink Canvas/App.xaml.cs | 11 + Ink Canvas/MainWindow.xaml | 2318 +++++++++++++++++ Ink Canvas/MainWindow.xaml.cs | 86 +- Ink Canvas/MainWindow_cs/MW_AutoTheme.cs | 4 + .../MW_FloatingWindowInterceptor.cs | 20 + Ink Canvas/MainWindow_cs/MW_PPT.cs | 12 +- Ink Canvas/MainWindow_cs/MW_Settings.cs | 836 +++++- Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 266 +- Ink Canvas/MainWindow_cs/MW_TouchEvents.cs | 6 +- Ink Canvas/Windows/CustomIconWindow.xaml.cs | 3 +- .../SettingsViews/Pages/AdvancedPage.xaml | 139 - .../SettingsViews/Pages/AdvancedPage.xaml.cs | 148 -- .../SettingsViews/Pages/AppearancePage.xaml | 327 +-- .../Pages/AppearancePage.xaml.cs | 334 +-- .../SettingsViews/Pages/AutomationPage.xaml | 76 - .../Pages/AutomationPage.xaml.cs | 127 - .../SettingsViews/Pages/GesturePage.xaml | 78 - .../SettingsViews/Pages/GesturePage.xaml.cs | 83 - .../Windows/SettingsViews/Pages/PPTPage.xaml | 169 -- .../SettingsViews/Pages/PPTPage.xaml.cs | 183 -- .../SettingsViews/Pages/StartupPage.xaml | 35 - .../SettingsViews/Pages/StartupPage.xaml.cs | 53 - .../Windows/SettingsViews/SettingsWindow.xaml | 45 - .../SettingsViews/SettingsWindow.xaml.cs | 5 - 24 files changed, 3526 insertions(+), 1838 deletions(-) delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/GesturePage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/GesturePage.xaml.cs delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/PPTPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/PPTPage.xaml.cs diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs index 6c3dc892..8b52712f 100644 --- a/Ink Canvas/App.xaml.cs +++ b/Ink Canvas/App.xaml.cs @@ -1113,6 +1113,17 @@ namespace Ink_Canvas LogHelper.WriteLogToFile($"Failed to register InkCanvasService: {ex.Message}", LogHelper.LogType.Error); } + try + { + var appRestartService = new Plugins.AppRestartService(); + Plugins.PluginManager.Instance.RegisterService(appRestartService); + LogHelper.WriteLogToFile("AppRestartService registered for plugins"); + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"Failed to register AppRestartService: {ex.Message}", LogHelper.LogType.Error); + } + // 主窗口加载完成后关闭启动画面 mainWindow.Loaded += (s, args) => { diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 11f9499e..42917682 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -649,8 +649,2326 @@ Padding="15,5" Margin="0,10,0,0"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +