[feature]提示自动播放和排练计时，设置UI优化

Ink Canvas/Ink Canvas.csproj

@@ -627,5 +627,11 @@
   <ItemGroup>
     <Resource Include="Resources\Icons-png\PPTTools.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Icons-png\WPS.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\hatsune-miku1.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Ink Canvas/MainWindow.xaml

@@ -89,7 +89,10 @@
         <Grid Name="GridBackgroundCoverHolder">
             <Grid Name="GridBackgroundCover" Visibility="Collapsed" Background="#1F1F1F"/>
         </Grid>
-
+        <Canvas IsHitTestVisible="False">
+            <TextBlock Canvas.Left="25" Canvas.Top="15" Text="{Binding nowTime}" Name="WaterMarkTime" Visibility="Collapsed" FontSize="30" FontWeight="Bold" Foreground="White" Opacity="0.5"/>
+            <TextBlock Canvas.Right="25" Canvas.Top="15" Text="Helloworld" Name="BlackBoardWaterMark" Visibility="Collapsed" FontSize="30" FontWeight="Bold" Foreground="White" Opacity="0.5"/>
+        </Canvas>
         <Canvas Name="Canvas"/>
         <Label Name="Label" Visibility="Collapsed" Foreground="Gray" Content="0"/>
         <InkCanvas x:Name="inkCanvas" Background="Transparent" Cursor="Pen" ForceCursor="False"
@@ -960,25 +963,57 @@
                             <GroupBox.Header>
                                 <TextBlock Text="PPT联动选项" FontWeight="Bold" Foreground="#18181b" FontSize="26"/>
                             </GroupBox.Header>
-                            <ui:SimpleStackPanel Spacing="12">
+                            <ui:SimpleStackPanel Spacing="6">
-                                <TextBlock Text="# 此部分的设置项将会在幻灯片播放时使用，优先级高于其他设置项" Foreground="#666666"/>
+                                <TextBlock Text="此部分的设置项将会在幻灯片播放时使用，优先级高于其他设置项" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchSupportPowerPoint" Header="Microsoft PowerPoint 支持" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportPowerPoint_Toggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <ui:ToggleSwitch Name="ToggleSwitchSupportWPS" Header="WPS Office 支持" IsOn="True" IsEnabled="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportWPS_Toggled"/>
+                                    <Image Source="/Resources/Icons-png/Powerpoint.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
+                                    <TextBlock Text="Microsoft PowerPoint 支持" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchSupportPowerPoint" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportPowerPoint_Toggled" />
+                                </ui:SimpleStackPanel>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="/Resources/Icons-png/WPS.png" Margin="0,0,6,0" Width="28" Height="28" VerticalAlignment="Center" />
+                                    <TextBlock Text="WPS 支持" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchSupportWPS" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportWPS_Toggled" />
+                                </ui:SimpleStackPanel>
                                 <TextBlock Text="# 不推荐使用 WPS Office，鉴于其对于触摸设备的较差支持及其自身的兼容性问题，对 WPS Office 支持时会导致 WPS Office 关闭时卡顿。" TextWrapping="Wrap" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchShowCanvasAtNewSlideShow" Header="进入 PPT 放映时自动进入批注模式" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCanvasAtNewSlideShow_Toggled"/>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerGestureInPresentationMode" Header="允许幻灯片模式下的双指手势" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerGestureInPresentationMode_Toggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <ui:ToggleSwitch Name="ToggleSwitchEnableFingerGestureSlideShowControl" Header="允许使用手指手势进行幻灯片翻页" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" IsOn="False" Toggled="ToggleSwitchEnableFingerGestureSlideShowControl_Toggled"/>
+                                    <TextBlock Text="进入 PPT 放映时自动进入批注模式" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchShowCanvasAtNewSlideShow" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCanvasAtNewSlideShow_Toggled" />
+                                </ui:SimpleStackPanel>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="允许幻灯片模式下的双指手势" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerGestureInPresentationMode" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerGestureInPresentationMode_Toggled" />
+                                </ui:SimpleStackPanel>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="允许使用手指手势进行幻灯片翻页" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchEnableFingerGestureSlideShowControl" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableFingerGestureSlideShowControl_Toggled" />
+                                </ui:SimpleStackPanel>
                                 <TextBlock Text="# 允许开启画板时使用手指手势进行幻灯片翻页（启用后，在幻灯片放映模式下，当画板无墨迹时，使用手指（笔尖或手掌无法识别）左右滑动即可控制幻灯片翻页。）" TextWrapping="Wrap" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchAutoSaveScreenShotInPowerPoint" Header="自动幻灯片截屏" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveScreenShotInPowerPoint_Toggled"/>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="自动幻灯片截屏" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchAutoSaveScreenShotInPowerPoint" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveScreenShotInPowerPoint_Toggled" />
+                                </ui:SimpleStackPanel>
                                 <TextBlock Text="#开启 自动幻灯片截屏 后将会在幻灯片有墨迹时翻页自动截屏" TextWrapping="Wrap" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesInPowerPoint" Header="自动保存幻灯片墨迹" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="自动保存幻灯片墨迹" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesInPowerPoint" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled" />
+                                </ui:SimpleStackPanel>
                                 <TextBlock Text="#开启 自动保存幻灯片墨迹 后将在结束幻灯片放映时自动将保存已有墨迹，并在下次打开时自动加载（文件名和幻灯片页数都要相同）" TextWrapping="Wrap" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchNotifyPreviousPage" Header="记忆并提示上次播放位置" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyPreviousPage_Toggled"/>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchNotifyHiddenPage" Header="提示隐藏幻灯片" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyHiddenPage_Toggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <!--
+                                    <TextBlock Text="记忆并提示上次播放位置" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchNoStrokeClearInPowerPoint" Header="退出画板模式时不清除笔迹" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchNoStrokeClearInPowerPoint_Toggled"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchNotifyPreviousPage" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyPreviousPage_Toggled" />
-                                <ui:ToggleSwitch Name="ToggleSwitchShowStrokeOnSelectInPowerPoint" Header="退出画板模式时不隐藏笔迹" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowStrokeOnSelectInPowerPoint_Toggled"/>
+                                </ui:SimpleStackPanel>
-                                -->
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="提示隐藏幻灯片" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchNotifyHiddenPage" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyHiddenPage_Toggled" />
+                                </ui:SimpleStackPanel>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="提示是否已启用自动播放" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchNotifyAutoPlayPresentation" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyAutoPlayPresentation_Toggled" />
+                                </ui:SimpleStackPanel>
                             </ui:SimpleStackPanel>
 
                         </GroupBox>
@@ -986,9 +1021,12 @@
                             <GroupBox.Header>
                                 <TextBlock Text="高级项" FontWeight="Bold" Foreground="#18181b" FontSize="26"/>
                             </GroupBox.Header>
-                            <ui:SimpleStackPanel Spacing="12">
+                            <ui:SimpleStackPanel Spacing="6">
-                                <TextBlock Text="#可在手指触摸画板时显示圆形橡皮或手掌触摸画板时显示的橡皮比&#x000A;手掌大很多时调整" Foreground="#666666"/>
+                                <TextBlock Text="可在手指触摸画板时显示圆形橡皮或手掌触摸画板时显示的橡皮比&#x000A;手掌大很多时调整" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchIsSpecialScreen" Header="特殊屏幕模式" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsSpecialScreen_OnToggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="特殊屏幕模式" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchIsSpecialScreen" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsSpecialScreen_OnToggled" />
+                                </ui:SimpleStackPanel>
                                 <StackPanel Orientation="Horizontal" Visibility="{Binding Visibility,ElementName=TouchMultiplierSlider}">
                                     <Slider x:Name="TouchMultiplierSlider"
                                             Minimum="0" Maximum="2"
@@ -1010,10 +1048,11 @@
                                     <Border Margin="0,0,20,0" CornerRadius="4" Height="48" Background="White" BorderBrush="Black" BorderThickness="2" TouchDown="BorderCalculateMultiplier_TouchDown"/>
                                     <TextBlock Name="TextBlockShowCalculatedMultiplier" FontSize="14"/>
                                 </ui:SimpleStackPanel>
-
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchEraserBindTouchMultiplier" Header="橡皮擦绑定触摸大小倍数" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" IsOn="False" Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled" Visibility="{Binding Path=Visibility, ElementName=TouchMultiplierSlider, Mode=OneWay}"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-
+                                    <TextBlock Text="橡皮擦绑定触摸大小倍数" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
-
+                                    <ui:ToggleSwitch Name="ToggleSwitchEraserBindTouchMultiplier" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled" />
+                                </ui:SimpleStackPanel>
                                 <TextBlock Text="# BoundsWidth 参数作为接触面积区分界限，用来区分橡皮和书写模式。笔尖模式参数值应较小。" TextWrapping="Wrap" Foreground="#666666"/>
                                 <StackPanel Orientation="Horizontal" Visibility="{Binding Visibility,ElementName=TouchMultiplierSlider}">
                                     <Slider x:Name="NibModeBoundsWidthSlider" Minimum="1" Maximum="50" Width="340" FontFamily="Microsoft YaHei UI" ui:ControlHelper.Header="笔尖模式 BoundsWidth"
@@ -1027,11 +1066,20 @@
                                     <TextBlock Text="{Binding Value, ElementName=FingerModeBoundsWidthSlider, Mode=OneWay}"
                                                VerticalAlignment="Bottom" Margin="10,0,0,8" FontSize="14" Width="30"/>
                                 </StackPanel>
-
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <ui:ToggleSwitch Name="ToggleSwitchIsQuadIR" Header="四边红外模式" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsQuadIR_Toggled"/>
+                                    <TextBlock Text="四边红外模式" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchIsLogEnabled" Header="记录日志" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" IsOn="True" Toggled="ToggleSwitchIsLogEnabled_Toggled"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchIsQuadIR" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsQuadIR_Toggled" />
+                                </ui:SimpleStackPanel>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="记录日志" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchIsLogEnabled" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsLogEnabled_Toggled" />
+                                </ui:SimpleStackPanel>
                                 <TextBlock Text="# 日志文件超过 512 KB 时会自动删除。" TextWrapping="Wrap" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchIsSecondConfimeWhenShutdownApp" Header="关闭软件时二次弹窗确认" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" IsOn="False" Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="关闭软件时二次弹窗确认" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchIsSecondConfimeWhenShutdownApp" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsSecondConfimeWhenShutdownApp_Toggled" />
+                                </ui:SimpleStackPanel>
                             </ui:SimpleStackPanel>
                         </GroupBox>
                         <GroupBox>
@@ -1046,7 +1094,7 @@
                                 </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="“希沃白板”自动收纳忽略桌面EN批注窗口" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <TextBlock Text="自动收纳忽略桌面EN批注窗口" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
                                     <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">
@@ -1098,13 +1146,14 @@
                                     <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>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
                                 <!--<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInZySmartBoard" Header="进入“中原新白板（相似鸿合）”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInZySmartBoard_Toggled"/>-->
-                                <TextBlock Text="# 请注意，查杀 PPT 小工具会导致希沃课堂授课助手无法使用，直接进入希沃课堂授课助手安装目录删除 Office.dll 文件即可进入 PPT 放映时不会启动希沃的 PPT 工具栏。" TextWrapping="Wrap" Foreground="#666666"/>
                                 <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <Image Source="/Resources/Icons-png/PPTTools.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="ToggleSwitchAutoKillPptService" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoKillPptService_Toggled" />
                                 </ui:SimpleStackPanel>
+                                <TextBlock Text="# 请注意，查杀 PPT 小工具会导致希沃课堂授课助手无法使用，直接进入希沃课堂授课助手安装目录删除 Office.dll 文件即可进入 PPT 放映时不会启动希沃的 PPT 工具栏。" TextWrapping="Wrap" Foreground="#666666"/>
                                 <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"/>
@@ -1115,12 +1164,20 @@
                                     <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"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesAtClear" Header="清屏时自动截图" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesAtClear_Toggled"/>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchSaveScreenshotsInDateFolders" Header="截图分日期文件夹保存" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSaveScreenshotsInDateFolders_Toggled"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesAtScreenshot" Header="截图时自动保存墨迹" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesAtScreenshot_Toggled"/>
+                                    <TextBlock Text="清屏时自动截图" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
-                                <!--
+                                    <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesAtClear" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesAtClear_Toggled"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchClearExitingWritingMode" Header="切换到鼠标模式后自动清屏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchExitingWritingMode_Toggled"/>
+                                </ui:SimpleStackPanel>
-                                -->
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="截图分日期文件夹保存" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchSaveScreenshotsInDateFolders" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchSaveScreenshotsInDateFolders_Toggled"/>
+                                </ui:SimpleStackPanel>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="截图时自动保存墨迹" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesAtScreenshot" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesAtScreenshot_Toggled"/>
+                                </ui:SimpleStackPanel>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
                                 <StackPanel Orientation="Horizontal">
                                     <Slider x:Name="SideControlMinimumAutomationSlider"
                                             HorizontalAlignment="Left"
@@ -1144,8 +1201,12 @@
                                     <Button Name="SetAutoSavedStrokesLocationToDocumentFolderButton" Grid.Row="1" Content="设置保存到 文档" Click="SetAutoSavedStrokesLocationToDocumentFolderButton_Click"/>
                                 </ui:SimpleStackPanel>
                                 <TextBlock Text="* 请注意检查保存文件夹是否有写入权限" TextWrapping="Wrap" Foreground="#666666"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchAutoDelSavedFiles" Header="定期自动删除超过保存时间的墨迹、截图文件" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoDelSavedFiles_Toggled"/>
+                                <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4"/>
-                                <TextBlock Text="！请注意自动删除功能将会删除自动保存目录下所有后缀名为 .icstk 和 .png 的文件！" TextWrapping="Wrap" Foreground="Black"/>
+                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <TextBlock Text="定期自动删除超过保存时间的墨迹、截图文件" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0"/>
+                                    <ui:ToggleSwitch Name="ToggleSwitchAutoDelSavedFiles" IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoDelSavedFiles_Toggled"/>
+                                </ui:SimpleStackPanel>
+                                <TextBlock Text="！请注意自动删除功能将会删除自动保存目录下所有后缀名为 .icstk 和 .png 的文件！" TextWrapping="Wrap" Foreground="#666666"/>
                                 <TextBlock FontSize="15">保存时间设置（Days）:</TextBlock>
                                 <ComboBox Name="ComboBoxAutoDelSavedFilesDaysThreshold" FontFamily="Microsoft YaHei UI" SelectedIndex="4" SelectionChanged="ComboBoxAutoDelSavedFilesDaysThreshold_SelectionChanged">
                                     <ComboBoxItem Content="1"/>
@@ -1662,7 +1723,7 @@
 
                             <ui:SimpleStackPanel Name="Eraser_Icon" MouseLeave="FloatingBarIcons_MouseUp_MouseLeave" MouseUp="EraserIcon_Click" MouseDown="FloatingBarIcons_MouseDown_New" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Margin="0,-2" Width="28">
                                 <Image x:Name="CircleEraserToolbarIconImage" Source="/Resources/new-icons/circle-eraser-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
-                                <TextBlock x:Name="CircleEraserToolbarTextBlock" Text="圆擦" Foreground="Black"  FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
+                                <TextBlock x:Name="CircleEraserToolbarTextBlock" Text="面积擦" Foreground="Black"  FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
                             </ui:SimpleStackPanel>
                             <ui:SimpleStackPanel Name="EraserByStrokes_Icon" MouseLeave="FloatingBarIcons_MouseUp_MouseLeave" MouseUp="EraserIconByStrokes_Click" MouseDown="FloatingBarIcons_MouseDown_New" Background="Transparent" Orientation="Vertical" Width="28" Margin="0,-2" HorizontalAlignment="Center">
                                 <Image x:Name="StrokeEraserToolbarIconImage" Source="/Resources/new-icons/eraser-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>

Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs

@@ -410,6 +410,8 @@ namespace Ink_Canvas {
                     ToggleSwitchEnableTwoFingerTranslate.IsOn = true;
                     if (isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = false;
                 }
+                WaterMarkTime.Visibility = Visibility.Visible;
+                BlackBoardWaterMark.Visibility = Visibility.Visible;
             } else {
                 //关闭黑板
                 HideSubPanelsImmediately();
@@ -453,6 +455,8 @@ namespace Ink_Canvas {
                     // 2024.5.2 need to be tested
                     // if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
                 }
+                WaterMarkTime.Visibility = Visibility.Collapsed;
+                BlackBoardWaterMark.Visibility = Visibility.Collapsed;
             }
 
             BtnSwitch_Click(BtnSwitch, null);
@@ -785,13 +789,22 @@ namespace Ink_Canvas {
                 ColorSwitchCheck();
                 HideSubPanels("pen", true);
             } else {
-                if (PenPalette.Visibility == Visibility.Visible) {
+                if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink)
-                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                {
-                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                    if (PenPalette.Visibility == Visibility.Visible) {
-                } else {
+                        AnimationsHelper.HideWithSlideAndFade(PenPalette);
-                    AnimationsHelper.ShowWithSlideFromBottomAndFade(PenPalette);
+                        AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
-                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette);
+                    } else {
+                        AnimationsHelper.ShowWithSlideFromBottomAndFade(PenPalette);
+                        AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette);
+                    }
+                } else
+                {
+                    inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
+                    ColorSwitchCheck();
+                    HideSubPanels("pen", true);
                 }
+                
             }
         }
 

Ink Canvas/MainWindow_cs/MW_PPT.cs

@@ -75,6 +75,7 @@ namespace Ink_Canvas {
         public static bool isWPSSupportOn => Settings.PowerPointSettings.IsSupportWPS;
 
         public static bool IsShowingRestoreHiddenSlidesWindow = false;
+        public static bool IsShowingAutoplaySlidesWindow = false;
 
         private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) {
             if (IsShowingRestoreHiddenSlidesWindow) return;
@@ -174,6 +175,26 @@ namespace Ink_Canvas {
                     }, DispatcherPriority.Normal);
                 }
 
+                //检测是否有自动播放
+                if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation)
+                {
+                    Application.Current.Dispatcher.BeginInvoke(() => {
+                        bool isHaveAutoPlaySettings = false;
+                        isHaveAutoPlaySettings = presentation.SlideShowSettings.AdvanceMode != PpSlideShowAdvanceMode.ppSlideShowManualAdvance;
+                        if (isHaveAutoPlaySettings && !IsShowingAutoplaySlidesWindow)
+                        {
+                            IsShowingAutoplaySlidesWindow = true;
+                            new YesOrNoNotificationWindow("检测到此演示文档中有自动播放或排练计时已经启用，是否取消？",
+                                () => {
+                                    presentation.SlideShowSettings.AdvanceMode = PpSlideShowAdvanceMode.ppSlideShowManualAdvance;
+                                }).ShowDialog();
+                        }
+
+                        BtnPPTSlideShow.Visibility = Visibility.Visible;
+                    }, DispatcherPriority.Normal);
+                }
+                
+
                 //如果检测到已经开始放映，则立即进入画板模式
                 if (pptApplication.SlideShowWindows.Count >= 1) {
                     PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]);

Ink Canvas/MainWindow_cs/MW_Settings.cs

@@ -437,6 +437,13 @@ namespace Ink_Canvas {
             SaveSettingsToFile();
         }
 
+        private void ToggleSwitchNotifyAutoPlayPresentation_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.PowerPointSettings.IsNotifyAutoPlayPresentation = ToggleSwitchNotifyAutoPlayPresentation.IsOn;
+            SaveSettingsToFile();
+        }
+
         private void SideControlMinimumAutomationSlider_ValueChanged(object sender, RoutedEventArgs e) {
             if (!isLoaded) return;
             Settings.Automation.MinimumAutomationStrokeNumber = (int)SideControlMinimumAutomationSlider.Value;

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -197,6 +197,15 @@ namespace Ink_Canvas {
                 } else {
                     ToggleSwitchNotifyHiddenPage.IsOn = false;
                 }
+
+                if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation)
+                {
+                    ToggleSwitchNotifyAutoPlayPresentation.IsOn = true;
+                }
+                else
+                {
+                    ToggleSwitchNotifyAutoPlayPresentation.IsOn = false;
+                }
                 if (Settings.PowerPointSettings.IsSupportWPS) {
                     ToggleSwitchSupportWPS.IsOn = true;
                 } else {

Ink Canvas/MainWindow_cs/MW_Timer.cs

@@ -1,11 +1,39 @@
 using Ink_Canvas.Helpers;
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using System.Timers;
 using System.Windows;
 using MessageBox = System.Windows.MessageBox;
 
 namespace Ink_Canvas {
+
+    public class TimeViewModel : INotifyPropertyChanged
+    {
+        private string _nowTime;
+
+        public string nowTime
+        {
+            get { return _nowTime; }
+            set
+            {
+                if (_nowTime != value)
+                {
+                    _nowTime = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
     public partial class MainWindow : Window {
         Timer timerCheckPPT = new Timer();
         Timer timerKillProcess = new Timer();
@@ -14,6 +42,10 @@ namespace Ink_Canvas {
         Timer timerCheckAutoUpdateWithSilence = new Timer();
         bool isHidingSubPanelsWhenInking = false; // 避免书写时触发二次关闭二级菜单导致动画不连续
 
+        Timer timerDisplayTime = new Timer();
+
+        private TimeViewModel nowTimeVM = new TimeViewModel();
+
         private void InitTimers() {
             timerCheckPPT.Elapsed += TimerCheckPPT_Elapsed;
             timerCheckPPT.Interval = 1000;
@@ -23,6 +55,14 @@ namespace Ink_Canvas {
             timerCheckAutoFold.Interval = 1500;
             timerCheckAutoUpdateWithSilence.Elapsed += timerCheckAutoUpdateWithSilence_Elapsed;
             timerCheckAutoUpdateWithSilence.Interval = 1000 * 60 * 10;
+            WaterMarkTime.DataContext = nowTimeVM;
+            timerDisplayTime.Elapsed += TimerDisplayTime_Elapsed;
+            timerDisplayTime.Interval = 1000;
+            timerDisplayTime.Start();
+        }
+
+        private void TimerDisplayTime_Elapsed(object sender, System.Timers.ElapsedEventArgs e) { 
+            nowTimeVM.nowTime = DateTime.Now.ToShortTimeString().ToString();
         }
 
         private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e) {

Ink Canvas/Resources/Settings.cs

@@ -153,6 +153,8 @@ namespace Ink_Canvas
         public bool IsNotifyPreviousPage { get; set; } = false;
         [JsonProperty("isNotifyHiddenPage")]
         public bool IsNotifyHiddenPage { get; set; } = true;
+        [JsonProperty("isNotifyAutoPlayPresentation")]
+        public bool IsNotifyAutoPlayPresentation { get; set; } = true;
         [JsonProperty("isEnableTwoFingerGestureInPresentationMode")]
         public bool IsEnableTwoFingerGestureInPresentationMode { get; set; } = false;
         [JsonProperty("isEnableFingerGestureSlideShowControl")]

Ink Canvas/Windows/RandWindow.xaml

@@ -9,64 +9,64 @@
         mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True" Loaded="Window_Loaded"
         WindowStartupLocation="CenterScreen"
         Title="Ink Canvas 抽奖" Height="500" Width="900">
-    <Border Background="#F0F3F9" CornerRadius="10" BorderThickness="1" BorderBrush="#0066BF" Margin="0">
+    <Border Background="#F0F3F9" CornerRadius="10" BorderThickness="1" BorderBrush="#0066BF" Margin="0" ClipToBounds="True">
-        <Grid>
+        <Canvas>
-            <Grid.ColumnDefinitions>
+            <Image Source="/Resources/hatsune-miku1.png" Width="300" Canvas.Bottom="-140" Canvas.Left="-48" Canvas.Top="314"></Image>
-                <ColumnDefinition Width="1.8*"/>
+            <Grid Canvas.Left="0" Canvas.Right="0" Canvas.Top="0" Canvas.Bottom="0" Width="900" Height="300">
-                <ColumnDefinition Width="1*"/>
+                <Grid.ColumnDefinitions>
-            </Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1.8*"/>
-            <Viewbox HorizontalAlignment="Center" Margin="20,0">
+                    <ColumnDefinition Width="1*"/>
-                <ui:SimpleStackPanel Orientation="Horizontal" Spacing="50" MinHeight="470">
+                </Grid.ColumnDefinitions>
-                    <Label Name="LabelOutput" FontSize="70" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <Viewbox HorizontalAlignment="Center" Margin="20,0">
-                    <Label Name="LabelOutput2" FontSize="70" Visibility="Collapsed" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <ui:SimpleStackPanel Orientation="Horizontal" Spacing="50" MinHeight="470">
-                    <Label Name="LabelOutput3" FontSize="70" Visibility="Collapsed" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Label Name="LabelOutput" FontSize="110" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Label Name="LabelOutput2" FontSize="110" Visibility="Collapsed" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Label Name="LabelOutput3" FontSize="110" Visibility="Collapsed" Content="" Block.TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </ui:SimpleStackPanel>
+                </Viewbox>
+                <ui:SimpleStackPanel Spacing="50" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center">
+                    <StackPanel Orientation="Horizontal">
+                        <Border x:Name="BorderBtnMinus" MouseUp="BorderBtnMinus_MouseUp" Background="#FBFBFD" Height="70" Width="70" CornerRadius="100">
+                            <Border.Effect>
+                                <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
+                            </Border.Effect>
+                            <Viewbox Margin="20">
+                                <ui:SymbolIcon Symbol="Remove" Foreground="Black"/>
+                            </Viewbox>
+                        </Border>
+                        <Label Name="LabelNumberCount" Content="1" FontFamily="Segeo UI" FontSize="55" Margin="30"/>
+                        <Border x:Name="BorderBtnAdd" MouseUp="BorderBtnAdd_MouseUp" Background="#FBFBFD" Height="70" Width="70" CornerRadius="100">
+                            <Border.Effect>
+                                <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
+                            </Border.Effect>
+                            <Viewbox Margin="20">
+                                <ui:SymbolIcon Symbol="Add" Foreground="Black"/>
+                            </Viewbox>
+                        </Border>
+                    </StackPanel>
+                    <Grid>
+                        <Border x:Name="BorderBtnRand" MouseUp="BorderBtnRand_MouseUp" Background="#0066BF"
+                Height="70" Width="200" CornerRadius="10">
+                            <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
+                                <Viewbox Margin="0,20">
+                                    <ui:SymbolIcon Name="SymbolIconStart" Symbol="Contact" Foreground="White"/>
+                                </Viewbox>
+                                <TextBlock Text="抽奖" Foreground="White" FontSize="35" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
+                            </ui:SimpleStackPanel>
+                        </Border>
+                        <Border x:Name="BorderBtnRandCover" Background="#BFBFBF" Visibility="Collapsed"
+                Height="70" Width="200" CornerRadius="10">
+                            <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
+                                <Viewbox Margin="0,20">
+                                    <ui:SymbolIcon Symbol="{Binding ElementName=SymbolIconStart, Path=Symbol}" Foreground="White"/>
+                                </Viewbox>
+                                <TextBlock Text="抽奖" Foreground="White" FontSize="35" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
+                            </ui:SimpleStackPanel>
+                        </Border>
+                    </Grid>
                 </ui:SimpleStackPanel>
-            </Viewbox>
+            </Grid>
-            <ui:SimpleStackPanel Spacing="50" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center">
+            <Border UseLayoutRounding="True" Canvas.Bottom="8" Canvas.Right="8" x:Name="BorderBtnHelp" MouseUp="BorderBtnHelp_MouseUp" Background="#FBFBFD" Grid.Column="1" Margin="10,10,60,10" Height="40" VerticalAlignment="Bottom" HorizontalAlignment="Right" CornerRadius="20">
-                <StackPanel Orientation="Horizontal">
-                    <Border x:Name="BorderBtnMinus" MouseUp="BorderBtnMinus_MouseUp" Background="#FBFBFD" Height="70" Width="70" CornerRadius="100">
-                        <Border.Effect>
-                            <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
-                        </Border.Effect>
-                        <Viewbox Margin="20">
-                            <ui:SymbolIcon Symbol="Remove" Foreground="Black"/>
-                        </Viewbox>
-                    </Border>
-                    <Label Name="LabelNumberCount" Content="1" FontFamily="Segeo UI" FontSize="55" Margin="30"/>
-                    <Border x:Name="BorderBtnAdd" MouseUp="BorderBtnAdd_MouseUp" Background="#FBFBFD" Height="70" Width="70" CornerRadius="100">
-                        <Border.Effect>
-                            <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
-                        </Border.Effect>
-                        <Viewbox Margin="20">
-                            <ui:SymbolIcon Symbol="Add" Foreground="Black"/>
-                        </Viewbox>
-                    </Border>
-                </StackPanel>
-                <Grid>
-                    <Border x:Name="BorderBtnRand" MouseUp="BorderBtnRand_MouseUp" Background="#0066BF"
-                        Height="70" Width="200" CornerRadius="10">
-                        <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
-                            <Viewbox Margin="0,20">
-                                <ui:SymbolIcon Name="SymbolIconStart" Symbol="Contact" Foreground="White"/>
-                            </Viewbox>
-                            <TextBlock Text="抽奖" Foreground="White" FontSize="35" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
-                        </ui:SimpleStackPanel>
-                    </Border>
-                    <Border x:Name="BorderBtnRandCover" Background="#BFBFBF" Visibility="Collapsed"
-                        Height="70" Width="200" CornerRadius="10">
-                        <ui:SimpleStackPanel Margin="3,0" Spacing="20" Orientation="Horizontal" HorizontalAlignment="Center">
-                            <Viewbox Margin="0,20">
-                                <ui:SymbolIcon Symbol="{Binding ElementName=SymbolIconStart, Path=Symbol}" Foreground="White"/>
-                            </Viewbox>
-                            <TextBlock Text="抽奖" Foreground="White" FontSize="35" Margin="-1,-1,4,0" VerticalAlignment="Center"/>
-                        </ui:SimpleStackPanel>
-                    </Border>
-                </Grid>
-            </ui:SimpleStackPanel>
-            <Border x:Name="BorderBtnHelp" MouseUp="BorderBtnHelp_MouseUp"
-                    Background="#FBFBFD" Grid.Column="1"
-                    Margin="10,10,60,10" Height="40"
-                    VerticalAlignment="Bottom" HorizontalAlignment="Right" CornerRadius="20">
                 <Border.Effect>
                     <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.15" BlurRadius="3"/>
                 </Border.Effect>
@@ -77,10 +77,7 @@
                     <TextBlock Margin="-5,12,15,12" Name="TextBlockPeopleCount" Text="点击此处以导入名单" FontSize="16" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 </ui:SimpleStackPanel>
             </Border>
-            <Border x:Name="BtnClose" MouseUp="BtnClose_MouseUp"
+            <Border UseLayoutRounding="True" Canvas.Bottom="8" Canvas.Right="8" x:Name="BtnClose" MouseUp="BtnClose_MouseUp" HorizontalAlignment="Right" VerticalAlignment="{Binding ElementName=BorderBtnHelp, Path=VerticalAlignment}" Margin="10" Grid.Column="1" Background="#E32A34" Height="40" Width="40" CornerRadius="100">
-                    HorizontalAlignment="Right" VerticalAlignment="{Binding ElementName=BorderBtnHelp, Path=VerticalAlignment}"
-                    Margin="10" Grid.Column="1"
-                    Background="#E32A34" Height="40" Width="40" CornerRadius="100">
                 <Border.Effect>
                     <DropShadowEffect Direction="0" ShadowDepth="0" Opacity="0.1" BlurRadius="3"/>
                 </Border.Effect>
@@ -88,6 +85,7 @@
                     <ui:SymbolIcon Symbol="Clear" Foreground="White"/>
                 </Viewbox>
             </Border>
-        </Grid>
+        </Canvas>
+
     </Border>
 </Window>

Ink Canvas/Windows/YesOrNoNotificationWindow.xaml

@@ -16,10 +16,16 @@
             <Viewbox HorizontalAlignment="Left" Margin="10" Height="30">
                 <ui:SymbolIcon Symbol="SlideShow" Foreground="{Binding ElementName=Label, Path=Foreground}"/>
             </Viewbox>
-            <Label Name="Label" Margin="60,20,0,20" VerticalAlignment="Center"/>
+            <TextBlock TextWrapping="Wrap" Name="Label" Margin="60,0,10,0" VerticalAlignment="Center"/>
             <ui:SimpleStackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal" Spacing="10">
-                <Button Margin="0" Content="是" Width="100" FontFamily="Microsoft YaHei UI" Click="ButtonYes_Click"/>
+                <Button Margin="0" Content="是" Width="100" FontFamily="Microsoft YaHei UI" Click="ButtonYes_Click" Foreground="White">
-                <Button Margin="0" Content="否" Width="100" FontFamily="Microsoft YaHei UI" Click="ButtonNo_Click"/>
+                    <Button.Resources>
+                        <SolidColorBrush x:Key="{x:Static ui:ThemeKeys.ButtonBackgroundKey}" Color="#15803d"/>
+                        <SolidColorBrush x:Key="{x:Static ui:ThemeKeys.ButtonBackgroundPointerOverKey}" Color="#15803d"/>
+                        <SolidColorBrush x:Key="{x:Static ui:ThemeKeys.ButtonBackgroundPressedKey}" Color="#166534"/>
+                    </Button.Resources>
+                </Button>
+                <Button Margin="0" Content="否" Width="100" FontFamily="Microsoft YaHei UI" Click="ButtonNo_Click" Foreground="#555555"/>
             </ui:SimpleStackPanel>
         </Grid>
     </Grid>

Ink Canvas/Windows/YesOrNoNotificationWindow.xaml.cs

@@ -17,7 +17,7 @@ namespace Ink_Canvas
             _yesAction = yesAction;
             _noAction = noAction;
             InitializeComponent();
-            Label.Content = text;
+            Label.Text = text;
         }
 
         private void ButtonYes_Click(object sender, RoutedEventArgs e)