add:新新设置

Ink Canvas/App.xaml.cs

@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Sentry;
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -33,6 +34,20 @@ namespace Ink_Canvas
     {
         Mutex mutex;
 
+        public void ReleaseMutexForRestart()
+        {
+            try
+            {
+                if (mutex != null)
+                {
+                    mutex.ReleaseMutex();
+                    mutex.Dispose();
+                    mutex = null;
+                }
+            }
+            catch { }
+        }
+
         public static string[] StartArgs;
         public static string RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
@@ -697,6 +712,16 @@ namespace Ink_Canvas
             appStartTime = DateTime.Now;
             appStartupStartTime = DateTime.Now;
 
+            var resourceSet = Strings.ResourceManager.GetResourceSet(CultureInfo.CurrentUICulture, true, true);
+            if (resourceSet != null)
+            {
+                foreach (System.Collections.DictionaryEntry entry in resourceSet)
+                {
+                    if (entry.Key is string key && entry.Value is string value)
+                        Current.Resources[key] = value;
+                }
+            }
+
             // 根据设置决定是否显示启动画面
             if (ShouldShowSplashScreen() && !IsLaunchByFileOrUri(e.Args))
             {

Ink Canvas/MainWindow.xaml

@@ -656,11 +656,6 @@
                                                    FontSize="26" />
                                     </GroupBox.Header>
                                     <ikw:SimpleStackPanel Spacing="6">
-                                        <controls:LabeledToggleSwitch x:Name="ToggleSwitchNoFocusMode" Label="{i18n:I18n Key=Startup_NoFocusMode}" IsOn="True" Toggled="ToggleSwitchNoFocusMode_Toggled"/>
-                                        <controls:LabeledToggleSwitch x:Name="ToggleSwitchWindowMode" Label="{i18n:I18n Key=Startup_NoBorderMode}" IsOn="True" Toggled="ToggleSwitchWindowMode_Toggled"/>
-                                        <controls:LabeledToggleSwitch x:Name="ToggleSwitchAlwaysOnTop" Label="{i18n:I18n Key=Startup_TopMost}" IsOn="True" Toggled="ToggleSwitchAlwaysOnTop_Toggled"/>
-                                        <controls:LabeledToggleSwitch x:Name="ToggleSwitchUIAccessTopMost" Label="{i18n:I18n Key=Startup_UIATopMost}" IsOn="False" Toggled="ToggleSwitchUIAccessTopMost_Toggled"
-                                                                      Hint="{i18n:I18n Key=Startup_UIAccessTopMostHint}" ShowWhen="{Binding IsOn, ElementName=ToggleSwitchAlwaysOnTop}" />
                                         <controls:LabeledToggleSwitch x:Name="ToggleSwitchIsAutoUpdate" Label="{i18n:I18n Key=Header_AutoUpdate}" IsOn="True" Toggled="ToggleSwitchIsAutoUpdate_Toggled"/>
                                         <controls:LabeledToggleSwitch x:Name="ToggleSwitchIsAutoUpdateWithSilence" Label="{i18n:I18n Key=Header_SilentUpdate}" IsOn="True" Toggled="ToggleSwitchIsAutoUpdateWithSilence_Toggled"
                                                                       Hint="{i18n:I18n Key=Startup_SilentUpdateHint}" ShowWhen="{Binding IsOn, ElementName=ToggleSwitchIsAutoUpdate}"/>
@@ -741,8 +736,6 @@
                                                 </ikw:SimpleStackPanel>
                                             </ikw:SimpleStackPanel>
                                         </Border>
-                                        <controls:LabeledToggleSwitch x:Name="ToggleSwitchRunAtStartup" Label="{i18n:I18n Key=Startup_RunAtStartup}" IsOn="True" Toggled="ToggleSwitchRunAtStartup_Toggled"/>
-                                        <controls:LabeledToggleSwitch x:Name="ToggleSwitchFoldAtStartup" Label="{i18n:I18n Key=Startup_FoldAtStartup}" IsOn="True" Toggled="ToggleSwitchFoldAtStartup_Toggled"/>
                                         <!--<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchAutoHideCanvas" Header="自动隐藏画板" Toggled="ToggleSwitchAutoHideCanvas_Toggled"/>
                                         <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchAutoEnterModeFinger" Header="自动进入手指模式" Toggled="ToggleSwitchAutoEnterModeFinger_Toggled"/>-->
                                     </ikw:SimpleStackPanel>

Ink Canvas/MainWindow.xaml.cs

@@ -329,11 +329,9 @@ namespace Ink_Canvas
                 BlackBoardRightSidePageListScrollViewer.ReleaseTouchCapture(e.TouchDevice);
                 e.Handled = true;
             };
-            // 初始化无焦点模式开关
+            // 应用无焦点模式设置
-            ToggleSwitchNoFocusMode.IsOn = Settings.Advanced.IsNoFocusMode;
             ApplyNoFocusMode();
-            // 初始化窗口置顶开关
+            // 应用窗口置顶设置
-            ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
             ApplyAlwaysOnTop();
 
             // 添加窗口激活事件处理，确保置顶状态在窗口重新激活时得到保持
@@ -1367,16 +1365,17 @@ namespace Ink_Canvas
                 }), DispatcherPriority.Loaded);
             }
 
-            // 确保开关和设置同步
+            // 应用无焦点模式设置
-            ToggleSwitchNoFocusMode.IsOn = Settings.Advanced.IsNoFocusMode;
             ApplyNoFocusMode();
-            ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
+            // 应用窗口置顶设置
             ApplyAlwaysOnTop();
 
-            // 初始化UIA置顶开关
+            // 设置UIA置顶状态
-            ToggleSwitchUIAccessTopMost.IsOn = Settings.Advanced.EnableUIAccessTopMost;
-
             App.IsUIAccessTopMostEnabled = Settings.Advanced.EnableUIAccessTopMost;
+            if (Settings.Advanced.EnableUIAccessTopMost && Settings.Advanced.IsAlwaysOnTop)
+            {
+                ApplyUIAccessTopMost();
+            }
 
             // 初始化橡皮擦自动切换回批注模式开关
             if (ToggleSwitchEnableEraserAutoSwitchBack != null)
@@ -1618,7 +1617,7 @@ namespace Ink_Canvas
         /// 如果该设置为 true，将窗口置为普通状态并调整到主屏幕的左上角(0,0)及主屏幕分辨率的宽高，使窗口覆盖整个主屏幕；
         /// 否则将窗口设为最大化状态。
         /// </remarks>
-        private void SetWindowMode()
+        public void SetWindowMode()
         {
             if (Settings.Advanced.WindowMode)
             {
@@ -2997,7 +2996,7 @@ namespace Ink_Canvas
             }
         }
 
-        private void ApplyNoFocusMode()
+        public void ApplyNoFocusMode()
         {
             var hwnd = new WindowInteropHelper(this).Handle;
             int exStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
@@ -3017,7 +3016,7 @@ namespace Ink_Canvas
             }
         }
 
-        private void ApplyAlwaysOnTop()
+        public void ApplyAlwaysOnTop()
         {
             try
             {
@@ -3209,51 +3208,6 @@ namespace Ink_Canvas
             }
         }
 
-        private void ToggleSwitchNoFocusMode_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
-            var toggle = sender as ToggleSwitch;
-            Settings.Advanced.IsNoFocusMode = toggle != null && toggle.IsOn;
-            SaveSettingsToFile();
-
-            if (isTemporarilyDisablingNoFocusMode)
-            {
-                isTemporarilyDisablingNoFocusMode = false;
-            }
-
-            ApplyNoFocusMode();
-
-            // 如果启用了窗口置顶，需要重新应用置顶设置以处理无焦点模式的变化
-            if (Settings.Advanced.IsAlwaysOnTop)
-            {
-                ApplyAlwaysOnTop();
-            }
-
-        }
-
-        private void ToggleSwitchAlwaysOnTop_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
-            var toggle = sender as ToggleSwitch;
-            Settings.Advanced.IsAlwaysOnTop = toggle != null && toggle.IsOn;
-            SaveSettingsToFile();
-            ApplyAlwaysOnTop();
-        }
-
-        private void ToggleSwitchUIAccessTopMost_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
-            var toggle = sender as ToggleSwitch;
-            bool newValue = toggle != null && toggle.IsOn;
-
-            Settings.Advanced.EnableUIAccessTopMost = newValue;
-            SaveSettingsToFile();
-            ApplyUIAccessTopMost();
-
-            App.IsUIAccessTopMostEnabled = newValue;
-
-        }
-
         private void Window_Activated(object sender, EventArgs e)
         {
             // 窗口激活时，如果启用了置顶功能，重新应用置顶设置
@@ -4630,7 +4584,7 @@ namespace Ink_Canvas
         /// <summary>
         /// 应用UIA置顶功能
         /// </summary>
-        private void ApplyUIAccessTopMost()
+        public void ApplyUIAccessTopMost()
         {
             try
             {
@@ -4651,8 +4605,8 @@ namespace Ink_Canvas
                                 App.watchdogProcess = null;
                             }
 
+                            App.StartWatchdogIfNeeded();
 
-                            // 调用UIAccess DLL
                             if (Environment.Is64BitProcess)
                             {
                                 PrepareUIAccessX64();
@@ -4662,7 +4616,6 @@ namespace Ink_Canvas
                                 PrepareUIAccessX86();
                             }
 
-                            App.StartWatchdogIfNeeded();
                             timerKillProcess.Start();
                         }
                         catch (Exception ex)

Ink Canvas/MainWindow_cs/MW_Settings.cs

@@ -687,46 +687,6 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
-        /// <summary>
-        /// 处理开机启动开关状态更改事件
-        /// </summary>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="e">路由事件参数</param>
-        /// <remarks>
-        /// 当开机启动开关状态更改时：
-        /// 1. 如果开启，删除旧的启动项并创建新的启动项
-        /// 2. 如果关闭，删除所有启动项
-        /// </remarks>
-        private void ToggleSwitchRunAtStartup_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
-            if (ToggleSwitchRunAtStartup.IsOn)
-            {
-                StartAutomaticallyDel("InkCanvas");
-                StartAutomaticallyCreate("Ink Canvas Annotation");
-            }
-            else
-            {
-                StartAutomaticallyDel("InkCanvas");
-                StartAutomaticallyDel("Ink Canvas Annotation");
-            }
-        }
-
-        /// <summary>
-        /// 处理启动时折叠开关状态更改事件
-        /// </summary>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="e">路由事件参数</param>
-        /// <remarks>
-        /// 当启动时折叠开关状态更改时，保存设置到文件
-        /// </remarks>
-        private void ToggleSwitchFoldAtStartup_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
-            Settings.Startup.IsFoldAtStartup = ToggleSwitchFoldAtStartup.IsOn;
-            SaveSettingsToFile();
-        }
-
         /// <summary>
         /// 处理PowerPoint支持开关状态更改事件
         /// </summary>
@@ -3917,8 +3877,6 @@ namespace Ink_Canvas
                 SaveSettingsToFile();
                 LoadSettings(isStartup: false, skipAutoUpdateCheck: true);
                 isLoaded = true;
-
-                ToggleSwitchRunAtStartup.IsOn = false;
             }
             catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
 
@@ -4205,14 +4163,6 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
-        private void ToggleSwitchWindowMode_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
-            Settings.Advanced.WindowMode = ToggleSwitchWindowMode.IsOn;
-            SaveSettingsToFile();
-            SetWindowMode();
-        }
-
         private void ToggleSwitchIsAutoBackupBeforeUpdate_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -216,24 +216,6 @@ namespace Ink_Canvas
             {
             }
 
-            try
-            {
-                if (File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.Startup) +
-                                "\\Ink Canvas Annotation.lnk"))
-                {
-                    ToggleSwitchRunAtStartup.IsOn = true;
-                }
-                else
-                {
-                    ToggleSwitchRunAtStartup.IsOn = false;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
-                ToggleSwitchRunAtStartup.IsOn = false;
-            }
-
             if (Settings.Startup != null)
             {
                 if (isStartup)
@@ -243,11 +225,6 @@ namespace Ink_Canvas
                         DelAutoSavedFiles.DeleteFilesOlder(Settings.Automation.AutoSavedStrokesLocation,
                             Settings.Automation.AutoDelSavedFilesDaysThreshold);
                     }
-
-                    if (Settings.Startup.IsFoldAtStartup && !App.StartWithBoardMode)
-                    {
-                        FoldFloatingBar_MouseUp(Fold_Icon, null);
-                    }
                 }
 
                 if (Settings.Startup.IsEnableNibMode)
@@ -331,8 +308,6 @@ namespace Ink_Canvas
                     AutoUpdateWithSilenceStartTimeComboBox, AutoUpdateWithSilenceEndTimeComboBox);
                 AutoUpdateWithSilenceStartTimeComboBox.SelectedItem = Settings.Startup.AutoUpdateWithSilenceStartTime;
                 AutoUpdateWithSilenceEndTimeComboBox.SelectedItem = Settings.Startup.AutoUpdateWithSilenceEndTime;
-
-                ToggleSwitchFoldAtStartup.IsOn = Settings.Startup.IsFoldAtStartup;
             }
             else
             {
@@ -1003,7 +978,6 @@ namespace Ink_Canvas
                 ToggleSwitchIsLogEnabled.IsOn = Settings.Advanced.IsLogEnabled;
                 ToggleSwitchIsSaveLogByDate.IsOn = Settings.Advanced.IsSaveLogByDate;
                 ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
-                ToggleSwitchWindowMode.IsOn = Settings.Advanced.WindowMode;
                 ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
                 ToggleSwitchIsEnableUriScheme.IsOn = Settings.Advanced.IsEnableUriScheme;
                 ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;

Ink Canvas/Properties/Strings.en-US.resx

@@ -258,6 +258,27 @@
   <data name="Startup_UIATopMostHint" xml:space="preserve">
     <value># UIA topmost requires admin to take effect.</value>
   </data>
+  <data name="Startup_TopMostMode" xml:space="preserve">
+    <value>Topmost Mode</value>
+  </data>
+  <data name="Startup_TopMostMode_Normal" xml:space="preserve">
+    <value>Normal Topmost</value>
+  </data>
+  <data name="Startup_TopMostMode_UIA" xml:space="preserve">
+    <value>UIA Topmost (Requires Admin)</value>
+  </data>
+  <data name="Startup_TopMostMode_UIA_RestartRequired" xml:space="preserve">
+    <value>Switching to UIA topmost mode requires a restart to take effect. Restart now?</value>
+  </data>
+  <data name="Startup_TopMostMode_Normal_RestartRequired" xml:space="preserve">
+    <value>Switching to normal topmost mode requires a restart to take effect. Restart now?</value>
+  </data>
+  <data name="Startup_TopMostMode_RestartAsAdmin" xml:space="preserve">
+    <value>Restart as Administrator</value>
+  </data>
+  <data name="Startup_TopMostMode_RestartAsNormal" xml:space="preserve">
+    <value>Switch to Non-Admin Mode</value>
+  </data>
   <data name="Header_AutoUpdate" xml:space="preserve">
     <value>Auto-update</value>
   </data>

Ink Canvas/Properties/Strings.resx

@@ -273,6 +273,27 @@
   <data name="Startup_UIATopMostHint" xml:space="preserve">
     <value># 开启UIA置顶后，软件需要管理员启动才能置顶…</value>
   </data>
+  <data name="Startup_TopMostMode" xml:space="preserve">
+    <value>置顶模式</value>
+  </data>
+  <data name="Startup_TopMostMode_Normal" xml:space="preserve">
+    <value>普通置顶</value>
+  </data>
+  <data name="Startup_TopMostMode_UIA" xml:space="preserve">
+    <value>UIA置顶（需要管理员权限）</value>
+  </data>
+  <data name="Startup_TopMostMode_UIA_RestartRequired" xml:space="preserve">
+    <value>切换到UIA置顶模式需要重启软件才能生效，是否立即重启？</value>
+  </data>
+  <data name="Startup_TopMostMode_Normal_RestartRequired" xml:space="preserve">
+    <value>切换到普通置顶模式需要重启软件才能生效，是否立即重启？</value>
+  </data>
+  <data name="Startup_TopMostMode_RestartAsAdmin" xml:space="preserve">
+    <value>重启到管理员模式</value>
+  </data>
+  <data name="Startup_TopMostMode_RestartAsNormal" xml:space="preserve">
+    <value>切换到非管理员模式</value>
+  </data>
   <data name="Header_AutoUpdate" xml:space="preserve">
     <value>自动检查更新</value>
   </data>

Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml

@@ -8,6 +8,7 @@
       xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
       xmlns:i18n="clr-namespace:Ink_Canvas.MarkupExtensions"
       xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      xmlns:controls="clr-namespace:Ink_Canvas.Controls;assembly=InkCanvas.Controls"
       mc:Ignorable="d" 
       
       Title="启动">
@@ -15,9 +16,7 @@
     <ScrollViewer PanningMode="VerticalFirst">
         <Grid Margin="59,0,59,0">
             <FrameworkElement.Resources>
-            <!--  Spacing between cards  -->
             <sys:Double x:Key="SettingsCardSpacing">4</sys:Double>
-            <!--  Style (inc. the correct spacing) of a section header  -->
             <Style x:Key="SettingsSectionHeaderTextBlockStyle"
                 BasedOn="{StaticResource BodyStrongTextBlockStyle}"
                 TargetType="TextBlock">
@@ -36,62 +35,83 @@
                         Text="窗口设置" />
                 
                     <!-- 窗口无焦点模式 -->
-                    <ui:SettingsCard Description="{i18n:I18n Key=Startup_NoFocusModeHint}"
+                    <controls:LabeledSettingsCard x:Name="CardNoFocusMode"
-                            Header="{i18n:I18n Key=Startup_NoFocusMode}">
+                            Header="{i18n:I18n Key=Startup_NoFocusMode}"
-                        <ui:SettingsCard.HeaderIcon>
+                            Description="{i18n:I18n Key=Startup_NoFocusModeHint}"
-                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.View}" />
+                            Icon="{x:Static ui:SegoeFluentIcons.View}"
-                        </ui:SettingsCard.HeaderIcon>
+                            SwitchName="ToggleSwitchNoFocusMode"
-                        <ui:ToggleSwitch Name="ToggleSwitchNoFocusMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchNoFocusMode_Toggled" />
+                            Toggled="ToggleSwitchNoFocusMode_Toggled" />
-                    </ui:SettingsCard>
                 
                     <!-- 窗口无边框模式 -->
-                    <ui:SettingsCard Description="{i18n:I18n Key=Startup_NoBorderModeHint}"
+                    <controls:LabeledSettingsCard x:Name="CardWindowMode"
-                            Header="{i18n:I18n Key=Startup_NoBorderMode}">
+                            Header="{i18n:I18n Key=Startup_NoBorderMode}"
-                        <ui:SettingsCard.HeaderIcon>
+                            Description="{i18n:I18n Key=Startup_NoBorderModeHint}"
-                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FullScreen}" />
+                            Icon="{x:Static ui:SegoeFluentIcons.FullScreen}"
-                        </ui:SettingsCard.HeaderIcon>
+                            SwitchName="ToggleSwitchWindowMode"
-                        <ui:ToggleSwitch Name="ToggleSwitchWindowMode" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchWindowMode_Toggled" />
+                            Toggled="ToggleSwitchWindowMode_Toggled" />
-                    </ui:SettingsCard>
                 
                     <!-- 窗口置顶 -->
-                    <ui:SettingsCard Description="{i18n:I18n Key=Startup_TopMostHint}"
+                    <ui:SettingsExpander x:Name="ExpanderAlwaysOnTop"
-                            Header="{i18n:I18n Key=Startup_TopMost}">
+                            Header="{i18n:I18n Key=Startup_TopMost}"
-                        <ui:SettingsCard.HeaderIcon>
+                            Description="{i18n:I18n Key=Startup_TopMostHint}">
+                        <ui:SettingsExpander.HeaderIcon>
                             <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Pinned}" />
-                        </ui:SettingsCard.HeaderIcon>
+                        </ui:SettingsExpander.HeaderIcon>
-                        <ui:ToggleSwitch Name="ToggleSwitchAlwaysOnTop" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchAlwaysOnTop_Toggled" />
+                        <ui:ToggleSwitch x:Name="ToggleSwitchAlwaysOnTop"
-                    </ui:SettingsCard>
+                                OnContent="{DynamicResource Common_On}"
-                
+                                OffContent="{DynamicResource Common_Off}"
-                    <!-- UIA置顶 -->
+                                Toggled="ToggleSwitchAlwaysOnTop_Toggled" />
-                    <ui:SettingsCard Description="{i18n:I18n Key=Startup_UIAccessTopMostHint_1}"
+                        <ui:SettingsExpander.ItemTemplate>
-                            Header="{i18n:I18n Key=Startup_UIATopMost}">
+                            <local:TopMostModeTemplateSelector>
-                        <ui:SettingsCard.HeaderIcon>
+                                <local:TopMostModeTemplateSelector.SelectionTemplate>
-                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Shield}" />
+                                    <DataTemplate>
-                        </ui:SettingsCard.HeaderIcon>
+                                        <ui:SettingsCard Header="{i18n:I18n Key=Startup_TopMostMode}">
-                        <ui:ToggleSwitch Name="ToggleSwitchUIAccessTopMost" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchUIAccessTopMost_Toggled" />
+                                            <StackPanel Orientation="Horizontal">
-                    </ui:SettingsCard>
+                                                <RadioButton Content="{i18n:I18n Key=Startup_TopMostMode_Normal}"
+                                                        GroupName="TopMostMode"
+                                                        Checked="RadioTopMostNormal_Checked"
+                                                        Loaded="RadioTopMostNormal_Loaded"
+                                                        Margin="0,0,16,0" />
+                                                <RadioButton Content="{i18n:I18n Key=Startup_TopMostMode_UIA}"
+                                                        GroupName="TopMostMode"
+                                                        Checked="RadioTopMostUIA_Checked"
+                                                        Loaded="RadioTopMostUIA_Loaded" />
+                                            </StackPanel>
+                                        </ui:SettingsCard>
+                                    </DataTemplate>
+                                </local:TopMostModeTemplateSelector.SelectionTemplate>
+                                <local:TopMostModeTemplateSelector.ButtonTemplate>
+                                    <DataTemplate>
+                                        <ui:SettingsCard Header="{Binding ButtonHeader}">
+                                            <Button Content="{Binding ButtonContent}"
+                                                    Click="BtnRestart_Click"
+                                                    Tag="{Binding RestartAsAdmin}" />
+                                        </ui:SettingsCard>
+                                    </DataTemplate>
+                                </local:TopMostModeTemplateSelector.ButtonTemplate>
+                            </local:TopMostModeTemplateSelector>
+                        </ui:SettingsExpander.ItemTemplate>
+                    </ui:SettingsExpander>
                 
                     <!-- 启动设置 -->
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                         Text="启动设置" />
                 
                     <!-- 开机时运行 -->
-                    <ui:SettingsCard Description="{i18n:I18n Key=Startup_RunAtStartupHint}"
+                    <controls:LabeledSettingsCard x:Name="CardRunAtStartup"
-                            Header="{i18n:I18n Key=Startup_RunAtStartup}">
+                            Header="{i18n:I18n Key=Startup_RunAtStartup}"
-                        <ui:SettingsCard.HeaderIcon>
+                            Description="{i18n:I18n Key=Startup_RunAtStartupHint}"
-                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}"/>
+                            Icon="{x:Static ui:SegoeFluentIcons.Settings}"
-                        </ui:SettingsCard.HeaderIcon>
+                            SwitchName="ToggleSwitchRunAtStartup"
-                        <ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchRunAtStartup_Toggled" />
+                            Toggled="ToggleSwitchRunAtStartup_Toggled" />
-                    </ui:SettingsCard>
                 
                     <!-- 开机运行后收纳到侧边栏 -->
-                    <ui:SettingsCard Description="{i18n:I18n Key=Startup_FoldAtStartupHint}"
+                    <controls:LabeledSettingsCard x:Name="CardFoldAtStartup"
-                            Header="{i18n:I18n Key=Startup_FoldAtStartup}">
+                            Header="{i18n:I18n Key=Startup_FoldAtStartup}"
-                        <ui:SettingsCard.HeaderIcon>
+                            Description="{i18n:I18n Key=Startup_FoldAtStartupHint}"
-                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.ChevronLeft}" />
+                            Icon="{x:Static ui:SegoeFluentIcons.ChevronLeft}"
-                        </ui:SettingsCard.HeaderIcon>
+                            SwitchName="ToggleSwitchFoldAtStartup"
-                        <ui:ToggleSwitch Name="ToggleSwitchFoldAtStartup" OnContent="{i18n:I18n Key=Common_On}" OffContent="{i18n:I18n Key=Common_Off}" Toggled="ToggleSwitchFoldAtStartup_Toggled" />
+                            Toggled="ToggleSwitchFoldAtStartup_Toggled" />
-                    </ui:SettingsCard>
                 
                     <!-- 模式设置 -->
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"

Ink Canvas/Windows/SettingsViews/Pages/StartupPage.xaml.cs

@@ -1,15 +1,20 @@
-using iNKORE.UI.WPF.Modern.Controls;
+using Ink_Canvas.Controls;
 using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Security.Principal;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Ink_Canvas.Windows.SettingsViews.Pages
 {
-    /// <summary>
+    public partial class StartupPage : iNKORE.UI.WPF.Modern.Controls.Page
-    /// StartupPage.xaml 的交互逻辑
-    /// </summary>
-    public partial class StartupPage : Page
     {
         private bool _isLoaded = false;
+        private bool _isAdmin = false;
+        private RadioButton _radioNormal;
+        private RadioButton _radioUIA;
+        private readonly ObservableCollection<object> _topMostModeItems = new();
 
         public StartupPage()
         {
@@ -23,53 +28,93 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             _isLoaded = true;
         }
 
-        /// <summary>
+        private static bool IsRunningAsAdmin()
-        /// 加载设置到UI
+        {
-        /// </summary>
+            try
+            {
+                var identity = WindowsIdentity.GetCurrent();
+                var principal = new WindowsPrincipal(identity);
+                return principal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        private void RestartApp(bool asAdmin)
+        {
+            try
+            {
+                App.IsAppExitByUser = true;
+
+                (Application.Current as App)?.ReleaseMutexForRestart();
+
+                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+
+                if (asAdmin)
+                {
+                    var psi = new ProcessStartInfo(exePath) { UseShellExecute = true, Verb = "runas" };
+                    Process.Start(psi);
+                }
+                else
+                {
+                    Process.Start("explorer.exe", "\"" + exePath + "\"");
+                }
+
+                Application.Current.Shutdown();
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"重启应用时出错: {ex.Message}");
+            }
+        }
+
         private void LoadSettings()
         {
             if (MainWindow.Settings == null) return;
 
             _isLoaded = false;
+            _isAdmin = IsRunningAsAdmin();
 
             try
             {
-                // 窗口无焦点模式
-                if (MainWindow.Settings.Advanced != null)
-                {
-                    ToggleSwitchNoFocusMode.IsOn = MainWindow.Settings.Advanced.IsNoFocusMode;
-                }
-
-                // 窗口无边框模式
-                if (MainWindow.Settings.Advanced != null)
-                {
-                    ToggleSwitchWindowMode.IsOn = MainWindow.Settings.Advanced.WindowMode;
-                }
-
-                // 窗口置顶
                 if (MainWindow.Settings.Advanced != null)
                 {
+                    CardNoFocusMode.IsOn = MainWindow.Settings.Advanced.IsNoFocusMode;
+                    CardWindowMode.IsOn = MainWindow.Settings.Advanced.WindowMode;
                     ToggleSwitchAlwaysOnTop.IsOn = MainWindow.Settings.Advanced.IsAlwaysOnTop;
+
+                    _topMostModeItems.Clear();
+                    _topMostModeItems.Add(new TopMostModeSelectionItem());
+
+                    var btnItem = _isAdmin
+                        ? new TopMostModeButtonItem
+                        {
+                            ButtonHeader = Properties.Strings.GetString("Startup_TopMostMode_RestartAsNormal"),
+                            ButtonContent = Properties.Strings.GetString("Startup_TopMostMode_RestartAsNormal"),
+                            RestartAsAdmin = false
+                        }
+                        : new TopMostModeButtonItem
+                        {
+                            ButtonHeader = Properties.Strings.GetString("Startup_TopMostMode_RestartAsAdmin"),
+                            ButtonContent = Properties.Strings.GetString("Startup_TopMostMode_RestartAsAdmin"),
+                            RestartAsAdmin = true
+                        };
+                    _topMostModeItems.Add(btnItem);
+
+                    ExpanderAlwaysOnTop.ItemsSource = _topMostModeItems;
                 }
 
-                // 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;
+                CardRunAtStartup.IsOn = runAtStartup;
 
-                // 启动时折叠
                 if (MainWindow.Settings.Startup != null)
                 {
-                    ToggleSwitchFoldAtStartup.IsOn = MainWindow.Settings.Startup.IsFoldAtStartup;
+                    CardFoldAtStartup.IsOn = MainWindow.Settings.Startup.IsFoldAtStartup;
                 }
 
-                // 仅PPT模式
                 if (MainWindow.Settings.ModeSettings != null)
                 {
                     ToggleSwitchPPTOnlyMode.IsOn = MainWindow.Settings.ModeSettings.IsPPTOnlyMode;
@@ -77,57 +122,101 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"加载启动设置时出错: {ex.Message}");
+                Debug.WriteLine($"加载启动设置时出错: {ex.Message}");
             }
 
             _isLoaded = true;
         }
 
+        private void UpdateRadioButtons()
+        {
+            if (_radioNormal == null || _radioUIA == null) return;
+
+            bool wasLoaded = _isLoaded;
+            _isLoaded = false;
+
+            _radioNormal.IsEnabled = _isAdmin;
+            _radioUIA.IsEnabled = _isAdmin;
+
+            if (_isAdmin && MainWindow.Settings.Advanced.EnableUIAccessTopMost)
+                _radioUIA.IsChecked = true;
+            else
+                _radioNormal.IsChecked = true;
+
+            _isLoaded = wasLoaded;
+        }
+
+        private void RadioTopMostNormal_Loaded(object sender, RoutedEventArgs e)
+        {
+            _radioNormal = sender as RadioButton;
+            UpdateRadioButtons();
+        }
+
+        private void RadioTopMostUIA_Loaded(object sender, RoutedEventArgs e)
+        {
+            _radioUIA = sender as RadioButton;
+            UpdateRadioButtons();
+        }
+
         #region 窗口设置事件处理
 
-        /// <summary>
-        /// 窗口无焦点模式开关事件
-        /// </summary>
         private void ToggleSwitchNoFocusMode_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
 
             try
             {
-                bool newState = ToggleSwitchNoFocusMode.IsOn;
+                bool newState = CardNoFocusMode.IsOn;
 
-                // 使用Helper类更新设置并应用
+                if (MainWindow.Settings.Advanced != null)
-                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchNoFocusMode", newState);
+                {
+                    MainWindow.Settings.Advanced.IsNoFocusMode = newState;
+                    MainWindow.SaveSettingsToFile();
+                }
+
+                var mainWindow = Application.Current.MainWindow as MainWindow;
+                if (mainWindow != null)
+                {
+                    mainWindow.ApplyNoFocusMode();
+
+                    if (MainWindow.Settings.Advanced.IsAlwaysOnTop)
+                    {
+                        mainWindow.ApplyAlwaysOnTop();
+                    }
+                }
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置窗口无焦点模式时出错: {ex.Message}");
+                Debug.WriteLine($"设置窗口无焦点模式时出错: {ex.Message}");
             }
         }
 
-        /// <summary>
-        /// 窗口无边框模式开关事件
-        /// </summary>
         private void ToggleSwitchWindowMode_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
 
             try
             {
-                bool newState = ToggleSwitchWindowMode.IsOn;
+                bool newState = CardWindowMode.IsOn;
 
-                // 使用Helper类更新设置并应用
+                if (MainWindow.Settings.Advanced != null)
-                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchWindowMode", newState);
+                {
+                    MainWindow.Settings.Advanced.WindowMode = newState;
+                    MainWindow.SaveSettingsToFile();
+                }
+
+                var mainWindow = Application.Current.MainWindow as MainWindow;
+                if (mainWindow != null)
+                {
+                    mainWindow.SetWindowMode();
+                }
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置窗口无边框模式时出错: {ex.Message}");
+                Debug.WriteLine($"设置窗口无边框模式时出错: {ex.Message}");
             }
         }
 
-        /// <summary>
-        /// 窗口置顶开关事件
-        /// </summary>
         private void ToggleSwitchAlwaysOnTop_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
@@ -136,41 +225,100 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             {
                 bool newState = ToggleSwitchAlwaysOnTop.IsOn;
 
-                // 使用Helper类更新设置并应用
+                if (MainWindow.Settings.Advanced != null)
-                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchAlwaysOnTop", newState);
+                {
+                    MainWindow.Settings.Advanced.IsAlwaysOnTop = newState;
+                    MainWindow.SaveSettingsToFile();
+                }
+
+                var mainWindow = Application.Current.MainWindow as MainWindow;
+                if (mainWindow != null)
+                {
+                    mainWindow.ApplyAlwaysOnTop();
+
+                    if (!newState && MainWindow.Settings.Advanced.EnableUIAccessTopMost)
+                    {
+                        MainWindow.Settings.Advanced.EnableUIAccessTopMost = false;
+                        App.IsUIAccessTopMostEnabled = false;
+                        mainWindow.ApplyUIAccessTopMost();
+                        MainWindow.SaveSettingsToFile();
+                        if (_radioNormal != null) _radioNormal.IsChecked = true;
+                    }
+                }
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置窗口置顶时出错: {ex.Message}");
+                Debug.WriteLine($"设置窗口置顶时出错: {ex.Message}");
             }
         }
 
-        /// <summary>
+        private void RadioTopMostNormal_Checked(object sender, RoutedEventArgs e)
-        /// 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.Settings.Advanced.EnableUIAccessTopMost = false;
+                    MainWindow.SaveSettingsToFile();
                 }
 
-                // 保存设置
+                App.IsUIAccessTopMostEnabled = false;
-                MainWindow.SaveSettingsToFile();
 
-                // 通知其他面板同步状态
+                var msg = Properties.Strings.GetString("Startup_TopMostMode_Normal_RestartRequired");
-                Windows.SettingsViews.MainWindowSettingsHelper.NotifySettingsPanelsSyncState("ToggleSwitchUIAccessTopMost");
+                var result = System.Windows.MessageBox.Show(msg, "Ink Canvas", MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+                if (result == MessageBoxResult.Yes)
+                {
+                    RestartApp(_isAdmin);
+                }
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置UIA置顶时出错: {ex.Message}");
+                Debug.WriteLine($"设置普通置顶模式时出错: {ex.Message}");
+            }
+        }
+
+        private void RadioTopMostUIA_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!_isLoaded) return;
+
+            try
+            {
+                if (MainWindow.Settings.Advanced != null)
+                {
+                    MainWindow.Settings.Advanced.EnableUIAccessTopMost = true;
+
+                    if (!MainWindow.Settings.Advanced.IsAlwaysOnTop)
+                    {
+                        MainWindow.Settings.Advanced.IsAlwaysOnTop = true;
+                        ToggleSwitchAlwaysOnTop.IsOn = true;
+                    }
+
+                    MainWindow.SaveSettingsToFile();
+                }
+
+                var msg = Properties.Strings.GetString("Startup_TopMostMode_UIA_RestartRequired");
+                var result = System.Windows.MessageBox.Show(msg, "Ink Canvas", MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+                if (result == MessageBoxResult.Yes)
+                {
+                    App.IsUIAccessTopMostEnabled = true;
+                    RestartApp(true);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"设置UIA置顶模式时出错: {ex.Message}");
+            }
+        }
+
+        private void BtnRestart_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button btn && btn.Tag is bool asAdmin)
+            {
+                RestartApp(asAdmin);
             }
         }
 
@@ -178,43 +326,48 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
 
         #region 启动设置事件处理
 
-        /// <summary>
-        /// 开机时运行开关事件
-        /// </summary>
         private void ToggleSwitchRunAtStartup_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
 
             try
             {
-                bool newState = ToggleSwitchRunAtStartup.IsOn;
+                bool newState = CardRunAtStartup.IsOn;
 
-                // 使用Helper类更新设置并应用
+                if (newState)
-                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchRunAtStartup", newState);
+                {
+                    MainWindow.StartAutomaticallyDel("InkCanvas");
+                    MainWindow.StartAutomaticallyCreate("Ink Canvas Annotation");
+                }
+                else
+                {
+                    MainWindow.StartAutomaticallyDel("InkCanvas");
+                    MainWindow.StartAutomaticallyDel("Ink Canvas Annotation");
+                }
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置开机启动时出错: {ex.Message}");
+                Debug.WriteLine($"设置开机启动时出错: {ex.Message}");
             }
         }
 
-        /// <summary>
-        /// 开机运行后收纳到侧边栏开关事件
-        /// </summary>
         private void ToggleSwitchFoldAtStartup_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
 
             try
             {
-                bool newState = ToggleSwitchFoldAtStartup.IsOn;
+                bool newState = CardFoldAtStartup.IsOn;
 
-                // 使用Helper类更新设置并应用
+                if (MainWindow.Settings.Startup != null)
-                Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchFoldAtStartup", newState);
+                {
+                    MainWindow.Settings.Startup.IsFoldAtStartup = newState;
+                    MainWindow.SaveSettingsToFile();
+                }
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置开机折叠时出错: {ex.Message}");
+                Debug.WriteLine($"设置开机折叠时出错: {ex.Message}");
             }
         }
 
@@ -222,9 +375,6 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
 
         #region 模式设置事件处理
 
-        /// <summary>
-        /// 仅PPT模式开关事件
-        /// </summary>
         private void ToggleSwitchPPTOnlyMode_Toggled(object sender, RoutedEventArgs e)
         {
             if (!_isLoaded) return;
@@ -233,12 +383,11 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             {
                 bool newState = ToggleSwitchPPTOnlyMode.IsOn;
 
-                // 使用Helper类更新设置并应用
                 Windows.SettingsViews.MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchMode", newState);
             }
             catch (Exception ex)
             {
-                System.Diagnostics.Debug.WriteLine($"设置仅PPT模式时出错: {ex.Message}");
+                Debug.WriteLine($"设置仅PPT模式时出错: {ex.Message}");
             }
         }
 

Ink Canvas/Windows/SettingsViews/Pages/TopMostModeTemplateSelector.cs

@@ -0,0 +1,29 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Ink_Canvas.Windows.SettingsViews.Pages
+{
+    public class TopMostModeSelectionItem
+    {
+    }
+
+    public class TopMostModeButtonItem
+    {
+        public string ButtonHeader { get; set; }
+        public string ButtonContent { get; set; }
+        public bool RestartAsAdmin { get; set; }
+    }
+
+    public class TopMostModeTemplateSelector : DataTemplateSelector
+    {
+        public DataTemplate SelectionTemplate { get; set; }
+        public DataTemplate ButtonTemplate { get; set; }
+
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            if (item is TopMostModeSelectionItem) return SelectionTemplate;
+            if (item is TopMostModeButtonItem) return ButtonTemplate;
+            return null;
+        }
+    }
+}

InkCanvas.Controls/LabeledSettingsCard.xaml

@@ -0,0 +1,16 @@
+<UserControl x:Class="Ink_Canvas.Controls.LabeledSettingsCard"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf">
+    <ui:SettingsCard x:Name="SettingsCard"
+                     Description="{Binding Description, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                     Header="{Binding Header, RelativeSource={RelativeSource AncestorType=UserControl}}">
+        <ui:ToggleSwitch x:Name="ToggleSwitch"
+                         OnContent="{DynamicResource Common_On}"
+                         OffContent="{DynamicResource Common_Off}"
+                         IsOn="{Binding IsOn, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
+                         FontWeight="Bold"
+                         Toggled="ToggleSwitch_Toggled"/>
+    </ui:SettingsCard>
+</UserControl>

InkCanvas.Controls/LabeledSettingsCard.xaml.cs

@@ -0,0 +1,128 @@
+using System.Windows;
+using System.Windows.Controls;
+using iNKORE.UI.WPF.Modern.Common.IconKeys;
+
+namespace Ink_Canvas.Controls
+{
+    public partial class LabeledSettingsCard : UserControl
+    {
+        public iNKORE.UI.WPF.Modern.Controls.ToggleSwitch ToggleSwitchControl => ToggleSwitch;
+
+        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+            nameof(Header), typeof(string), typeof(LabeledSettingsCard), new PropertyMetadata(string.Empty));
+
+        public string Header
+        {
+            get => (string)GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+
+        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+            nameof(Description), typeof(string), typeof(LabeledSettingsCard), new PropertyMetadata(string.Empty));
+
+        public string Description
+        {
+            get => (string)GetValue(DescriptionProperty);
+            set => SetValue(DescriptionProperty, value);
+        }
+
+        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+            nameof(Icon), typeof(FontIconData?), typeof(LabeledSettingsCard), new PropertyMetadata(null, OnIconChanged));
+
+        public FontIconData? Icon
+        {
+            get => (FontIconData?)GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
+        private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is LabeledSettingsCard control && control.SettingsCard != null)
+            {
+                var iconData = (FontIconData?)e.NewValue;
+                control.SettingsCard.HeaderIcon = iconData.HasValue
+                    ? new iNKORE.UI.WPF.Modern.Controls.FontIcon(iconData.Value)
+                    : null;
+            }
+        }
+
+        public static readonly DependencyProperty HeaderIconProperty = DependencyProperty.Register(
+            nameof(HeaderIcon), typeof(object), typeof(LabeledSettingsCard), new PropertyMetadata(null, OnHeaderIconChanged));
+
+        public object HeaderIcon
+        {
+            get => GetValue(HeaderIconProperty);
+            set => SetValue(HeaderIconProperty, value);
+        }
+
+        private static void OnHeaderIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is LabeledSettingsCard control && control.SettingsCard != null)
+            {
+                control.SettingsCard.HeaderIcon = e.NewValue;
+            }
+        }
+
+        public static readonly DependencyProperty IsOnProperty = DependencyProperty.Register(
+            nameof(IsOn), typeof(bool), typeof(LabeledSettingsCard), new PropertyMetadata(false));
+
+        public bool IsOn
+        {
+            get => (bool)GetValue(IsOnProperty);
+            set => SetValue(IsOnProperty, value);
+        }
+
+        public static readonly DependencyProperty ShowWhenProperty = DependencyProperty.Register(
+            nameof(ShowWhen), typeof(bool), typeof(LabeledSettingsCard), new PropertyMetadata(true, OnShowWhenChanged));
+
+        public bool ShowWhen
+        {
+            get => (bool)GetValue(ShowWhenProperty);
+            set => SetValue(ShowWhenProperty, value);
+        }
+
+        public static readonly DependencyProperty SwitchNameProperty = DependencyProperty.Register(
+            nameof(SwitchName), typeof(string), typeof(LabeledSettingsCard), new PropertyMetadata(string.Empty, OnSwitchNameChanged));
+
+        public string SwitchName
+        {
+            get => (string)GetValue(SwitchNameProperty);
+            set => SetValue(SwitchNameProperty, value);
+        }
+
+        private static void OnSwitchNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is LabeledSettingsCard control && control.ToggleSwitch != null)
+                control.ToggleSwitch.Name = (string)e.NewValue;
+        }
+
+        private static void OnShowWhenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is LabeledSettingsCard control)
+                control.Visibility = (bool)e.NewValue ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public event RoutedEventHandler Toggled;
+
+        public LabeledSettingsCard()
+        {
+            InitializeComponent();
+            Loaded += LabeledSettingsCard_Loaded;
+        }
+
+        private void LabeledSettingsCard_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(SwitchName) && ToggleSwitch != null)
+                ToggleSwitch.Name = SwitchName;
+            if (Icon.HasValue && SettingsCard != null)
+                SettingsCard.HeaderIcon = new iNKORE.UI.WPF.Modern.Controls.FontIcon(Icon.Value);
+            else if (HeaderIcon != null && SettingsCard != null)
+                SettingsCard.HeaderIcon = HeaderIcon;
+        }
+
+        private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+        {
+            Toggled?.Invoke(this, e);
+        }
+    }
+}