feat(设置): 新增个性化设置页面并重构主题相关功能
重构主题和语言设置功能，将相关代码从主窗口迁移至新增的个性化设置页面 优化浮动工具栏图标选择逻辑，移除冗余代码 统一设置页面中开关控件的样式和行为 修复设置页面导航项的选择状态问题
This commit is contained in:
PrefacedCorg
+4
-358
@@ -640,360 +640,6 @@
|
||||
Padding="15,5" Margin="0,10,0,0"/>
|
||||
</ikw:SimpleStackPanel>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Name="GroupBoxAppearanceNewUI">
|
||||
<GroupBox.Header>
|
||||
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=Theme_GroupTitle}" FontWeight="Bold" Foreground="#fafafa"
|
||||
FontSize="26" />
|
||||
</GroupBox.Header>
|
||||
<ikw:SimpleStackPanel Spacing="6">
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_Label}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxTheme"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="ComboBoxTheme_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Light}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Dark}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_System}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_LanguageLabel}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxLanguage"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="ComboBoxLanguage_SelectionChanged"
|
||||
Width="160">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Language_System}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Language_ChineseSimplified}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Language_English}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
<TextBlock Text="{i18n:I18n Key=Theme_Language_RestartHint}"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableSplashScreen" Label="{i18n:I18n Key=Theme_EnableSplash}" IsOn="False" Toggled="ToggleSwitchEnableSplashScreen_Toggled"/>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_SplashStyle}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxSplashScreenStyle"
|
||||
SelectedIndex="1" Width="150"
|
||||
SelectionChanged="ComboBoxSplashScreenStyle_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Random}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Seasonal}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Spring}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Summer}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Autumn}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Winter}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_Splash_Horse}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_FloatingBarIcon}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxFloatingBarImg"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="ComboBoxFloatingBarImg_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_IccDefault}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_IccNoShadow}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_IccDark}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_IccDarkBreath}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_IccWhiteTransparent}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_IccBlackTransparent}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_CoolapkCrossEye}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_CoolapkAbused}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_CoolapkSmile}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_CoolapkUnderwear}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_CoolapkGreenHatDoge}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_FloatingIcon_TiebaEmoji}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,6,0,0">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_CustomFloatingIconLabel}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<Button Name="ButtonAddCustomIcon" Content="{i18n:I18n Key=Theme_Upload}"
|
||||
Click="ButtonAddCustomIcon_Click" Padding="10,3"/>
|
||||
<Button Name="ButtonManageCustomIcons" Content="{i18n:I18n Key=Theme_Manage}"
|
||||
Click="ButtonManageCustomIcons_Click" Padding="10,3" Margin="5,0,0,0"/>
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_FloatingBarScale}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<Slider x:Name="ViewboxFloatingBarScaleTransformValueSlider" Minimum="0.5"
|
||||
Maximum="1.25" Width="168"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="ViewboxFloatingBarScaleTransformValueSlider_ValueChanged" />
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=ViewboxFloatingBarScaleTransformValueSlider, Path=Value}"
|
||||
VerticalAlignment="Center" FontSize="14" FontFamily="Consolas"
|
||||
Margin="12,0,16,0" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_FloatingBarOpacity}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<Slider x:Name="ViewboxFloatingBarOpacityValueSlider" Minimum="0.3"
|
||||
Maximum="1" Width="168"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="ViewboxFloatingBarOpacityValueSlider_ValueChanged" />
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=ViewboxFloatingBarOpacityValueSlider, Path=Value}"
|
||||
VerticalAlignment="Center" FontSize="14" FontFamily="Consolas"
|
||||
Margin="12,0,16,0" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_FloatingBarOpacityInPPT}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<Slider x:Name="ViewboxFloatingBarOpacityInPPTValueSlider" Minimum="0.3"
|
||||
Maximum="1" Width="168"
|
||||
FontSize="20" IsSnapToTickEnabled="True" Value="1" TickFrequency="0.05"
|
||||
TickPlacement="None" AutoToolTipPlacement="None"
|
||||
ValueChanged="ViewboxFloatingBarOpacityInPPTValueSlider_ValueChanged" />
|
||||
<TextBlock
|
||||
Text="{Binding ElementName=ViewboxFloatingBarOpacityInPPTValueSlider, Path=Value}"
|
||||
VerticalAlignment="Center" FontSize="14" FontFamily="Consolas"
|
||||
Margin="12,0,16,0" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<TextBlock Text="{i18n:I18n Key=Theme_FloatingBarOpacityInPPTHint}"
|
||||
TextWrapping="Wrap" Foreground="#a1a1aa" />
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableDisPlayNibModeToggle" Label="{i18n:I18n Key=Theme_ShowNibButton}" IsOn="False" Toggled="ToggleSwitchEnableDisPlayNibModeToggle_Toggled"/>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<!--<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Text="浮动工具栏背景色" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
|
||||
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchColorfulViewboxFloatingBar" IsOn="True" FontWeight="Bold" Toggled="ToggleSwitchIsColorfulViewboxFloatingBar_Toggled" />
|
||||
</ikw:SimpleStackPanel>-->
|
||||
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableViewboxBlackBoardScaleTransform" Label="{i18n:I18n Key=Theme_BlackboardScale80}" IsOn="True" Toggled="ToggleSwitchEnableViewboxBlackBoardScaleTransform_Toggled"/>
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableTimeDisplayInWhiteboardMode" Label="{i18n:I18n Key=Theme_ShowTimeInWhiteboard}" IsOn="True" Toggled="ToggleSwitchEnableTimeDisplayInWhiteboardMode_Toggled"/>
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableChickenSoupInWhiteboardMode" Label="{i18n:I18n Key=Theme_ShowQuoteInWhiteboard}" IsOn="True" Toggled="ToggleSwitchEnableChickenSoupInWhiteboardMode_Toggled"/>
|
||||
<ikw:SimpleStackPanel Orientation="Vertical" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_QuoteSource}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,0,6" />
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<ComboBox Name="ComboBoxChickenSoupSource"
|
||||
Width="240"
|
||||
SelectionChanged="ComboBoxChickenSoupSource_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuoteSource_OsuQuotes}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuoteSource_Mottos}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuoteSource_GaokaoBless}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuoteSource_Hitokoto}" />
|
||||
</ComboBox>
|
||||
<Button Name="BtnHitokotoCustomize" Content="{i18n:I18n Key=Theme_Customize}"
|
||||
FontSize="14" Padding="14,4" Margin="8,0,0,0" MinWidth="65" VerticalAlignment="Center"
|
||||
Click="BtnHitokotoCustomize_Click"
|
||||
Visibility="Collapsed" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableQuickPanel" Label="{i18n:I18n Key=Theme_EnableQuickPanel}" IsOn="True" Toggled="ToggleSwitchEnableQuickPanel_Toggled"/>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_UnfoldButtonIcon}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxUnFoldBtnImg"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="ComboBoxUnFoldBtnImg_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_UnfoldIcon_Arrow}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_UnfoldIcon_Pen}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
|
||||
<!-- 浮动栏按钮显示控制 -->
|
||||
<Border Background="#101010" Height="50" Margin="-20,0" Padding="20,0">
|
||||
<Grid>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" FlowDirection="RightToLeft">
|
||||
<Image Height="24" Width="24" Margin="16,0,0,0">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#FFFFFFFF"
|
||||
Geometry="F0 M24,24z M0,0z M4.41721,4.29873C4.35178,4.29873,4.29873,4.35178,4.29873,4.41721L4.29873,9.15646C4.29873,9.22189,4.35178,9.27494,4.41721,9.27494L9.15646,9.27494C9.22189,9.27494,9.27494,9.22189,9.27494,9.15646L9.27494,4.41721C9.27494,4.35178,9.22189,4.29873,9.15646,4.29873L4.41721,4.29873z M2.64,4.41721C2.64,3.43569,3.43569,2.64,4.41721,2.64L9.15646,2.64C10.138,2.64,10.9337,3.43569,10.9337,4.41721L10.9337,9.15646C10.9337,10.138,10.138,10.9337,9.15646,10.9337L4.41721,10.9337C3.43569,10.9337,2.64,10.138,2.64,9.15646L2.64,4.41721z M14.8435,4.29873C14.7781,4.29873,14.7251,4.35178,14.7251,4.41721L14.7251,9.15646C14.7251,9.22189,14.7781,9.27494,14.8435,9.27494L19.5828,9.27494C19.6482,9.27494,19.7013,9.22189,19.7013,9.15646L19.7013,4.41721C19.7013,4.35178,19.6482,4.29873,19.5828,4.29873L14.8435,4.29873z M13.0663,4.41721C13.0663,3.43569,13.862,2.64,14.8435,2.64L19.5828,2.64C20.5643,2.64,21.36,3.43569,21.36,4.41721L21.36,9.15646C21.36,10.138,20.5643,10.9337,19.5828,10.9337L14.8435,10.9337C13.862,10.9337,13.0663,10.138,13.0663,9.15646L13.0663,4.41721z M14.8435,14.7251C14.7781,14.7251,14.7251,14.7781,14.7251,14.8435L14.7251,19.5828C14.7251,19.6482,14.7781,19.7013,14.8435,19.7013L19.5828,19.7013C19.6482,19.7013,19.7013,19.6482,19.7013,19.5828L19.7013,14.8435C19.7013,14.7781,19.6482,14.7251,19.5828,14.7251L14.8435,14.7251z M13.0663,14.8435C13.0663,13.862,13.862,13.0663,14.8435,13.0663L19.5828,13.0663C20.5643,13.0663,21.36,13.862,21.36,14.8435L21.36,19.5828C21.36,20.5643,20.5643,21.36,19.5828,21.36L14.8435,21.36C13.862,21.36,13.0663,20.5643,13.0663,19.5828L13.0663,14.8435z M4.41721,14.7251C4.35178,14.7251,4.29873,14.7781,4.29873,14.8435L4.29873,19.5828C4.29873,19.6482,4.35178,19.7013,4.41721,19.7013L9.15646,19.7013C9.22189,19.7013,9.27494,19.6482,9.27494,19.5828L9.27494,14.8435C9.27494,14.7781,9.22189,14.7251,9.15646,14.7251L4.41721,14.7251z M2.64,14.8435C2.64,13.862,3.43569,13.0663,4.41721,13.0663L9.15646,13.0663C10.138,13.0663,10.9337,13.862,10.9337,14.8435L10.9337,19.5828C10.9337,20.5643,10.138,21.36,9.15646,21.36L4.41721,21.36C3.43569,21.36,2.64,20.5643,2.64,19.5828L2.64,14.8435z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
</ikw:SimpleStackPanel>
|
||||
<TextBlock Margin="12,0,0,0" VerticalAlignment="Center" Text="{i18n:I18n Key=Theme_FloatingBarButtonsTitle}"
|
||||
FontWeight="Bold" Foreground="#fafafa"
|
||||
FontSize="20" />
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- 老版UI切换按钮 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,12">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_UseLegacyFloatingBarUI}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="320"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxUseLegacyFloatingBarUI"
|
||||
IsChecked="False" FontWeight="Bold"
|
||||
Checked="CheckBoxUseLegacyFloatingBarUI_Checked" Unchecked="CheckBoxUseLegacyFloatingBarUI_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<!-- 第一行：形状按钮和撤销按钮 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="0,0,0,8">
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowShapeButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowShapeButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowShapeButton_Checked" Unchecked="CheckBoxShowShapeButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowUndoButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowUndoButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowUndoButton_Checked" Unchecked="CheckBoxShowUndoButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<!-- 第二行：重做按钮和清空按钮 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="0,0,0,8">
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowRedoButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowRedoButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowRedoButton_Checked" Unchecked="CheckBoxShowRedoButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowClearButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowClearButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowClearButton_Checked" Unchecked="CheckBoxShowClearButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<!-- 第三行：白板按钮和隐藏按钮 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="0,0,0,8">
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowWhiteboardButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowWhiteboardButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowWhiteboardButton_Checked" Unchecked="CheckBoxShowWhiteboardButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowHideButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowHideButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowHideButton_Checked" Unchecked="CheckBoxShowHideButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<!-- 第四行：套索选择按钮和清并鼠按钮 -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch" Margin="0,0,0,8">
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowLassoButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowLassoSelectButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowLassoSelectButton_Checked" Unchecked="CheckBoxShowLassoSelectButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Width="190">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowClearAndMouseButton}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" Width="150"
|
||||
Style="{StaticResource AutoFitSettingsOptionLabel14}" />
|
||||
<CheckBox Name="CheckBoxShowClearAndMouseButton"
|
||||
IsChecked="True" FontWeight="Bold"
|
||||
Checked="CheckBoxShowClearAndMouseButton_Checked" Unchecked="CheckBoxShowClearAndMouseButton_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<!-- 第五行：快捷调色盘（单独一行，因为需要更多空间） -->
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,8">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_ShowQuickPalette}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,8,0" />
|
||||
<CheckBox Name="CheckBoxShowQuickColorPalette"
|
||||
IsChecked="False" FontWeight="Bold"
|
||||
Checked="CheckBoxShowQuickColorPalette_Checked" Unchecked="CheckBoxShowQuickColorPalette_Unchecked" />
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_QuickPaletteMode}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxQuickColorPaletteDisplayMode"
|
||||
SelectedIndex="1"
|
||||
SelectionChanged="ComboBoxQuickColorPaletteDisplayMode_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuickPalette_SingleRow}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_QuickPalette_DoubleRow}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||
<TextBlock Foreground="#fafafa" Text="{i18n:I18n Key=Theme_EraserButtonDisplay}" VerticalAlignment="Center"
|
||||
FontSize="14" Margin="0,0,16,0" />
|
||||
<ComboBox Name="ComboBoxEraserDisplayOption"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="ComboBoxEraserDisplayOption_SelectionChanged">
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_EraserDisplay_Both}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_EraserDisplay_AreaOnly}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_EraserDisplay_LineOnly}" />
|
||||
<ComboBoxItem Content="{i18n:I18n Key=Theme_EraserDisplay_None}" />
|
||||
</ComboBox>
|
||||
</ikw:SimpleStackPanel>
|
||||
|
||||
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
|
||||
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
|
||||
|
||||
<Border Background="#101010" Height="50" Margin="-20,0" Padding="20,0">
|
||||
<Grid>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal" FlowDirection="RightToLeft">
|
||||
<Image Height="24" Width="24" Margin="16,0,0,0">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V17 H19 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#FFFFFFFF"
|
||||
Geometry="F1 M19,17z M0,0z M14.8268,0.0699463C15.3572,0.600333 15.8257,1.17492 16.2323,1.7937 16.6448,2.41249 16.9925,3.06368 17.2754,3.74729 17.5583,4.42501 17.7704,5.12925 17.9119,5.86 18.0592,6.58486 18.1329,7.32151 18.1329,8.06995 18.1329,8.81838 18.0592,9.55798 17.9119,10.2887 17.7704,11.0136 17.5583,11.7178 17.2754,12.4014 16.9925,13.0792 16.6448,13.7274 16.2323,14.3462 15.8257,14.965 15.3572,15.5396 14.8268,16.0699L14.0312,15.2744C14.5086,14.797 14.9299,14.2814 15.2953,13.7274 15.6666,13.1676 15.9789,12.5812 16.2323,11.9683 16.4857,11.3554 16.6773,10.7219 16.8069,10.0677 16.9424,9.4077 17.0102,8.74177 17.0102,8.06995 17.0102,7.39812 16.9424,6.73514 16.8069,6.081 16.6773,5.42096 16.4857,4.7845 16.2323,4.1716 15.9789,3.55871 15.6666,2.97529 15.2953,2.42133 14.9299,1.86147 14.5086,1.34287 14.0312,0.865526L14.8268,0.0699463z M12.4312,2.46553C12.8025,2.8368 13.1296,3.24048 13.4124,3.67658 13.7012,4.10678 13.9428,4.56055 14.1373,5.0379 14.3377,5.51525 14.4879,6.01028 14.5881,6.52299 14.6942,7.03569 14.7472,7.55135 14.7472,8.06995 14.7472,8.59444 14.6942,9.11304 14.5881,9.62575 14.4879,10.1326 14.3377,10.6246 14.1373,11.102 13.9428,11.5793 13.7012,12.0361 13.4124,12.4722 13.1296,12.9024 12.8025,13.3031 12.4312,13.6744L11.6268,12.8699C12.2633,12.2335 12.7524,11.4998 13.0942,10.6688 13.4419,9.8379 13.6157,8.9716 13.6157,8.06995 13.6157,7.16829 13.4419,6.30199 13.0942,5.47105 12.7524,4.64011 12.2633,3.90641 11.6268,3.26995L12.4312,2.46553z M10.0268,4.86995C10.4511,5.29426 10.7782,5.78339 11.008,6.33735 11.2378,6.89131 11.3528,7.46884 11.3528,8.06995 11.3528,8.67105 11.2378,9.24858 11.008,9.80254 10.7782,10.3565 10.4511,10.8456 10.0268,11.2699L9.23121,10.4744C9.54944,10.1561 9.79401,9.79076 9.96491,9.37823 10.1358,8.95982 10.2213,8.52372 10.2213,8.06995 10.2213,7.61617 10.1358,7.18302 9.96491,6.7705 9.79401,6.35208 9.54944,5.98376 9.23121,5.66553L10.0268,4.86995z M6.02237,1.281L6.82679,1.281 6.82679,14.8589 6.02237,14.8589 2.6279,11.4644 0.0378418,11.4644 0.0378418,4.67547 2.6279,4.67547 6.02237,1.281z M5.6953,3.21691L3.10525,5.80696 1.16933,5.80696 1.16933,10.3329 3.10525,10.3329 5.6953,12.923 5.6953,3.21691z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Image Height="24" Width="24" Margin="8,0,0,0">
|
||||
<Image.Source>
|
||||
<DrawingImage>
|
||||
<DrawingImage.Drawing>
|
||||
<DrawingGroup ClipGeometry="M0,0 V17 H22 V0 H0 Z">
|
||||
<GeometryDrawing Brush="#FFFFFFFF"
|
||||
Geometry="F1 M22,17z M0,0z M21.3712,12.8727L12.0378,12.8727 12.0378,15.5393 16.0378,15.5393 16.0378,16.8727 6.70451,16.8727 6.70451,15.5393 10.7045,15.5393 10.7045,12.8727 4.03784,12.8727 4.03784,16.8727 2.70451,16.8727 2.70451,8.87268 0.0378418,8.87268 0.0378418,0.872681 21.3712,0.872681 21.3712,12.8727z M1.37118,2.20601L1.37118,3.53935 5.37118,3.53935 5.37118,2.20601 1.37118,2.20601z M1.37118,7.53935L5.37118,7.53935 5.37118,4.87268 4.03784,4.87268 4.03784,6.20601 2.70451,6.20601 2.70451,4.87268 1.37118,4.87268 1.37118,7.53935z M4.03784,11.5393L20.0378,11.5393 20.0378,2.20601 6.70451,2.20601 6.70451,8.87268 4.03784,8.87268 4.03784,11.5393z" />
|
||||
</DrawingGroup>
|
||||
</DrawingImage.Drawing>
|
||||
</DrawingImage>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Image Name="ICCTrayIconExampleImage" Height="24" Width="24"
|
||||
Source="Resources/icc.ico" Margin="8,0,0,0" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<TextBlock Margin="12,0,0,0" VerticalAlignment="Center" Text="{i18n:I18n Key=Tray_GroupTitle}"
|
||||
FontWeight="Bold" Foreground="#fafafa"
|
||||
FontSize="20" />
|
||||
</Grid>
|
||||
</Border>
|
||||
<controls:LabeledToggleSwitch x:Name="ToggleSwitchEnableTrayIcon" Label="{i18n:I18n Key=Tray_EnableTrayIcon}" IsOn="True" Toggled="ToggleSwitchEnableTrayIcon_Toggled"/>
|
||||
</ikw:SimpleStackPanel>
|
||||
</GroupBox>
|
||||
<GroupBox Name="GroupBoxPPT">
|
||||
<GroupBox.Header>
|
||||
<TextBlock Margin="0,12,0,0" Text="{i18n:I18n Key=PPT_GroupTitle}" FontWeight="Bold" Foreground="#fafafa"
|
||||
@@ -4093,11 +3739,11 @@
|
||||
FontSize="12"
|
||||
VerticalAlignment="Center" />
|
||||
<ui:ToggleSwitch
|
||||
x:Name="BoardToggleSwitchEnableInkToShape"
|
||||
Foreground="{DynamicResource FloatBarForeground}"
|
||||
Width="80"
|
||||
Toggled="ToggleSwitchEnableInkToShape_Toggled"
|
||||
MinWidth="0"
|
||||
IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}" />
|
||||
MinWidth="0" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal"
|
||||
Width="100" x:Name="InkFadeControlPanel1">
|
||||
@@ -5614,11 +5260,11 @@
|
||||
Foreground="{DynamicResource FloatBarForeground}"
|
||||
FontSize="12" VerticalAlignment="Center" />
|
||||
<ui:ToggleSwitch
|
||||
x:Name="FloatingBarToggleSwitchEnableInkToShape"
|
||||
Foreground="{DynamicResource FloatBarForeground}"
|
||||
Width="80"
|
||||
Toggled="ToggleSwitchEnableInkToShape_Toggled"
|
||||
MinWidth="0"
|
||||
IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}" />
|
||||
MinWidth="0" />
|
||||
</ikw:SimpleStackPanel>
|
||||
<ikw:SimpleStackPanel Orientation="Horizontal"
|
||||
Width="100" x:Name="InkFadeControlPanel2">
|
||||
|
||||
Reference in New Issue
Block a user