kriastans/InkCanvasForClass
kriastans/InkCanvasForClass
1
Fork 0
Code Issues 1 Actions Projects 1 Releases Wiki Activity

Merge pull request #50 from WXRIW/feat/toggle-ppt-nav-collapse

Browse Source 
[feat] 允许用户设置是否显示 PPT 的切页按钮
This commit is contained in:
XY Wang 2023-02-12 13:28:42 +08:00 committed by GitHub
commit c95e99c824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Ink Canvas/MainWindow.xaml
View File

@ -183,7 +183,7 @@
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
</Grid>
</Border>
<Border Width="36" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Width="36" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Grid MouseUp="PPTNavigationBtn_Click">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{Binding ElementName=PptNavigationTextBlock, Path=Foreground}" FontSize="{Binding ElementName=PptNavigationTextBlock, Path=FontSize}" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}" />
</Grid>
@ -428,6 +428,7 @@
<GroupBox Name="GroupBoxAppearanceNewUI" Header="外观">
<ui:SimpleStackPanel Spacing="12">
<ui:ToggleSwitch Header="显示“橡皮”按钮" IsOn="{Binding ElementName=ToggleSwitchShowButtonEraser, Path=IsOn}" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关"/>
<ui:ToggleSwitch Name="ToggleSwitchShowButtonPPTNavigation" Header="显示 PPT 浏览切页按钮" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowButtonPPTNavigation_OnToggled"/>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Header="高级">
@ -799,7 +800,7 @@
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
</Grid>
</Border>
<Border Width="36" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border x:Name="PptNavigationBtn" Width="36" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Grid MouseUp="PPTNavigationBtn_Click">
<TextBlock Name="PptNavigationTextBlock" FontSize="10" Foreground="#FF666666" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0/0" />
</Grid>
@ -819,7 +820,7 @@
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
</Grid>
</Border>
<Border Width="36" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Grid MouseUp="PPTNavigationBtn_Click">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{Binding ElementName=PptNavigationTextBlock, Path=Foreground}" FontSize="{Binding ElementName=PptNavigationTextBlock, Path=FontSize}" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}" />
</Grid>

14
Ink Canvas/MainWindow.xaml.cs
View File

@ -517,6 +517,10 @@ namespace Ink_Canvas
BtnExit.Visibility = Visibility.Collapsed;
ToggleSwitchShowButtonExit.IsOn = false;
}
PptNavigationBtn.Visibility =
Settings.Appearance.IsShowPPTNavigation ? Visibility.Visible : Visibility.Collapsed;
ToggleSwitchShowButtonPPTNavigation.IsOn = Settings.Appearance.IsShowPPTNavigation;
if (Settings.Appearance.IsShowHideControlButton)
{
BtnHideControl.Visibility = Visibility.Visible;
@ -2541,6 +2545,16 @@ namespace Ink_Canvas
BtnErase.Visibility = Visibility.Collapsed;
}
}
private void ToggleSwitchShowButtonPPTNavigation_OnToggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
Settings.Appearance.IsShowPPTNavigation = ToggleSwitchShowButtonPPTNavigation.IsOn;
SaveSettingsToFile();
PptNavigationBtn.Visibility =
Settings.Appearance.IsShowPPTNavigation ? Visibility.Visible : Visibility.Collapsed;
}
private void ToggleSwitchShowButtonHideControl_Toggled(object sender, RoutedEventArgs e)
{

2
Ink Canvas/Settings.cs
View File

@ -83,6 +83,8 @@ namespace Ink_Canvas
public bool IsShowLRSwitchButton { get; set; } = false;
[JsonProperty("isShowModeFingerToggleSwitch")]
public bool IsShowModeFingerToggleSwitch { get; set; } = true;
[JsonProperty("isShowPPTNavigation")]
public bool IsShowPPTNavigation { get; set; } = true;
}
public class Automation