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

Compare commits

base: kriastans:3433d2b14d609355d49eb3e41463273e9a65bd1e
Branches Tags
kriastans:master
kriastans:master-rendertransform-beta
...
compare: kriastans:e2e740059688c03360846efaa18123cfcc59cabf
Branches Tags
kriastans:master
kriastans:master-rendertransform-beta

2 Commits
3433d2b14d ... e2e7400596

Author SHA1 Message Date
kriastans
e2e7400596 [update] 白板页面列表适配和白板模式下更多子面板的适配（目前只有形状没有适配了，5.0.5.1再来搞吧） 2024-06-13 21:45:11 +08:00
kriastans
dc1fbdec78 [update] 修复TrayIcon资源改名后导致的问题. 2024-06-13 20:28:34 +08:00
17 changed files with 522 additions and 217 deletions
Show Stats Expand all files Collapse all files

1
Ink Canvas/App.xaml
View File

@ -227,6 +227,7 @@
</MenuItem>
</ContextMenu>
<tb:TaskbarIcon x:Key="TaskbarTrayIcon"
Visibility="Collapsed"
ToolTipText="InkCanvasForClass"
ContextMenu="{StaticResource SysTrayMenu}"
IconSource="/Resources/icc.ico"/>

2
Ink Canvas/App.xaml.cs
View File

@ -53,7 +53,7 @@ namespace Ink_Canvas
Environment.Exit(0);
}
_taskbar = (TaskbarIcon)FindResource("Taskbar");
_taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
StartArgs = e.Args;
}

1
Ink Canvas/Helpers/EdgeGestureUtil.cs
View File

@ -145,6 +145,7 @@ namespace Ink_Canvas.Helpers
//the warning for the whole project, it's a nice warning and we do want
//it in other places so we make a nice dummy function to keep the compiler
//happy.
// 代码应该在警告级别 4 下编译而不会出现任何警告，但是此结构将给出警告 CS0649：字段 [Fieldname] 从未分配，并且始终具有其默认值。您可以在项目选项中禁用 CS0649，但这将禁用整个项目的警告，这是一个很好的警告，我们确实希望它在其他地方，所以我们制作了一个不错的虚拟函数来让编译器满意。
private void FixCS0649()
{
Length = 0;

8
Ink Canvas/InkCanvasForClass.csproj
View File

@ -199,10 +199,12 @@
<Resource Include="Resources\Icons-png\eraser-line.png" />
<Resource Include="Resources\Icons-png\eraser-outline.png" />
<Resource Include="Resources\Icons-png\HiteLightBoard.png" />
<Resource Include="Resources\Icons-png\ica.png" />
<Resource Include="Resources\Icons-png\icc-transparent-dark-small.png" />
<Resource Include="Resources\Icons-png\icc-transparent-dark.png" />
<Resource Include="Resources\Icons-png\icc-transparent.png" />
<Resource Include="Resources\Icons-png\icc.png" />
<Resource Include="Resources\Icons-png\InkCanvas.png" />
<Resource Include="Resources\Icons-png\kuanciya.png" />
<Resource Include="Resources\Icons-png\kuandogeyuanliangwo.png" />
<Resource Include="Resources\Icons-png\kuandoujiyanhuaji.png" />
@ -490,10 +492,13 @@
<None Remove="Resources\Icons-png\EasiNote3.png" />
<None Remove="Resources\Icons-png\HiteAnnotation.png" />
<None Remove="Resources\Icons-png\HiteLightBoard.png" />
<None Remove="Resources\Icons-png\ica.png" />
<None Remove="Resources\Icons-png\icc-transparent-dark-small.png" />
<None Remove="Resources\Icons-png\icc-transparent-dark.png" />
<None Remove="Resources\Icons-png\icc-transparent.png" />
<None Remove="Resources\Icons-png\icc.png" />
<None Remove="Resources\Icons-png\idt.png" />
<None Remove="Resources\Icons-png\InkCanvas.png" />
<None Remove="Resources\Icons-png\kuanciya.png" />
<None Remove="Resources\Icons-png\kuandogeyuanliangwo.png" />
<None Remove="Resources\Icons-png\kuandoujiyanhuaji.png" />
@ -517,6 +522,9 @@
<None Remove="Resources\new-icons\unfold-chevron.png" />
<None Remove="Resources\new-icons\zoom.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\idt.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Icons-png\HiteAnnotation.png" />
</ItemGroup>

400
Ink Canvas/MainWindow.xaml
View File

@ -606,7 +606,8 @@
<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" />
<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>
@ -617,15 +618,18 @@
<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" />
<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"/>
<Image Name="ICCTrayIconExampleImage" Height="24" Width="24"
Source="Resources/icc.ico" Margin="8,0,0,0" />
</ui:SimpleStackPanel>
<TextBlock Margin="12,0,0,0" VerticalAlignment="Center" Text="任务栏托盘图标" FontWeight="Bold" Foreground="#fafafa"
<TextBlock Margin="12,0,0,0" VerticalAlignment="Center" Text="任务栏托盘图标"
FontWeight="Bold" Foreground="#fafafa"
FontSize="20" />
</Grid>
</Border>
@ -664,6 +668,26 @@
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchSupportWPS_Toggled" />
</ui:SimpleStackPanel>
<Border BorderBrush="#ef4444"
BorderThickness="2" Padding="8" CornerRadius="6" Background="#991b1b">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="4">
<Image Width="20" Height="20">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="White"
Geometry="F0 M24,24z M0,0z M10.478,6.91759C10.478,6.07778 11.1588,5.39697 11.9986,5.39697 12.8385,5.39697 13.5193,6.07778 13.5193,6.91759L13.5193,12.0001C13.5193,12.8399 12.8385,13.5207 11.9986,13.5207 11.1588,13.5207 10.478,12.8399 10.478,12.0001L10.478,6.91759z M10.478,17.0826C10.478,16.2427,11.1588,15.5619,11.9986,15.5619L12.0114,15.5619C12.8512,15.5619 13.532,16.2427 13.532,17.0826 13.532,17.9224 12.8512,18.6032 12.0114,18.6032L11.9986,18.6032C11.1588,18.6032,10.478,17.9224,10.478,17.0826z M12,0.75C5.7868,0.75 0.75,5.7868 0.75,12 0.75,18.2132 5.7868,23.25 12,23.25 18.2132,23.25 23.25,18.2132 23.25,12 23.25,5.7868 18.2132,0.75 12,0.75z M3.25,12C3.25,7.16751 7.16751,3.25 12,3.25 16.8325,3.25 20.75,7.16751 20.75,12 20.75,16.8325 16.8325,20.75 12,20.75 7.16751,20.75 3.25,16.8325 3.25,12z" />
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
</Image.Source>
</Image>
<TextBlock Margin="2,0,0,0" FontSize="13" VerticalAlignment="Center"
Text="开启WPS支持后会导致WPS关闭时卡顿！">
</TextBlock>
</ui:SimpleStackPanel>
</Border>
<TextBlock
Text="# 可支持 WPS，但目前无法同时支持 MSOffice 和 WPS。若要启用WPS支持，请确保 WPS 是否在 “配置工具” 中开启了 “WPS Office 兼容第三方系统和软件” 选项，否则将无法识别到WPS！"
TextWrapping="Wrap" Foreground="#a1a1aa" />
@ -1061,7 +1085,8 @@
</Border>
<ui:ToggleSwitch OnContent="" OffContent="" MinWidth="0"
Toggled="ToggleSwitchIsEnableResolutionChangeDetection_Toggled"
Name="ToggleSwitchIsEnableResolutionChangeDetection" IsOn="True"
Name="ToggleSwitchIsEnableResolutionChangeDetection"
IsOn="True"
FontFamily="Microsoft YaHei UI" FontWeight="Bold" />
</ui:SimpleStackPanel>
<TextBlock TextWrapping="Wrap" Foreground="#a1a1aa"
@ -1380,6 +1405,45 @@
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchAutoKillHiteAnnotation_Toggled" />
</ui:SimpleStackPanel>
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
StrokeThickness="1" Margin="0,4,0,4" />
<TextBlock Margin="0,0,0,8" Text="同类软件查杀" FontWeight="Bold" Foreground="#fafafa"
FontSize="20" />
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/InkCanvas.png" Margin="0,0,6,0"
Width="28"
Height="28" VerticalAlignment="Center" />
<TextBlock Foreground="#fafafa" Text="自动查杀 Ink Canvas"
VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchAutoKillInkCanvas"
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchAutoKillInkCanvas_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/ica.png" Margin="0,0,6,0"
Width="28"
Height="28" VerticalAlignment="Center" />
<TextBlock Foreground="#fafafa" Text="自动查杀ICA（新版旧版通杀）"
VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchAutoKillICA"
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchAutoKillICA_Toggled" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Image Source="/Resources/Icons-png/idt.png" Margin="0,0,6,0"
Width="28"
Height="28" VerticalAlignment="Center" />
<TextBlock Foreground="#fafafa" Text="自动查杀“智绘教”" VerticalAlignment="Center"
FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchAutoKillIDT"
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
Toggled="ToggleSwitchAutoKillIDT_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">
@ -1493,7 +1557,8 @@
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchDisplayRandWindowNamesInputBtn"
IsOn="True" FontFamily="Microsoft YaHei UI"
FontWeight="Bold" Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled" />
FontWeight="Bold"
Toggled="ToggleSwitchDisplayRandWindowNamesInputBtn_OnToggled" />
</ui:SimpleStackPanel>
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0"
Stroke="#3f3f46" StrokeThickness="1" Margin="0,4,0,4" />
@ -1503,7 +1568,8 @@
<Slider x:Name="RandWindowOnceCloseLatencySlider" Minimum="0.5"
Maximum="8" Width="168" FontFamily="Microsoft YaHei UI"
FontSize="20" IsSnapToTickEnabled="True" Value="2.5"
TickFrequency="0.1" ValueChanged="RandWindowOnceCloseLatencySlider_ValueChanged"
TickFrequency="0.1"
ValueChanged="RandWindowOnceCloseLatencySlider_ValueChanged"
TickPlacement="None" AutoToolTipPlacement="None" />
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"
Margin="12,0,16,0">
@ -2135,6 +2201,7 @@
</Grid>
</Border>
<Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
Name="BtnLeftPageListWB"
BorderThickness="1,1,1,1" BorderBrush="#a1a1aa" Background="#f4f4f5"
Opacity="0.95">
<Grid Margin="6,6,6,4">
@ -3860,121 +3927,147 @@
</Grid>
</Border>
<Border>
<Grid Margin="0,0,0,5" Width="0">
<Border Name="BoardBorderTools" Margin="-162,-190,-102,54" CornerRadius="5"
Background="LightGray" Opacity="0.85" BorderBrush="Black"
BorderThickness="1">
<ui:SimpleStackPanel Margin="13">
<Border Margin="4,3" BorderBrush="Black" BorderThickness="1.5"
Width="220"
CornerRadius="10">
<Grid Width="0" Margin="0,0,0,5" RenderTransformOrigin="0,1">
<Grid.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform/>
</TransformGroup>
</Grid.RenderTransform>
<Border ClipToBounds="True" Name="BoardBorderTools" Margin="-105,-138.5,-14,33.5"
CornerRadius="5" Background="#fafafa" Opacity="1"
BorderThickness="1"
BorderBrush="#2563eb">
<ui:SimpleStackPanel Margin="-1,0,0,0">
<Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1"
CornerRadius="6,6,0,0" Background="#2563eb"
Margin="-1,-1,-1,0"
Padding="1,1,1,0">
<ui:SimpleStackPanel Orientation="Horizontal"
VerticalAlignment="Center"
HorizontalAlignment="Center">
<ui:SimpleStackPanel Orientation="Horizontal"
HorizontalAlignment="Center"
Margin="2.5,0,0,0"
Height="35" Spacing="5"
MouseDown="Border_MouseDown"
MouseUp="BoardLaunchEasiCamera_MouseUp">
<Image Source="/Resources/Icons-png/EasiCamera.png"
HorizontalAlignment="Stretch">
<TextBlock Text="更多功能" Foreground="White"
Padding="8,5,44,5"
FontSize="11" FontWeight="Bold"
TextAlignment="Center" />
<Image Margin="0,0,0,0"
Source="/Resources/new-icons/close-white.png"
RenderOptions.BitmapScalingMode="HighQuality"
Height="25"
Width="25" />
<TextBlock Text="视频展台" FontSize="15"
VerticalAlignment="Center" />
</ui:SimpleStackPanel>
<Line Margin="10,0" HorizontalAlignment="Center"
VerticalAlignment="Center" X1="0" Y1="0" X2="0"
Y2="25"
Stroke="Black" StrokeThickness="1" />
<ui:SimpleStackPanel Orientation="Horizontal"
HorizontalAlignment="Center"
Margin="2.5,0,0,0"
Height="35" Spacing="5"
MouseDown="Border_MouseDown"
MouseUp="BoardLaunchDesmos_MouseUp">
<Image Margin="-1,0,0,0"
Source="/Resources/Icons-png/Desmos.png"
RenderOptions.BitmapScalingMode="HighQuality"
Height="25"
Width="25">
<Image.Clip>
<EllipseGeometry Center="12.5,12.5"
RadiusX="12.5"
RadiusY="12.5" />
</Image.Clip>
</Image>
<TextBlock Text="Desmos" FontSize="15"
VerticalAlignment="Center" />
</ui:SimpleStackPanel>
Height="16"
Width="16" MouseDown="Border_MouseDown"
MouseUp="CloseBordertools_MouseUp" />
</ui:SimpleStackPanel>
</Border>
<Label Content="保存 | 打开 | 播放 — 当前页墨迹" FontSize="16"
HorizontalAlignment="Left" />
<ui:SimpleStackPanel Orientation="Horizontal" Margin="2.5,0,0,0"
Height="35"
Spacing="15">
<!---->
<ui:SimpleStackPanel Margin="10,3,10,2" Spacing="-2">
<ui:SimpleStackPanel Margin="0,0,0,0" Height="40" Spacing="0"
Orientation="Horizontal">
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="ImageCountdownTimer_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_save_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality" Height="30"
Width="30"
MouseDown="Border_MouseDown"
MouseUp="SymbolIconSaveStrokes_MouseUp" />
<Image
Source="/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality" Height="30"
Width="30"
MouseDown="Border_MouseDown"
MouseUp="SymbolIconOpenStrokes_MouseUp" />
<Image Source="/Resources/Icons-png/playCircle.png"
RenderOptions.BitmapScalingMode="HighQuality"
Height="30"
Width="30"
MouseDown="Border_MouseDown"
MouseUp="GridInkReplayButton_MouseUp" />
</ui:SimpleStackPanel>
<Label Content="截图 设置 | 倒计时 随机抽选" FontSize="17"
HorizontalAlignment="Left" />
<ui:SimpleStackPanel Orientation="Horizontal" Margin="2.5,0,0,0"
Height="35"
Spacing="14">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_camera_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality" Height="30"
Width="30"
MouseDown="Border_MouseDown"
MouseUp="SymbolIconScreenshot_MouseUp" />
<Image
Source="/Resources/Icons-Fluent/ic_fluent_settings_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality" Height="30"
Width="30"
MouseDown="Border_MouseDown"
MouseUp="SymbolIconSettings_Click" />
<Border Margin="-10,0,0,0" Width="1" Height="30"
BorderBrush="Black"
Background="Black" />
<Image Margin="-2,0,5,0"
Source="/Resources/Icons-Fluent/ic_fluent_timer_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality"
Height="30"
Width="30"
MouseDown="Border_MouseDown"
MouseUp="ImageCountdownTimer_MouseUp" />
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="计时器" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="SymbolIconRand_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_people_money_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality" Height="28"
Width="28"
MouseDown="Border_MouseDown"
MouseUp="SymbolIconRand_MouseUp" />
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="随机抽" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="SymbolIconRandOne_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_person_money_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality" Height="28"
Width="28"
MouseDown="Border_MouseDown"
MouseUp="SymbolIconRandOne_MouseUp" />
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="单次抽选" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Margin="0,0,0,0" Height="40" Spacing="0"
Orientation="Horizontal">
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="SymbolIconSaveStrokes_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_save_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="保存" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="SymbolIconOpenStrokes_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_folder_open_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="打开..." FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="GridInkReplayButton_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image Source="/Resources/Icons-png/playCircle.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="重播" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Margin="0,0,0,0" Height="40" Spacing="0"
Orientation="Horizontal">
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="SymbolIconScreenshot_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_camera_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="截屏" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="OperatingGuideWindowIcon_MouseUp"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_book_question_mark_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="说明书" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown"
MouseUp="SymbolIconSettings_Click"
Margin="0,0,0,0" Height="38" Width="32"
Orientation="Vertical">
<Image
Source="/Resources/Icons-Fluent/ic_fluent_settings_24_regular.png"
RenderOptions.BitmapScalingMode="HighQuality"
Margin="0,4,0,2" Height="19" Width="19" />
<Label Content="设置" FontSize="8"
HorizontalAlignment="Center" />
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</Border>
@ -4040,6 +4133,7 @@
<Border CornerRadius="5,5,5,5" Background="#f4f4f5" Margin="0,0,0,0">
<ui:SimpleStackPanel Orientation="Horizontal">
<Border Width="60" Height="50"
IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchPrevious, Path=IsEnabled}"
BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
Background="#f4f4f5"
@ -4052,6 +4146,7 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="#18181b"
x:Name="BtnRightWhiteBoardSwitchPreviousGeometry"
Geometry="F1 M24,24z M0,0z M7.40091,10.456L14.5033,3.35357 12.3198,1.17001 1.48978,12 12.3198,22.83 14.5033,20.6465 7.40089,13.544 22.5102,13.544 22.5102,10.456 7.40091,10.456z" />
</DrawingGroup>
</DrawingImage.Drawing>
@ -4059,10 +4154,12 @@
</Image.Source>
</Image>
<TextBlock Text="上一页" Foreground="#18181b" VerticalAlignment="Bottom"
HorizontalAlignment="Center" FontSize="12" />
HorizontalAlignment="Center" FontSize="12"
Name="BtnRightWhiteBoardSwitchPreviousLabel" />
</Grid>
</Border>
<Border Width="75" Height="50"
<Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
Name="BtnRightPageListWB"
BorderThickness="1,1,1,1" BorderBrush="#a1a1aa" Background="#f4f4f5"
Opacity="0.95">
<Grid Margin="6,6,6,4">
@ -4074,7 +4171,58 @@
HorizontalAlignment="Center" FontSize="12" />
</Grid>
</Border>
<Grid Width="0" Margin="0,0,0,5">
<Border ClipToBounds="True" Name="BoardBorderRightPageListView"
Margin="-138,-465,-56,50"
CornerRadius="8"
Background="#fafafa" Opacity="1" BorderBrush="#a1a1aa"
BorderThickness="1">
<ui:ScrollViewerEx Name="BlackBoardRightSidePageListScrollViewer"
Height="460"
VerticalScrollBarVisibility="Hidden"
ForceUseSmoothScroll="True">
<ListView ScrollViewer.CanContentScroll="False" SelectionMode="Single"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled"
Name="BlackBoardRightSidePageListView">
<ListView.ItemTemplate>
<DataTemplate>
<ui:SimpleStackPanel Orientation="Vertical"
MouseUp="BlackBoardRightSidePageListView_OnMouseUp">
<Border Margin="0,4" Width="160" BorderBrush="#a1a1aa"
BorderThickness="1">
<Grid>
<Viewbox Width="160">
<InkCanvas EditingMode="None"
Background="{Binding ElementName=GridBackgroundCover, Path=Background}"
Strokes="{Binding Strokes}"
Width="{Binding ElementName=inkCanvas, Path=ActualWidth}"
Height="{Binding ElementName=inkCanvas, Path=ActualHeight}">
</InkCanvas>
</Viewbox>
<Border Margin="4" Width="36" Height="20"
CornerRadius="3" HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="#cc09090b">
<TextBlock FontSize="14"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Consolas"
Foreground="White"
Text="{Binding Index}">
</TextBlock>
</Border>
</Grid>
</Border>
</ui:SimpleStackPanel>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</ui:ScrollViewerEx>
</Border>
</Grid>
<Border Width="60" Height="50" MouseUp="BtnWhiteBoardSwitchNext_Click"
IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchNext, Path=IsEnabled}"
CornerRadius="0,5,5,0"
BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
Background="#f4f4f5" Opacity="0.95">
@ -4086,6 +4234,7 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="#18181b"
x:Name="BtnRightWhiteBoardSwitchNextGeometry"
Geometry="F1 M24,24z M0,0z M16.5991,10.456L9.49667,3.35357 11.6802,1.17001 22.5102,12 11.6802,22.83 9.49667,20.6465 16.5991,13.544 1.48978,13.544 1.48978,10.456 16.5991,10.456z" />
</DrawingGroup>
</DrawingImage.Drawing>
@ -4093,7 +4242,8 @@
</Image.Source>
</Image>
<TextBlock Text="下一页" Foreground="Black" VerticalAlignment="Bottom"
HorizontalAlignment="Center" FontSize="12" />
HorizontalAlignment="Center" FontSize="12"
Name="BtnRightWhiteBoardSwitchNextLabel" />
</Grid>
</Border>
</ui:SimpleStackPanel>
@ -5744,12 +5894,13 @@
Background="Transparent" Orientation="Vertical"
HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
Margin="0,3,0,0" >
Margin="0,3,0,0">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="#FF000000" Geometry="F0 M24,24z M0,0z M11.5007,11.0214C11.5007,10.674,11.7823,10.3923,12.1298,10.3923L14.2967,10.3923 14.2967,9.90299C14.2967,9.41878 14.5325,8.98723 14.8305,8.68924 15.1285,8.39124 15.56,8.15547 16.0442,8.15547L18.281,8.15547C18.7652,8.15547 19.1968,8.39124 19.4948,8.68924 19.7928,8.98723 20.0286,9.41878 20.0286,9.90299L20.0286,10.3923 22.1955,10.3923C22.5429,10.3923 22.8246,10.674 22.8246,11.0214 22.8246,11.3688 22.5429,11.6505 22.1955,11.6505L21.7062,11.6505 21.7062,18.8503C21.7062,19.3345 21.4704,19.766 21.1724,20.064 20.8744,20.362 20.4429,20.5978 19.9587,20.5978L14.3666,20.5978C13.8824,20.5978 13.4508,20.362 13.1528,20.064 12.8549,19.766 12.6191,19.3345 12.6191,18.8503L12.6191,11.6505 12.1298,11.6505C11.7823,11.6505,11.5007,11.3688,11.5007,11.0214z M14.0425,19.1743C13.9211,19.0529,13.8773,18.9253,13.8773,18.8503L13.8773,11.6505 20.448,11.6505 20.448,18.8503C20.448,18.9253 20.4041,19.0529 20.2827,19.1743 20.1613,19.2958 20.0337,19.3396 19.9587,19.3396L14.3666,19.3396C14.2916,19.3396,14.1639,19.2958,14.0425,19.1743z M15.5549,9.90299C15.5549,9.82799 15.5987,9.70034 15.7202,9.57893 15.8416,9.45752 15.9692,9.41368 16.0442,9.41368L18.281,9.41368C18.356,9.41368 18.4837,9.45752 18.6051,9.57893 18.7265,9.70034 18.7703,9.82799 18.7703,9.90299L18.7703,10.3923 15.5549,10.3923 15.5549,9.90299z M18.9101,13.8174C18.9101,13.47 18.6285,13.1883 18.281,13.1883 17.9336,13.1883 17.6519,13.47 17.6519,13.8174L17.6519,17.1727C17.6519,17.5201 17.9336,17.8018 18.281,17.8018 18.6285,17.8018 18.9101,17.5201 18.9101,17.1727L18.9101,13.8174z M16.6733,13.8174C16.6733,13.47 16.3917,13.1883 16.0442,13.1883 15.6968,13.1883 15.4151,13.47 15.4151,13.8174L15.4151,17.1727C15.4151,17.5201 15.6968,17.8018 16.0442,17.8018 16.3917,17.8018 16.6733,17.5201 16.6733,17.1727L16.6733,13.8174z M1.32567,3.55246C1.47265,3.40549,1.69379,3.36174,1.88566,3.44167L11.8342,7.58639C12.0311,7.66845 12.1567,7.86389 12.1495,8.07716 12.1424,8.29043 12.0039,8.47698 11.8018,8.54561L8.25047,9.75183 11.4309,12.9323C11.6313,13.1326 11.6313,13.4574 11.4309,13.6577 11.2306,13.8581 10.9058,13.8581 10.7055,13.6577L7.52503,10.4773 6.31881,14.0286C6.25019,14.2307 6.06364,14.3692 5.85037,14.3763 5.6371,14.3835 5.44166,14.2579 5.3596,14.0609L1.21488,4.11245C1.13494,3.92058,1.1787,3.69944,1.32567,3.55246z" />
<GeometryDrawing Brush="#FF000000"
Geometry="F0 M24,24z M0,0z M11.5007,11.0214C11.5007,10.674,11.7823,10.3923,12.1298,10.3923L14.2967,10.3923 14.2967,9.90299C14.2967,9.41878 14.5325,8.98723 14.8305,8.68924 15.1285,8.39124 15.56,8.15547 16.0442,8.15547L18.281,8.15547C18.7652,8.15547 19.1968,8.39124 19.4948,8.68924 19.7928,8.98723 20.0286,9.41878 20.0286,9.90299L20.0286,10.3923 22.1955,10.3923C22.5429,10.3923 22.8246,10.674 22.8246,11.0214 22.8246,11.3688 22.5429,11.6505 22.1955,11.6505L21.7062,11.6505 21.7062,18.8503C21.7062,19.3345 21.4704,19.766 21.1724,20.064 20.8744,20.362 20.4429,20.5978 19.9587,20.5978L14.3666,20.5978C13.8824,20.5978 13.4508,20.362 13.1528,20.064 12.8549,19.766 12.6191,19.3345 12.6191,18.8503L12.6191,11.6505 12.1298,11.6505C11.7823,11.6505,11.5007,11.3688,11.5007,11.0214z M14.0425,19.1743C13.9211,19.0529,13.8773,18.9253,13.8773,18.8503L13.8773,11.6505 20.448,11.6505 20.448,18.8503C20.448,18.9253 20.4041,19.0529 20.2827,19.1743 20.1613,19.2958 20.0337,19.3396 19.9587,19.3396L14.3666,19.3396C14.2916,19.3396,14.1639,19.2958,14.0425,19.1743z M15.5549,9.90299C15.5549,9.82799 15.5987,9.70034 15.7202,9.57893 15.8416,9.45752 15.9692,9.41368 16.0442,9.41368L18.281,9.41368C18.356,9.41368 18.4837,9.45752 18.6051,9.57893 18.7265,9.70034 18.7703,9.82799 18.7703,9.90299L18.7703,10.3923 15.5549,10.3923 15.5549,9.90299z M18.9101,13.8174C18.9101,13.47 18.6285,13.1883 18.281,13.1883 17.9336,13.1883 17.6519,13.47 17.6519,13.8174L17.6519,17.1727C17.6519,17.5201 17.9336,17.8018 18.281,17.8018 18.6285,17.8018 18.9101,17.5201 18.9101,17.1727L18.9101,13.8174z M16.6733,13.8174C16.6733,13.47 16.3917,13.1883 16.0442,13.1883 15.6968,13.1883 15.4151,13.47 15.4151,13.8174L15.4151,17.1727C15.4151,17.5201 15.6968,17.8018 16.0442,17.8018 16.3917,17.8018 16.6733,17.5201 16.6733,17.1727L16.6733,13.8174z M1.32567,3.55246C1.47265,3.40549,1.69379,3.36174,1.88566,3.44167L11.8342,7.58639C12.0311,7.66845 12.1567,7.86389 12.1495,8.07716 12.1424,8.29043 12.0039,8.47698 11.8018,8.54561L8.25047,9.75183 11.4309,12.9323C11.6313,13.1326 11.6313,13.4574 11.4309,13.6577 11.2306,13.8581 10.9058,13.8581 10.7055,13.6577L7.52503,10.4773 6.31881,14.0286C6.25019,14.2307 6.06364,14.3692 5.85037,14.3763 5.6371,14.3835 5.44166,14.2579 5.3596,14.0609L1.21488,4.11245C1.13494,3.92058,1.1787,3.69944,1.32567,3.55246z" />
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
@ -5862,12 +6013,13 @@
Orientation="Vertical" HorizontalAlignment="Center" Width="28"
Margin="0,-2">
<Image RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
Margin="0,3,0,0" >
Margin="0,3,0,0">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="#FF000000" Geometry="F0 M24,24z M0,0z M5,5.875C4.70163,5.875 4.41548,5.99353 4.2045,6.2045 3.99353,6.41548 3.875,6.70163 3.875,7L3.875,17C3.875,17.2984 3.99353,17.5845 4.2045,17.7955 4.41548,18.0065 4.70163,18.125 5,18.125L8,18.125C8.48325,18.125 8.875,18.5168 8.875,19 8.875,19.4832 8.48325,19.875 8,19.875L5,19.875C4.2375,19.875 3.50623,19.5721 2.96707,19.0329 2.4279,18.4938 2.125,17.7625 2.125,17L2.125,7C2.125,6.2375 2.4279,5.50624 2.96707,4.96707 3.50624,4.4279 4.2375,4.125 5,4.125L19,4.125C19.7625,4.125 20.4938,4.4279 21.0329,4.96707 21.5721,5.50623 21.875,6.2375 21.875,7L21.875,18C21.875,18.4973 21.6775,18.9742 21.3258,19.3258 20.9742,19.6775 20.4973,19.875 20,19.875 19.5168,19.875 19.125,19.4832 19.125,19 19.125,18.5168 19.5168,18.125 20,18.125 20.0332,18.125 20.0649,18.1118 20.0884,18.0884 20.1118,18.0649 20.125,18.0332 20.125,18L20.125,7C20.125,6.70163 20.0065,6.41548 19.7955,6.2045 19.5845,5.99353 19.2984,5.875 19,5.875L5,5.875z M10.6742,15.6742C11.0258,15.3225,11.5027,15.125,12,15.125L16,15.125C16.4973,15.125 16.9742,15.3225 17.3258,15.6742 17.6775,16.0258 17.875,16.5027 17.875,17L17.875,18C17.875,18.4973 17.6775,18.9742 17.3258,19.3258 16.9742,19.6775 16.4973,19.875 16,19.875L12,19.875C11.5027,19.875 11.0258,19.6775 10.6742,19.3258 10.3225,18.9742 10.125,18.4973 10.125,18L10.125,17C10.125,16.5027,10.3225,16.0258,10.6742,15.6742z" />
<GeometryDrawing Brush="#FF000000"
Geometry="F0 M24,24z M0,0z M5,5.875C4.70163,5.875 4.41548,5.99353 4.2045,6.2045 3.99353,6.41548 3.875,6.70163 3.875,7L3.875,17C3.875,17.2984 3.99353,17.5845 4.2045,17.7955 4.41548,18.0065 4.70163,18.125 5,18.125L8,18.125C8.48325,18.125 8.875,18.5168 8.875,19 8.875,19.4832 8.48325,19.875 8,19.875L5,19.875C4.2375,19.875 3.50623,19.5721 2.96707,19.0329 2.4279,18.4938 2.125,17.7625 2.125,17L2.125,7C2.125,6.2375 2.4279,5.50624 2.96707,4.96707 3.50624,4.4279 4.2375,4.125 5,4.125L19,4.125C19.7625,4.125 20.4938,4.4279 21.0329,4.96707 21.5721,5.50623 21.875,6.2375 21.875,7L21.875,18C21.875,18.4973 21.6775,18.9742 21.3258,19.3258 20.9742,19.6775 20.4973,19.875 20,19.875 19.5168,19.875 19.125,19.4832 19.125,19 19.125,18.5168 19.5168,18.125 20,18.125 20.0332,18.125 20.0649,18.1118 20.0884,18.0884 20.1118,18.0649 20.125,18.0332 20.125,18L20.125,7C20.125,6.70163 20.0065,6.41548 19.7955,6.2045 19.5845,5.99353 19.2984,5.875 19,5.875L5,5.875z M10.6742,15.6742C11.0258,15.3225,11.5027,15.125,12,15.125L16,15.125C16.4973,15.125 16.9742,15.3225 17.3258,15.6742 17.6775,16.0258 17.875,16.5027 17.875,17L17.875,18C17.875,18.4973 17.6775,18.9742 17.3258,19.3258 16.9742,19.6775 16.4973,19.875 16,19.875L12,19.875C11.5027,19.875 11.0258,19.6775 10.6742,19.3258 10.3225,18.9742 10.125,18.4973 10.125,18L10.125,17C10.125,16.5027,10.3225,16.0258,10.6742,15.6742z" />
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
@ -5884,12 +6036,13 @@
Orientation="Vertical" HorizontalAlignment="Center" Width="28"
Margin="0,-2">
<Image RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
Margin="0,3,0,0" >
Margin="0,3,0,0">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="#FF1B1B1B" 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" />
<GeometryDrawing Brush="#FF1B1B1B"
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>
@ -5907,12 +6060,13 @@
Orientation="Vertical" HorizontalAlignment="Center" Width="28"
Margin="0,-2">
<Image RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
Margin="0,3,0,0" >
Margin="0,3,0,0">
<Image.Source>
<DrawingImage>
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
<GeometryDrawing Brush="#FF1B1B1B" Geometry="F1 M24,24z M0,0z M19.1634,15.0537C18.9999,15.0537 18.8278,15.0021 18.6902,14.8902 18.3632,14.6321 18.3116,14.1589 18.5783,13.832 19.0343,13.2642 19.4387,12.6447 19.7656,11.9909 19.172,10.8208 16.763,6.72556 11.9967,6.72556 11.6612,6.72556 11.3256,6.75137 10.9987,6.78579 10.5943,6.83741 10.2072,6.54489 10.1556,6.13193 10.1039,5.71896 10.3965,5.34041 10.8094,5.28879 11.1966,5.23717 11.5923,5.21136 11.9967,5.21136 18.4407,5.21136 21.1766,11.423 21.297,11.6897 21.383,11.8876 21.3744,12.1113 21.2884,12.3006 20.8754,13.1781 20.3592,14.0041 19.757,14.7612 19.6107,14.9418 19.387,15.0451 19.172,15.0451L19.1634,15.0537z M10.689,15.1483C11.0847,15.3118,11.5063,15.3892,11.9365,15.3892L11.9451,15.4064 12.0053,15.4064C12.4613,15.3978 12.8915,15.2946 13.3044,15.1139 13.4763,15.0387 13.6392,14.9486 13.7931,14.8455L15.4197,16.472 16.533,17.5854 20.0753,21.1277C20.2216,21.2826,20.4195,21.3514,20.6087,21.3514L20.6001,21.36C20.7894,21.36 20.9873,21.2826 21.1335,21.1363 21.4261,20.8438 21.4261,20.362 21.1335,20.0695L3.92668,2.86262C3.63416,2.5615 3.16958,2.57011 2.86846,2.86262 2.56734,3.15514 2.56734,3.62833 2.86846,3.92085L6.21371,7.2661C4.72738,8.44444 3.5311,9.95577 2.71359,11.6725 2.62756,11.8704 2.61896,12.0941 2.70499,12.292 2.81684,12.5587 5.55273,18.7704 12.0053,18.7704L12.0311,18.7704C13.6161,18.7704,15.1606,18.3654,16.533,17.5854L15.4197,16.472C14.3708,16.9906,13.2144,17.2648,12.0311,17.2648L12.0053,17.2648C7.239,17.2648 4.83004,13.1695 4.2364,11.9995 4.96897,10.5725 6.01289,9.32147 7.29011,8.3425L9.15767,10.2101C9.05523,10.3645 8.96629,10.5279 8.89086,10.7003 8.71018,11.1133 8.60694,11.5521 8.60694,11.9995 8.59834,12.4468 8.67577,12.8856 8.84784,13.3072 9.0113,13.7288 9.26081,14.0987 9.57913,14.417 9.89746,14.7354 10.2674,14.9763 10.689,15.1483z" />
<GeometryDrawing Brush="#FF1B1B1B"
Geometry="F1 M24,24z M0,0z M19.1634,15.0537C18.9999,15.0537 18.8278,15.0021 18.6902,14.8902 18.3632,14.6321 18.3116,14.1589 18.5783,13.832 19.0343,13.2642 19.4387,12.6447 19.7656,11.9909 19.172,10.8208 16.763,6.72556 11.9967,6.72556 11.6612,6.72556 11.3256,6.75137 10.9987,6.78579 10.5943,6.83741 10.2072,6.54489 10.1556,6.13193 10.1039,5.71896 10.3965,5.34041 10.8094,5.28879 11.1966,5.23717 11.5923,5.21136 11.9967,5.21136 18.4407,5.21136 21.1766,11.423 21.297,11.6897 21.383,11.8876 21.3744,12.1113 21.2884,12.3006 20.8754,13.1781 20.3592,14.0041 19.757,14.7612 19.6107,14.9418 19.387,15.0451 19.172,15.0451L19.1634,15.0537z M10.689,15.1483C11.0847,15.3118,11.5063,15.3892,11.9365,15.3892L11.9451,15.4064 12.0053,15.4064C12.4613,15.3978 12.8915,15.2946 13.3044,15.1139 13.4763,15.0387 13.6392,14.9486 13.7931,14.8455L15.4197,16.472 16.533,17.5854 20.0753,21.1277C20.2216,21.2826,20.4195,21.3514,20.6087,21.3514L20.6001,21.36C20.7894,21.36 20.9873,21.2826 21.1335,21.1363 21.4261,20.8438 21.4261,20.362 21.1335,20.0695L3.92668,2.86262C3.63416,2.5615 3.16958,2.57011 2.86846,2.86262 2.56734,3.15514 2.56734,3.62833 2.86846,3.92085L6.21371,7.2661C4.72738,8.44444 3.5311,9.95577 2.71359,11.6725 2.62756,11.8704 2.61896,12.0941 2.70499,12.292 2.81684,12.5587 5.55273,18.7704 12.0053,18.7704L12.0311,18.7704C13.6161,18.7704,15.1606,18.3654,16.533,17.5854L15.4197,16.472C14.3708,16.9906,13.2144,17.2648,12.0311,17.2648L12.0053,17.2648C7.239,17.2648 4.83004,13.1695 4.2364,11.9995 4.96897,10.5725 6.01289,9.32147 7.29011,8.3425L9.15767,10.2101C9.05523,10.3645 8.96629,10.5279 8.89086,10.7003 8.71018,11.1133 8.60694,11.5521 8.60694,11.9995 8.59834,12.4468 8.67577,12.8856 8.84784,13.3072 9.0113,13.7288 9.26081,14.0987 9.57913,14.417 9.89746,14.7354 10.2674,14.9763 10.689,15.1483z" />
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
@ -6218,7 +6372,7 @@
<Grid>
<InkCanvas Name="InkCanvasForInkReplay" MouseDown="InkCanvasForInkReplay_MouseDown" Visibility="Collapsed"
EditingMode="None" Background="Transparent" />
<Border Name="BorderInkReplayToolBox" Width="386" Height="48" HorizontalAlignment="Center"
<Border Name="BorderInkReplayToolBox" Width="386" Height="48" HorizontalAlignment="Center" Visibility="Collapsed"
VerticalAlignment="Bottom" Margin="0,0,0,16" Background="#fafafa" CornerRadius="5"
BorderBrush="#a1a1aa" BorderThickness="1">
<ui:SimpleStackPanel Orientation="Horizontal">

8
Ink Canvas/MainWindow.xaml.cs
View File

@ -181,10 +181,16 @@ namespace Ink_Canvas {
isLoaded = true;
BlackBoardLeftSidePageListView.ItemsSource = blackBoardLeftSidePageListViewObservableCollection;
BlackBoardLeftSidePageListView.ItemsSource = blackBoardSidePageListViewObservableCollection;
BlackBoardRightSidePageListView.ItemsSource = blackBoardSidePageListViewObservableCollection;
BtnLeftWhiteBoardSwitchPreviousGeometry.Brush =
new SolidColorBrush(System.Windows.Media.Color.FromArgb(127, 24, 24, 27));
BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
BtnRightWhiteBoardSwitchPreviousGeometry.Brush =
new SolidColorBrush(System.Windows.Media.Color.FromArgb(127, 24, 24, 27));
BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
BtnWhiteBoardSwitchPrevious.IsEnabled = CurrentWhiteboardIndex != 1;
BorderInkReplayToolBox.Visibility = Visibility.Collapsed;

71
Ink Canvas/MainWindow_cs/MW_BoardControls.cs
View File

@ -59,50 +59,33 @@ namespace Ink_Canvas {
}
private async void BtnWhiteBoardPageIndex_Click(object sender, EventArgs e) {
if (sender == BtnLeftPageListWB) {
if (BoardBorderLeftPageListView.Visibility == Visibility.Visible) {
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
} else {
RefreshBlackBoardLeftSidePageListView();
try {
var sb = new Storyboard();
// 渐变动画
var fadeInAnimation = new DoubleAnimation {
From = 0.5,
To = 1,
Duration = TimeSpan.FromSeconds(0.15)
};
fadeInAnimation.EasingFunction = new CubicEase();
Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
// 滑动动画
var slideAnimation = new DoubleAnimation {
From = BoardBorderLeftPageListView.RenderTransform.Value.OffsetY + 10, // 滑动距离
To = 0,
Duration = TimeSpan.FromSeconds(0.15)
};
Storyboard.SetTargetProperty(slideAnimation,
new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)"));
slideAnimation.EasingFunction = new CubicEase();
sb.Children.Add(fadeInAnimation);
sb.Children.Add(slideAnimation);
BoardBorderLeftPageListView.Visibility = Visibility.Visible;
BoardBorderLeftPageListView.RenderTransform = new TranslateTransform();
sb.Begin((FrameworkElement)BoardBorderLeftPageListView);
}
catch { }
AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
RefreshBlackBoardSidePageListView();
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderLeftPageListView);
await Task.Delay(1);
ScrollViewToVerticalTop(
(ListViewItem)BlackBoardLeftSidePageListView.ItemContainerGenerator.ContainerFromIndex(
CurrentWhiteboardIndex - 1), BlackBoardLeftSidePageListScrollViewer);
}
} else if (sender == BtnRightPageListWB)
{
if (BoardBorderRightPageListView.Visibility == Visibility.Visible) {
AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
} else {
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
RefreshBlackBoardSidePageListView();
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderRightPageListView);
await Task.Delay(1);
ScrollViewToVerticalTop(
(ListViewItem)BlackBoardRightSidePageListView.ItemContainerGenerator.ContainerFromIndex(
CurrentWhiteboardIndex - 1), BlackBoardRightSidePageListScrollViewer);
}
}
}
private void BtnWhiteBoardSwitchPrevious_Click(object sender, EventArgs e) {
@ -157,7 +140,7 @@ namespace Ink_Canvas {
if (WhiteboardTotalCount >= 99) BtnWhiteBoardAdd.IsEnabled = false;
if (BlackBoardLeftSidePageListView.Visibility == Visibility.Visible) {
RefreshBlackBoardLeftSidePageListView();
RefreshBlackBoardSidePageListView();
}
}
@ -215,17 +198,31 @@ namespace Ink_Canvas {
BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
} else {
BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1;
BtnRightWhiteBoardSwitchPreviousGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 1;
if (CurrentWhiteboardIndex == WhiteboardTotalCount) {
BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
BtnLeftWhiteBoardSwitchNextLabel.Opacity = 0.5;
BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(127, 24, 24, 27));
BtnRightWhiteBoardSwitchNextLabel.Opacity = 0.5;
BtnWhiteBoardSwitchNext.IsEnabled = false;
} else {
BtnLeftWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
BtnRightWhiteBoardSwitchNextGeometry.Brush = new SolidColorBrush(Color.FromArgb(255, 24, 24, 27));
BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
}
}

2
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
View File

@ -208,6 +208,7 @@ namespace Ink_Canvas {
EraserSizePanel.Visibility = Visibility.Collapsed;
BorderSettings.Visibility = Visibility.Collapsed;
BoardBorderLeftPageListView.Visibility = Visibility.Collapsed;
BoardBorderRightPageListView.Visibility = Visibility.Collapsed;
}
/// <summary>
@ -278,6 +279,7 @@ namespace Ink_Canvas {
AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
if (BorderSettings.Visibility == Visibility.Visible) {
BorderSettingsMask.IsHitTestVisible = false;

33
Ink Canvas/MainWindow_cs/MW_PageListView.cs
View File

@ -24,14 +24,14 @@ namespace Ink_Canvas
public StrokeCollection Strokes { get; set; }
}
ObservableCollection<PageListViewItem> blackBoardLeftSidePageListViewObservableCollection = new ObservableCollection<PageListViewItem>();
ObservableCollection<PageListViewItem> blackBoardSidePageListViewObservableCollection = new ObservableCollection<PageListViewItem>();
/// <summary>
/// <para>刷新白板的缩略图页面列表。</para>
/// </summary>
private void RefreshBlackBoardLeftSidePageListView()
private void RefreshBlackBoardSidePageListView()
{
if (blackBoardLeftSidePageListViewObservableCollection.Count == WhiteboardTotalCount) {
if (blackBoardSidePageListViewObservableCollection.Count == WhiteboardTotalCount) {
foreach (int index in Enumerable.Range(1, WhiteboardTotalCount))
{
var st = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[index]);
@ -41,10 +41,10 @@ namespace Ink_Canvas
Index = index,
Strokes = st,
};
blackBoardLeftSidePageListViewObservableCollection[index-1] = pitem;
blackBoardSidePageListViewObservableCollection[index-1] = pitem;
}
} else {
blackBoardLeftSidePageListViewObservableCollection.Clear();
blackBoardSidePageListViewObservableCollection.Clear();
foreach (int index in Enumerable.Range(1, WhiteboardTotalCount)) {
var st = ApplyHistoriesToNewStrokeCollection(TimeMachineHistories[index]);
st.Clip(new Rect(0,0, (int)inkCanvas.ActualWidth, (int)inkCanvas.ActualHeight));
@ -53,7 +53,7 @@ namespace Ink_Canvas
Index = index,
Strokes = st,
};
blackBoardLeftSidePageListViewObservableCollection.Add(pitem);
blackBoardSidePageListViewObservableCollection.Add(pitem);
}
}
@ -64,9 +64,10 @@ namespace Ink_Canvas
Index = CurrentWhiteboardIndex,
Strokes = _st,
};
blackBoardLeftSidePageListViewObservableCollection[CurrentWhiteboardIndex - 1] = _pitem;
blackBoardSidePageListViewObservableCollection[CurrentWhiteboardIndex - 1] = _pitem;
BlackBoardLeftSidePageListView.SelectedIndex = CurrentWhiteboardIndex -1;
BlackBoardRightSidePageListView.SelectedIndex = CurrentWhiteboardIndex -1;
}
public static void ScrollViewToVerticalTop(FrameworkElement element, ScrollViewer scrollViewer)
@ -80,6 +81,7 @@ namespace Ink_Canvas
private void BlackBoardLeftSidePageListView_OnMouseUp(object sender, MouseButtonEventArgs e) {
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
var item = BlackBoardLeftSidePageListView.SelectedItem;
var index = BlackBoardLeftSidePageListView.SelectedIndex;
if (item != null)
@ -93,5 +95,22 @@ namespace Ink_Canvas
}
}
private void BlackBoardRightSidePageListView_OnMouseUp(object sender, MouseButtonEventArgs e)
{
AnimationsHelper.HideWithSlideAndFade(BoardBorderLeftPageListView);
AnimationsHelper.HideWithSlideAndFade(BoardBorderRightPageListView);
var item = BlackBoardRightSidePageListView.SelectedItem;
var index = BlackBoardRightSidePageListView.SelectedIndex;
if (item != null)
{
SaveStrokes();
ClearStrokes(true);
CurrentWhiteboardIndex = index + 1;
RestoreStrokes();
UpdateIndexInfoDisplay();
BlackBoardRightSidePageListView.SelectedIndex = index;
}
}
}
}

52
Ink Canvas/MainWindow_cs/MW_Settings.cs
View File

@ -675,7 +675,9 @@ namespace Ink_Canvas {
Settings.Automation.IsAutoKillPptService = ToggleSwitchAutoKillPptService.IsOn;
SaveSettingsToFile();
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService)
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT)
timerKillProcess.Start();
else
timerKillProcess.Stop();
@ -686,7 +688,8 @@ namespace Ink_Canvas {
Settings.Automation.IsAutoKillEasiNote = ToggleSwitchAutoKillEasiNote.IsOn;
SaveSettingsToFile();
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation)
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT)
timerKillProcess.Start();
else
timerKillProcess.Stop();
@ -697,7 +700,47 @@ namespace Ink_Canvas {
Settings.Automation.IsAutoKillHiteAnnotation = ToggleSwitchAutoKillHiteAnnotation.IsOn;
SaveSettingsToFile();
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation)
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT)
timerKillProcess.Start();
else
timerKillProcess.Stop();
}
private void ToggleSwitchAutoKillInkCanvas_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
Settings.Automation.IsAutoKillInkCanvas = ToggleSwitchAutoKillInkCanvas.IsOn;
SaveSettingsToFile();
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT)
timerKillProcess.Start();
else
timerKillProcess.Stop();
}
private void ToggleSwitchAutoKillICA_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
Settings.Automation.IsAutoKillICA = ToggleSwitchAutoKillICA.IsOn;
SaveSettingsToFile();
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT)
timerKillProcess.Start();
else
timerKillProcess.Stop();
}
private void ToggleSwitchAutoKillIDT_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
Settings.Automation.IsAutoKillIDT = ToggleSwitchAutoKillIDT.IsOn;
SaveSettingsToFile();
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT)
timerKillProcess.Start();
else
timerKillProcess.Stop();
@ -971,6 +1014,9 @@ namespace Ink_Canvas {
Settings.Automation.IsAutoFoldInPPTSlideShow = false;
Settings.Automation.IsAutoKillPptService = false;
Settings.Automation.IsAutoKillEasiNote = false;
Settings.Automation.IsAutoKillInkCanvas = false;
Settings.Automation.IsAutoKillICA = false;
Settings.Automation.IsAutoKillIDT = true;
Settings.Automation.IsSaveScreenshotsInDateFolders = false;
Settings.Automation.IsAutoSaveStrokesAtScreenshot = true;
Settings.Automation.IsAutoSaveStrokesAtClear = true;

11
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
View File

@ -473,7 +473,6 @@ namespace Ink_Canvas {
ToggleSwitchIsEnableFullScreenHelper.IsOn = Settings.Advanced.IsEnableFullScreenHelper;
if (Settings.Advanced.IsEnableFullScreenHelper) {
FullScreenHelper.MarkFullscreenWindowTaskbarList(new WindowInteropHelper(this).Handle, true);
}
@ -563,7 +562,9 @@ namespace Ink_Canvas {
}
ToggleSwitchAutoFoldInPPTSlideShow.IsOn = Settings.Automation.IsAutoFoldInPPTSlideShow;
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService) {
if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
|| Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT) {
timerKillProcess.Start();
} else {
timerKillProcess.Stop();
@ -575,6 +576,12 @@ namespace Ink_Canvas {
ToggleSwitchAutoKillPptService.IsOn = Settings.Automation.IsAutoKillPptService;
ToggleSwitchAutoKillInkCanvas.IsOn = Settings.Automation.IsAutoKillInkCanvas;
ToggleSwitchAutoKillICA.IsOn = Settings.Automation.IsAutoKillICA;
ToggleSwitchAutoKillIDT.IsOn = Settings.Automation.IsAutoKillIDT;
ToggleSwitchAutoSaveStrokesAtClear.IsOn = Settings.Automation.IsAutoSaveStrokesAtClear;
ToggleSwitchSaveScreenshotsInDateFolders.IsOn = Settings.Automation.IsSaveScreenshotsInDateFolders;

53
Ink Canvas/MainWindow_cs/MW_Timer.cs
View File

@ -69,6 +69,7 @@ namespace Ink_Canvas {
timerDisplayDate.Elapsed += TimerDisplayDate_Elapsed;
timerDisplayDate.Interval = 1000 * 60 * 60 * 1;
timerDisplayDate.Start();
timerKillProcess.Start();
nowTimeVM.nowDate = DateTime.Now.ToShortDateString().ToString();
nowTimeVM.nowTime = DateTime.Now.ToShortTimeString().ToString();
}
@ -82,6 +83,9 @@ namespace Ink_Canvas {
}
private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e) {
Trace.WriteLine("timer up");
try {
// 希沃相关： easinote swenserver RemoteProcess EasiNote.MediaHttpService smartnote.cloud EasiUpdate smartnote EasiUpdate3 EasiUpdate3Protect SeewoP2P CefSharp.BrowserSubprocess SeewoUploadService
var arg = "/F";
@ -102,6 +106,23 @@ namespace Ink_Canvas {
if (processes.Length > 0) arg += " /IM HiteAnnotation.exe";
}
if (Settings.Automation.IsAutoKillICA) {
var processesAnnotation = Process.GetProcessesByName("Ink Canvas Annotation");
var processesArtistry = Process.GetProcessesByName("Ink Canvas Artistry");
if (processesAnnotation.Length > 0) arg += " /IM \"Ink Canvas Annotation.exe\"";
if (processesArtistry.Length > 0) arg += " /IM \"Ink Canvas Artistry.exe\"";
}
if (Settings.Automation.IsAutoKillInkCanvas) {
var processes = Process.GetProcessesByName("Ink Canvas");
if (processes.Length > 0) arg += " /IM \"Ink Canvas.exe\"";
}
if (Settings.Automation.IsAutoKillIDT) {
var processes = Process.GetProcessesByName("智绘教");
if (processes.Length > 0) arg += " /IM \"智绘教.exe\"";
}
if (arg != "/F") {
var p = new Process();
p.StartInfo = new ProcessStartInfo("taskkill", arg);
@ -109,17 +130,39 @@ namespace Ink_Canvas {
p.Start();
if (arg.Contains("EasiNote")) {
BtnSwitch_Click(BtnSwitch, null);
MessageBox.Show("“希沃白板 5”已自动关闭");
Dispatcher.Invoke(() => {
ShowNotification("“希沃白板 5”已自动关闭");
});
}
if (arg.Contains("HiteAnnotation")) {
BtnSwitch_Click(BtnSwitch, null);
MessageBox.Show("“鸿合屏幕书写”已自动关闭");
Dispatcher.Invoke(() => {
ShowNotification("“鸿合屏幕书写”已自动关闭");
});
}
if (arg.Contains("Ink Canvas Annotation") || arg.Contains("Ink Canvas Artistry")) {
Dispatcher.Invoke(() => {
ShowNewMessage("“ICA”已自动关闭");
});
}
if (arg.Contains("\"Ink Canvas.exe\"")) {
Dispatcher.Invoke(() => {
ShowNotification("“Ink Canvas”已自动关闭");
});
}
if (arg.Contains("智绘教")) {
Dispatcher.Invoke(() => {
ShowNotification("“智绘教”已自动关闭");
});
}
}
}
catch { }
catch {
Trace.WriteLine("timer has error");
}
}

19
Ink Canvas/MainWindow_cs/MW_TrayIcon.cs
View File

@ -12,6 +12,7 @@ using System.Windows.Controls;
using System.Windows.Forms.VisualStyles;
using System.Windows.Interop;
using System.Windows.Media.Animation;
using Hardcodet.Wpf.TaskbarNotification;
namespace Ink_Canvas
{
@ -94,9 +95,11 @@ namespace Ink_Canvas
}
private void HideICCMainWindowTrayIconMenuItem_Checked(object sender, RoutedEventArgs e) {
var mi = (MenuItem)sender;
var mainWin = (MainWindow)Application.Current.MainWindow;
if (mainWin.IsLoaded) {
mainWin.Hide();
var s = (ContextMenu)_taskbar.ContextMenu;
var s = ((TaskbarIcon)Application.Current.Resources["TaskbarTrayIcon"]).ContextMenu;
var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
var FoldFloatingBarTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 5];
var ForceFullScreenTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 6];
@ -106,13 +109,18 @@ namespace Ink_Canvas
ResetFloatingBarPositionTrayIconMenuItem.Opacity = 0.5;
FoldFloatingBarTrayIconMenuItem.Opacity = 0.5;
ForceFullScreenTrayIconMenuItem.Opacity = 0.5;
} else {
mi.IsChecked = false;
}
private void HideICCMainWindowTrayIconMenuItem_UnChecked(object sender, RoutedEventArgs e)
{
}
private void HideICCMainWindowTrayIconMenuItem_UnChecked(object sender, RoutedEventArgs e) {
var mi = (MenuItem)sender;
var mainWin = (MainWindow)Application.Current.MainWindow;
if (mainWin.IsLoaded) {
mainWin.Show();
var s = (ContextMenu)_taskbar.ContextMenu;
var s = ((TaskbarIcon)Application.Current.Resources["TaskbarTrayIcon"]).ContextMenu;
var ResetFloatingBarPositionTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 4];
var FoldFloatingBarTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 5];
var ForceFullScreenTrayIconMenuItem = (MenuItem)s.Items[s.Items.Count - 6];
@ -122,6 +130,9 @@ namespace Ink_Canvas
ResetFloatingBarPositionTrayIconMenuItem.Opacity = 1;
FoldFloatingBarTrayIconMenuItem.Opacity = 1;
ForceFullScreenTrayIconMenuItem.Opacity = 1;
} else {
mi.IsChecked = false;
}
}
}

BIN
Ink Canvas/Resources/Icons-png/InkCanvas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Ink Canvas/Resources/Icons-png/ica.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Ink Canvas/Resources/Icons-png/idt.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

10
Ink Canvas/Resources/Settings.cs
View File

@ -269,9 +269,19 @@ namespace Ink_Canvas
[JsonProperty("isAutoKillEasiNote")]
public bool IsAutoKillEasiNote { get; set; } = false;
[JsonProperty("isAutoKillHiteAnnotation")]
public bool IsAutoKillHiteAnnotation { get; set; } = false;
[JsonProperty("isAutoKillInkCanvas")]
public bool IsAutoKillInkCanvas { get; set; } = false;
[JsonProperty("isAutoKillICA")]
public bool IsAutoKillICA { get; set; } = false;
[JsonProperty("isAutoKillIDT")]
public bool IsAutoKillIDT { get; set; } = true;
[JsonProperty("isSaveScreenshotsInDateFolders")]
public bool IsSaveScreenshotsInDateFolders { get; set; } = false;