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

[fix, add, feat, style, update from upstream]

Browse Source
This commit is contained in:
ChanginJolly 2024-03-08 13:53:21 +08:00
parent cee46b6d8d
commit 38b81787b2
26 changed files with 693 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ink Canvas/App.xaml
View File

@ -3,12 +3,18 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Ink_Canvas"
StartupUri="MainWindow.xaml"
xmlns:ui="http://schemas.modernwpf.com/2019">
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
<Application.Resources>
<ResourceDictionary>
<Style TargetType="ScrollViewer">
<Style TargetType="ui:ScrollViewerEx">
<EventSetter Event="PreviewMouseWheel" Handler="ScrollViewer_PreviewMouseWheel"/>
</Style>
<Style TargetType="ui:FontIcon">
<Setter Property="FontSize" Value="20"/>
</Style>
<Style TargetType="ui:SymbolIcon">
<Setter Property="FontSize" Value="20"/>
</Style>
<ResourceDictionary.MergedDictionaries>
<ui:ThemeResources RequestedTheme="Light"/>
<ui:XamlControlsResources />

4
Ink Canvas/App.xaml.cs
View File

@ -1,8 +1,10 @@
using Ink_Canvas.Helpers;
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Linq;
using System.Reflection;
using System.Windows;
using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
namespace Ink_Canvas
{
@ -58,7 +60,7 @@ namespace Ink_Canvas
else
try
{
System.Windows.Controls.ScrollViewer SenderScrollViewer = (System.Windows.Controls.ScrollViewer)sender;
ScrollViewerEx SenderScrollViewer = (ScrollViewerEx)sender;
SenderScrollViewer.ScrollToVerticalOffset(SenderScrollViewer.VerticalOffset - e.Delta * 10 * System.Windows.Forms.SystemInformation.MouseWheelScrollLines / (double)120);
e.Handled = true;
}

2
Ink Canvas/ChangeLogWindow.xaml
View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Ink_Canvas" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ShowInTaskbar="False"
xmlns:ui="http://schemas.modernwpf.com/2019" FontFamily="Microsoft YaHei UI" Topmost="True"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" FontFamily="Microsoft YaHei UI" Topmost="True"
mc:Ignorable="d" ui:WindowHelper.UseModernWindowStyle="True" Loaded="Window_Loaded" Closed="Window_Closed"
Title="" Height="390" Width="600">
<Grid>

2
Ink Canvas/CountdownTimerWindow.xaml
View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Ink_Canvas"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:processbars="clr-namespace:Ink_Canvas.ProcessBars"
ui:ThemeManager.RequestedTheme="Light" Topmost="True" Background="Transparent"
mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True"

16
Ink Canvas/CountdownTimerWindow.xaml.cs
View File

@ -16,7 +16,7 @@ namespace Ink_Canvas
public CountdownTimerWindow()
{
InitializeComponent();
AnimationHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
AnimationsHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
timer.Elapsed += Timer_Elapsed;
timer.Interval = 50;
@ -50,7 +50,7 @@ namespace Ink_Canvas
TextBlockSecond.Text = "00";
timer.Stop();
isTimerRunning = false;
SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Play;
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play;
BtnStartCover.Visibility = Visibility.Visible;
TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F"));
BorderStopTime.Visibility = Visibility.Collapsed;
@ -201,12 +201,12 @@ namespace Ink_Canvas
if (WindowState == WindowState.Normal)
{
WindowState = WindowState.Maximized;
SymbolIconFullscreen.Symbol = ModernWpf.Controls.Symbol.BackToWindow;
SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow;
}
else
{
WindowState = WindowState.Normal;
SymbolIconFullscreen.Symbol = ModernWpf.Controls.Symbol.FullScreen;
SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen;
}
}
@ -232,7 +232,7 @@ namespace Ink_Canvas
BtnStartCover.Visibility = Visibility.Collapsed;
BorderStopTime.Visibility = Visibility.Collapsed;
TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F"));
SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Play;
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play;
isTimerRunning = false;
timer.Stop();
isPaused = false;
@ -282,7 +282,7 @@ namespace Ink_Canvas
startTime += DateTime.Now - pauseTime;
ProcessBarTime.IsPaused = false;
TextBlockHour.Foreground = Brushes.Black;
SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Pause;
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause;
isPaused = false;
timer.Start();
UpdateStopTime();
@ -294,7 +294,7 @@ namespace Ink_Canvas
pauseTime = DateTime.Now;
ProcessBarTime.IsPaused = true;
TextBlockHour.Foreground = new SolidColorBrush(StringToColor("#FF5B5D5F"));
SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Play;
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Play;
BorderStopTime.Visibility = Visibility.Collapsed;
isPaused = true;
timer.Stop();
@ -306,7 +306,7 @@ namespace Ink_Canvas
totalSeconds = ((hour * 60) + minute) * 60 + second;
ProcessBarTime.IsPaused = false;
TextBlockHour.Foreground = Brushes.Black;
SymbolIconStart.Symbol = ModernWpf.Controls.Symbol.Pause;
SymbolIconStart.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pause;
BtnResetCover.Visibility = Visibility.Collapsed;
if (totalSeconds <= 10)

196
Ink Canvas/Helpers/AnimationsHelper.cs Normal file
View File

@ -0,0 +1,196 @@
using System;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Animation;
namespace Ink_Canvas.Helpers
{
internal class AnimationsHelper
{
public static void ShowWithSlideFromBottomAndFade(UIElement element, double duration = 0.15)
{
if (element.Visibility == Visibility.Visible) return;
if (element == null)
throw new ArgumentNullException(nameof(element));
var sb = new Storyboard();
// 渐变动画
var fadeInAnimation = new DoubleAnimation
{
From = 0.5,
To = 1,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
// 滑动动画
var slideAnimation = new DoubleAnimation
{
From = element.RenderTransform.Value.OffsetY + 10, // 滑动距离
To = 0,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)"));
sb.Children.Add(fadeInAnimation);
sb.Children.Add(slideAnimation);
element.Visibility = Visibility.Visible;
element.RenderTransform = new TranslateTransform();
sb.Begin((FrameworkElement)element);
}
public static void ShowWithSlideFromLeftAndFade(UIElement element, double duration = 0.25)
{
if (element.Visibility == Visibility.Visible) return;
if (element == null)
throw new ArgumentNullException(nameof(element));
var sb = new Storyboard();
// 渐变动画
var fadeInAnimation = new DoubleAnimation
{
From = 0.5,
To = 1,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
// 滑动动画
var slideAnimation = new DoubleAnimation
{
From = element.RenderTransform.Value.OffsetX - 20, // 滑动距离
To = 0,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.X)"));
sb.Children.Add(fadeInAnimation);
sb.Children.Add(slideAnimation);
element.Visibility = Visibility.Visible;
element.RenderTransform = new TranslateTransform();
sb.Begin((FrameworkElement)element);
}
public static void ShowWithScaleFromLeft(UIElement element, double duration = 0.5)
{
if (element.Visibility == Visibility.Visible) return;
if (element == null)
throw new ArgumentNullException(nameof(element));
var sb = new Storyboard();
// 水平方向的缩放动画
var scaleXAnimation = new DoubleAnimation
{
From = 0,
To = 1,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(scaleXAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleX)"));
// 垂直方向的缩放动画
var scaleYAnimation = new DoubleAnimation
{
From = 0,
To = 1,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(scaleYAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleY)"));
sb.Children.Add(scaleXAnimation);
sb.Children.Add(scaleYAnimation);
element.Visibility = Visibility.Visible;
element.RenderTransformOrigin = new Point(0, 0.5); // 左侧中心点为基准
element.RenderTransform = new ScaleTransform(0, 0);
sb.Begin((FrameworkElement)element);
}
public static void ShowWithScaleFromRight(UIElement element, double duration = 0.5)
{
if (element.Visibility == Visibility.Visible) return;
if (element == null)
throw new ArgumentNullException(nameof(element));
var sb = new Storyboard();
// 水平方向的缩放动画
var scaleXAnimation = new DoubleAnimation
{
From = 0,
To = 1,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(scaleXAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleX)"));
// 垂直方向的缩放动画
var scaleYAnimation = new DoubleAnimation
{
From = 0,
To = 1,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(scaleYAnimation, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleY)"));
sb.Children.Add(scaleXAnimation);
sb.Children.Add(scaleYAnimation);
element.Visibility = Visibility.Visible;
element.RenderTransformOrigin = new Point(1, 0.5); // 右侧中心点为基准
element.RenderTransform = new ScaleTransform(0, 0);
sb.Begin((FrameworkElement)element);
}
public static void HideWithSlideAndFade(UIElement element, double duration = 0.15)
{
if (element.Visibility == Visibility.Collapsed) return;
if (element == null)
throw new ArgumentNullException(nameof(element));
var sb = new Storyboard();
// 渐变动画
var fadeOutAnimation = new DoubleAnimation
{
From = 1,
To = 0,
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(UIElement.OpacityProperty));
// 滑动动画
var slideAnimation = new DoubleAnimation
{
From = 0,
To = element.RenderTransform.Value.OffsetY + 10, // 滑动距离
Duration = TimeSpan.FromSeconds(duration)
};
Storyboard.SetTargetProperty(slideAnimation, new PropertyPath("(UIElement.RenderTransform).(TranslateTransform.Y)"));
sb.Children.Add(fadeOutAnimation);
sb.Children.Add(slideAnimation);
sb.Completed += (s, e) =>
{
element.Visibility = Visibility.Collapsed;
};
element.RenderTransform = new TranslateTransform();
sb.Begin((FrameworkElement)element);
}
}
}

3
Ink Canvas/Helpers/ForegroundWindowInfo.cs
View File

@ -29,6 +29,9 @@ namespace Ink_Canvas.Helpers
public int Top;
public int Right;
public int Bottom;
public int Width => Right - Left;
public int Height => Bottom - Top;
}
public static string WindowTitle() {

12
Ink Canvas/Ink Canvas.csproj
View File

@ -54,7 +54,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Ink Canvas Annotation.ico</ApplicationIcon>
<ApplicationIcon>Resources\Ink Canvas Annotation.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@ -167,7 +167,7 @@
<Compile Include="CycleProcessBar.xaml.cs">
<DependentUpon>CycleProcessBar.xaml</DependentUpon>
</Compile>
<Compile Include="Helpers\AnimationHelper.cs" />
<Compile Include="Helpers\AnimationsHelper.cs" />
<Compile Include="Helpers\InkRecognizeHelper.cs" />
<Compile Include="Helpers\LogHelper.cs" />
<Compile Include="Helpers\MultiTouchInput.cs" />
@ -286,6 +286,9 @@
</ItemGroup>
<!-- When Office is not installed -->
<ItemGroup>
<PackageReference Include="iNKORE.UI.WPF.Modern">
<Version>0.9.26.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.Office.Interop.PowerPoint">
<Version>15.0.4420.1018</Version>
</PackageReference>
@ -315,9 +318,6 @@
</COMReference>
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="ModernWpfUI">
<Version>0.9.6</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>13.0.3</Version>
</PackageReference>
@ -388,7 +388,7 @@
<Resource Include="Resources\Icons-png\close-circle.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Ink Canvas Annotation.ico" />
<Resource Include="Resources\Ink Canvas Annotation.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DeveloperAvatars\ChangSakura.png" />

175
Ink Canvas/MainWindow.xaml
View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Ink_Canvas"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:c="clr-namespace:Ink_Canvas.Converter" xmlns:Controls="http://schemas.microsoft.com/netfx/2009/xaml/presentation"
mc:Ignorable="d"
AllowsTransparency="True"
@ -20,7 +20,7 @@
Closing="Window_Closing"
Closed="Window_Closed"
PreviewKeyDown="Main_Grid_PreviewKeyDown"
Height="6000" Width="1440"
Height="6500" Width="1440"
FontFamily="Microsoft YaHei UI"
MouseWheel="Window_MouseWheel"
Foreground="Black"
@ -143,73 +143,73 @@
PreviewTouchUp="GridInkCanvasSelectionCover_PreviewTouchUp"
TouchDown="GridInkCanvasSelectionCover_TouchDown"
TouchUp="GridInkCanvasSelectionCover_TouchUp"
Background="#01FFFFFF" Opacity="0.01" Visibility="Visible"/>
Background="#01FFFFFF" Opacity="0.01" Visibility="Visible" Margin="1,0,-1,0"/>
<Border Name="BorderStrokeSelectionControl"
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,900,0,0"
CornerRadius="5" Height="80"
Background="{DynamicResource ToolBarBackground}" Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}"
BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
Background="{DynamicResource FloatBarBackground}" Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}"
BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Viewbox Margin="0,-2.5">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="10" Height="60">
<Border Name="BorderStrokeSelectionClone" Margin="0,2,-9,2" Background="Transparent" CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionClone_MouseUp">
<ui:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_copy_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25"/>
<TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center"/>
<TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Center"/>
</ui:SimpleStackPanel>
</Border>
<Border Name="BorderStrokeSelectionCloneToNewBoard" Margin="0,2,-9,2" Background="Transparent" CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}"
Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionCloneToNewBoard_MouseUp" Visibility="{Binding Visibility, ElementName=GridBackgroundCover}">
<ui:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_copy_add_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25"/>
<TextBlock Text="克隆至新页" FontSize="8" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center"/>
<TextBlock Text="克隆至新页" FontSize="8" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Center"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}" Background="{DynamicResource FloatBarForeground}"/>
<Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Height="40">
<ui:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="10">
<Image Source="{DynamicResource Rotate45DrawingImage}" Height="22" MouseDown="Border_MouseDown" MouseUp="ImageRotate45_MouseUp"/>
<Image Source="{DynamicResource Rotate90DrawingImage}" Height="22" MouseDown="Border_MouseDown" MouseUp="ImageRotate90_MouseUp"/>
</ui:SimpleStackPanel>
<TextBlock Text="旋转" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="旋转" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource FloatBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}" Background="{DynamicResource FloatBarForeground}"/>
<Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Height="40">
<ui:SimpleStackPanel VerticalAlignment="Center" Margin="0,-10">
<ui:SimpleStackPanel Orientation="Horizontal">
<Image MouseDown="Border_MouseDown" MouseUp="ImageFlipHorizontal_MouseUp" Source="/Resources/Icons-Fluent/ic_fluent_flip_horizontal_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30"/>
<Image MouseDown="Border_MouseDown" MouseUp="ImageFlipVertical_MouseUp" Source="/Resources/Icons-Fluent/ic_fluent_flip_vertical_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30"/>
</ui:SimpleStackPanel>
<TextBlock Text="翻转" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="翻转" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource FloatBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}" Background="{DynamicResource FloatBarForeground}"/>
<Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Height="40">
<ui:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
<Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthDecrease_MouseUp">
<Image Source="/Resources/Icons-Fluent/ic_fluent_edit_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25"/>
<TextBlock Text="-" Foreground="{DynamicResource ToolBarForeground}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-2,-7" FontSize="15"/>
<TextBlock Text="-" Foreground="{DynamicResource FloatBarForeground}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-2,-7" FontSize="15"/>
</Grid>
<Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthIncrease_MouseUp">
<Image Source="/Resources/Icons-Fluent/ic_fluent_edit_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25"/>
<TextBlock Text="+" Foreground="{DynamicResource ToolBarForeground}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-3,-4" FontSize="11"/>
<TextBlock Text="+" Foreground="{DynamicResource FloatBarForeground}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-3,-4" FontSize="11"/>
</Grid>
<Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthRestore_MouseUp">
<Image Source="/Resources/Icons-Fluent/ic_fluent_edit_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25"/>
<Image Source="{DynamicResource AndroidRefreshDrawingImage}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-2,-2" Width="8"/>
</Grid>
</ui:SimpleStackPanel>
<TextBlock Text="画笔粗细" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="画笔粗细" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource FloatBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource FloatBarForeground}" Background="{DynamicResource FloatBarForeground}"/>
<Border Margin="-8,0,0,0" CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Width="40" MouseDown="Border_MouseDown" MouseUp="BorderStrokeSelectionDelete_MouseUp">
<ui:SimpleStackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_delete_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25"/>
<TextBlock Margin="0,5,0,0" Text="删除" FontSize="10" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center"/>
<TextBlock Margin="0,5,0,0" Text="删除" FontSize="10" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Center"/>
</ui:SimpleStackPanel>
</Border>
</ui:SimpleStackPanel>
@ -221,17 +221,17 @@
<Grid Visibility="{Binding ElementName=GridBackgroundCoverHolder, Path=Visibility}">
<Viewbox Margin="10" Height="50" HorizontalAlignment="Right" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6" MouseUp="GridPPTControlPrevious_MouseUp">
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
</Grid>
</Border>
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid MouseUp="PPTNavigationBtn_Click">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{Binding ElementName=PptNavigationTextBlock, Path=Foreground}" FontSize="{Binding ElementName=PptNavigationTextBlock, Path=FontSize}" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}" />
</Grid>
</Border>
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6" MouseUp="GridPPTControlNext_MouseUp">
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
</Grid>
@ -278,9 +278,9 @@
</Grid>
</Border>
<!--
<Border Width="36" Height="36" MouseDown="Border_MouseDown" MouseUp="BorderMultiTouchMode_MouseUp" CornerRadius="5" Background="White" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" Height="36" MouseDown="Border_MouseDown" MouseUp="BorderMultiTouchMode_MouseUp" CornerRadius="5" Background="White" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Viewbox Margin="8">
<ui:SymbolIcon Name="SymbolIconMultiTouchMode" Symbol="People" Foreground="{DynamicResource ToolBarForeground}" />
<ui:SymbolIcon Name="SymbolIconMultiTouchMode" Symbol="People" Foreground="{DynamicResource FloatBarForeground}" />
</Viewbox>
</Border>
-->
@ -303,20 +303,20 @@
<Grid Margin="0,0,0,5" Width="0">
<Border Name="BoardTwoFingerGestureBorder" Margin="-115,-125,-55,54" CornerRadius="5" Background="LightGray" Opacity="0.85" BorderBrush="Black" BorderThickness="1">
<ui:SimpleStackPanel Margin="13">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_drag_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="双指移动" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Width="42" Name="BoardToggleSwitchEnableTwoFingerTranslate" FontFamily="Microsoft YaHei UI" IsOn="False" Toggled="ToggleSwitchEnableTwoFingerTranslate_Toggled"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Name="BoardToggleSwitchEnableTwoFingerTranslate" FontFamily="Microsoft YaHei UI" IsOn="False" OnContent="" OffContent="" Toggled="ToggleSwitchEnableTwoFingerTranslate_Toggled"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_scale_fit_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="双指缩放" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Width="42" Name="BoardToggleSwitchEnableTwoFingerZoom" FontFamily="Microsoft YaHei UI" IsOn="False" Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Name="BoardToggleSwitchEnableTwoFingerZoom" FontFamily="Microsoft YaHei UI" IsOn="False" OnContent="" OffContent="" Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="双指旋转" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Width="42" Name="BoardToggleSwitchEnableTwoFingerRotation" FontFamily="Microsoft YaHei UI" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Name="BoardToggleSwitchEnableTwoFingerRotation" FontFamily="Microsoft YaHei UI" OnContent="" OffContent="" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</Border>
@ -349,7 +349,7 @@
<ui:SimpleStackPanel>
<Controls:UniformGrid Columns="2" Width="300" Height="55">
<ui:SimpleStackPanel Orientation="Horizontal" Height="35">
<Label Content="笔锋" Margin="0,0,12,0" Foreground="{DynamicResource ToolBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Label Content="笔锋" Margin="0,0,12,0" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ComboBox Height="30" VerticalAlignment="Center" Name="BoardComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
<ComboBoxItem Content="抬笔笔锋" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="速度笔锋" FontFamily="Microsoft YaHei UI"/>
@ -359,19 +359,18 @@
<ui:SimpleStackPanel Margin="0,-5,0,-5" VerticalAlignment="Center">
<ui:SimpleStackPanel x:Name="BoardNibModeSimpleStackPanel" Orientation="Horizontal" Width="140">
<Label Content="笔尖模式" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch x:Name="ToggleSwitchBoardEnableNibMode" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
<ui:ToggleSwitch x:Name="ToggleSwitchBoardEnableNibMode" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" MinWidth="0" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" Width="140">
<Label Margin="0,0,10,0" Content="墨迹识别" Foreground="{DynamicResource ToolBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Foreground="{DynamicResource ToolBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关"
Toggled="ToggleSwitchEnableInkToShape_Toggled" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
<Label Margin="0,0,10,0" Content="墨迹识别" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Foreground="{DynamicResource FloatBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" MinWidth="0" Toggled="ToggleSwitchEnableInkToShape_Toggled" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</Controls:UniformGrid>
<StackPanel Orientation="Horizontal" Height="30">
<Label Margin="0,0,10,0" Content="粗细" Foreground="{DynamicResource ToolBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Label Margin="0,0,10,0" Content="粗细" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Slider x:Name="BoardInkWidthSlider" Minimum="1" Maximum="15" Width="230" FontFamily="Microsoft YaHei UI"
FontSize="20" IsSnapToTickEnabled="True" Value="5" TickFrequency="1" TickPlacement="None" ValueChanged="InkWidthSlider_ValueChanged"/>
<TextBlock Text="{Binding Value, ElementName=BoardInkWidthSlider, Mode=OneWay}" VerticalAlignment="Bottom" Margin="10,0,0,8" FontSize="14"/>
@ -471,16 +470,16 @@
<Border x:Name="BoardBorderDrawShape" Visibility="Visible" Background="LightGray" Opacity="0.85" BorderBrush="Black" BorderThickness="1" CornerRadius="8" Margin="-147,-286,-89,59">
<Viewbox>
<ui:SimpleStackPanel Spacing="-8" Orientation="Vertical">
<TextBlock FontSize="16" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Left" Margin="10,8">
<TextBlock FontSize="16" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Left" Margin="10,8">
<Run Text="图形"/>
<Run Text="(第一行支持长按保持选中)" FontSize="10"/>
</TextBlock>
<ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Right"/>
<ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Right"/>
<ui:SimpleStackPanel Margin="20,0,0,0" Orientation="Horizontal">
<ui:SimpleStackPanel Visibility="Collapsed" Margin="58,6,5,6" Width="54">
<Label Margin="0,0,0,-2" Content="自动隐藏" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
<Label Margin="0,0,0,-2" Content="自动隐藏" Foreground="{DynamicResource FloatBarForeground}" FontSize="13" VerticalAlignment="Center"/>
<Viewbox Height="25">
<ui:ToggleSwitch Name="ToggleSwitchDrawShapeBorderAutoHide" Foreground="{DynamicResource ToolBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" IsOn="True"/>
<ui:ToggleSwitch Name="ToggleSwitchDrawShapeBorderAutoHide" Foreground="{DynamicResource FloatBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" IsOn="True"/>
</Viewbox>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
@ -724,10 +723,10 @@
</Image>
</Button>
<Button Name="BtnWhiteBoardDelete" Click="BtnWhiteBoardDelete_Click"
FontFamily="Microsoft YaHei UI" Width="50" Height="48" FontSize="26"
Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
Background="{Binding ElementName=BtnExit, Path=Background}"
IsEnabled="False">
FontFamily="Microsoft YaHei UI" Width="50" Height="48" FontSize="26"
Foreground="{Binding ElementName=BtnExit, Path=Foreground}"
Background="{Binding ElementName=BtnExit, Path=Background}"
IsEnabled="False">
<ui:SymbolIcon Symbol="Delete" />
</Button>
</ui:SimpleStackPanel>
@ -737,7 +736,7 @@
BorderThickness="1" CornerRadius="5" ui:ThemeManager.RequestedTheme="Light"
Width="440" HorizontalAlignment="Center" Margin="0,150,0,350" Visibility="Visible">
<Grid>
<ScrollViewer Margin="0,60,0,50" VerticalScrollBarVisibility="Auto"
<ui:ScrollViewerEx Margin="0,60,0,50" VerticalScrollBarVisibility="Auto"
PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light"
ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback">
<StackPanel Margin="20,20,20,20">
@ -753,7 +752,7 @@
<Label FontSize="16" VerticalAlignment="Center" FontFamily="Microsoft YaHei UI" FontWeight="Bold">重启软件</Label>
</ui:SimpleStackPanel>
</Button>
<Button Width="168" Height="45" Background="LightPink" BorderBrush="IndianRed" BorderThickness="1.5" FontFamily="Microsoft YaHei UI" Click="BtnExit_Click">
<Button Width="168" Height="45" Background="#ffbfb6" BorderBrush="IndianRed" BorderThickness="1.5" FontFamily="Microsoft YaHei UI" Click="BtnExit_Click">
<ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="0">
<Image Source="/Resources/Icons-Fluent/ic_fluent_power_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="26"/>
<Label FontSize="16" VerticalAlignment="Center" FontFamily="Microsoft YaHei UI" FontWeight="Bold">关闭软件</Label>
@ -764,7 +763,7 @@
<Button Background="FloralWhite" BorderBrush="RosyBrown" BorderThickness="1.5" Width="358" Height="40" FontFamily="Microsoft YaHei UI" FontWeight="Bold" Click="BtnResetToSuggestion_Click" Margin="0,0,0,0">
<ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="0">
<Image Source="/Resources/Icons-Fluent/ic_fluent_calendar_sync_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="26"/>
<Label FontSize="16" VerticalAlignment="Center" FontFamily="Microsoft YaHei UI" FontWeight="Bold">重置设置为希沃六代机推荐设置</Label>
<Label Margin="3,0,0,0" FontSize="16" VerticalAlignment="Center" FontFamily="Microsoft YaHei UI" FontWeight="Bold">重置设置为希沃六代机推荐设置</Label>
</ui:SimpleStackPanel>
</Button>
</ui:SimpleStackPanel>
@ -838,9 +837,9 @@
<ComboBoxItem Content="无笔锋" FontFamily="Microsoft YaHei UI"/>
</ComboBox>
<ui:ToggleSwitch x:Name="ToggleSwitchModeFinger" Header="手指模式" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关"/>
-->
<TextBlock Text="# 此选项仅适用于可获取触摸面积的屏幕" TextWrapping="Wrap" Foreground="#666666"/>
<!--
<TextBlock Text="橡皮模式" FontFamily="Microsoft YaHei UI" FontSize="14"/>
<ComboBox Name="ComboBoxEraserType" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxEraserType_OnSelectionChanged">
<ComboBoxItem Content="交替切换" FontFamily="Microsoft YaHei UI"/>
@ -856,27 +855,27 @@
<ComboBoxItem Content="较大" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="大" FontFamily="Microsoft YaHei UI"/>
</ComboBox>
<TextBlock Text="# 开启 退出画板模式后隐藏墨迹 选项后，进入 PPT 模式时未处于批注模式时不会显示墨迹。" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchHideStrokeWhenSelecting" Header="退出画板模式后隐藏墨迹" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchHideStrokeWhenSelecting_Toggled"/>
<TextBlock Text="# 开启 退出画板模式后隐藏墨迹 选项后，进入 PPT 模式时未处于批注模式时不会显示墨迹。" TextWrapping="Wrap" Foreground="#666666"/>
<!--
<ui:ToggleSwitch Name="ToggleSwitchUsingWhiteboard" Header="使用白板 (白色背景)" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchUsingWhiteboard_Toggled"/>
-->
<TextBlock Text="# 请注意，若不保留双曲线渐近线会有 TimeMachine 相关的 BUG 影响使用。" TextWrapping="Wrap" Foreground="#666666"/>
<TextBlock Text="保留双曲线渐近线" FontFamily="Microsoft YaHei UI" FontSize="14"/>
<ComboBox Name="ComboBoxHyperbolaAsymptoteOption" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxHyperbolaAsymptoteOption_SelectionChanged">
<ComboBoxItem Content="是" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="否" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="每次询问" FontFamily="Microsoft YaHei UI"/>
</ComboBox>
<TextBlock Text="# 请注意，若不保留双曲线渐近线可能会有遇到撤回相关的 BUG 影响用。" TextWrapping="Wrap" Foreground="#666666"/>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Header="手势">
<ui:SimpleStackPanel Spacing="12">
<TextBlock Text="# 开启 自动开关两指缩放功能 后退出画板模式时自动关闭双指移动手势，进入画板模式时自动开启双指移动手势" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoSwitchTwoFingerGesture" Header="自动开关两指缩放功能" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSwitchTwoFingerGesture_Toggled"/>
<TextBlock Text="# 开启 自动开关两指缩放功能 后退出画板模式时自动关闭双指移动手势，进入画板模式时自动开启双指移动手势" TextWrapping="Wrap" Foreground="#666666"/>
<TextBlock Text="# 允许选中墨迹后对墨迹进行双指或多指缩放操作（此设置不受“允许双指旋转”设置的影响）" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerRotationOnSelection" Header="允许双指旋转选中的墨迹" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>
<TextBlock Text="# 允许选中墨迹后对墨迹进行双指或多指缩放操作（此设置不受“允许双指旋转”设置的影响）" TextWrapping="Wrap" Foreground="#666666"/>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Name="GroupBoxInkRecognition" Header="墨迹识别">
@ -911,16 +910,16 @@
<ui:SimpleStackPanel Spacing="12">
<TextBlock Text="# 此部分的设置项将会在幻灯片播放时使用，优先级高于其他设置项" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchSupportPowerPoint" Header="Microsoft PowerPoint 支持" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportPowerPoint_Toggled"/>
<TextBlock Text="# 不推荐使用 WPS Office，鉴于其对于触摸设备的较差支持及其自身的兼容性问题，对 WPS Office 支持时会导致 WPS Office 关闭时卡顿。" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchSupportWPS" Header="WPS Office 支持" IsOn="True" IsEnabled="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportWPS_Toggled"/>
<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"/>
<ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerGestureInPresentationMode" Header="允许幻灯片模式下的双指手势" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerGestureInPresentationMode_Toggled"/>
<TextBlock Text="# 允许开启画板时使用手指手势进行幻灯片翻页（启用后，在幻灯片放映模式下，当画板无墨迹时，使用手指（笔尖或手掌无法识别）左右滑动即可控制幻灯片翻页。）" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchEnableFingerGestureSlideShowControl" Header="允许使用手指手势进行幻灯片翻页" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" IsOn="False" Toggled="ToggleSwitchEnableFingerGestureSlideShowControl_Toggled"/>
<TextBlock Text="#开启 自动幻灯片截屏 后将会在幻灯片有墨迹时翻页自动截屏" TextWrapping="Wrap" Foreground="#666666"/>
<TextBlock Text="# 允许开启画板时使用手指手势进行幻灯片翻页（启用后，在幻灯片放映模式下，当画板无墨迹时，使用手指（笔尖或手掌无法识别）左右滑动即可控制幻灯片翻页。）" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoSaveScreenShotInPowerPoint" Header="自动幻灯片截屏" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveScreenShotInPowerPoint_Toggled"/>
<TextBlock Text="#开启 自动保存幻灯片墨迹 后将在结束幻灯片放映时自动将保存已有墨迹，并在下次打开时自动加载（文件名和幻灯片页数都要相同）" TextWrapping="Wrap" Foreground="#666666"/>
<TextBlock Text="#开启 自动幻灯片截屏 后将会在幻灯片有墨迹时翻页自动截屏" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoSaveStrokesInPowerPoint" Header="自动保存幻灯片墨迹" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled"/>
<TextBlock Text="#开启 自动保存幻灯片墨迹 后将在结束幻灯片放映时自动将保存已有墨迹，并在下次打开时自动加载（文件名和幻灯片页数都要相同）" TextWrapping="Wrap" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchNotifyPreviousPage" Header="记忆并提示上次播放位置" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyPreviousPage_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchNotifyHiddenPage" Header="提示隐藏幻灯片" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchNotifyHiddenPage_Toggled"/>
<!--
@ -975,12 +974,14 @@
<ui:ToggleSwitch Name="ToggleSwitchIsQuadIR" Header="四边红外模式" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchIsQuadIR_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchIsLogEnabled" Header="记录日志" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" IsOn="True" Toggled="ToggleSwitchIsLogEnabled_Toggled"/>
<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>
</GroupBox>
<GroupBox Header="自动">
<ui:SimpleStackPanel Spacing="12">
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote" Header="进入“希沃白板”时自动收纳至侧边栏" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno" Header="“希沃白板”自动收纳忽略桌面 EN 批注窗口 (BETA)" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiCamera" Header="进入“希沃视频展台”时自动收纳至侧边栏" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiCamera_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInEasiNote3C" Header="进入“希沃轻白板”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInEasiNote3C_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchAutoFoldInSeewoPincoTeacher" Header="进入“希沃品课”时自动收纳至侧边栏" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchAutoFoldInSeewoPincoTeacher_Toggled"/>
@ -1120,7 +1121,7 @@
</ui:SimpleStackPanel>
</GroupBox>
</StackPanel>
</ScrollViewer>
</ui:ScrollViewerEx>
<Grid Background="White" Margin="20" Height="40" VerticalAlignment="Top">
<ui:SimpleStackPanel Orientation="Horizontal" VerticalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_settings_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="30" Width="30">
@ -1137,7 +1138,7 @@
</EventTrigger>
</Image.Triggers>
</Image>
<TextBlock Margin="10,-2,0,0" Text="设置 | Settings" FontSize="26"/>
<TextBlock Margin="10,-2,0,0" Text="详细设置" FontSize="26"/>
</ui:SimpleStackPanel>
</Grid>
<Grid VerticalAlignment="Bottom" Height="50">
@ -1254,18 +1255,18 @@
<Grid Visibility="{Binding ElementName=StackPanelPPTControls, Path=Visibility}">
<Viewbox Name="BottomViewboxPPTSidesControl" Visibility="Visible" Opacity="0.5" Margin="5" Height="40" HorizontalAlignment="Left" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="3.5">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Name="ImagePPTControlPreviousPressed" Visibility="Collapsed" Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideSelected}"/>
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
</Grid>
</Border>
<Border x:Name="PptNavigationBtn" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border x:Name="PptNavigationBtn" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid MouseUp="PPTNavigationBtn_Click" MouseDown="Border_MouseDown">
<TextBlock Name="PptNavigationTextBlock" FontSize="9" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0/0" />
<TextBlock Name="PptNavigationTextBlock" FontSize="9" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0/0" />
</Grid>
</Border>
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Name="ImagePPTControlNextPressed" Visibility="Collapsed" Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideSelected}"/>
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
@ -1275,17 +1276,17 @@
</Viewbox>
<Viewbox Visibility="{Binding ElementName=BottomViewboxPPTSidesControl, Path=Visibility}" Opacity="0.5" Margin="5" Height="40" HorizontalAlignment="Right" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="3.5">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
</Grid>
</Border>
<Border Width="36" Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid MouseUp="PPTNavigationBtn_Click">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" MouseDown="Border_MouseDown" Foreground="{Binding ElementName=PptNavigationTextBlock, Path=Foreground}" FontSize="{Binding ElementName=PptNavigationTextBlock, Path=FontSize}" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}" />
</Grid>
</Border>
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
</Grid>
@ -1298,17 +1299,17 @@
<!--// PPT 侧边翻页按钮 //-->
<Viewbox x:Name="LeftSidePanelForPPTNavigation" Visibility="Visible" Margin="6,0,0,0" Width="40" HorizontalAlignment="Left" VerticalAlignment="Center">
<ui:SimpleStackPanel Orientation="Vertical" Spacing="5" Opacity="0.4">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Source="/Resources/Icons-png/up.png" RenderOptions.BitmapScalingMode="HighQuality"/>
</Grid>
</Border>
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" MouseUp="PPTNavigationBtn_Click" MouseDown="Border_MouseDown" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" MouseUp="PPTNavigationBtn_Click" MouseDown="Border_MouseDown" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid>
<TextBlock FontSize="9" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}"/>
<TextBlock FontSize="9" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}"/>
</Grid>
</Border>
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Source="/Resources/Icons-png/down.png" RenderOptions.BitmapScalingMode="HighQuality"/>
</Grid>
@ -1317,17 +1318,17 @@
</Viewbox>
<Viewbox x:Name="RightSidePanelForPPTNavigation" Visibility="Visible" Margin="0,0,6,0" Width="40" HorizontalAlignment="Right" VerticalAlignment="Center">
<ui:SimpleStackPanel Orientation="Vertical" Spacing="5" Opacity="0.4">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Source="/Resources/Icons-png/up.png" RenderOptions.BitmapScalingMode="HighQuality"/>
</Grid>
</Border>
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" MouseUp="PPTNavigationBtn_Click" MouseDown="Border_MouseDown" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" MouseUp="PPTNavigationBtn_Click" MouseDown="Border_MouseDown" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid>
<TextBlock FontSize="9" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}"/>
<TextBlock FontSize="9" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding ElementName=PptNavigationTextBlock, Path=Text}"/>
</Grid>
</Border>
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" MouseDown="Border_MouseDown" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Grid Margin="6">
<Image Source="/Resources/Icons-png/down.png" RenderOptions.BitmapScalingMode="HighQuality"/>
</Grid>
@ -1341,14 +1342,14 @@
<ScaleTransform x:Name="ViewboxFloatingBarScaleTransform" ScaleX="1" ScaleY="1"/>
</Viewbox.LayoutTransform>
<ui:SimpleStackPanel Orientation="Horizontal">
<Border x:Name="BorderFloatingBarMoveControls" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}"
<Border x:Name="BorderFloatingBarMoveControls" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}"
MouseDown="SymbolIconEmoji_MouseDown" MouseUp="SymbolIconEmoji_MouseUp">
<ui:SimpleStackPanel Margin="0,5,0,5" Orientation="Horizontal"
HorizontalAlignment="Center">
<ui:SymbolIcon Name="SymbolIconEmoji" Symbol="Emoji2" Foreground="{DynamicResource ToolBarForeground}"/>
<ui:SymbolIcon Name="SymbolIconEmoji" Symbol="Emoji2" Foreground="{DynamicResource FloatBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Padding="2" Margin="2,0,0,0" Visibility="Visible" Height="36" Name="BorderFloatingBarMainControls" Background="{DynamicResource ToolBarBackground}" CornerRadius="5" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Padding="2" Margin="2,0,0,0" Visibility="Visible" Height="36" Name="BorderFloatingBarMainControls" Background="{DynamicResource FloatBarBackground}" CornerRadius="5" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<ui:SimpleStackPanel Margin="2,0" Name="StackPanelFloatingBar" Orientation="Horizontal">
<ui:SimpleStackPanel Name="Cursor_Icon" MouseDown="Border_MouseDown" MouseUp="CursorIcon_Click"
Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center" Width="28">
@ -1367,7 +1368,7 @@
<ui:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<ui:SimpleStackPanel Width="0" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<Grid Margin="0,5,0,5" Width="0" RenderTransformOrigin="0.5,0.5">
<Border x:Name="PenPalette" Visibility="Visible" Background="white" Opacity="0.9" BorderBrush="{DynamicResource ToolBarBorderBrush}" BorderThickness="1" CornerRadius="8" Margin="-160,-190,-70,35">
<Border x:Name="PenPalette" Visibility="Visible" Background="white" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="8" Margin="-160,-190,-70,35">
<Viewbox>
<StackPanel Margin="20 10">
@ -1375,7 +1376,7 @@
<ui:SimpleStackPanel>
<Controls:UniformGrid Columns="2" Width="300" Height="55">
<ui:SimpleStackPanel Orientation="Horizontal" Height="35">
<Label Content="笔锋" Margin="0,0,12,0" Foreground="{DynamicResource ToolBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Label Content="笔锋" Margin="0,0,12,0" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ComboBox Height="30" VerticalAlignment="Center" Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
<ComboBoxItem Content="抬笔笔锋" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="速度笔锋" FontFamily="Microsoft YaHei UI"/>
@ -1385,19 +1386,19 @@
<ui:SimpleStackPanel Margin="0,-5,0,-5" VerticalAlignment="Center">
<ui:SimpleStackPanel x:Name="NibModeSimpleStackPanel" Orientation="Horizontal" Width="140">
<Label Content="笔尖模式" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
<ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode" MinWidth="0" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" Width="140">
<Label Margin="0,0,10,0" Content="墨迹识别" Foreground="{DynamicResource ToolBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Foreground="{DynamicResource ToolBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关"
Toggled="ToggleSwitchEnableInkToShape_Toggled" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
<Label Margin="0,0,10,0" Content="墨迹识别" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Foreground="{DynamicResource FloatBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关"
Toggled="ToggleSwitchEnableInkToShape_Toggled" MinWidth="0" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</Controls:UniformGrid>
<StackPanel Orientation="Horizontal" Height="30">
<Label Margin="0,0,10,0" Content="粗细" Foreground="{DynamicResource ToolBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Label Margin="0,0,10,0" Content="粗细" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Slider x:Name="InkWidthSlider" Minimum="1" Maximum="15" Width="230" FontFamily="Microsoft YaHei UI"
FontSize="20" IsSnapToTickEnabled="True" Value="5" TickFrequency="1" TickPlacement="None" ValueChanged="InkWidthSlider_ValueChanged"/>
<TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}" VerticalAlignment="Bottom" Margin="10,0,0,8" FontSize="14"/>
@ -1480,15 +1481,15 @@
</ui:SimpleStackPanel>
<Grid Width="0">
<Border x:Name="BorderDrawShape" Visibility="Visible" Background="White" Opacity="0.9" BorderBrush="{DynamicResource ToolBarBorderBrush}" BorderThickness="1"
<Border x:Name="BorderDrawShape" Visibility="Visible" Background="White" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"
CornerRadius="8" Margin="-112,-262,-88,27" Height="240">
<Viewbox>
<ui:SimpleStackPanel Spacing="-8" Orientation="Vertical">
<TextBlock FontSize="16" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Left" Margin="10,8">
<TextBlock FontSize="16" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Left" Margin="10,8">
<Run Text="图形"/>
<Run Text="(第一行支持长按保持选中)" FontSize="10"/>
</TextBlock>
<ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Right"/>
<ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Right"/>
<ui:SimpleStackPanel Height="50" Spacing="14" Orientation="Horizontal">
<Image Name="BoardImageDrawLine" Margin="16,12,0,12" MouseDown="Image_MouseDown" MouseUp="BtnDrawLine_Click" Source="{DynamicResource DrawShapeImageSource.Line}"/>
<Image Name="BoardImageDrawDashedLine" Margin="0,12,0,12" MouseDown="Image_MouseDown" MouseUp="BtnDrawDashedLine_Click" Source="{DynamicResource DrawShapeImageSource.DashedLine}"/>
@ -1569,11 +1570,11 @@
<Image Source="/Resources/Icons-Fluent/ic_fluent_dual_screen_span_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
</ui:SimpleStackPanel>
<Grid Width="0">
<Border Name="BorderTools" Margin="-117,-148,-35,40" CornerRadius="5" Background="White" Opacity="0.9" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Border Name="BorderTools" Margin="-117,-148,-35,40" CornerRadius="5" Background="White" Opacity="0.9" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<ui:SimpleStackPanel>
<Image HorizontalAlignment="Right" Margin="0,2,2,-27" Source="/Resources/Icons-png/close-circle.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" MouseDown="Border_MouseDown" MouseUp="CloseBordertools_MouseUp"/>
<ui:SimpleStackPanel Margin="10">
<Label Content="倒计时 抽选 单次抽选" FontSize="9.5" Foreground="{DynamicResource ToolBarForeground}" HorizontalAlignment="Left"/>
<Label Content="倒计时 抽选 单次抽选" FontSize="9.5" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Left"/>
<ui:SimpleStackPanel Margin="2.5,0,0,2" Height="25" Spacing="13" Orientation="Horizontal">
<Image Source="/Resources/Icons-Fluent/ic_fluent_timer_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="22" MouseDown="Border_MouseDown" MouseUp="ImageCountdownTimer_MouseUp"/>
<Image Source="/Resources/Icons-Fluent/ic_fluent_people_money_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20" MouseDown="Border_MouseDown" MouseUp="SymbolIconRand_MouseUp"/>
@ -1601,7 +1602,7 @@
</Border>
<Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36" Height="36" MouseUp="TwoFingerGestureBorder_MouseUp" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderBrush="{DynamicResource ToolBarBorderBrush}" BorderThickness="1" >
<Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36" Height="36" MouseUp="TwoFingerGestureBorder_MouseUp" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" >
<Image x:Name="EnableTwoFingerGestureBtn" Source="/Resources/Icons-png/twoFingelMove.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="30"/>
</Border>
<Grid Width="0">
@ -1627,7 +1628,7 @@
</Grid>
<Border x:Name="BorderFloatingBarExitPPTBtn" Margin="2,0,0,0" Width="34" Height="36" MouseDown="Border_MouseDown" MouseUp="ImagePPTControlEnd_MouseUp"
Background="{DynamicResource ToolBarBackground}" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}"
Background="{DynamicResource FloatBarBackground}" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}"
Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">
<Grid>
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.PPTExitNormal}" Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}" Height="20" Width="30" />

353
Ink Canvas/MainWindow.xaml.cs
View File

@ -2,7 +2,7 @@ using Ink_Canvas.Helpers;
using IWshRuntimeLibrary;
using Microsoft.Office.Interop.PowerPoint;
using Microsoft.Win32;
using ModernWpf;
using iNKORE.UI.WPF.Modern;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@ -27,10 +27,11 @@ using System.Windows.Media.Imaging;
using System.Windows.Threading;
using Application = System.Windows.Application;
using File = System.IO.File;
using MessageBox = System.Windows.MessageBox;
using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
using Path = System.IO.Path;
using Point = System.Windows.Point;
using Timer = System.Timers.Timer;
using iNKORE.UI.WPF.Helpers;
namespace Ink_Canvas {
public partial class MainWindow : Window {
@ -78,6 +79,22 @@ namespace Ink_Canvas {
} catch (Exception ex) {
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
}
try {
if (File.Exists("Log.txt")) {
FileInfo fileInfo = new FileInfo("Log.txt");
long fileSizeInKB = fileInfo.Length / 1024;
if (fileSizeInKB > 512) {
try {
File.Delete("Log.txt");
LogHelper.WriteLogToFile("The Log.txt file has been successfully deleted. Original file size: " + fileSizeInKB + " KB", LogHelper.LogType.Info);
} catch (Exception ex) {
LogHelper.WriteLogToFile("Can not delete the Log.txt file. File size: " + fileSizeInKB + " KB", LogHelper.LogType.Error);
}
}
}
} catch (Exception ex) {
LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
}
InitTimers();
timeMachine.OnRedoStateChanged += TimeMachine_OnRedoStateChanged;
@ -158,10 +175,11 @@ namespace Ink_Canvas {
if (isFloatingBarChangingHideMode) return;
try {
string windowProcessName = ForegroundWindowInfo.ProcessName();
//string windowTitle = ForegroundWindowInfo.WindowTitle();
string windowTitle = ForegroundWindowInfo.WindowTitle();
//LogHelper.WriteLogToFile("windowTitle | " + windowTitle + " | windowProcessName | " + windowProcessName);
if (Settings.Automation.IsAutoFoldInEasiNote && windowProcessName == "EasiNote" // 希沃白板
&& (!(windowTitle.Length == 0 && ForegroundWindowInfo.WindowRect().Height < 500) || !Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno)
|| Settings.Automation.IsAutoFoldInEasiCamera && windowProcessName == "EasiCamera" // 希沃视频展台
|| Settings.Automation.IsAutoFoldInEasiNote3C && windowProcessName == "EasiNote" // 希沃轻白板
|| Settings.Automation.IsAutoFoldInSeewoPincoTeacher && (windowProcessName == "BoardService" || windowProcessName == "seewoPincoTeacher") // 希沃品课
@ -262,7 +280,7 @@ namespace Ink_Canvas {
if (inkCanvas.EditingMode == InkCanvasEditingMode.Select) {
//SymbolIconSelect.Foreground = new SolidColorBrush(Color.FromRgb(0, 136, 255));
} else {
//SymbolIconSelect.Foreground = new SolidColorBrush(toolBarForegroundColor);
//SymbolIconSelect.Foreground = new SolidColorBrush(FloatBarForegroundColor);
}
}
@ -603,10 +621,10 @@ namespace Ink_Canvas {
ToggleSwitchColorfulViewboxFloatingBar.IsOn = true;
} else {
EnableTwoFingerGestureBorder.Background = (Brush)FindResource("ToolBarBackground");
BorderFloatingBarMainControls.Background = (Brush)FindResource("ToolBarBackground");
BorderFloatingBarMoveControls.Background = (Brush)FindResource("ToolBarBackground");
BorderFloatingBarExitPPTBtn.Background = (Brush)FindResource("ToolBarBackground");
EnableTwoFingerGestureBorder.Background = (Brush)FindResource("FloatBarBackground");
BorderFloatingBarMainControls.Background = (Brush)FindResource("FloatBarBackground");
BorderFloatingBarMoveControls.Background = (Brush)FindResource("FloatBarBackground");
BorderFloatingBarExitPPTBtn.Background = (Brush)FindResource("FloatBarBackground");
ToggleSwitchColorfulViewboxFloatingBar.IsOn = false;
}
@ -1053,9 +1071,9 @@ namespace Ink_Canvas {
private void BtnSettings_Click(object sender, RoutedEventArgs e) {
if (BorderSettings.Visibility == Visibility.Visible) {
AnimationHelper.HideWithSlideAndFade(BorderSettings, 0.5);
AnimationsHelper.HideWithSlideAndFade(BorderSettings, 0.5);
} else {
AnimationHelper.ShowWithSlideFromBottomAndFade(BorderSettings, 0.5);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderSettings, 0.5);
}
}
@ -1065,30 +1083,6 @@ namespace Ink_Canvas {
bool forceEraser = false;
private void BtnErase_Click(object sender, RoutedEventArgs e) {
forceEraser = true;
forcePointEraser = !forcePointEraser;
switch (Settings.Canvas.EraserType) {
case 1:
forcePointEraser = true;
break;
case 2:
forcePointEraser = false;
break;
}
inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5);
inkCanvas.EditingMode =
forcePointEraser ? InkCanvasEditingMode.EraseByPoint : InkCanvasEditingMode.EraseByStroke;
drawingShapeMode = 0;
/*
GeometryDrawingEraser.Brush = forcePointEraser
? new SolidColorBrush(Color.FromRgb(0x23, 0xA9, 0xF2))
: new SolidColorBrush(Color.FromRgb(0x66, 0x66, 0x66));
ImageEraser.Visibility = Visibility.Collapsed;
*/
inkCanvas_EditingModeChanged(inkCanvas, null);
CancelSingleFingerDragMode();
}
private void BtnClear_Click(object sender, RoutedEventArgs e) {
forceEraser = false;
@ -1147,9 +1141,9 @@ namespace Ink_Canvas {
if (currentMode == 0) {
currentMode++;
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
SaveStrokes(true);
ClearStrokes(true);
@ -1172,15 +1166,16 @@ namespace Ink_Canvas {
}
StackPanelPPTButtons.Visibility = Visibility.Visible;
}
Topmost = true;
BtnHideInkCanvas_Click(BtnHideInkCanvas, e);
} else {
switch ((++currentMode) % 2) {
case 0: //屏幕模式
currentMode = 0;
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
SaveStrokes();
ClearStrokes(true);
@ -1205,13 +1200,14 @@ namespace Ink_Canvas {
}
StackPanelPPTButtons.Visibility = Visibility.Visible;
Topmost = true;
break;
case 1: //黑板或白板模式
currentMode = 1;
GridBackgroundCover.Visibility = Visibility.Visible;
AnimationHelper.ShowWithSlideFromBottomAndFade(BlackboardLeftSide);
AnimationHelper.ShowWithSlideFromBottomAndFade(BlackboardCenterSide);
AnimationHelper.ShowWithSlideFromBottomAndFade(BlackboardRightSide);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BlackboardLeftSide);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BlackboardCenterSide);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BlackboardRightSide);
SaveStrokes(true);
ClearStrokes(true);
@ -1229,6 +1225,7 @@ namespace Ink_Canvas {
}
StackPanelPPTButtons.Visibility = Visibility.Collapsed;
Topmost = false;
break;
}
}
@ -1359,7 +1356,7 @@ namespace Ink_Canvas {
CheckEnableTwoFingerGestureBtnVisibility(false);
HideSubPanels("cursor");
} else {
AnimationHelper.ShowWithSlideFromLeftAndFade(StackPanelCanvasControls);
AnimationsHelper.ShowWithSlideFromLeftAndFade(StackPanelCanvasControls);
CheckEnableTwoFingerGestureBtnVisibility(true);
}
}
@ -1395,9 +1392,9 @@ namespace Ink_Canvas {
if (currentMode == 1) {
currentMode = 0;
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
}
BtnHideInkCanvas_Click(BtnHideInkCanvas, null);
}
@ -1675,7 +1672,7 @@ namespace Ink_Canvas {
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
inkCanvas.Children.Clear();
isInMultiTouchMode = false;
//SymbolIconMultiTouchMode.Symbol = ModernWpf.Controls.Symbol.People;
//SymbolIconMultiTouchMode.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.People;
} else {
inkCanvas.StylusDown += MainWindow_StylusDown;
inkCanvas.StylusMove += MainWindow_StylusMove;
@ -1685,7 +1682,7 @@ namespace Ink_Canvas {
inkCanvas.EditingMode = InkCanvasEditingMode.None;
inkCanvas.Children.Clear();
isInMultiTouchMode = true;
//SymbolIconMultiTouchMode.Symbol = ModernWpf.Controls.Symbol.Contact;
//SymbolIconMultiTouchMode.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Contact;
}
}
@ -1697,7 +1694,7 @@ namespace Ink_Canvas {
double boundWidth = e.GetTouchPoint(null).Bounds.Width;
if (boundWidth > 20) {
inkCanvas.EraserShape = new EllipseStylusShape(boundWidth, boundWidth);
inkCanvas.EraserShape = new EllipseStylusShape(boundWidth * 0.75, boundWidth * 0.75);
TouchDownPointsList[e.TouchDevice.Id] = InkCanvasEditingMode.EraseByPoint;
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
} else {
@ -1824,7 +1821,7 @@ namespace Ink_Canvas {
k = 1.8;
break;
}
inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * 1.5 * k * eraserMultiplier, boundsWidth * 1.5 * k * eraserMultiplier);
inkCanvas.EraserShape = new EllipseStylusShape(boundsWidth * 1.5 * k * eraserMultiplier * 0.75, boundsWidth * 1.5 * k * eraserMultiplier * 0.75);
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
} else {
if (StackPanelPPTControls.Visibility == Visibility.Visible && inkCanvas.Strokes.Count == 0 && Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl) {
@ -2313,13 +2310,13 @@ namespace Ink_Canvas {
StackPanelPPTControls.Visibility = Visibility.Visible;
if (Settings.PowerPointSettings.IsShowBottomPPTNavigationPanel) {
AnimationHelper.ShowWithSlideFromBottomAndFade(BottomViewboxPPTSidesControl);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BottomViewboxPPTSidesControl);
} else {
BottomViewboxPPTSidesControl.Visibility = Visibility.Collapsed;
}
if (Settings.PowerPointSettings.IsShowSidePPTNavigationPanel) {
AnimationHelper.ShowWithScaleFromLeft(LeftSidePanelForPPTNavigation);
AnimationHelper.ShowWithScaleFromRight(RightSidePanelForPPTNavigation);
AnimationsHelper.ShowWithScaleFromLeft(LeftSidePanelForPPTNavigation);
AnimationsHelper.ShowWithScaleFromRight(RightSidePanelForPPTNavigation);
} else {
LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
@ -2339,9 +2336,9 @@ namespace Ink_Canvas {
if (currentMode != 0) {
currentMode = 0;
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
//SaveStrokes();
ClearStrokes(true);
@ -2478,9 +2475,9 @@ namespace Ink_Canvas {
if (currentMode != 0) {
currentMode = 0;
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
//SaveStrokes();
ClearStrokes(true);
@ -2552,9 +2549,9 @@ namespace Ink_Canvas {
private void BtnPPTSlidesUp_Click(object sender, RoutedEventArgs e) {
if (currentMode == 1) {
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
currentMode = 0;
}
@ -2584,9 +2581,9 @@ namespace Ink_Canvas {
private void BtnPPTSlidesDown_Click(object sender, RoutedEventArgs e) {
if (currentMode == 1) {
GridBackgroundCover.Visibility = Visibility.Collapsed;
AnimationHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationHelper.HideWithSlideAndFade(BlackboardRightSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide);
AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide);
currentMode = 0;
}
_isPptClickingBtnTurned = true;
@ -2633,7 +2630,7 @@ namespace Ink_Canvas {
})).Start();
}
private void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) {
private async void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) {
Application.Current.Dispatcher.Invoke(() => {
try {
MemoryStream ms = new MemoryStream();
@ -2650,10 +2647,8 @@ namespace Ink_Canvas {
})).Start();
HideSubPanels("cursor");
new Thread(new ThreadStart(() => {
Thread.Sleep(50);
ViewboxFloatingBarMarginAnimation(100);
})).Start();
await Task.Delay(150);
ViewboxFloatingBarMarginAnimation(100);
}
#endregion
@ -3006,6 +3001,13 @@ namespace Ink_Canvas {
StartOrStoptimerCheckAutoFold();
}
private void ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno_Toggled(object sender, RoutedEventArgs e) {
if (!isLoaded) return;
Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno = ToggleSwitchAutoFoldInEasiNoteIgnoreDesktopAnno.IsOn;
SaveSettingsToFile();
//StartOrStoptimerCheckAutoFold();
}
private void ToggleSwitchAutoFoldInEasiCamera_Toggled(object sender, RoutedEventArgs e) {
if (!isLoaded) return;
Settings.Automation.IsAutoFoldInEasiCamera = ToggleSwitchAutoFoldInEasiCamera.IsOn;
@ -3292,6 +3294,7 @@ namespace Ink_Canvas {
Settings.Appearance.Theme = 0;
Settings.Automation.IsAutoFoldInEasiNote = true;
Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno = true;
Settings.Automation.IsAutoFoldInEasiCamera = true;
Settings.Automation.IsAutoFoldInEasiNote3C = false;
Settings.Automation.IsAutoFoldInSeewoPincoTeacher = false;
@ -3732,26 +3735,29 @@ namespace Ink_Canvas {
}
private void BorderStrokeSelectionDelete_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject == sender) {
SymbolIconDelete_MouseUp(sender, e);
}
if (lastBorderMouseDownObject != sender) return;
SymbolIconDelete_MouseUp(sender, e);
}
private void GridPenWidthDecrease_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
foreach (Stroke stroke in inkCanvas.GetSelectedStrokes()) {
stroke.DrawingAttributes.Width *= 0.8;
stroke.DrawingAttributes.Height *= 0.8;
}
ChangeStrokeThickness(0.8);
}
private void GridPenWidthIncrease_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
ChangeStrokeThickness(1.25);
}
private void ChangeStrokeThickness(double multipler) {
foreach (Stroke stroke in inkCanvas.GetSelectedStrokes()) {
stroke.DrawingAttributes.Width *= 1.25;
stroke.DrawingAttributes.Height *= 1.25;
var newWidth = stroke.DrawingAttributes.Width * multipler;
var newHeight = stroke.DrawingAttributes.Height * multipler;
if (newWidth >= DrawingAttributes.MinWidth && newWidth <= DrawingAttributes.MaxWidth
&& newHeight >= DrawingAttributes.MinHeight && newHeight <= DrawingAttributes.MaxHeight) {
stroke.DrawingAttributes.Width = newWidth;
stroke.DrawingAttributes.Height = newHeight;
}
}
}
@ -3909,7 +3915,14 @@ namespace Ink_Canvas {
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
inkCanvas.EditingMode = InkCanvasEditingMode.Select;
} else {
inkCanvas.Select(inkCanvas.Strokes);
StrokeCollection selectedStrokes = new StrokeCollection();
foreach (Stroke stroke in inkCanvas.Strokes) {
if (stroke.GetBounds().Width > 0 && stroke.GetBounds().Height > 0) {
selectedStrokes.Add(stroke);
}
}
inkCanvas.Select(selectedStrokes);
//inkCanvas.Select(inkCanvas.Strokes);
}
} else {
inkCanvas.EditingMode = InkCanvasEditingMode.Select;
@ -4049,11 +4062,11 @@ namespace Ink_Canvas {
private void ImageDrawShape_MouseUp(object sender, MouseButtonEventArgs e) {
if (BorderDrawShape.Visibility == Visibility.Visible) {
AnimationHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationHelper.HideWithSlideAndFade(BoardBorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
} else {
AnimationHelper.ShowWithSlideFromBottomAndFade(BorderDrawShape);
AnimationHelper.ShowWithSlideFromBottomAndFade(BoardBorderDrawShape);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderDrawShape);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderDrawShape);
}
}
@ -4070,9 +4083,9 @@ namespace Ink_Canvas {
ToggleSwitchDrawShapeBorderAutoHide.IsOn = !ToggleSwitchDrawShapeBorderAutoHide.IsOn;
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
((ModernWpf.Controls.SymbolIcon)sender).Symbol = ModernWpf.Controls.Symbol.Pin;
((iNKORE.UI.WPF.Modern.Controls.SymbolIcon)sender).Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pin;
} else {
((ModernWpf.Controls.SymbolIcon)sender).Symbol = ModernWpf.Controls.Symbol.UnPin;
((iNKORE.UI.WPF.Modern.Controls.SymbolIcon)sender).Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.UnPin;
}
}
@ -4130,7 +4143,9 @@ namespace Ink_Canvas {
}
lastMouseDownSender = null;
if (isLongPressSelected) {
CollapseBorderDrawShape(true);
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
CollapseBorderDrawShape(true);
}
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawLine.BeginAnimation(OpacityProperty, dA);
}
@ -4147,7 +4162,9 @@ namespace Ink_Canvas {
}
lastMouseDownSender = null;
if (isLongPressSelected) {
CollapseBorderDrawShape(true);
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
CollapseBorderDrawShape(true);
}
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawDashedLine.BeginAnimation(OpacityProperty, dA);
}
@ -4164,7 +4181,9 @@ namespace Ink_Canvas {
}
lastMouseDownSender = null;
if (isLongPressSelected) {
CollapseBorderDrawShape(true);
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
CollapseBorderDrawShape(true);
}
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawDotLine.BeginAnimation(OpacityProperty, dA);
}
@ -4181,7 +4200,9 @@ namespace Ink_Canvas {
}
lastMouseDownSender = null;
if (isLongPressSelected) {
CollapseBorderDrawShape(true);
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
CollapseBorderDrawShape(true);
}
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawArrow.BeginAnimation(OpacityProperty, dA);
}
@ -4198,7 +4219,9 @@ namespace Ink_Canvas {
}
lastMouseDownSender = null;
if (isLongPressSelected) {
CollapseBorderDrawShape(true);
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
CollapseBorderDrawShape(true);
}
var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0)));
ImageDrawParallelLine.BeginAnimation(OpacityProperty, dA);
}
@ -5940,6 +5963,7 @@ namespace Ink_Canvas {
foreach (StylusPoint stylusPoint in e.Stroke.StylusPoints) {
//LogHelper.WriteLogToFile(stylusPoint.PressureFactor.ToString(), LogHelper.LogType.Info);
// 检查是否是压感笔书写
//if (stylusPoint.PressureFactor != 0.5 && stylusPoint.PressureFactor != 0)
if ((stylusPoint.PressureFactor > 0.501 || stylusPoint.PressureFactor < 0.5) && stylusPoint.PressureFactor != 0) {
@ -6246,7 +6270,7 @@ namespace Ink_Canvas {
#region Auto Theme
Color toolBarForegroundColor = Color.FromRgb(102, 102, 102);
Color FloatBarForegroundColor = Color.FromRgb(102, 102, 102);
private void SetTheme(string theme) {
if (theme == "Light") {
ResourceDictionary rd1 = new ResourceDictionary() { Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative) };
@ -6263,7 +6287,7 @@ namespace Ink_Canvas {
ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
toolBarForegroundColor = (Color)Application.Current.FindResource("ToolBarForegroundColor");
FloatBarForegroundColor = (Color)Application.Current.FindResource("FloatBarForegroundColor");
} else if (theme == "Dark") {
ResourceDictionary rd1 = new ResourceDictionary() { Source = new Uri("Resources/Styles/Dark.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd1);
@ -6279,11 +6303,11 @@ namespace Ink_Canvas {
ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
toolBarForegroundColor = (Color)Application.Current.FindResource("ToolBarForegroundColor");
FloatBarForegroundColor = (Color)Application.Current.FindResource("FloatBarForegroundColor");
}
//SymbolIconSelect.Foreground = new SolidColorBrush(toolBarForegroundColor);
//SymbolIconDelete.Foreground = new SolidColorBrush(toolBarForegroundColor);
//SymbolIconSelect.Foreground = new SolidColorBrush(FloatBarForegroundColor);
//SymbolIconDelete.Foreground = new SolidColorBrush(FloatBarForegroundColor);
}
private void SystemEvents_UserPreferenceChanged(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e) {
@ -6439,13 +6463,13 @@ namespace Ink_Canvas {
lastNotificationShowTime = Environment.TickCount;
TextBlockNotice.Text = notice;
AnimationHelper.ShowWithSlideFromBottomAndFade(GridNotifications);
AnimationsHelper.ShowWithSlideFromBottomAndFade(GridNotifications);
new Thread(new ThreadStart(() => {
Thread.Sleep(notificationShowTime + 300);
if (Environment.TickCount - lastNotificationShowTime >= notificationShowTime) {
Application.Current.Dispatcher.Invoke(() => {
AnimationHelper.HideWithSlideAndFade(GridNotifications);
AnimationsHelper.HideWithSlideAndFade(GridNotifications);
});
}
})).Start();
@ -6470,17 +6494,17 @@ namespace Ink_Canvas {
}
private async void HideSubPanels(String mode = null, bool autoAlignCenter = false) {
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationHelper.HideWithSlideAndFade(PenPalette);
AnimationHelper.HideWithSlideAndFade(BoardPenPalette);
AnimationHelper.HideWithSlideAndFade(BoardDeleteIcon);
AnimationHelper.HideWithSlideAndFade(BorderSettings, 0.5);
AnimationHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
AnimationHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(PenPalette);
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
AnimationsHelper.HideWithSlideAndFade(BoardDeleteIcon);
AnimationsHelper.HideWithSlideAndFade(BorderSettings, 0.5);
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) {
AnimationHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationHelper.HideWithSlideAndFade(BoardBorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
}
if (mode != null) {
@ -6685,9 +6709,6 @@ namespace Ink_Canvas {
Not_Enter_Blackboard_fir_Mouse_Click = false;
}
*/
Topmost = false;
new Thread(new ThreadStart(() => {
Thread.Sleep(100);
Application.Current.Dispatcher.Invoke(() => {
@ -6706,11 +6727,11 @@ namespace Ink_Canvas {
if (StackPanelPPTControls.Visibility == Visibility.Visible) {
if (Settings.PowerPointSettings.IsShowBottomPPTNavigationPanel) {
AnimationHelper.ShowWithSlideFromBottomAndFade(BottomViewboxPPTSidesControl);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BottomViewboxPPTSidesControl);
}
if (Settings.PowerPointSettings.IsShowSidePPTNavigationPanel) {
AnimationHelper.ShowWithScaleFromLeft(LeftSidePanelForPPTNavigation);
AnimationHelper.ShowWithScaleFromRight(RightSidePanelForPPTNavigation);
AnimationsHelper.ShowWithScaleFromLeft(LeftSidePanelForPPTNavigation);
AnimationsHelper.ShowWithScaleFromRight(RightSidePanelForPPTNavigation);
}
}
@ -6728,8 +6749,6 @@ namespace Ink_Canvas {
SaveInkCanvasStrokes(false, false); // 自动保存当前页墨迹
}
Topmost = true;
if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null);
if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) {
@ -6776,8 +6795,8 @@ namespace Ink_Canvas {
private void ImageCountdownTimer_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
new CountdownTimerWindow().Show();
}
@ -6785,8 +6804,8 @@ namespace Ink_Canvas {
private void OperatingGuideWindowIcon_MouseUp(object sender, MouseButtonEventArgs e) {
//if (lastBorderMouseDownObject != sender) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
new OperatingGuideWindow().Show();
}
@ -6794,8 +6813,8 @@ namespace Ink_Canvas {
private void SymbolIconRand_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
new RandWindow().Show();
}
@ -6803,8 +6822,8 @@ namespace Ink_Canvas {
private void SymbolIconRandOne_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
new RandWindow(true).ShowDialog();
}
@ -6812,8 +6831,8 @@ namespace Ink_Canvas {
private void GridInkReplayButton_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
CollapseBorderDrawShape();
@ -6886,11 +6905,11 @@ namespace Ink_Canvas {
private void SymbolIconTools_MouseUp(object sender, MouseButtonEventArgs e) {
if (BorderTools.Visibility == Visibility.Visible) {
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
} else {
AnimationHelper.ShowWithSlideFromBottomAndFade(BorderTools);
AnimationHelper.ShowWithSlideFromBottomAndFade(BoardBorderTools);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BorderTools);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardBorderTools);
}
}
@ -6927,13 +6946,13 @@ namespace Ink_Canvas {
downPos = e.GetPosition(null);
GridForFloatingBarDraging.Visibility = Visibility.Visible;
SymbolIconEmoji.Symbol = ModernWpf.Controls.Symbol.Emoji;
SymbolIconEmoji.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Emoji;
}
void SymbolIconEmoji_MouseUp(object sender, MouseButtonEventArgs e) {
isDragDropInEffect = false;
if (e is null || (downPos.X == e.GetPosition(null).X && downPos.Y == e.GetPosition(null).Y)) {
if (e is null || Math.Abs(downPos.X - e.GetPosition(null).X) <= 10 && Math.Abs(downPos.Y - e.GetPosition(null).Y) <= 10) {
if (BorderFloatingBarMainControls.Visibility == Visibility.Visible) {
BorderFloatingBarMainControls.Visibility = Visibility.Collapsed;
CheckEnableTwoFingerGestureBtnVisibility(false);
@ -6944,7 +6963,7 @@ namespace Ink_Canvas {
}
GridForFloatingBarDraging.Visibility = Visibility.Collapsed;
SymbolIconEmoji.Symbol = ModernWpf.Controls.Symbol.Emoji2;
SymbolIconEmoji.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Emoji2;
}
#endregion
@ -6971,8 +6990,8 @@ namespace Ink_Canvas {
private void SymbolIconSaveStrokes_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender || inkCanvas.Visibility != Visibility.Visible) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
GridNotifications.Visibility = Visibility.Collapsed;
@ -7045,8 +7064,8 @@ namespace Ink_Canvas {
private void SymbolIconOpenStrokes_MouseUp(object sender, MouseButtonEventArgs e) {
if (lastBorderMouseDownObject != sender) return;
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
OpenFileDialog openFileDialog = new OpenFileDialog();
@ -7118,8 +7137,8 @@ namespace Ink_Canvas {
if (isFloatingBarChangingHideMode) return;
/*if (sender == hiddenButtonInBorderTools) {
AnimationHelper.HideWithSlideAndFade(BorderTools);
AnimationHelper.HideWithSlideAndFade(BoardBorderTools);
AnimationsHelper.HideWithSlideAndFade(BorderTools);
AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
}*/
await Dispatcher.InvokeAsync(() => {
@ -7169,11 +7188,11 @@ namespace Ink_Canvas {
await Dispatcher.InvokeAsync(() => {
if (StackPanelPPTControls.Visibility == Visibility.Visible) {
if (Settings.PowerPointSettings.IsShowBottomPPTNavigationPanel) {
AnimationHelper.ShowWithSlideFromBottomAndFade(BottomViewboxPPTSidesControl);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BottomViewboxPPTSidesControl);
}
if (Settings.PowerPointSettings.IsShowSidePPTNavigationPanel) {
AnimationHelper.ShowWithScaleFromLeft(LeftSidePanelForPPTNavigation);
AnimationHelper.ShowWithScaleFromRight(RightSidePanelForPPTNavigation);
AnimationsHelper.ShowWithScaleFromLeft(LeftSidePanelForPPTNavigation);
AnimationsHelper.ShowWithScaleFromRight(RightSidePanelForPPTNavigation);
}
}
if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) {
@ -7369,18 +7388,18 @@ namespace Ink_Canvas {
BtnHideInkCanvas.Content = "隐藏\n画板";
StackPanelCanvasControls.Visibility = Visibility.Visible;
//AnimationHelper.ShowWithSlideFromLeftAndFade(StackPanelCanvasControls);
//AnimationsHelper.ShowWithSlideFromLeftAndFade(StackPanelCanvasControls);
CheckEnableTwoFingerGestureBtnVisibility(true);
inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
ColorSwitchCheck();
HideSubPanels("pen", true);
} else {
if (PenPalette.Visibility == Visibility.Visible) {
AnimationHelper.HideWithSlideAndFade(PenPalette);
AnimationHelper.HideWithSlideAndFade(BoardPenPalette);
AnimationsHelper.HideWithSlideAndFade(PenPalette);
AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
} else {
AnimationHelper.ShowWithSlideFromBottomAndFade(PenPalette);
AnimationHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette);
AnimationsHelper.ShowWithSlideFromBottomAndFade(PenPalette);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardPenPalette);
}
}
}
@ -7411,8 +7430,7 @@ namespace Ink_Canvas {
k = 1.8;
break;
}
inkCanvas.EraserShape = new EllipseStylusShape(k * 80, k * 80);
//inkCanvas.EraserShape = new EllipseStylusShape(70, 70);
inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
drawingShapeMode = 0;
@ -7466,11 +7484,26 @@ namespace Ink_Canvas {
private void BoardEraserIcon_Click(object sender, RoutedEventArgs e) {
if (BoardEraser.Background.ToString() == "#FF679CF4") {
AnimationHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
} else {
forceEraser = true;
forcePointEraser = true;
inkCanvas.EraserShape = new EllipseStylusShape(50, 50);
double k = 1;
switch (Settings.Canvas.EraserSize) {
case 0:
k = 0.5;
break;
case 1:
k = 0.8;
break;
case 3:
k = 1.25;
break;
case 4:
k = 1.8;
break;
}
inkCanvas.EraserShape = new EllipseStylusShape(k * 90, k * 90);
inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
drawingShapeMode = 0;
@ -7483,7 +7516,7 @@ namespace Ink_Canvas {
private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e) {
if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
AnimationHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
} else {
forceEraser = true;
forcePointEraser = false;
@ -7516,8 +7549,8 @@ namespace Ink_Canvas {
}
private void CollapseBorderDrawShape(bool isLongPressSelected = false) {
AnimationHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationHelper.HideWithSlideAndFade(BoardBorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
}
private void DrawShapePromptToPen() {
@ -7542,11 +7575,11 @@ namespace Ink_Canvas {
private void TwoFingerGestureBorder_MouseUp(object sender, RoutedEventArgs e) {
if (TwoFingerGestureBorder.Visibility == Visibility.Visible) {
AnimationHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
AnimationHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
} else {
AnimationHelper.ShowWithSlideFromBottomAndFade(TwoFingerGestureBorder);
AnimationHelper.ShowWithSlideFromBottomAndFade(BoardTwoFingerGestureBorder);
AnimationsHelper.ShowWithSlideFromBottomAndFade(TwoFingerGestureBorder);
AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardTwoFingerGestureBorder);
}
}

2
Ink Canvas/NamesInputWindow.xaml
View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Ink_Canvas"
mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
ui:ThemeManager.RequestedTheme="Light" WindowStartupLocation="CenterScreen"
xmlns:ui="http://schemas.modernwpf.com/2019" Topmost="True"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
Title="Ink Canvas 抽奖 - 名单导入" Height="500" Width="400"
Loaded="Window_Loaded" Closing="Window_Closing">
<Grid>

2
Ink Canvas/NamesInputWindow.xaml.cs
View File

@ -12,7 +12,7 @@ namespace Ink_Canvas
public NamesInputWindow()
{
InitializeComponent();
AnimationHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
AnimationsHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
}
string originText = "";

2
Ink Canvas/OperatingGuideWindow.xaml
View File

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Ink_Canvas"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
ui:ThemeManager.RequestedTheme="Light" Topmost="True" Background="Transparent"
mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True"
WindowStartupLocation="CenterScreen"

6
Ink Canvas/OperatingGuideWindow.xaml.cs
View File

@ -12,7 +12,7 @@ namespace Ink_Canvas
public OperatingGuideWindow()
{
InitializeComponent();
AnimationHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
AnimationsHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
}
private void BtnClose_MouseUp(object sender, MouseButtonEventArgs e)
@ -28,10 +28,10 @@ namespace Ink_Canvas
private void BtnFullscreen_MouseUp(object sender, MouseButtonEventArgs e) {
if (WindowState == WindowState.Normal) {
WindowState = WindowState.Maximized;
SymbolIconFullscreen.Symbol = ModernWpf.Controls.Symbol.BackToWindow;
SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.BackToWindow;
} else {
WindowState = WindowState.Normal;
SymbolIconFullscreen.Symbol = ModernWpf.Controls.Symbol.FullScreen;
SymbolIconFullscreen.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.FullScreen;
}
}

4
Ink Canvas/Properties/AssemblyInfo.cs
View File

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

2
Ink Canvas/RandWindow.xaml
View File

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:local="clr-namespace:Ink_Canvas" FontFamily="Microsoft YaHei UI"
ui:ThemeManager.RequestedTheme="Light" Topmost="True" Background="Transparent"
mc:Ignorable="d" WindowStyle="None" AllowsTransparency="True" Loaded="Window_Loaded"

4
Ink Canvas/RandWindow.xaml.cs
View File

@ -1,6 +1,6 @@
using Ink_Canvas.Helpers;
using Microsoft.VisualBasic;
using ModernWpf.Controls;
using iNKORE.UI.WPF.Modern.Controls;
using System;
using System.Collections.Generic;
using System.IO;
@ -16,7 +16,7 @@ namespace Ink_Canvas {
public partial class RandWindow : Window {
public RandWindow() {
InitializeComponent();
AnimationHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
AnimationsHelper.ShowWithSlideFromBottomAndFade(this, 0.25);
}
public RandWindow(bool IsAutoClose) {

244
Ink Canvas/Resources/DrawShapeImageDictionary.xaml
View File

@ -5,7 +5,7 @@
<DrawingGroup ClipGeometry="M0,0 V825 H825 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<EllipseGeometry RadiusX="387.5" RadiusY="387.5" Center="412.5,412.5" />
@ -13,7 +13,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="412.45,412.55" EndPoint="412.55,412.45" />
@ -27,7 +27,7 @@
<DrawingGroup ClipGeometry="M0,0 V825 H825 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="2.029 2.029" />
</Pen.DashStyle>
@ -39,7 +39,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="412.45,412.55" EndPoint="412.55,412.45" />
@ -53,7 +53,7 @@
<DrawingGroup ClipGeometry="M0,0 V798.2 H801.77 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25.23,224.28" EndPoint="572.99,224.67" />
@ -61,7 +61,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25.23,772.23" EndPoint="25.23,224.47" />
@ -69,7 +69,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="575.5,772.79" EndPoint="575.5,225.03" />
@ -77,7 +77,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="26.01,772.23" EndPoint="573.77,772.62" />
@ -85,7 +85,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,225" EndPoint="225,25" />
@ -93,7 +93,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="575.75,225.25" EndPoint="775.75,25.25" />
@ -101,7 +101,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="224.5,25.5" EndPoint="775.5,25.5" />
@ -109,7 +109,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="576.77,773.2" EndPoint="776.77,573.2" />
@ -117,7 +117,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="775.75,25.5" EndPoint="776.25,573.5" />
@ -125,7 +125,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="223.77,573.08" EndPoint="223.77,523.08" />
@ -133,7 +133,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="1.791 1.791" />
</Pen.DashStyle>
@ -145,7 +145,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="223.77,75.32" EndPoint="223.77,25.32" />
@ -153,7 +153,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25.77,772.2" EndPoint="61.12,736.85" />
@ -161,7 +161,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="1.219 1.219" />
</Pen.DashStyle>
@ -173,7 +173,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="190.41,607.56" EndPoint="225.77,572.2" />
@ -181,7 +181,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="223.89,572.01" EndPoint="273.89,572.04" />
@ -189,7 +189,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="1.791 1.791" />
</Pen.DashStyle>
@ -201,7 +201,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="721.65,572.36" EndPoint="771.65,572.4" />
@ -216,21 +216,21 @@
<DrawingGroup Transform="1,0,0,1,-210,-175">
<GeometryDrawing Geometry="F1 M579.5,750z M0,0z M764.5,800C764.5,855.23 646.08,900 500,900 353.92,900 235.5,855.23 235.5,800">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-210,-175">
<GeometryDrawing Geometry="F1 M579.5,750z M0,0z M235.5,800C235.5,785,244.17,770.87,259.72,758.14">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-210,-175">
<GeometryDrawing Geometry="F1 M579.5,750z M0,0z M350.75,717.43C393.23,706.43 444.63,700 500,700 578.18,700 648.44,712.82 696.87,733.21">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="2.0084 2.0084" />
</Pen.DashStyle>
@ -241,13 +241,13 @@
<DrawingGroup Transform="1,0,0,1,-210,-175">
<GeometryDrawing Geometry="F1 M579.5,750z M0,0z M740.28,758.14C755.83,770.87,764.5,785.05,764.5,800">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="290,25" EndPoint="554,625" />
@ -255,7 +255,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,625" EndPoint="290,25" />
@ -269,7 +269,7 @@
<DrawingGroup ClipGeometry="M0,0 V850 H579.5 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<EllipseGeometry RadiusX="264.5" RadiusY="100" Center="290,125" />
@ -278,21 +278,21 @@
<DrawingGroup Transform="1,0,0,1,-210,-75">
<GeometryDrawing Geometry="F1 M579.5,850z M0,0z M764.5,800C764.5,855.23 646.08,900 500,900 353.92,900 235.5,855.23 235.5,800">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-210,-75">
<GeometryDrawing Geometry="F1 M579.5,850z M0,0z M235.5,800C235.5,785,244.17,770.87,259.72,758.14">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-210,-75">
<GeometryDrawing Geometry="F1 M579.5,850z M0,0z M350.75,717.43C393.23,706.43 444.63,700 500,700 578.18,700 648.44,712.82 696.87,733.21">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="2.0084 2.0084" />
</Pen.DashStyle>
@ -303,13 +303,13 @@
<DrawingGroup Transform="1,0,0,1,-210,-75">
<GeometryDrawing Geometry="F1 M579.5,850z M0,0z M740.28,758.14C755.83,770.87,764.5,785.05,764.5,800">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,125" EndPoint="25,725" />
@ -317,7 +317,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="554,125" EndPoint="554,725" />
@ -331,7 +331,7 @@
<DrawingGroup ClipGeometry="M0,0 V750.75 H750.75 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,725.75" EndPoint="725.75,25" />
@ -345,7 +345,7 @@
<DrawingGroup ClipGeometry="M0,0 V698.08 H755.38 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25.42,25" EndPoint="726.79,25" />
@ -353,7 +353,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,241.08" EndPoint="726.38,241.08" />
@ -361,7 +361,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="29,673.08" EndPoint="730.38,673.08" />
@ -369,7 +369,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,457.08" EndPoint="726.38,457.08" />
@ -383,7 +383,7 @@
<DrawingGroup ClipGeometry="M0,0 V750.75 H750.75 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,725.75" EndPoint="60.36,690.39" />
@ -391,7 +391,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="1.98 1.98" />
</Pen.DashStyle>
@ -403,7 +403,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="690.39,60.36" EndPoint="725.75,25" />
@ -417,7 +417,7 @@
<DrawingGroup ClipGeometry="M0,0 V751.14 H753.64 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,726.14" EndPoint="725.75,25.39" />
@ -425,7 +425,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="725.62,25" EndPoint="375.38,132.77" />
@ -433,7 +433,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="615.38,375.77" EndPoint="728.64,25.47" />
@ -447,7 +447,7 @@
<DrawingGroup ClipGeometry="M0,0 V750.96 H753.21 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,25" EndPoint="725,25.5" />
@ -455,7 +455,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,725.25" EndPoint="25,25.25" />
@ -463,7 +463,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="728.21,725.96" EndPoint="728.21,25.96" />
@ -471,7 +471,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="26,725.25" EndPoint="726,725.75" />
@ -485,7 +485,7 @@
<DrawingGroup ClipGeometry="M0,0 V825 H825 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<EllipseGeometry RadiusX="387.5" RadiusY="387.5" Center="412.5,412.5" />
@ -498,13 +498,13 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V806.56 H868.59 V0 H0 Z">
<DrawingGroup Transform="1,0,0,1,-65.71,-96.72">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M868.59,806.56z M0,0z M562,655.39C561.93,792.12 450.68,903.27 313.89,903.28 176.7,903.28 65.51,791.82 65.73,654.48 65.94,517.88 177.42,406.93 314.32,407.07 451,407.21 562.05,518.56 562,655.39z M500.25,655.54C500.35,552.64 417.25,469.02 314.71,468.81 211.25,468.59 127.57,551.72 127.47,654.81 127.38,757.71 210.47,841.32 313.01,841.54 416.45,841.76 500.14,758.62 500.23,655.54z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M868.59,806.56z M0,0z M562,655.39C561.93,792.12 450.68,903.27 313.89,903.28 176.7,903.28 65.51,791.82 65.73,654.48 65.94,517.88 177.42,406.93 314.32,407.07 451,407.21 562.05,518.56 562,655.39z M500.25,655.54C500.35,552.64 417.25,469.02 314.71,468.81 211.25,468.59 127.57,551.72 127.47,654.81 127.38,757.71 210.47,841.32 313.01,841.54 416.45,841.76 500.14,758.62 500.23,655.54z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-65.71,-96.72">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M868.59,806.56z M0,0z M587.75,717.08C590.08,696.17,592.29,676.36,594.63,655.48L849.63,655.48 665.33,341.9 559.18,518.72C557.47,516.72 556.07,515.23 554.89,513.61 544.47,499.26 534.31,484.7 523.53,470.61 520.53,466.67 519.89,464.18 522.53,459.79 561.22,395.63 599.59,331.27 638.32,267.13 652.23,244.13 679.84,244.98 693.8,268.7Q776.62,409.4,859.25,550.18C881.99,588.88 904.58,627.67 927.57,666.23 934.57,677.94 937.26,689.46 929.99,701.77 922.99,713.65 911.99,717.2 898.71,717.17Q748.39,716.92,598.07,717.08z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M868.59,806.56z M0,0z M587.75,717.08C590.08,696.17,592.29,676.36,594.63,655.48L849.63,655.48 665.33,341.9 559.18,518.72C557.47,516.72 556.07,515.23 554.89,513.61 544.47,499.26 534.31,484.7 523.53,470.61 520.53,466.67 519.89,464.18 522.53,459.79 561.22,395.63 599.59,331.27 638.32,267.13 652.23,244.13 679.84,244.98 693.8,268.7Q776.62,409.4,859.25,550.18C881.99,588.88 904.58,627.67 927.57,666.23 934.57,677.94 937.26,689.46 929.99,701.77 922.99,713.65 911.99,717.2 898.71,717.17Q748.39,716.92,598.07,717.08z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-65.71,-96.72">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M868.59,806.56z M0,0z M562.23,328.74L562.23,159 251.88,159 251.88,381.15 190.34,402.94C190.19,400.16,189.88,397.13,189.88,394.11Q189.88,263.25 189.88,132.39 189.88,96.75 225.73,96.73 407.01,96.73 588.3,96.73 624.05,96.73 624.07,132.46C624.07,164.13 624.24,195.79 623.89,227.46 623.89,231.46 621.66,235.77 619.56,239.46 616.56,244.74 612.34,249.36 609.18,254.59 594.18,279.42 579.28,304.36 564.35,329.26z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M868.59,806.56z M0,0z M562.23,328.74L562.23,159 251.88,159 251.88,381.15 190.34,402.94C190.19,400.16,189.88,397.13,189.88,394.11Q189.88,263.25 189.88,132.39 189.88,96.75 225.73,96.73 407.01,96.73 588.3,96.73 624.05,96.73 624.07,132.46C624.07,164.13 624.24,195.79 623.89,227.46 623.89,231.46 621.66,235.77 619.56,239.46 616.56,244.74 612.34,249.36 609.18,254.59 594.18,279.42 579.28,304.36 564.35,329.26z" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -514,7 +514,7 @@
<DrawingGroup ClipGeometry="M0,0 V813.58 H813.58 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,457.61" EndPoint="787.05,457.61" />
@ -522,7 +522,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="787.64,457.15" EndPoint="618.33,367.52" />
@ -530,7 +530,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="617.22,546.06" EndPoint="788.58,458.44" />
@ -538,7 +538,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="357.61,788.58" EndPoint="357.61,26.53" />
@ -546,7 +546,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="357.15,25.94" EndPoint="267.52,195.25" />
@ -554,7 +554,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="446.06,196.36" EndPoint="358.44,25" />
@ -568,7 +568,7 @@
<DrawingGroup ClipGeometry="M0,0 V813.58 H813.58 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,457.61" EndPoint="787.05,457.61" />
@ -576,7 +576,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="787.64,457.15" EndPoint="618.33,367.52" />
@ -584,7 +584,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="617.22,546.06" EndPoint="788.58,458.44" />
@ -592,7 +592,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="157.61,788.58" EndPoint="157.61,26.53" />
@ -600,7 +600,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="157.15,25.94" EndPoint="67.52,195.25" />
@ -608,7 +608,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="246.06,196.36" EndPoint="158.44,25" />
@ -622,7 +622,7 @@
<DrawingGroup ClipGeometry="M0,0 V813.58 H813.58 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,657.61" EndPoint="787.05,657.61" />
@ -630,7 +630,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="787.64,657.15" EndPoint="618.33,567.52" />
@ -638,7 +638,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="617.22,746.06" EndPoint="788.58,658.44" />
@ -646,7 +646,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="357.61,788.58" EndPoint="357.61,26.53" />
@ -654,7 +654,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="357.15,25.94" EndPoint="267.52,195.25" />
@ -662,7 +662,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="446.06,196.36" EndPoint="358.44,25" />
@ -676,7 +676,7 @@
<DrawingGroup ClipGeometry="M0,0 V813.58 H813.58 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,657.61" EndPoint="787.05,657.61" />
@ -684,7 +684,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="787.64,657.15" EndPoint="618.33,567.52" />
@ -692,7 +692,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="617.22,746.06" EndPoint="788.58,658.44" />
@ -700,7 +700,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="157.61,788.58" EndPoint="157.61,26.53" />
@ -708,7 +708,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="157.15,25.94" EndPoint="67.52,195.25" />
@ -716,7 +716,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="246.06,196.36" EndPoint="158.44,25" />
@ -730,7 +730,7 @@
<DrawingGroup ClipGeometry="M0,0 V764.7 H724 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="457,739.29" EndPoint="457,25" />
@ -738,7 +738,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,539" EndPoint="455.27,739.12" />
@ -746,7 +746,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="458.27,739.7" EndPoint="699,539" />
@ -754,7 +754,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="457,25" EndPoint="699,539" />
@ -762,7 +762,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,539" EndPoint="457,25" />
@ -770,7 +770,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,538.9" EndPoint="75,538.9" />
@ -778,7 +778,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="2.296 2.296" />
</Pen.DashStyle>
@ -790,7 +790,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="649,538.9" EndPoint="699,538.9" />
@ -804,7 +804,7 @@
<DrawingGroup ClipGeometry="M0,0 V798.42 H796.54 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="290.48,508.88" EndPoint="770.01,508.88" />
@ -812,7 +812,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="770.6,508.42" EndPoint="601.29,418.79" />
@ -820,7 +820,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="600.18,597.33" EndPoint="771.54,509.71" />
@ -828,7 +828,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="290.3,509.06" EndPoint="290.3,26.53" />
@ -836,7 +836,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="289.84,25.94" EndPoint="200.21,195.25" />
@ -844,7 +844,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="378.75,196.36" EndPoint="291.13,25" />
@ -852,7 +852,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="290.39,508.97" EndPoint="26.67,772.68" />
@ -860,7 +860,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="26.58,773.42" EndPoint="209.68,717.08" />
@ -868,7 +868,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="84.21,590.05" EndPoint="25,773.18" />
@ -882,7 +882,7 @@
<DrawingGroup ClipGeometry="M0,0 V750.96 H753.21 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,25" EndPoint="725,25.5" />
@ -890,7 +890,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="25,725.25" EndPoint="25,25.25" />
@ -898,7 +898,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="728.21,725.96" EndPoint="728.21,25.96" />
@ -906,7 +906,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="26,725.25" EndPoint="726,725.75" />
@ -914,7 +914,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="376.56,375.53" EndPoint="376.66,375.43" />
@ -928,7 +928,7 @@
<DrawingGroup ClipGeometry="M0,0 V649.3 H825 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<EllipseGeometry RadiusX="387.5" RadiusY="299.65" Center="412.5,324.65" />
@ -936,7 +936,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="412.45,324.7" EndPoint="412.55,324.6" />
@ -950,7 +950,7 @@
<DrawingGroup ClipGeometry="M0,0 V749.84 H749.84 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="60" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="60" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="0.0166666666666667 2" />
</Pen.DashStyle>
@ -969,14 +969,14 @@
<DrawingGroup Transform="1,0,0,1,-157.87,-182.4">
<GeometryDrawing Geometry="F1 M684.27,635.2z M0,0z M182.87,207.4C191.75,296.78 210.54,423.16 252.87,553.03 260.15,575.33 290.28,665.09 352.09,727.67 378.68,754.59 401.88,767.11 413.96,772.86A203.34,203.34,0,0,0,496.84,792.4">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-157.87,-182.4">
<GeometryDrawing Geometry="F1 M684.27,635.2z M0,0z M817.13,207.6C808.25,296.98 789.46,423.36 747.13,553.23 739.85,575.53 709.72,665.29 647.91,727.87 621.32,754.79 598.12,767.31 586.04,773.06A203.34,203.34,0,0,1,503.16,792.6">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
@ -989,13 +989,13 @@
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M136.54,861.37A395.1,395.1,0,0,0,216.54,814.37C254.61,785.46,277.79,756.9,284.54,748.37A351.08,351.08,0,0,0,330.54,672.37C345.4,638.21,350.64,610.37,355.54,583.37A523.22,523.22,0,0,0,363.85,500.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="85" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="85" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="108.8,386.42" EndPoint="108.9,386.32" />
@ -1004,27 +1004,27 @@
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M136.15,138.63A395.1,395.1,0,0,1,216.15,185.63C254.22,214.54,277.41,243.1,284.15,251.63A350.65,350.65,0,0,1,330.15,327.63C345.01,361.79,350.25,389.63,355.15,416.63A522,522,0,0,1,363.46,499.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M863.46,861.37A395.1,395.1,0,0,1,783.46,814.37C745.39,785.46,722.21,756.9,715.46,748.37A351.08,351.08,0,0,1,669.46,672.37C654.6,638.21,649.36,610.37,644.46,583.37A523.22,523.22,0,0,1,636.15,500.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M863.85,138.63A395.1,395.1,0,0,0,783.85,185.63C745.78,214.54,722.59,243.1,715.85,251.63A350.65,350.65,0,0,0,669.85,327.63C654.99,361.79,649.75,389.63,644.85,416.63A522,522,0,0,0,636.54,499.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="85" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="85" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="668.8,386.42" EndPoint="668.9,386.32" />
@ -1039,20 +1039,20 @@
<DrawingGroup Transform="1,0,0,1,-157.87,-182.4">
<GeometryDrawing Geometry="F1 M684.27,635.2z M0,0z M182.87,207.4C191.75,296.78 210.54,423.16 252.87,553.03 260.15,575.33 290.28,665.09 352.09,727.67 378.68,754.59 401.88,767.11 413.96,772.86A203.34,203.34,0,0,0,496.84,792.4">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-157.87,-182.4">
<GeometryDrawing Geometry="F1 M684.27,635.2z M0,0z M817.13,207.6C808.25,296.98 789.46,423.36 747.13,553.23 739.85,575.53 709.72,665.29 647.91,727.87 621.32,754.79 598.12,767.31 586.04,773.06A203.34,203.34,0,0,1,503.16,792.6">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="342.08,417.65" EndPoint="342.18,417.55" />
@ -1066,7 +1066,7 @@
<DrawingGroup ClipGeometry="M0,0 V649.3 H825 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<EllipseGeometry RadiusX="387.5" RadiusY="299.65" Center="412.5,324.65" />
@ -1074,7 +1074,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="412.45,324.7" EndPoint="412.55,324.6" />
@ -1082,7 +1082,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="212.45,324.7" EndPoint="212.55,324.6" />
@ -1090,7 +1090,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="612.45,324.7" EndPoint="612.55,324.6" />
@ -1105,28 +1105,28 @@
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M136.54,861.37A395.1,395.1,0,0,0,216.54,814.37C254.61,785.46,277.79,756.9,284.54,748.37A351.08,351.08,0,0,0,330.54,672.37C345.4,638.21,350.64,610.37,355.54,583.37A523.22,523.22,0,0,0,363.85,500.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M136.15,138.63A395.1,395.1,0,0,1,216.15,185.63C254.22,214.54,277.41,243.1,284.15,251.63A350.65,350.65,0,0,1,330.15,327.63C345.01,361.79,350.25,389.63,355.15,416.63A522,522,0,0,1,363.46,499.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M863.46,861.37A395.1,395.1,0,0,1,783.46,814.37C745.39,785.46,722.21,756.9,715.46,748.37A351.08,351.08,0,0,1,669.46,672.37C654.6,638.21,649.36,610.37,644.46,583.37A523.22,523.22,0,0,1,636.15,500.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-111.15,-113.63">
<GeometryDrawing Geometry="F1 M777.7,772.73z M0,0z M863.85,138.63A395.1,395.1,0,0,0,783.85,185.63C745.78,214.54,722.59,243.1,715.85,251.63A350.65,350.65,0,0,0,669.85,327.63C654.99,361.79,649.75,389.63,644.85,416.63A522,522,0,0,0,636.54,499.5">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>

32
Ink Canvas/Resources/IconImageDictionary.xaml
View File

@ -4,16 +4,16 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V36 H36 V0 H0 Z">
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M50,32A17.78,17.78,0,0,1,49.35,36.78A18.35,18.35,0,0,1,47.5,41.15A18.12,18.12,0,0,1,44.57,44.88A17.56,17.56,0,0,1,40.68,47.75L45.5,47.75 45.5,50 36.5,50 36.5,41 38.75,41 38.75,46.22A15,15,0,0,0,42.47,43.76A16.18,16.18,0,0,0,45.31,40.41A15.89,15.89,0,0,0,47.12,36.41A15.78,15.78,0,0,0,47.19,27.83A15.36,15.36,0,0,0,45.6,24.06A16.21,16.21,0,0,0,43.13,20.87A15.93,15.93,0,0,0,39.94,18.4A16.28,16.28,0,0,0,36.18,16.81A15.84,15.84,0,0,0,27.83,16.81A15.79,15.79,0,0,0,16.83,27.81A15.6,15.6,0,0,0,16.25,32A15.26,15.26,0,0,0,17.1,37.08A16,16,0,0,0,19.49,41.53A16.23,16.23,0,0,0,23.13,45A15.23,15.23,0,0,0,27.8,47.17L27.2,49.33A17,17,0,0,1,21.86,46.86A18.36,18.36,0,0,1,17.68,42.86A18.11,18.11,0,0,1,15,37.81A18,18,0,0,1,14.67,27.22A18.28,18.28,0,0,1,16.48,22.91A18.07,18.07,0,0,1,22.94,16.45A18.38,18.38,0,0,1,27.24,14.64A18.21,18.21,0,0,1,36.81,14.64A18.28,18.28,0,0,1,41.12,16.45A18.07,18.07,0,0,1,47.58,22.91A18.28,18.28,0,0,1,49.39,27.22A17.67,17.67,0,0,1,50,32z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M50,32A17.78,17.78,0,0,1,49.35,36.78A18.35,18.35,0,0,1,47.5,41.15A18.12,18.12,0,0,1,44.57,44.88A17.56,17.56,0,0,1,40.68,47.75L45.5,47.75 45.5,50 36.5,50 36.5,41 38.75,41 38.75,46.22A15,15,0,0,0,42.47,43.76A16.18,16.18,0,0,0,45.31,40.41A15.89,15.89,0,0,0,47.12,36.41A15.78,15.78,0,0,0,47.19,27.83A15.36,15.36,0,0,0,45.6,24.06A16.21,16.21,0,0,0,43.13,20.87A15.93,15.93,0,0,0,39.94,18.4A16.28,16.28,0,0,0,36.18,16.81A15.84,15.84,0,0,0,27.83,16.81A15.79,15.79,0,0,0,16.83,27.81A15.6,15.6,0,0,0,16.25,32A15.26,15.26,0,0,0,17.1,37.08A16,16,0,0,0,19.49,41.53A16.23,16.23,0,0,0,23.13,45A15.23,15.23,0,0,0,27.8,47.17L27.2,49.33A17,17,0,0,1,21.86,46.86A18.36,18.36,0,0,1,17.68,42.86A18.11,18.11,0,0,1,15,37.81A18,18,0,0,1,14.67,27.22A18.28,18.28,0,0,1,16.48,22.91A18.07,18.07,0,0,1,22.94,16.45A18.38,18.38,0,0,1,27.24,14.64A18.21,18.21,0,0,1,36.81,14.64A18.28,18.28,0,0,1,41.12,16.45A18.07,18.07,0,0,1,47.58,22.91A18.28,18.28,0,0,1,49.39,27.22A17.67,17.67,0,0,1,50,32z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M28.6,26.4L28.6,33.63 30.27,33.63 30.27,35.14 28.6,35.14 28.6,37.6 26.84,37.6 26.84,35.14 21.77,35.14 21.77,33.62Q22.46,32.84,23.18,31.94C23.67,31.34 24.13,30.72 24.57,30.1 25.01,29.48 25.43,28.84 25.81,28.21A16.94,16.94,0,0,0,26.81,26.4z M26.84,33.63L26.84,28.93A25.47,25.47,0,0,1,25.16,31.6C24.61,32.36,24.09,33.04,23.6,33.6z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M28.6,26.4L28.6,33.63 30.27,33.63 30.27,35.14 28.6,35.14 28.6,37.6 26.84,37.6 26.84,35.14 21.77,35.14 21.77,33.62Q22.46,32.84,23.18,31.94C23.67,31.34 24.13,30.72 24.57,30.1 25.01,29.48 25.43,28.84 25.81,28.21A16.94,16.94,0,0,0,26.81,26.4z M26.84,33.63L26.84,28.93A25.47,25.47,0,0,1,25.16,31.6C24.61,32.36,24.09,33.04,23.6,33.6z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M31.8,37.34L31.8,35.6A4,4,0,0,0,34.03,36.34A2.78,2.78,0,0,0,35.87,35.76A1.92,1.92,0,0,0,36.56,34.21A1.73,1.73,0,0,0,35.86,32.73A3.31,3.31,0,0,0,33.86,32.19C33.56,32.19,32.94,32.19,32.02,32.29L32.42,26.4 37.94,26.4 37.94,27.94 33.94,27.94 33.75,30.75 34.75,30.75A3.85,3.85,0,0,1,37.5,31.66A3.25,3.25,0,0,1,38.5,34.16A3.43,3.43,0,0,1,37.3,36.8A4.39,4.39,0,0,1,34.24,37.8A5,5,0,0,1,31.8,37.34z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M31.8,37.34L31.8,35.6A4,4,0,0,0,34.03,36.34A2.78,2.78,0,0,0,35.87,35.76A1.92,1.92,0,0,0,36.56,34.21A1.73,1.73,0,0,0,35.86,32.73A3.31,3.31,0,0,0,33.86,32.19C33.56,32.19,32.94,32.19,32.02,32.29L32.42,26.4 37.94,26.4 37.94,27.94 33.94,27.94 33.75,30.75 34.75,30.75A3.85,3.85,0,0,1,37.5,31.66A3.25,3.25,0,0,1,38.5,34.16A3.43,3.43,0,0,1,37.3,36.8A4.39,4.39,0,0,1,34.24,37.8A5,5,0,0,1,31.8,37.34z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M42.53,30.6A2.08,2.08,0,0,1,41,30A2.12,2.12,0,0,1,40.36,28.44A2.05,2.05,0,0,1,41,26.87A2.09,2.09,0,0,1,42.54,26.24A2.15,2.15,0,0,1,44.1,26.87A2.06,2.06,0,0,1,44.75,28.4A2.16,2.16,0,0,1,44.08,30A2.1,2.1,0,0,1,42.53,30.6z M42.53,27.28A1.09,1.09,0,0,0,41.73,27.61A1.07,1.07,0,0,0,41.4,28.4A1.17,1.17,0,0,0,41.72,29.22A1.05,1.05,0,0,0,42.52,29.56A1.1,1.1,0,0,0,43.32,29.22A1.15,1.15,0,0,0,43.66,28.4A1.07,1.07,0,0,0,43.32,27.6A1.1,1.1,0,0,0,42.53,27.28z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M42.53,30.6A2.08,2.08,0,0,1,41,30A2.12,2.12,0,0,1,40.36,28.44A2.05,2.05,0,0,1,41,26.87A2.09,2.09,0,0,1,42.54,26.24A2.15,2.15,0,0,1,44.1,26.87A2.06,2.06,0,0,1,44.75,28.4A2.16,2.16,0,0,1,44.08,30A2.1,2.1,0,0,1,42.53,30.6z M42.53,27.28A1.09,1.09,0,0,0,41.73,27.61A1.07,1.07,0,0,0,41.4,28.4A1.17,1.17,0,0,0,41.72,29.22A1.05,1.05,0,0,0,42.52,29.56A1.1,1.1,0,0,0,43.32,29.22A1.15,1.15,0,0,0,43.66,28.4A1.07,1.07,0,0,0,43.32,27.6A1.1,1.1,0,0,0,42.53,27.28z" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -22,16 +22,16 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V36 H36 V0 H0 Z">
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M50,32A17.78,17.78,0,0,1,49.35,36.78A18.35,18.35,0,0,1,47.5,41.15A18.12,18.12,0,0,1,44.57,44.88A17.56,17.56,0,0,1,40.68,47.75L45.5,47.75 45.5,50 36.5,50 36.5,41 38.75,41 38.75,46.22A15,15,0,0,0,42.47,43.76A16.18,16.18,0,0,0,45.31,40.41A15.89,15.89,0,0,0,47.12,36.41A15.78,15.78,0,0,0,47.19,27.83A15.36,15.36,0,0,0,45.6,24.06A16.21,16.21,0,0,0,43.13,20.87A15.93,15.93,0,0,0,39.94,18.4A16.28,16.28,0,0,0,36.18,16.81A15.84,15.84,0,0,0,27.83,16.81A15.79,15.79,0,0,0,16.83,27.81A15.6,15.6,0,0,0,16.25,32A15.26,15.26,0,0,0,17.1,37.08A16,16,0,0,0,19.49,41.53A16.23,16.23,0,0,0,23.13,45A15.23,15.23,0,0,0,27.8,47.17L27.2,49.33A17,17,0,0,1,21.86,46.86A18.36,18.36,0,0,1,17.68,42.86A18.11,18.11,0,0,1,15,37.81A18,18,0,0,1,14.67,27.22A18.28,18.28,0,0,1,16.48,22.91A18.07,18.07,0,0,1,22.94,16.45A18.38,18.38,0,0,1,27.24,14.64A18.21,18.21,0,0,1,36.81,14.64A18.28,18.28,0,0,1,41.12,16.45A18.07,18.07,0,0,1,47.58,22.91A18.28,18.28,0,0,1,49.39,27.22A17.67,17.67,0,0,1,50,32z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M50,32A17.78,17.78,0,0,1,49.35,36.78A18.35,18.35,0,0,1,47.5,41.15A18.12,18.12,0,0,1,44.57,44.88A17.56,17.56,0,0,1,40.68,47.75L45.5,47.75 45.5,50 36.5,50 36.5,41 38.75,41 38.75,46.22A15,15,0,0,0,42.47,43.76A16.18,16.18,0,0,0,45.31,40.41A15.89,15.89,0,0,0,47.12,36.41A15.78,15.78,0,0,0,47.19,27.83A15.36,15.36,0,0,0,45.6,24.06A16.21,16.21,0,0,0,43.13,20.87A15.93,15.93,0,0,0,39.94,18.4A16.28,16.28,0,0,0,36.18,16.81A15.84,15.84,0,0,0,27.83,16.81A15.79,15.79,0,0,0,16.83,27.81A15.6,15.6,0,0,0,16.25,32A15.26,15.26,0,0,0,17.1,37.08A16,16,0,0,0,19.49,41.53A16.23,16.23,0,0,0,23.13,45A15.23,15.23,0,0,0,27.8,47.17L27.2,49.33A17,17,0,0,1,21.86,46.86A18.36,18.36,0,0,1,17.68,42.86A18.11,18.11,0,0,1,15,37.81A18,18,0,0,1,14.67,27.22A18.28,18.28,0,0,1,16.48,22.91A18.07,18.07,0,0,1,22.94,16.45A18.38,18.38,0,0,1,27.24,14.64A18.21,18.21,0,0,1,36.81,14.64A18.28,18.28,0,0,1,41.12,16.45A18.07,18.07,0,0,1,47.58,22.91A18.28,18.28,0,0,1,49.39,27.22A17.67,17.67,0,0,1,50,32z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M29.55,31.39A9.85,9.85,0,0,1,29.18,34.28A5.55,5.55,0,0,1,28.18,36.28A3.83,3.83,0,0,1,26.69,37.43A4.52,4.52,0,0,1,24.85,37.8C24.64,37.8,24.42,37.8,24.21,37.8A5.7,5.7,0,0,1,23.59,37.69A5.15,5.15,0,0,1,23.06,37.56L22.66,37.41 22.66,35.74A3.09,3.09,0,0,0,23.07,35.95A3.66,3.66,0,0,0,23.6,36.13A5.63,5.63,0,0,0,24.19,36.27A4.28,4.28,0,0,0,24.79,36.27A2.86,2.86,0,0,0,26,36.06A2.42,2.42,0,0,0,26.92,35.29A3.51,3.51,0,0,0,27.51,34A6.48,6.48,0,0,0,27.72,32.26L27.72,32.26A2.63,2.63,0,0,1,27.35,32.73A2.59,2.59,0,0,1,26.82,33.12A3.26,3.26,0,0,1,26.16,33.39A2.78,2.78,0,0,1,25.38,33.49A3.55,3.55,0,0,1,24,33.28A3.27,3.27,0,0,1,22.95,32.58A3.45,3.45,0,0,1,22.25,31.48A4,4,0,0,1,22,30A4.19,4.19,0,0,1,22.29,28.42A3.6,3.6,0,0,1,23.09,27.21A3.42,3.42,0,0,1,24.28,26.45A4.07,4.07,0,0,1,25.77,26.18A3.66,3.66,0,0,1,27.21,26.46A3.21,3.21,0,0,1,28.39,27.37A4.59,4.59,0,0,1,29.25,29A8.21,8.21,0,0,1,29.55,31.39z M27.66,30.19A3.31,3.31,0,0,0,27.51,29.19A2.35,2.35,0,0,0,27.11,28.4A1.85,1.85,0,0,0,26.5,27.89A1.72,1.72,0,0,0,25.72,27.71A1.64,1.64,0,0,0,25,27.87A1.76,1.76,0,0,0,24.41,28.3A2.07,2.07,0,0,0,24,29A2.5,2.5,0,0,0,23.85,29.88A3,3,0,0,0,23.99,30.82A1.85,1.85,0,0,0,24.4,31.5A1.69,1.69,0,0,0,25.02,31.93A2.28,2.28,0,0,0,25.82,32.07A1.89,1.89,0,0,0,26.54,31.93A1.94,1.94,0,0,0,27.12,31.53A1.85,1.85,0,0,0,27.51,30.95A1.89,1.89,0,0,0,27.66,30.19z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M29.55,31.39A9.85,9.85,0,0,1,29.18,34.28A5.55,5.55,0,0,1,28.18,36.28A3.83,3.83,0,0,1,26.69,37.43A4.52,4.52,0,0,1,24.85,37.8C24.64,37.8,24.42,37.8,24.21,37.8A5.7,5.7,0,0,1,23.59,37.69A5.15,5.15,0,0,1,23.06,37.56L22.66,37.41 22.66,35.74A3.09,3.09,0,0,0,23.07,35.95A3.66,3.66,0,0,0,23.6,36.13A5.63,5.63,0,0,0,24.19,36.27A4.28,4.28,0,0,0,24.79,36.27A2.86,2.86,0,0,0,26,36.06A2.42,2.42,0,0,0,26.92,35.29A3.51,3.51,0,0,0,27.51,34A6.48,6.48,0,0,0,27.72,32.26L27.72,32.26A2.63,2.63,0,0,1,27.35,32.73A2.59,2.59,0,0,1,26.82,33.12A3.26,3.26,0,0,1,26.16,33.39A2.78,2.78,0,0,1,25.38,33.49A3.55,3.55,0,0,1,24,33.28A3.27,3.27,0,0,1,22.95,32.58A3.45,3.45,0,0,1,22.25,31.48A4,4,0,0,1,22,30A4.19,4.19,0,0,1,22.29,28.42A3.6,3.6,0,0,1,23.09,27.21A3.42,3.42,0,0,1,24.28,26.45A4.07,4.07,0,0,1,25.77,26.18A3.66,3.66,0,0,1,27.21,26.46A3.21,3.21,0,0,1,28.39,27.37A4.59,4.59,0,0,1,29.25,29A8.21,8.21,0,0,1,29.55,31.39z M27.66,30.19A3.31,3.31,0,0,0,27.51,29.19A2.35,2.35,0,0,0,27.11,28.4A1.85,1.85,0,0,0,26.5,27.89A1.72,1.72,0,0,0,25.72,27.71A1.64,1.64,0,0,0,25,27.87A1.76,1.76,0,0,0,24.41,28.3A2.07,2.07,0,0,0,24,29A2.5,2.5,0,0,0,23.85,29.88A3,3,0,0,0,23.99,30.82A1.85,1.85,0,0,0,24.4,31.5A1.69,1.69,0,0,0,25.02,31.93A2.28,2.28,0,0,0,25.82,32.07A1.89,1.89,0,0,0,26.54,31.93A1.94,1.94,0,0,0,27.12,31.53A1.85,1.85,0,0,0,27.51,30.95A1.89,1.89,0,0,0,27.66,30.19z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M34.62,37.79A3.13,3.13,0,0,1,31.89,36.36A7.24,7.24,0,0,1,30.89,32.23A8.14,8.14,0,0,1,31.89,27.73A3.35,3.35,0,0,1,34.89,26.21Q38.59,26.21,38.59,31.95A7.6,7.6,0,0,1,37.59,36.29A3.36,3.36,0,0,1,34.62,37.79z M34.8,27.65Q32.8,27.65,32.8,32.15C32.8,34.95 33.46,36.35 34.8,36.35 36.14,36.35 36.8,34.93 36.8,32.08 36.8,29.23 36.08,27.65 34.8,27.65z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M34.62,37.79A3.13,3.13,0,0,1,31.89,36.36A7.24,7.24,0,0,1,30.89,32.23A8.14,8.14,0,0,1,31.89,27.73A3.35,3.35,0,0,1,34.89,26.21Q38.59,26.21,38.59,31.95A7.6,7.6,0,0,1,37.59,36.29A3.36,3.36,0,0,1,34.62,37.79z M34.8,27.65Q32.8,27.65,32.8,32.15C32.8,34.95 33.46,36.35 34.8,36.35 36.14,36.35 36.8,34.93 36.8,32.08 36.8,29.23 36.08,27.65 34.8,27.65z" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M36,36z M0,0z M42.24,30.6A2.08,2.08,0,0,1,40.69,30A2.12,2.12,0,0,1,40.05,28.44A2.05,2.05,0,0,1,40.68,26.91A2.09,2.09,0,0,1,42.22,26.28A2.17,2.17,0,0,1,43.79,26.91A2.09,2.09,0,0,1,44.43,28.44A2.12,2.12,0,0,1,43.79,30A2.1,2.1,0,0,1,42.24,30.6z M42.24,27.28A1.09,1.09,0,0,0,41.44,27.61A1.07,1.07,0,0,0,41.11,28.4A1.17,1.17,0,0,0,41.43,29.22A1.05,1.05,0,0,0,42.23,29.56A1.1,1.1,0,0,0,43.03,29.22A1.15,1.15,0,0,0,43.37,28.4A1.09,1.09,0,0,0,43.04,27.6A1.14,1.14,0,0,0,42.24,27.28z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M36,36z M0,0z M42.24,30.6A2.08,2.08,0,0,1,40.69,30A2.12,2.12,0,0,1,40.05,28.44A2.05,2.05,0,0,1,40.68,26.91A2.09,2.09,0,0,1,42.22,26.28A2.17,2.17,0,0,1,43.79,26.91A2.09,2.09,0,0,1,44.43,28.44A2.12,2.12,0,0,1,43.79,30A2.1,2.1,0,0,1,42.24,30.6z M42.24,27.28A1.09,1.09,0,0,0,41.44,27.61A1.07,1.07,0,0,0,41.11,28.4A1.17,1.17,0,0,0,41.43,29.22A1.05,1.05,0,0,0,42.23,29.56A1.1,1.1,0,0,0,43.03,29.22A1.15,1.15,0,0,0,43.37,28.4A1.09,1.09,0,0,0,43.04,27.6A1.14,1.14,0,0,0,42.24,27.28z" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -41,7 +41,7 @@
<DrawingGroup ClipGeometry="M0,0 V890 H650 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="0" RadiusY="0" Rect="25,324,600,450" />
@ -49,7 +49,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="325,25" EndPoint="325,100" />
@ -57,7 +57,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Round">
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Round">
<Pen.DashStyle>
<DashStyle Offset="0" Dashes="2.76 2.76" />
</Pen.DashStyle>
@ -69,7 +69,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="325,790" EndPoint="325,865" />
@ -78,13 +78,13 @@
<DrawingGroup Transform="1,0,0,1,-175,-55">
<GeometryDrawing Geometry="F1 M650,890z M0,0z M290,167.77C324,193.07 374.32,222.77 438.14,235.65 469.39,241.96 527.44,252.86 598.97,227.21 652.37,208.06 692.04,176.16 716.5,152.88">
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="422,98" EndPoint="542,95.02" />
@ -92,7 +92,7 @@
</GeometryDrawing>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource FloatBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="545,100.58" EndPoint="496,206" />
@ -105,7 +105,7 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V512 H512 V0 H0 Z">
<DrawingGroup Opacity="1">
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M512,512z M0,0z M256,388C183.403,388 124,328.595 124,256 124,183.399 183.403,124 256,124 292.3,124 325.299,139.4 348.406,163.601L278,234 432,234 432,80 380.302,131.702C348.406,99.798 304.406,80 256,80 159.203,80 80,159.203 80,256 80,352.797 158.094,432 256,432 337.045,432 404.287,377.866 425.401,304L378.85,304C360.105,353.561,311.712,388,256,388z" />
<GeometryDrawing Brush="{DynamicResource FloatBarForeground}" Geometry="F1 M512,512z M0,0z M256,388C183.403,388 124,328.595 124,256 124,183.399 183.403,124 256,124 292.3,124 325.299,139.4 348.406,163.601L278,234 432,234 432,80 380.302,131.702C348.406,99.798 304.406,80 256,80 159.203,80 80,159.203 80,256 80,352.797 158.094,432 256,432 337.045,432 404.287,377.866 425.401,304L378.85,304C360.105,353.561,311.712,388,256,388z" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>

BIN
Ink Canvas/Resources/Ink Canvas Annotation.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 109 KiB

44
Ink Canvas/Resources/SeewoImageDictionary.xaml
View File

@ -34,7 +34,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -84,7 +84,7 @@
<GeometryDrawing>
<GeometryDrawing.Brush>
<SolidColorBrush
Color="{DynamicResource ToolBarForegroundColor}"
Color="{DynamicResource FloatBarForegroundColor}"
Opacity="1"
Transform="-6.12303176911189E-17,1,-1,-6.12303176911189E-17,30,-2" />
</GeometryDrawing.Brush>
@ -133,7 +133,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -183,7 +183,7 @@
<GeometryDrawing>
<GeometryDrawing.Brush>
<SolidColorBrush
Color="{DynamicResource ToolBarForegroundColor}"
Color="{DynamicResource FloatBarForegroundColor}"
Opacity="1"
Transform="-6.12303176911189E-17,-1,-1,6.12303176911189E-17,34,34" />
</GeometryDrawing.Brush>
@ -230,7 +230,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -273,7 +273,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<StreamGeometry>M7,15C6.85289858,15.5677816,6.85289858,16.4322348,7,17L22,29C22.7348015,29.3762198,24,28.8227297,24,28L24,4C24,3.1772867,22.7348015,2.62379657,22,3L7,15z</StreamGeometry>
</GeometryDrawing.Geometry>
@ -314,7 +314,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -362,7 +362,7 @@
<GeometryDrawing>
<GeometryDrawing.Brush>
<SolidColorBrush
Color="{DynamicResource ToolBarForegroundColor}"
Color="{DynamicResource FloatBarForegroundColor}"
Opacity="1"
Transform="-1,0,0,1,33,0" />
</GeometryDrawing.Brush>
@ -414,7 +414,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -428,7 +428,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<PathGeometry
FillRule="EvenOdd"
@ -436,7 +436,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -445,7 +445,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -454,7 +454,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -463,7 +463,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -511,7 +511,7 @@
Transform="1,0,0,1,1,2">
<DrawingGroup.Children>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<PathGeometry
FillRule="EvenOdd"
@ -519,7 +519,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -528,7 +528,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -537,7 +537,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -546,7 +546,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -597,7 +597,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -614,7 +614,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="{DynamicResource ToolBarForeground}"
Brush="{DynamicResource FloatBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -666,7 +666,7 @@
Transform="-0.707106781186548,-0.707106781186547,-0.707106781186547,0.707106781186548,31.4055917955108,13.0208154846605">
<DrawingGroup.Children>
<GeometryDrawing
Brush="{DynamicResource ToolBarForeground}">
Brush="{DynamicResource FloatBarForeground}">
<GeometryDrawing.Geometry>
<PathGeometry
FillRule="EvenOdd"

19
Ink Canvas/Resources/Styles/Dark.xaml
View File

@ -1,16 +1,7 @@
<!--
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarBackground" Color="#88000000"/>
<SolidColorBrush x:Key="ToolBarBorderBrush" Color="#BFcccccc"/>
<SolidColorBrush x:Key="ToolBarForeground" Color="#cccccc"/>
<Color x:Key="ToolBarForegroundColor">#FFcccccc</Color>
</ResourceDictionary>
-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarBackground" Color="Black" Opacity="0.5"/>
<SolidColorBrush x:Key="ToolBarBorderBrush" Color="White" Opacity="0.5"/>
<SolidColorBrush x:Key="ToolBarForeground" Color="White"/>
<Color x:Key="ToolBarForegroundColor">#FFcccccc</Color>
<SolidColorBrush x:Key="FloatBarBackground" Color="Black" Opacity="0.5"/>
<SolidColorBrush x:Key="FloatBarBorderBrush" Color="White" Opacity="0.5"/>
<SolidColorBrush x:Key="FloatBarForeground" Color="White"/>
<Color x:Key="FloatBarForegroundColor">#FFcccccc</Color>
</ResourceDictionary>

19
Ink Canvas/Resources/Styles/Light.xaml
View File

@ -1,16 +1,7 @@
<!--
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarBackground" Color="#9FFFFFFF"/>
<SolidColorBrush x:Key="ToolBarBorderBrush" Color="#BF666666"/>
<SolidColorBrush x:Key="ToolBarForeground" Color="#666666"/>
<Color x:Key="ToolBarForegroundColor">#FF666666</Color>
</ResourceDictionary>
-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="ToolBarBackground" Color="#9FFFFFFF" Opacity="0.6"/>
<SolidColorBrush x:Key="ToolBarBorderBrush" Color="Black" Opacity="0.6"/>
<SolidColorBrush x:Key="ToolBarForeground" Color="Black"/>
<Color x:Key="ToolBarForegroundColor">#FF666666</Color>
<SolidColorBrush x:Key="FloatBarBackground" Color="#9FFFFFFF" Opacity="0.6"/>
<SolidColorBrush x:Key="FloatBarBorderBrush" Color="Black" Opacity="0.6"/>
<SolidColorBrush x:Key="FloatBarForeground" Color="Black"/>
<Color x:Key="FloatBarForegroundColor">#FF666666</Color>
</ResourceDictionary>

3
Ink Canvas/Settings.cs
View File

@ -171,6 +171,9 @@ namespace Ink_Canvas
[JsonProperty("isAutoFoldInEasiNote")]
public bool IsAutoFoldInEasiNote { get; set; } = false;
[JsonProperty("isAutoFoldInEasiNoteIgnoreDesktopAnno")]
public bool IsAutoFoldInEasiNoteIgnoreDesktopAnno { get; set; } = false;
[JsonProperty("isAutoFoldInEasiCamera")]
public bool IsAutoFoldInEasiCamera { get; set; } = false;

2
Ink Canvas/SettingsPage.xaml
View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Ink_Canvas"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d" FontFamily="Microsoft YaHei UI"
ui:ThemeManager.RequestedTheme="Light">

2
Ink Canvas/YesOrNoNotificationWindow.xaml
View File

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True"
ResizeMode="NoResize" Closed="Window_Closed" ui:ThemeManager.RequestedTheme="Light"
Title="演示文档设置 - Ink Canvas 画板" Height="160" Width="450" FontFamily="Microsoft YaHei UI">