新设置

Ink Canvas/Windows/SettingsViews2/Pages/NewSettingStartup.xaml

@@ -9,11 +9,10 @@
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
       xmlns:sys="clr-namespace:System;assembly=mscorlib"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:DesignHeight="950" d:DesignWidth="800"
       Title="启动">
 
     <ScrollViewer Padding="59,0,59,0">
-        <!--  These styles can be referenced to create a consistent SettingsPage layout  -->
         <FrameworkElement.Resources>
             <!--  Spacing between cards  -->
             <sys:Double x:Key="SettingsCardSpacing">4</sys:Double>
@@ -30,16 +29,100 @@
             <ikw:SimpleStackPanel MaxWidth="1000"
                 HorizontalAlignment="Stretch"
                 Spacing="{StaticResource SettingsCardSpacing}">
+                
+                <!-- 窗口设置 -->
                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
-                    Text="启动时行为" />
+                    Text="窗口设置" />
-                <!--  开机时运行 - 开关  -->
+                
+                <!-- 窗口无焦点模式 -->
+                <ui:SettingsCard Description="{i18n:I18n Key=Startup_NoFocusModeHint}"
+                        Header="窗口无焦点模式">
+                    <ui:SettingsCard.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.View}" />
+                    </ui:SettingsCard.HeaderIcon>
+                    <ui:ToggleSwitch Name="ToggleSwitchNoFocusMode" Toggled="ToggleSwitchNoFocusMode_Toggled" />
+                </ui:SettingsCard>
+                
+                <!-- 窗口无边框模式 -->
+                <ui:SettingsCard Description="{i18n:I18n Key=Startup_NoBorderModeHint}"
+                        Header="窗口无边框模式">
+                    <ui:SettingsCard.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FullScreen}" />
+                    </ui:SettingsCard.HeaderIcon>
+                    <ui:ToggleSwitch Name="ToggleSwitchWindowMode" Toggled="ToggleSwitchWindowMode_Toggled" />
+                </ui:SettingsCard>
+                
+                <!-- 窗口置顶 -->
+                <ui:SettingsCard Description="{i18n:I18n Key=Startup_TopMostHint}"
+                        Header="窗口置顶">
+                    <ui:SettingsCard.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Pinned}" />
+                    </ui:SettingsCard.HeaderIcon>
+                    <ui:ToggleSwitch Name="ToggleSwitchAlwaysOnTop" Toggled="ToggleSwitchAlwaysOnTop_Toggled" />
+                </ui:SettingsCard>
+                
+                <!-- UIA置顶 -->
+                <ui:SettingsCard Description="{i18n:I18n Key=Startup_UIAccessTopMostHint}"
+                        Header="UIA置顶">
+                    <ui:SettingsCard.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Shield}" />
+                    </ui:SettingsCard.HeaderIcon>
+                    <ui:ToggleSwitch Name="ToggleSwitchUIAccessTopMost" Toggled="ToggleSwitchUIAccessTopMost_Toggled" />
+                </ui:SettingsCard>
+                
+                <!-- 启动设置 -->
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                    Text="启动设置" />
+                
+                <!-- 开机时运行 -->
                 <ui:SettingsCard Description="{i18n:I18n Key=Startup_RunAtStartupHint}"
                         Header="{i18n:I18n Key=Startup_RunAtStartup}">
                     <ui:SettingsCard.HeaderIcon>
-                        <ui:FontIcon Glyph="&#xE768;" />
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}"/>
                     </ui:SettingsCard.HeaderIcon>
                     <ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" Toggled="ToggleSwitchRunAtStartup_Toggled" />
                 </ui:SettingsCard>
+                
+                <!-- 开机运行后收纳到侧边栏 -->
+                <ui:SettingsCard Description="{i18n:I18n Key=Startup_FoldAtStartupHint}"
+                        Header="{i18n:I18n Key=Startup_FoldAtStartup}">
+                    <ui:SettingsCard.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronLeft}" />
+                    </ui:SettingsCard.HeaderIcon>
+                    <ui:ToggleSwitch Name="ToggleSwitchFoldAtStartup" Toggled="ToggleSwitchFoldAtStartup_Toggled" />
+                </ui:SettingsCard>
+                
+                <!-- 模式设置 -->
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                    Text="模式设置" />
+                
+                <ui:SettingsExpander Description="选择软件运行模式。仅PPT模式下，软件将完全隐藏，仅在PPT放映时出现。（实验性功能，可能不稳定。）"
+                        Header="运行模式">
+                    <ui:SettingsExpander.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" />
+                    </ui:SettingsExpander.HeaderIcon>
+                    <ui:SettingsExpander.Items>
+                        <ui:SettingsCard Header="仅PPT模式">
+                            <ui:ToggleSwitch Name="ToggleSwitchPPTOnlyMode" Toggled="ToggleSwitchPPTOnlyMode_Toggled" />
+                        </ui:SettingsCard>
+                    </ui:SettingsExpander.Items>
+                </ui:SettingsExpander>
+                
+                <!-- 插件管理 -->
+                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                    Text="插件管理" />
+                
+                <ui:SettingsCard Description="通过插件扩展InkCanvas的功能。您可以启用或禁用插件，或加载自定义插件。"
+                        Header="插件管理">
+                    <ui:SettingsCard.HeaderIcon>
+                        <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" />
+                    </ui:SettingsCard.HeaderIcon>
+                    <Button Name="BtnOpenPluginManager" Content="打开插件管理器" Click="BtnOpenPluginManager_Click" />
+                </ui:SettingsCard>
+                
+                <!-- 底部空白 -->
+                <Rectangle Height="48" />
+                
             </ikw:SimpleStackPanel>
         </Grid>
     </ScrollViewer>

Ink Canvas/Windows/SettingsViews2/Pages/NewSettingStartup.xaml.cs

@@ -1,17 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Ink_Canvas.Windows.SettingsViews2.Pages
 {
@@ -20,76 +9,260 @@ namespace Ink_Canvas.Windows.SettingsViews2.Pages
     /// </summary>
     public partial class NewSettingStartup : Page
     {
+        private bool _isLoaded = false;
+
         public NewSettingStartup()
         {
             InitializeComponent();
-            // 初始化开关状态
+            Loaded += NewSettingStartup_Loaded;
-            InitializeSwitchState();
+        }
+
+        private void NewSettingStartup_Loaded(object sender, RoutedEventArgs e)
+        {
+            LoadSettings();
+            _isLoaded = true;
         }
 
         /// <summary>
-        /// 初始化开关状态
+        /// 加载设置到UI
         /// </summary>
-        private void InitializeSwitchState()
+        private void LoadSettings()
         {
+            if (MainWindow.Settings == null) return;
+
+            _isLoaded = false;
+
             try
             {
-                // 通过检查启动文件夹中是否存在快捷方式来判断开机自启动状态
+                // 窗口无焦点模式
-                if (System.IO.File.Exists(System.Environment.GetFolderPath(System.Environment.SpecialFolder.Startup) + "\\Ink Canvas Annotation.lnk"))
+                if (MainWindow.Settings.Advanced != null)
                 {
-                    ToggleSwitchRunAtStartup.IsOn = true;
+                    ToggleSwitchNoFocusMode.IsOn = MainWindow.Settings.Advanced.IsNoFocusMode;
                 }
-                else
+
+                // 窗口无边框模式
+                if (MainWindow.Settings.Advanced != null)
                 {
-                    ToggleSwitchRunAtStartup.IsOn = false;
+                    ToggleSwitchWindowMode.IsOn = MainWindow.Settings.Advanced.WindowMode;
                 }
-                
+
-                // 同步主窗口的开关状态
+                // 窗口置顶
-                var mainWindow = Application.Current.MainWindow as MainWindow;
+                if (MainWindow.Settings.Advanced != null)
-                if (mainWindow != null && mainWindow.ToggleSwitchRunAtStartup != null)
                 {
-                    mainWindow.ToggleSwitchRunAtStartup.IsOn = ToggleSwitchRunAtStartup.IsOn;
+                    ToggleSwitchAlwaysOnTop.IsOn = MainWindow.Settings.Advanced.IsAlwaysOnTop;
+                }
+
+                // UIA置顶
+                if (MainWindow.Settings.Advanced != null)
+                {
+                    ToggleSwitchUIAccessTopMost.IsOn = MainWindow.Settings.Advanced.EnableUIAccessTopMost;
+                }
+
+                // 开机时运行
+                bool runAtStartup = System.IO.File.Exists(
+                    System.Environment.GetFolderPath(System.Environment.SpecialFolder.Startup) + "\\Ink Canvas Annotation.lnk");
+                ToggleSwitchRunAtStartup.IsOn = runAtStartup;
+
+                // 启动时折叠
+                if (MainWindow.Settings.Startup != null)
+                {
+                    ToggleSwitchFoldAtStartup.IsOn = MainWindow.Settings.Startup.IsFoldAtStartup;
+                }
+
+                // 仅PPT模式
+                if (MainWindow.Settings.ModeSettings != null)
+                {
+                    ToggleSwitchPPTOnlyMode.IsOn = MainWindow.Settings.ModeSettings.IsPPTOnlyMode;
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                // 如果发生异常，默认设置为关闭
+                System.Diagnostics.Debug.WriteLine($"加载启动设置时出错: {ex.Message}");
-                ToggleSwitchRunAtStartup.IsOn = false;
+            }
+
+            _isLoaded = true;
+        }
+
+        #region 窗口设置事件处理
+
+        /// <summary>
+        /// 窗口无焦点模式开关事件
+        /// </summary>
+        private void ToggleSwitchNoFocusMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                bool newState = ToggleSwitchNoFocusMode.IsOn;
+                
+                // 使用Helper类更新设置并应用
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchNoFocusMode", newState);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"设置窗口无焦点模式时出错: {ex.Message}");
             }
         }
 
         /// <summary>
-        /// 处理开机自启动开关状态更改事件
+        /// 窗口无边框模式开关事件
+        /// </summary>
+        private void ToggleSwitchWindowMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                bool newState = ToggleSwitchWindowMode.IsOn;
+                
+                // 使用Helper类更新设置并应用
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchWindowMode", newState);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"设置窗口无边框模式时出错: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 窗口置顶开关事件
+        /// </summary>
+        private void ToggleSwitchAlwaysOnTop_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                bool newState = ToggleSwitchAlwaysOnTop.IsOn;
+                
+                // 使用Helper类更新设置并应用
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchAlwaysOnTop", newState);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"设置窗口置顶时出错: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// UIA置顶开关事件
+        /// </summary>
+        private void ToggleSwitchUIAccessTopMost_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                bool newState = ToggleSwitchUIAccessTopMost.IsOn;
+                
+                // 更新Settings对象
+                if (MainWindow.Settings.Advanced != null)
+                {
+                    MainWindow.Settings.Advanced.EnableUIAccessTopMost = newState;
+                }
+                
+                // 保存设置
+                MainWindow.SaveSettingsToFile();
+                
+                // 通知其他面板同步状态
+                Windows.SettingsViews.MainWindowSettingsHelper.NotifySettingsPanelsSyncState("ToggleSwitchUIAccessTopMost");
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"设置UIA置顶时出错: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region 启动设置事件处理
+
+        /// <summary>
+        /// 开机时运行开关事件
         /// </summary>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="e">路由事件参数</param>
         private void ToggleSwitchRunAtStartup_Toggled(object sender, RoutedEventArgs e)
         {
+            if (!_isLoaded) return;
+
             try
             {
-                // 直接实现开机自启动逻辑
+                bool newState = ToggleSwitchRunAtStartup.IsOn;
-                if (ToggleSwitchRunAtStartup.IsOn)
-                {
-                    MainWindow.StartAutomaticallyDel("InkCanvas");
-                    MainWindow.StartAutomaticallyCreate("Ink Canvas Annotation");
-                }
-                else
-                {
-                    MainWindow.StartAutomaticallyDel("InkCanvas");
-                    MainWindow.StartAutomaticallyDel("Ink Canvas Annotation");
-                }
                 
-                // 同步到主窗口的设置
+                // 使用Helper类更新设置并应用
-                var mainWindow = Application.Current.MainWindow as MainWindow;
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchRunAtStartup", newState);
-                if (mainWindow != null && mainWindow.ToggleSwitchRunAtStartup != null)
-                {
-                    mainWindow.ToggleSwitchRunAtStartup.IsOn = ToggleSwitchRunAtStartup.IsOn;
-                }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                // 忽略异常
+                System.Diagnostics.Debug.WriteLine($"设置开机启动时出错: {ex.Message}");
             }
         }
+
+        /// <summary>
+        /// 开机运行后收纳到侧边栏开关事件
+        /// </summary>
+        private void ToggleSwitchFoldAtStartup_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                bool newState = ToggleSwitchFoldAtStartup.IsOn;
+                
+                // 使用Helper类更新设置并应用
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchFoldAtStartup", newState);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"设置开机折叠时出错: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region 模式设置事件处理
+
+        /// <summary>
+        /// 仅PPT模式开关事件
+        /// </summary>
+        private void ToggleSwitchPPTOnlyMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                bool newState = ToggleSwitchPPTOnlyMode.IsOn;
+                
+                // 使用Helper类更新设置并应用
+                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchMode", newState);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"设置仅PPT模式时出错: {ex.Message}");
+            }
+        }
+
+        #endregion
+
+        #region 插件管理事件处理
+
+        /// <summary>
+        /// 打开插件管理器按钮点击事件
+        /// </summary>
+        private void BtnOpenPluginManager_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                // 创建并显示插件设置窗口
+                var pluginSettingsWindow = new Windows.PluginSettingsWindow();
+                pluginSettingsWindow.ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"打开插件管理器时出错: {ex.Message}");
+            }
+        }
+
+        #endregion
     }
-}
+}

Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml

@@ -65,7 +65,7 @@
             <ui:NavigationView.AutoSuggestBox>
                 <ui:AutoSuggestBox
                     x:Name="controlsSearchBox"
-                    MinWidth="220"
+                    MinWidth="200"
                     VerticalAlignment="Center"
                     x:FieldModifier="public"
                     PlaceholderText="查找设置"
@@ -78,6 +78,7 @@
             </ui:NavigationView.AutoSuggestBox>
 
             <ui:NavigationView.MenuItems>
+                <ui:NavigationViewItemHeader Content="ICC CE 设置" Foreground="Black"/>
                 <!-- 基本设置 -->
                 <ui:NavigationViewItem
                     x:Name="BasicItem"
@@ -181,6 +182,7 @@
                         </ui:NavigationViewItem>
                     </ui:NavigationViewItem.MenuItems>
                 </ui:NavigationViewItem>
+                <ui:NavigationViewItemHeader Content="插件设置"  Foreground="Black"/>
             </ui:NavigationView.MenuItems>
 
             <ui:NavigationView.FooterMenuItems>

Ink Canvas/Windows/SettingsViews2/SettingsWindow2.xaml.cs

@@ -37,6 +37,9 @@ namespace Ink_Canvas.Windows.SettingsViews2
         private double _originalTop;
         private double _originalWidth;
         private double _originalHeight;
+        
+        // 标记窗口是否曾经最大化过
+        private bool _wasMaximized = false;
 
         public SettingsWindow2()
         {
@@ -99,21 +102,32 @@ namespace Ink_Canvas.Windows.SettingsViews2
                     _originalWidth = this.Width;
                     _originalHeight = this.Height;
                     
+                    // 标记窗口曾经最大化过
+                    _wasMaximized = true;
+                    
                     // 最大化时清除最大尺寸限制
                     this.MaxWidth = double.PositiveInfinity;
                     this.MaxHeight = double.PositiveInfinity;
                 }
-                else
+                else if (this.WindowState == WindowState.Normal && _wasMaximized)
                 {
-                    // 非最大化时恢复窗口原始位置和大小
+                    // 从最大化恢复到正常状态时，恢复窗口原始位置和大小
                     this.Left = _originalLeft;
                     this.Top = _originalTop;
                     this.Width = _originalWidth;
                     this.Height = _originalHeight;
                     
+                    // 重置标记
+                    _wasMaximized = false;
+                    
                     // 只设置最大尺寸，不改变窗口位置
                     SetMaxSizeOnly();
                 }
+                else if (this.WindowState == WindowState.Normal)
+                {
+                    // 正常状态下只设置最大尺寸限制
+                    SetMaxSizeOnly();
+                }
             };
         }