From f05062f9024ac959b30d81de875febc0054a9f20 Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Thu, 23 Apr 2026 23:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/MainWindow.xaml | 11 +-----
Ink Canvas/MainWindow.xaml.cs | 35 -------------------
Ink Canvas/MainWindow_cs/MW_AutoStart.cs | 11 ------
Ink Canvas/MainWindow_cs/MW_Settings.cs | 12 -------
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 21 ++++-------
InkCanvas.Controls/LabeledSettingsCard.xaml | 1 -
6 files changed, 8 insertions(+), 83 deletions(-)
delete mode 100644 Ink Canvas/MainWindow_cs/MW_AutoStart.cs
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index b3ec97a1..15ffeff0 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -626,16 +626,7 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 12925040..023e785e 100644
--- a/Ink Canvas/MainWindow.xaml.cs
+++ b/Ink Canvas/MainWindow.xaml.cs
@@ -3755,42 +3755,7 @@ namespace Ink_Canvas
#region 模式切换相关
- ///
- /// 模式切换开关事件处理
- ///
- private void ToggleSwitchMode_Toggled(object sender, RoutedEventArgs e)
- {
- try
- {
- var toggle = sender as ToggleSwitch;
- if (toggle != null)
- {
- Settings.ModeSettings.IsPPTOnlyMode = toggle.IsOn;
- // 保存设置到文件
- SaveSettingsToFile();
-
- // 如果切换到仅PPT模式，立即隐藏主窗口
- if (Settings.ModeSettings.IsPPTOnlyMode)
- {
- Hide();
- LogHelper.WriteLogToFile("已切换到仅PPT模式，主窗口已隐藏", LogHelper.LogType.Event);
- EnsurePptOnlyVisibilityProbeTimer();
- }
- else
- {
- StopPptOnlyVisibilityProbeTimer();
- // 如果切换到正常模式，显示主窗口
- Show();
- LogHelper.WriteLogToFile("已切换到正常模式，主窗口已显示", LogHelper.LogType.Event);
- }
- }
- }
- catch (Exception ex)
- {
- LogHelper.WriteLogToFile($"切换模式时出错: {ex.Message}", LogHelper.LogType.Error);
- }
- }
///
/// 检查是否应该显示主窗口（基于PPT模式和PPT放映状态）
diff --git a/Ink Canvas/MainWindow_cs/MW_AutoStart.cs b/Ink Canvas/MainWindow_cs/MW_AutoStart.cs
deleted file mode 100644
index 148c5ea3..00000000
--- a/Ink Canvas/MainWindow_cs/MW_AutoStart.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Ink_Canvas.Windows.SettingsViews.Helpers;
-
-namespace Ink_Canvas
-{
- public partial class MainWindow
- {
- public static bool StartAutomaticallyCreate(string exeName) => AutoStartHelper.StartAutomaticallyCreate(exeName);
-
- public static bool StartAutomaticallyDel(string exeName) => AutoStartHelper.StartAutomaticallyDel(exeName);
- }
-}
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 3a6bbe69..6061f90e 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -3063,18 +3063,6 @@ namespace Ink_Canvas
catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
}
- #endregion
-
- #region Ink To Shape
-
-
-
-
-
-
-
-
-
#endregion
#region Advanced
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 8e8c967b..1a4cecd6 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -1015,22 +1015,15 @@ namespace Ink_Canvas
}
// ModeSettings
- if (Settings.ModeSettings != null)
- {
- ToggleSwitchMode.IsOn = Settings.ModeSettings.IsPPTOnlyMode;
-
- // 根据加载的配置状态执行相应的窗口显示/隐藏逻辑
- if (isStartup && Settings.ModeSettings.IsPPTOnlyMode)
- {
- // 启动时如果是仅PPT模式，隐藏主窗口
- Hide();
- LogHelper.WriteLogToFile("启动时检测到仅PPT模式，主窗口已隐藏", LogHelper.LogType.Event);
- }
- }
- else
+ if (Settings.ModeSettings == null)
{
Settings.ModeSettings = new ModeSettings();
- ToggleSwitchMode.IsOn = false;
+ }
+
+ if (isStartup && Settings.ModeSettings.IsPPTOnlyMode)
+ {
+ Hide();
+ LogHelper.WriteLogToFile("启动时检测到仅PPT模式，主窗口已隐藏", LogHelper.LogType.Event);
}
// Automation
diff --git a/InkCanvas.Controls/LabeledSettingsCard.xaml b/InkCanvas.Controls/LabeledSettingsCard.xaml
index dcd3eac6..850e4b8e 100644
--- a/InkCanvas.Controls/LabeledSettingsCard.xaml
+++ b/InkCanvas.Controls/LabeledSettingsCard.xaml
@@ -10,7 +10,6 @@
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
IsOn="{Binding IsOn, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
- FontWeight="Bold"
Toggled="ToggleSwitch_Toggled"/>