From 6c7c76958f641fdf5454e97b7177525e8746e9ef Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Fri, 1 May 2026 17:36:53 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=BF=AB=E6=8D=B7=E9=94=AE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 23 - Ink Canvas/Windows/HotkeyItem.xaml | 63 +- Ink Canvas/Windows/HotkeyItem.xaml.cs | 83 +-- Ink Canvas/Windows/HotkeySettingsWindow.xaml | 375 ----------- .../Windows/HotkeySettingsWindow.xaml.cs | 628 ------------------ .../Windows/SettingsViews/Pages/HomePage.xaml | 7 + .../SettingsViews/Pages/HotkeyPage.xaml | 187 ++++++ .../SettingsViews/Pages/HotkeyPage.xaml.cs | 366 ++++++++++ .../Windows/SettingsViews/SettingsWindow.xaml | 9 + .../SettingsViews/SettingsWindow.xaml.cs | 1 + 10 files changed, 612 insertions(+), 1130 deletions(-) delete mode 100644 Ink Canvas/Windows/HotkeySettingsWindow.xaml delete mode 100644 Ink Canvas/Windows/HotkeySettingsWindow.xaml.cs create mode 100644 Ink Canvas/Windows/SettingsViews/Pages/HotkeyPage.xaml create mode 100644 Ink Canvas/Windows/SettingsViews/Pages/HotkeyPage.xaml.cs diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 33609dba..8e94e357 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -2575,29 +2575,6 @@ namespace Ink_Canvas } } - /// - /// 打开快捷键设置窗口 - /// - private void OpenHotkeySettingsWindow() - { - try - { - if (_globalHotkeyManager == null) - { - MessageBox.Show("快捷键管理器尚未初始化,请稍后重试。", "错误", MessageBoxButton.OK, MessageBoxImage.Error); - return; - } - - var hotkeySettingsWindow = new HotkeySettingsWindow(this, _globalHotkeyManager); - hotkeySettingsWindow.Owner = this; - hotkeySettingsWindow.ShowDialog(); - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"打开快捷键设置窗口时出错: {ex.Message}", LogHelper.LogType.Error); - MessageBox.Show($"打开快捷键设置窗口时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error); - } - } #endregion #region 展台/白板分辨率切换 diff --git a/Ink Canvas/Windows/HotkeyItem.xaml b/Ink Canvas/Windows/HotkeyItem.xaml index 3cfc5b1e..c3725b7f 100644 --- a/Ink Canvas/Windows/HotkeyItem.xaml +++ b/Ink Canvas/Windows/HotkeyItem.xaml @@ -3,68 +3,37 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf" mc:Ignorable="d" - d:DesignHeight="60" + d:DesignHeight="68" d:DesignWidth="600"> - - - - - - - - - - - - - - + + + + + -