CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(设置): 重构设置窗口为独立窗口并移除旧设置面板

Browse Source 
移除旧的内置设置面板及相关代码，将设置功能迁移至独立的设置窗口
优化设置窗口的主题同步功能，调整自动化页面布局
This commit is contained in:
PrefacedCorg
2026-04-27 09:40:24 +08:00
parent b4526473fa
commit 4f015fb155
10 changed files with 81 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Windows/SettingsViews/Pages/AutomationPage.xaml
+37 -41
View File
@@ -28,7 +28,7 @@
</Style>
</FrameworkElement.Resources>
<Grid>
<ikw:SimpleStackPanel MaxWidth="1600"
<ikw:SimpleStackPanel MaxWidth="1000"
HorizontalAlignment="Stretch"
Spacing="{StaticResource SettingsCardSpacing}">
@@ -214,21 +214,33 @@
</ui:SettingsExpander.Items>
</ui:SettingsExpander>
<ui:SettingsExpander Header="幻灯片"
d:IsExpanded="True">
<ui:SettingsExpander.HeaderIcon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Slideshow}"/>
</ui:SettingsExpander.HeaderIcon>
<ui:SettingsCard Header="{i18n:I18n Key=Automation_AutoFoldInPPT}">
<ui:SettingsCard.HeaderIcon>
<ui:ImageIcon Source="/Resources/Icons-png/PPTTools.png"/>
</ui:SettingsCard.HeaderIcon>
<ui:ToggleSwitch x:Name="CardAutoFoldInPPTSlideShow"
<ui:SettingsCard Header="{i18n:I18n Key=Automation_AutoFoldInPPT}">
<ui:SettingsCard.HeaderIcon>
<ui:ImageIcon Source="/Resources/Icons-png/Powerpoint.png"/>
</ui:SettingsCard.HeaderIcon>
<ui:ToggleSwitch x:Name="CardAutoFoldInPPTSlideShow"
OnContent="{DynamicResource Common_On}"
OffContent="{DynamicResource Common_Off}"
Toggled="ToggleSwitchAutoFoldInPPTSlideShow_Toggled"/>
</ui:SettingsCard>
</ui:SettingsExpander>
</ui:SettingsCard>
<controls:LabeledSettingsCard x:Name="CardAutoFoldWhenExitWhiteboard"
Header="{i18n:I18n Key=FoldMode_AutoFoldAfterWhiteboard}"
Description="{i18n:I18n Key=FoldMode_AutoFoldAfterWhiteboardHint}"
Icon="{x:Static ui:SegoeFluentIcons.Back}"
Toggled="ToggleSwitchAutoFoldWhenExitWhiteboard_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoFoldAfterPPTSlideShow"
Header="{i18n:I18n Key=FoldMode_AutoFoldAfterPPT}"
Description="{i18n:I18n Key=FoldMode_AutoFoldAfterPPTHint}"
IconSource="/Resources/Icons-png/PPTTools.png"
Toggled="ToggleSwitchAutoFoldAfterPPTSlideShow_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardKeepFoldAfterSoftwareExit"
Header="{i18n:I18n Key=Automation_KeepFoldAfterExit}"
Description="{i18n:I18n Key=Automation_KeepFoldAfterExitHint}"
Icon="{x:Static ui:SegoeFluentIcons.Pin}"
Toggled="ToggleSwitchKeepFoldAfterSoftwareExit_Toggled"/>
<TextBlock Text="{i18n:I18n Key=AutoKill_Title}" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"/>
@@ -250,7 +262,7 @@
<controls:LabeledSettingsCard x:Name="CardAutoKillVComYouJiao"
Header="{i18n:I18n Key=AutoKill_YouJiao}"
Icon="{x:Static ui:SegoeFluentIcons.Slideshow}"
IconSource="/Resources/Icons-png/VComYouJiao.png"
Toggled="ToggleSwitchAutoKillVComYouJiao_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoKillSeewoLauncher2DesktopAnnotation"
@@ -261,48 +273,32 @@
<controls:LabeledSettingsCard x:Name="CardAutoKillInkCanvas"
Header="{i18n:I18n Key=AutoKill_InkCanvasIC}"
Icon="{x:Static ui:SegoeFluentIcons.Slideshow}"
IconSource="/Resources/Icons-png/InkCanvas.png"
Toggled="ToggleSwitchAutoKillInkCanvas_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoKillICA"
Header="{i18n:I18n Key=AutoKill_ICA}"
Icon="{x:Static ui:SegoeFluentIcons.Slideshow}"
IconSource="/Resources/Icons-png/ICA.png"
Toggled="ToggleSwitchAutoKillICA_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoKillIDT"
Header="{i18n:I18n Key=AutoKill_Inkeys}"
Icon="{x:Static ui:SegoeFluentIcons.Slideshow}"
IconSource="/Resources/Icons-png/idt.png"
Toggled="ToggleSwitchAutoKillIDT_Toggled"/>
<TextBlock Text="{i18n:I18n Key=AutoFold_Mode}" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"/>
<controls:LabeledSettingsCard x:Name="CardAutoEnterAnnotationModeWhenExitFoldMode"
Header="{i18n:I18n Key=FoldMode_ExitToAnnotation}"
Description="{i18n:I18n Key=FoldMode_ExitToAnnotationHint}"
Icon="{x:Static ui:SegoeFluentIcons.Edit}"
Toggled="ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoEnterAnnotationAfterKillHite"
Header="{i18n:I18n Key=AutoKill_HiteAfterKillEnterAnnotation}"
IconSource="/Resources/Icons-png/HiteAnnotation.png"
Toggled="ToggleSwitchAutoEnterAnnotationAfterKillHite_Toggled"/>
<TextBlock Text="{i18n:I18n Key=AutoFold_Mode}" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"/>
<controls:LabeledSettingsCard x:Name="CardAutoEnterAnnotationModeWhenExitFoldMode"
Header="{i18n:I18n Key=FoldMode_AutoFoldAfterWhiteboard}"
Icon="{x:Static ui:SegoeFluentIcons.Edit}"
Toggled="ToggleSwitchAutoEnterAnnotationModeWhenExitFoldMode_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoFoldWhenExitWhiteboard"
Header="{i18n:I18n Key=FoldMode_AutoFoldAfterWhiteboard}"
Icon="{x:Static ui:SegoeFluentIcons.Back}"
Toggled="ToggleSwitchAutoFoldWhenExitWhiteboard_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardAutoFoldAfterPPTSlideShow"
Header="{i18n:I18n Key=FoldMode_AutoFoldAfterPPT}"
Description="{i18n:I18n Key=FoldMode_AutoFoldAfterPPTHint}"
IconSource="/Resources/Icons-png/PPTTools.png"
Toggled="ToggleSwitchAutoFoldAfterPPTSlideShow_Toggled"/>
<controls:LabeledSettingsCard x:Name="CardKeepFoldAfterSoftwareExit"
Header="{i18n:I18n Key=Automation_KeepFoldAfterExit}"
Description="{i18n:I18n Key=Automation_KeepFoldAfterExitHint}"
Icon="{x:Static ui:SegoeFluentIcons.Pin}"
Toggled="ToggleSwitchKeepFoldAfterSoftwareExit_Toggled"/>
<TextBlock Text="{i18n:I18n Key=AutoSave_Title}" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"/>
<controls:LabeledSettingsCard x:Name="CardSaveScreenshotsInDateFolders"
Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs
+23
View File
@@ -33,6 +33,8 @@ namespace Ink_Canvas.Windows.SettingsViews
{
InitializeComponent();
ApplyCurrentTheme();
// 初始化内置页面映射
_pageTypes = new Dictionary<string, Type>
{
@@ -124,6 +126,27 @@ namespace Ink_Canvas.Windows.SettingsViews
};
}
public void RefreshTheme()
{
ApplyCurrentTheme();
}
private void ApplyCurrentTheme()
{
try
{
int themeIndex = Helpers.SettingsManager.Settings.Appearance.Theme;
var elementTheme = themeIndex switch
{
0 => iNKORE.UI.WPF.Modern.ElementTheme.Light,
1 => iNKORE.UI.WPF.Modern.ElementTheme.Dark,
_ => iNKORE.UI.WPF.Modern.ElementTheme.Default,
};
iNKORE.UI.WPF.Modern.ThemeManager.SetRequestedTheme(this, elementTheme);
}
catch { }
}
#region 修复触摸屏鼠标指针消失问题
[System.Runtime.InteropServices.DllImport("user32.dll")]