[feature]优化了一下UI,把那个橡皮大小的写好了

This commit is contained in:
Dubi906w 2024-05-04 10:30:21 +08:00
parent d2af94ce51
commit 60bf3bd79c
15 changed files with 117 additions and 30 deletions

View File

@ -605,5 +605,27 @@
<ItemGroup> <ItemGroup>
<Resource Include="Resources\Icons-png\geo-icons\cube.png" /> <Resource Include="Resources\Icons-png\geo-icons\cube.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\EasiNote.png" />
<Resource Include="Resources\Icons-png\EasiNote3C.png" />
<Resource Include="Resources\Icons-png\EasiNote5C.png" />
<Resource Include="Resources\Icons-png\SeewoPinco.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\HiteBoard.png" />
<Resource Include="Resources\Icons-png\HiteCamera.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\WenXiang.jpg" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\Whiteboard.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\Powerpoint.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\PPTTools.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

View File

@ -1038,24 +1038,82 @@
<GroupBox.Header> <GroupBox.Header>
<TextBlock Text="自动化" FontWeight="Bold" Foreground="#18181b" FontSize="26"/> <TextBlock Text="自动化" FontWeight="Bold" Foreground="#18181b" FontSize="26"/>
</GroupBox.Header> </GroupBox.Header>
<ui:SimpleStackPanel Spacing="12"> <ui:SimpleStackPanel Spacing="6">
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote" Header="进入“希沃白板”时自动收纳至侧边栏" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote_Toggled"/> <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno" Header="“希沃白板”自动收纳忽略桌面 EN 批注窗口 (BETA)" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno_Toggled"/> <Image Source="/Resources/Icons-png/EasiNote.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiCamera" Header="进入“希沃视频展台”时自动收纳至侧边栏" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiCamera_Toggled"/> <TextBlock Text="进入“希沃白板”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote3C" Header="进入“希沃轻白板”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote3C_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote_Toggled" />
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote5C" Header="进入“希沃轻白板”(新版)时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote5C_Toggled"/> </ui:SimpleStackPanel>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInSeewoPincoTeacher" Header="进入“希沃品课”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInSeewoPincoTeacher_Toggled"/> <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInHiteTouchPro" Header="进入“鸿合白板”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInHiteTouchPro_Toggled"/> <Image Source="/Resources/Icons-png/EasiNote.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInHiteCamera" Header="进入“鸿合视频展台”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInHiteCamera_Toggled"/> <TextBlock Text="“希沃白板”自动收纳忽略桌面EN批注窗口" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInWxBoardMain" Header="进入“文香白板”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInWxBoardMain_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/EasiCamera.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“希沃视频展台”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiCamera" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiCamera_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/EasiNote3C.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“希沃轻白板”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote3C" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote3C_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/EasiNote5C.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“希沃轻白板”(新版)时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote5C" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote5C_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/SeewoPinco.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“希沃品课”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInSeewoPincoTeacher" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInSeewoPincoTeacher_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/HiteBoard.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“鸿合白板”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInHiteTouchPro" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInHiteTouchPro_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/HiteCamera.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“鸿合视频展台”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInHiteCamera" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInHiteCamera_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/WenXiang.jpg" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“文香白板”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInWxBoardMain" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInWxBoardMain_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Text="进入“中原旧白板”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInOldZyBoard" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInOldZyBoard_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/Whiteboard.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="进入“微软 Whiteboard”时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInMSWhiteboard" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInMSWhiteboard_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/Powerpoint.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="播放PPT时自动收纳" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInPPTSlideShow" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInPPTSlideShow_Toggled" />
</ui:SimpleStackPanel>
<!--<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInZySmartBoard" Header="进入“中原新白板(相似鸿合)”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInZySmartBoard_Toggled"/>--> <!--<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInZySmartBoard" Header="进入“中原新白板(相似鸿合)”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInZySmartBoard_Toggled"/>-->
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInOldZyBoard" Header="进入“中原旧白板”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInOldZyBoard_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInMSWhiteboard" Header="进入“微软 Whiteboard”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInMSWhiteboard_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInPPTSlideShow" Header="进入“PPT 放映”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInPPTSlideShow_Toggled"/>
<TextBlock Text="# 请注意,查杀 PPT 小工具会导致希沃课堂授课助手无法使用,直接进入希沃课堂授课助手安装目录删除 Office.dll 文件即可进入 PPT 放映时不会启动希沃的 PPT 工具栏。" TextWrapping="Wrap" Foreground="#666666"/> <TextBlock Text="# 请注意,查杀 PPT 小工具会导致希沃课堂授课助手无法使用,直接进入希沃课堂授课助手安装目录删除 Office.dll 文件即可进入 PPT 放映时不会启动希沃的 PPT 工具栏。" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoKillPptService" Header="自动查杀“PPT 小工具”" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillPptService_Toggled"/> <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<ui:ToggleSwitch Name="ToggleSwitchAutoKillEasiNote" Header="自动查杀“希沃白板 5”" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillEasiNote_Toggled"/> <Image Source="/Resources/Icons-png/PPTTools.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<ui:ToggleSwitch Name="ToggleSwitchAutoKillZygoPresentationHelper" Header="自动復原ZygoPresentationHelper對Powerpoint的接管" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关"/> <TextBlock Text="自动查杀希沃“PPT 小工具”" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoKillPptService" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillPptService_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/EasiNote.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
<TextBlock Text="自动查杀 希沃白板5" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoKillEasiNote" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillEasiNote_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock Text="自动阻止ZPH对Powerpoint的接管" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoKillZygoPresentationHelper" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关"/>
</ui:SimpleStackPanel>
<TextBlock Text="# 此操作會嘗試調用ZygoPresentationHelper的API接口使其將PPT窗口不再設置為自己的子窗口並取消本次放映的接管。也可以在ZPH中設置查殺InkCanvas系列軟件IC、ICA、ICC的選項。" TextWrapping="Wrap" Foreground="#666666"/> <TextBlock Text="# 此操作會嘗試調用ZygoPresentationHelper的API接口使其將PPT窗口不再設置為自己的子窗口並取消本次放映的接管。也可以在ZPH中設置查殺InkCanvas系列軟件IC、ICA、ICC的選項。" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesAtClear" Header="清屏时自动截图" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesAtClear_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesAtClear" Header="清屏时自动截图" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesAtClear_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchSaveScreenshotsInDateFolders" Header="截图分日期文件夹保存" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSaveScreenshotsInDateFolders_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchSaveScreenshotsInDateFolders" Header="截图分日期文件夹保存" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSaveScreenshotsInDateFolders_Toggled"/>
@ -1109,7 +1167,7 @@
<ui:SimpleStackPanel Spacing="12"> <ui:SimpleStackPanel Spacing="12">
<ui:SimpleStackPanel Orientation="Horizontal"> <ui:SimpleStackPanel Orientation="Horizontal">
<TextBlock FontSize="18" FontWeight="Bold" Text="Version"/> <TextBlock FontSize="18" FontWeight="Bold" Text="Version"/>
<TextBlock x:Name="AppVersionTextBlock" FontSize="18" FontWeight="Bold" Text="4.X.X.X"/> <TextBlock x:Name="AppVersionTextBlock" FontSize="18" FontWeight="Bold" Text="5.X.X.X"/>
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
<TextBlock Text="* 使用和分发本软件前,请您应当且务必知晓相关开源协议,且您应当知晓本软件基于 https://github.com/WXRIW/Ink-Canvas 修改而成。" TextWrapping="Wrap" Foreground="#666666"/> <TextBlock Text="* 使用和分发本软件前,请您应当且务必知晓相关开源协议,且您应当知晓本软件基于 https://github.com/WXRIW/Ink-Canvas 修改而成。" TextWrapping="Wrap" Foreground="#666666"/>
<Border BorderBrush="DarkBlue" BorderThickness="2" CornerRadius="5" Padding="0,5"> <Border BorderBrush="DarkBlue" BorderThickness="2" CornerRadius="5" Padding="0,5">
@ -1757,18 +1815,23 @@
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
<Grid Width="0"> <Grid Width="0">
<Border ClipToBounds="True" Name="EraserSizePanel" Margin="-202,-87,92,37" CornerRadius="5" Background="#fafafa" Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"> <Border ClipToBounds="True" Name="EraserSizePanel" Margin="-203,-87,98,37" CornerRadius="5" Background="#fafafa" Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1">
<ui:SimpleStackPanel Margin="0"> <ui:SimpleStackPanel Margin="0">
<Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1" CornerRadius="6,6,0,0" Background="#2563eb" Margin="-1,-1,-1,1"> <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1" CornerRadius="6,6,0,0" Background="#2563eb" Margin="-1,-1,-1,1">
<TextBlock Text="橡皮大小" Foreground="White" Padding="0,5" FontSize="11" FontWeight="Bold" TextAlignment="Center"/> <TextBlock Text="橡皮选项" Foreground="White" Padding="0,5" FontSize="11" FontWeight="Bold" TextAlignment="Center"/>
</Border> </Border>
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,8,0,0" Spacing="-2" VerticalAlignment="Center" HorizontalAlignment="Center">
<Label Margin="0,0,0,0" Content="大小" FontWeight="Bold" Foreground="{DynamicResource FloatBarForeground}" FontSize="10" VerticalAlignment="Center"/>
<Viewbox Margin="8,0,0,0" Height="20" Width="52">
<ComboBox Name="ComboBoxEraserSizeFloatingBar" FontFamily="Microsoft YaHei UI" SelectedIndex="2" SelectionChanged="ComboBoxEraserSizeFloatingBar_SelectionChanged"> <ComboBox Name="ComboBoxEraserSizeFloatingBar" FontFamily="Microsoft YaHei UI" SelectedIndex="2" SelectionChanged="ComboBoxEraserSizeFloatingBar_SelectionChanged">
<ComboBoxItem Content="小" FontFamily="Microsoft YaHei UI"/> <ComboBoxItem Content="小" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="较小" FontFamily="Microsoft YaHei UI"/> <ComboBoxItem Content="较小" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="中(默认)" FontFamily="Microsoft YaHei UI"/> <ComboBoxItem Content="中等" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="较大" FontFamily="Microsoft YaHei UI"/> <ComboBoxItem Content="较大" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="大" FontFamily="Microsoft YaHei UI"/> <ComboBoxItem Content="大" FontFamily="Microsoft YaHei UI"/>
</ComboBox> </ComboBox>
</Viewbox>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
</Border> </Border>
</Grid> </Grid>

View File

@ -229,6 +229,7 @@ namespace Ink_Canvas {
break; break;
} }
inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90); inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
// inkCanvas.EraserShape = new RectangleStylusShape(k * 90, k * 90);
inkCanvas.EditingMode = InkCanvasEditingMode.Ink; inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint; inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
SaveSettingsToFile(); SaveSettingsToFile();

View File

@ -297,6 +297,7 @@ namespace Ink_Canvas {
BoardComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle; BoardComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle;
ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize; ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize;
ComboBoxEraserSizeFloatingBar.SelectedIndex = Settings.Canvas.EraserSize;
if (Settings.Canvas.HideStrokeWhenSelecting) { if (Settings.Canvas.HideStrokeWhenSelecting) {
ToggleSwitchHideStrokeWhenSelecting.IsOn = true; ToggleSwitchHideStrokeWhenSelecting.IsOn = true;

View File

@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.5.8.0")] [assembly: AssemblyVersion("5.0.1.0")]
[assembly: AssemblyFileVersion("4.5.8.0")] [assembly: AssemblyFileVersion("5.0.1.0")]

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB