refactor(UI): 使用 LabeledSettingsCard 替换 SettingsCard 和 ToggleSwitch 组合
统一设置页面中的开关控件样式，将原有的 SettingsCard 和 ToggleSwitch 组合替换为自定义的 LabeledSettingsCard 控件，简化 XAML 结构并保持功能不变
This commit is contained in:
PrefacedCorg
@@ -32,28 +32,18 @@
|
||||
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||
Text="{i18n:I18n Key=Advanced_Title}" />
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_SpecialScreenMode}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Settings}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsSpecialScreen"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsSpecialScreen_OnToggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsSpecialScreen"
|
||||
Header="{i18n:I18n Key=Advanced_SpecialScreenMode}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Settings}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsSpecialScreen_OnToggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Canvas_DisableHardwareAcceleration}"
|
||||
Description="{i18n:I18n Key=Canvas_DisableHardwareAccelerationHint}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Process}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchDisableHardwareAcceleration"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchDisableHardwareAcceleration_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchDisableHardwareAcceleration"
|
||||
Header="{i18n:I18n Key=Canvas_DisableHardwareAcceleration}"
|
||||
Description="{i18n:I18n Key=Canvas_DisableHardwareAccelerationHint}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Settings}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchDisableHardwareAcceleration_Toggled"/>
|
||||
|
||||
<ui:SettingsExpander x:Name="CardTouchMultiplier"
|
||||
Header="{i18n:I18n Key=Advanced_TouchMultiplier}"
|
||||
@@ -83,17 +73,12 @@
|
||||
</ui:SettingsExpander.Items>
|
||||
</ui:SettingsExpander>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_EraserBindTouchMultiplier}"
|
||||
Description="{i18n:I18n Key=Advanced_EraserBindTouchHint}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.EraseTool}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchEraserBindTouchMultiplier"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchEraserBindTouchMultiplier"
|
||||
Header="{i18n:I18n Key=Advanced_EraserBindTouchMultiplier}"
|
||||
Description="{i18n:I18n Key=Advanced_EraserBindTouchHint}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.EraseTool}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_NibModeBoundsWidthHeader}">
|
||||
<Slider x:Name="NibModeBoundsWidthSlider"
|
||||
@@ -111,50 +96,32 @@
|
||||
ValueChanged="FingerModeBoundsWidthSlider_ValueChanged" />
|
||||
</ui:SettingsCard>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_QuadIRMode}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.FullScreen}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsQuadIR"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsQuadIR_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsQuadIR"
|
||||
Header="{i18n:I18n Key=Advanced_QuadIRMode}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.FullScreen}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsQuadIR_Toggled"/>
|
||||
|
||||
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||
Text="{i18n:I18n Key=Advanced_Logging}" />
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_Logging}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.OpenFile}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsLogEnabled"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsLogEnabled_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsLogEnabled"
|
||||
Header="{i18n:I18n Key=Advanced_Logging}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.OpenFile}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsLogEnabled_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_LogByDate}"
|
||||
Description="{i18n:I18n Key=Advanced_LogRotateHint}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsSaveLogByDate"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsSaveLogByDate_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsSaveLogByDate"
|
||||
Header="{i18n:I18n Key=Advanced_LogByDate}"
|
||||
Description="{i18n:I18n Key=Advanced_LogRotateHint}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsSaveLogByDate_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Advanced_ConfirmExit}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.SignOut}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsSecondConfimeWhenShutdownApp"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsSecondConfimeWhenShutdownApp"
|
||||
Header="{i18n:I18n Key=Advanced_ConfirmExit}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.SignOut}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled"/>
|
||||
|
||||
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||
Text="{i18n:I18n Key=Backup_Title}" />
|
||||
@@ -163,21 +130,15 @@
|
||||
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
|
||||
TextWrapping="Wrap" Margin="1,0,0,4" />
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Backup_AutoBeforeUpdate}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsAutoBackupBeforeUpdate"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsAutoBackupBeforeUpdate_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsAutoBackupBeforeUpdate"
|
||||
Header="{i18n:I18n Key=Backup_AutoBeforeUpdate}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsAutoBackupBeforeUpdate_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Backup_AutoPeriodic}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchIsAutoBackupEnabled"
|
||||
OnContent="{DynamicResource Common_On}"
|
||||
OffContent="{DynamicResource Common_Off}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsAutoBackupEnabled_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchIsAutoBackupEnabled"
|
||||
Header="{i18n:I18n Key=Backup_AutoPeriodic}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchIsAutoBackupEnabled_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Backup_Interval}"
|
||||
Description="{i18n:I18n Key=Backup_Interval_DefaultHint}">
|
||||
|
||||
@@ -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="{i18n:I18n Key=Random_Title}">
|
||||
|
||||
@@ -31,32 +32,26 @@
|
||||
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||
Text="{i18n:I18n Key=Random_Title}" />
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_ShowEditNamesButton}">
|
||||
<ui:SettingsCard.HeaderIcon>
|
||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
|
||||
</ui:SettingsCard.HeaderIcon>
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchDisplayRandWindowNamesInputBtn"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchDisplayRandWindowNamesInputBtn"
|
||||
Header="{i18n:I18n Key=Random_ShowEditNamesButton}"
|
||||
Icon="{x:Static ui:SegoeFluentIcons.Edit}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_EnableButtons}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchShowRandomAndSingleDraw"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchShowRandomAndSingleDraw_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchShowRandomAndSingleDraw"
|
||||
Header="{i18n:I18n Key=Random_EnableButtons}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchShowRandomAndSingleDraw_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_EnableQuickButton}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchEnableQuickDraw"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEnableQuickDraw_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchEnableQuickDraw"
|
||||
Header="{i18n:I18n Key=Random_EnableQuickButton}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEnableQuickDraw_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_UseExternal}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchExternalCaller"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchExternalCaller_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchExternalCaller"
|
||||
Header="{i18n:I18n Key=Random_UseExternal}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchExternalCaller_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_ExternalTypeLabel}">
|
||||
<ComboBox x:Name="ComboBoxExternalCallerType"
|
||||
@@ -103,17 +98,15 @@
|
||||
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||
Text="{i18n:I18n Key=Random_NewUI_Title}" />
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_NewUI_Enable}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchUseNewRollCallUI"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchUseNewRollCallUI_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchUseNewRollCallUI"
|
||||
Header="{i18n:I18n Key=Random_NewUI_Enable}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchUseNewRollCallUI_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_ML_AvoidRepeat}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchEnableMLAvoidance"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchEnableMLAvoidance"
|
||||
Header="{i18n:I18n Key=Random_ML_AvoidRepeat}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEnableMLAvoidance_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Random_ML_HistoryCount}">
|
||||
<Slider x:Name="MLAvoidanceHistorySlider"
|
||||
@@ -138,29 +131,25 @@
|
||||
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
|
||||
Text="{i18n:I18n Key=Timer_Title}" />
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_UseLegacyButtons}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchUseLegacyTimerUI"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchUseLegacyTimerUI_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchUseLegacyTimerUI"
|
||||
Header="{i18n:I18n Key=Timer_UseLegacyButtons}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchUseLegacyTimerUI_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_NewUI}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchUseNewStyleUI"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchUseNewStyleUI_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchUseNewStyleUI"
|
||||
Header="{i18n:I18n Key=Timer_NewUI}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchUseNewStyleUI_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_EnableCountUp}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchEnableOvertimeCountUp"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchEnableOvertimeCountUp_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchEnableOvertimeCountUp"
|
||||
Header="{i18n:I18n Key=Timer_EnableCountUp}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchEnableOvertimeCountUp_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_OvertimeHighlight}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchEnableOvertimeRedText"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchEnableOvertimeRedText"
|
||||
Header="{i18n:I18n Key=Timer_OvertimeHighlight}"
|
||||
IsOn="True"
|
||||
Toggled="ToggleSwitchEnableOvertimeRedText_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_Volume}">
|
||||
<Slider x:Name="TimerVolumeSlider"
|
||||
@@ -177,11 +166,10 @@
|
||||
</ikw:SimpleStackPanel>
|
||||
</ui:SettingsCard>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_Progressive}">
|
||||
<ui:ToggleSwitch x:Name="ToggleSwitchEnableProgressiveReminder"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/>
|
||||
</ui:SettingsCard>
|
||||
<controls:LabeledSettingsCard x:Name="ToggleSwitchEnableProgressiveReminder"
|
||||
Header="{i18n:I18n Key=Timer_Progressive}"
|
||||
IsOn="False"
|
||||
Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/>
|
||||
|
||||
<ui:SettingsCard Header="{i18n:I18n Key=Timer_ProgressiveVolume}">
|
||||
<Slider x:Name="ProgressiveReminderVolumeSlider"
|
||||
|
||||
Reference in New Issue
Block a user