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

Merge pull request #70 from STBBRD/master

Browse Source 
添加切换颜色主题设置项
This commit is contained in:
XY Wang 2023-05-29 12:37:35 +08:00 committed by GitHub
commit 1503604b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 373 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Ink Canvas/App.xaml
View File

@ -7,11 +7,12 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ui:ThemeResources RequestedTheme="Light" />
<ui:ThemeResources RequestedTheme="Light"/>
<ui:XamlControlsResources />
<ResourceDictionary Source="Resources/SeewoImageDictionary.xaml"/>
<ResourceDictionary Source="Resources/DrawShapeImageDictionary.xaml"/>
<ResourceDictionary Source="Resources/IconImageDictionary.xaml"/>
<ResourceDictionary Source="Resources/Styles/Light.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>

8
Ink Canvas/Ink Canvas.csproj
View File

@ -233,6 +233,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\Styles\Dark.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\Styles\Light.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="YesOrNoNotificationWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

155
Ink Canvas/MainWindow.xaml
View File

@ -1,4 +1,4 @@
<Window x:Class="Ink_Canvas.MainWindow"
<Window Name="window" x:Class="Ink_Canvas.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@ -133,35 +133,35 @@
<Border Name="BorderStrokeSelectionControl"
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="100,900,0,0"
CornerRadius="5" Height="80"
Background="#9FFFFFFF" Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}"
BorderThickness="1" BorderBrush="#BF666666">
Background="{DynamicResource ToolBarBackground}" Visibility="{Binding ElementName=GridInkCanvasSelectionCover, Path=Visibility}"
BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<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" Spacing="5">
<ui:SymbolIcon Symbol="Copy" Foreground="#666666"/>
<TextBlock Text="克隆" FontSize="10" Foreground="#666666"/>
<ui:SymbolIcon Symbol="Copy" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="克隆" FontSize="10" Foreground="{DynamicResource ToolBarForeground}"/>
</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" Spacing="5">
<ui:SymbolIcon Symbol="Copy" Foreground="#666666"/>
<TextBlock Text="克隆至新页" FontSize="8" Foreground="#666666"/>
<ui:SymbolIcon Symbol="Copy" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="克隆至新页" FontSize="8" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="#666666" Background="#666666"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Height="40">
<ui:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="15">
<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="#666666"/>
<TextBlock Text="旋转" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="#666666" Background="#666666"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border Margin="0,0,-6,0" CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Height="40">
<ui:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="15">
@ -178,40 +178,40 @@
</Image.RenderTransform>
</Image>
</ui:SimpleStackPanel>
<TextBlock Text="翻转" FontSize="10" Margin="-8,0,0,0" HorizontalAlignment="Center" Foreground="#666666"/>
<TextBlock Text="翻转" FontSize="10" Margin="-8,0,0,0" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="#666666" Background="#666666"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Border CornerRadius="{Binding ElementName=BorderStrokeSelectionControl, Path=CornerRadius}" Height="40">
<ui:SimpleStackPanel VerticalAlignment="Center" Spacing="5" Margin="0,-10">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="13">
<Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthDecrease_MouseUp">
<ui:SymbolIcon Symbol="Edit" Foreground="#666666"/>
<TextBlock Text="-" Foreground="#666666"
<ui:SymbolIcon Symbol="Edit" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="-" Foreground="{DynamicResource ToolBarForeground}"
VerticalAlignment="Bottom" HorizontalAlignment="Right"
Margin="0,0,-2,-7" FontSize="15"/>
</Grid>
<Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthIncrease_MouseUp">
<ui:SymbolIcon Symbol="Edit" Foreground="#666666"/>
<TextBlock Text="+" Foreground="#666666"
<ui:SymbolIcon Symbol="Edit" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="+" Foreground="{DynamicResource ToolBarForeground}"
VerticalAlignment="Bottom" HorizontalAlignment="Right"
Margin="0,0,-3,-4" FontSize="11"/>
</Grid>
<Grid MouseDown="Border_MouseDown" MouseUp="GridPenWidthRestore_MouseUp">
<ui:SymbolIcon Symbol="Edit" Foreground="#666666"/>
<ui:SymbolIcon Symbol="Edit" Foreground="{DynamicResource ToolBarForeground}"/>
<Image Source="{DynamicResource AndroidRefreshDrawingImage}" VerticalAlignment="Bottom" HorizontalAlignment="Right"
Margin="0,0,-2,-2" Width="8">
</Image>
</Grid>
</ui:SimpleStackPanel>
<TextBlock Text="画笔粗细" FontSize="10" HorizontalAlignment="Center" Foreground="#666666"/>
<TextBlock Text="画笔粗细" FontSize="10" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Width="1" Height="45" BorderBrush="#666666" Background="#666666"/>
<Border Width="1" Height="45" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<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" Spacing="5">
<ui:SymbolIcon Symbol="Delete" Foreground="#666666"/>
<TextBlock Text="删除" FontSize="10" Foreground="#666666"/>
<ui:SymbolIcon Symbol="Delete" Foreground="{DynamicResource ToolBarForeground}"/>
<TextBlock Text="删除" FontSize="10" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
</ui:SimpleStackPanel>
@ -223,17 +223,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="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<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="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<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="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Grid Margin="6" MouseUp="GridPPTControlNext_MouseUp">
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
</Grid>
@ -245,12 +245,12 @@
<Grid Visibility="{Binding ElementName=GridBackgroundCoverHolder, Path=Visibility}">
<Viewbox Visibility="{Binding ElementName=GridBackgroundCover, Path=Visibility}" Opacity="0.7" Margin="10" Height="50" HorizontalAlignment="Right" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
<Border Width="36" Height="36" MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" Height="36" MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Viewbox Margin="8">
<ui:SymbolIcon Symbol="Add" Foreground="#FF666666" />
<ui:SymbolIcon Symbol="Add" Foreground="{DynamicResource ToolBarForeground}" />
</Viewbox>
</Border>
<Border Width="36" MouseUp="BtnWhiteBoardSwitchPrevious_Click" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" MouseUp="BtnWhiteBoardSwitchPrevious_Click" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Grid Margin="6">
<Image Visibility="Collapsed" Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideSelected}"/>
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalPreviousSlideNormal}"/>
@ -262,7 +262,7 @@
VerticalAlignment="Center" HorizontalAlignment="Center"
FontFamily="Microsoft YaHei UI" FontSize="12"/>
</Border>
<Border Width="36" MouseUp="BtnWhiteBoardSwitchNext_Click" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" MouseUp="BtnWhiteBoardSwitchNext_Click" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Grid Margin="6">
<Image Visibility="Collapsed" Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideSelected}"/>
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
@ -272,9 +272,9 @@
</Viewbox>
<Viewbox Visibility="{Binding ElementName=GridBackgroundCover, Path=Visibility}" Opacity="0.7" Margin="10" Height="50" HorizontalAlignment="Left" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
<Border Width="36" Height="36" MouseUp="BorderMultiTouchMode_MouseUp" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" Height="36" MouseUp="BorderMultiTouchMode_MouseUp" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Viewbox Margin="8">
<ui:SymbolIcon Name="SymbolIconMultiTouchMode" Symbol="People" Foreground="#FF666666" />
<ui:SymbolIcon Name="SymbolIconMultiTouchMode" Symbol="People" Foreground="{DynamicResource ToolBarForeground}" />
</Viewbox>
</Border>
</ui:SimpleStackPanel>
@ -474,6 +474,12 @@
<ui:SimpleStackPanel Spacing="12">
<ui:ToggleSwitch Header="显示“橡皮”按钮" IsOn="{Binding ElementName=ToggleSwitchShowButtonEraser, Path=IsOn}" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关"/>
<ui:ToggleSwitch Name="ToggleSwitchShowButtonPPTNavigation" Header="显示 PPT 浏览切页按钮" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowButtonPPTNavigation_OnToggled"/>
<TextBlock Text="颜色主题" FontFamily="Microsoft YaHei UI" FontSize="14"/>
<ComboBox Name="ComboBoxTheme" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxTheme_SelectionChanged">
<ComboBoxItem Content="浅色（默认）" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="深色" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="跟随系统" FontFamily="Microsoft YaHei UI"/>
</ComboBox>
</ui:SimpleStackPanel>
</GroupBox>
<GroupBox Header="PowerPoint 相关">
@ -888,18 +894,18 @@
<Grid Visibility="{Binding ElementName=StackPanelPPTControls, Path=Visibility}">
<Viewbox Name="ViewboxPPTSidesControl" Visibility="{Binding ElementName=StackPanelPPTButtons, Path=Visibility}" Opacity="0.7" Margin="10" Height="50" HorizontalAlignment="Left" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<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="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border x:Name="PptNavigationBtn" Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Grid MouseUp="PPTNavigationBtn_Click">
<TextBlock Name="PptNavigationTextBlock" FontSize="10" Foreground="#FF666666" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0/0" />
</Grid>
</Border>
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Grid Margin="6">
<Image Name="ImagePPTControlNextPressed" Visibility="Collapsed" Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideSelected}"/>
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
@ -909,17 +915,17 @@
</Viewbox>
<Viewbox Visibility="{Binding ElementName=StackPanelPPTButtons, Path=Visibility}" Opacity="{Binding ElementName=ViewboxPPTSidesControl, Path=Opacity}" Margin="10" Height="50" HorizontalAlignment="Right" VerticalAlignment="Bottom">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" MouseUp="GridPPTControlPrevious_MouseUp" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<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="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" Visibility="{Binding ElementName=PptNavigationBtn, Path=Visibility}" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<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" MouseUp="GridPPTControlNext_MouseUp" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<Border Width="36" MouseUp="GridPPTControlNext_MouseUp" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<Grid Margin="6">
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.HorizontalNextSlideNormal}"/>
</Grid>
@ -935,25 +941,25 @@
<ScaleTransform x:Name="ViewboxFloatingBarScaleTransform" ScaleX="1" ScaleY="1"/>
</Viewbox.LayoutTransform>
<ui:SimpleStackPanel Orientation="Horizontal">
<Border Width="36" Height="36" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666" MouseDown="SymbolIconEmoji_MouseDown" MouseUp="SymbolIconEmoji_MouseUp">
<Border Width="36" Height="36" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}" MouseDown="SymbolIconEmoji_MouseDown" MouseUp="SymbolIconEmoji_MouseUp">
<ui:SimpleStackPanel Margin="0,5,0,5" Spacing="10" Orientation="Horizontal"
HorizontalAlignment="Center">
<ui:SymbolIcon Name="SymbolIconEmoji" Symbol="Emoji2" Foreground="#666666"/>
<ui:SymbolIcon Name="SymbolIconEmoji" Symbol="Emoji2" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Margin="5,0,0,0" Visibility="Visible" Height="36" Name="BorderFloatingBarMainControls" Background="#9FFFFFFF" CornerRadius="5" BorderThickness="1" BorderBrush="#BF666666">
<Border Margin="5,0,0,0" Visibility="Visible" Height="36" Name="BorderFloatingBarMainControls" Background="{DynamicResource ToolBarBackground}" CornerRadius="5" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<ui:SimpleStackPanel Name="StackPanelFloatingBar" Spacing="10" Orientation="Horizontal">
<ui:SimpleStackPanel Name="StackPanelCanvacMain" Margin="10,5,0,5" Spacing="10" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<Grid Height="24" Width="0">
</Grid>
<local:ClickSensitiveGrid Click="SymbolIconCursor_Click" Margin="-10,0,0,0">
<ui:SymbolIcon Symbol="Edit" Foreground="#666666"/>
<ui:SymbolIcon Symbol="Edit" Foreground="{DynamicResource ToolBarForeground}"/>
</local:ClickSensitiveGrid>
<ui:SymbolIcon Symbol="Setting" Foreground="#666666" MouseUp="SymbolIconSettings_Click"/>
<ui:SymbolIcon Symbol="Setting" Foreground="{DynamicResource ToolBarForeground}" MouseUp="SymbolIconSettings_Click"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible" Margin="10,5,0,5" Spacing="10" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<local:ClickSensitiveGrid Click="SymbolIconCursor_Click">
<ui:SymbolIcon Symbol="TouchPointer" Foreground="#666666"/>
<ui:SymbolIcon Symbol="TouchPointer" Foreground="{DynamicResource ToolBarForeground}"/>
</local:ClickSensitiveGrid>
<ui:SimpleStackPanel Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}" Spacing="8" Margin="0,1">
<Border Name="BorderPenColorBlack" Background="{Binding ElementName=BtnColorBlack, Path=Background}" MouseUp="BorderPenColorBlack_MouseUp" CornerRadius="100"
@ -1047,8 +1053,9 @@
</Image>
</Grid>
<Grid Margin="0,0,0,0" Width="20">
<ui:SymbolIcon Symbol="Delete" Foreground="#666666" MouseDown="Border_MouseDown" MouseUp="SymbolIconDelete_MouseUp"/>
<Border x:Name="BorderClearInDelete" Visibility="Collapsed" Background="White" BorderBrush="#BF666666" BorderThickness="1"
<ui:SymbolIcon Name="SymbolIconDelete" Symbol="Delete" Foreground="{DynamicResource ToolBarForeground}"
MouseDown="Border_MouseDown" MouseUp="SymbolIconDelete_MouseUp"/>
<Border x:Name="BorderClearInDelete" Visibility="Collapsed" Background="White" BorderBrush="{DynamicResource ToolBarBorderBrush}" BorderThickness="1"
CornerRadius="5" Margin="-40,-60,-40,35">
<Button Content="点击清屏" ui:ThemeManager.RequestedTheme="Light"
FontFamily="Microsoft YaHei UI"
@ -1056,24 +1063,24 @@
Click="BtnClear_Click"/>
</Border>
</Grid>
<ui:SymbolIcon Symbol="SelectAll" Foreground="#666666" MouseUp="SymbolIconSelect_MouseUp"/>
<ui:SymbolIcon Name="SymbolIconSelect" Symbol="SelectAll" Foreground="{DynamicResource ToolBarForeground}" MouseUp="SymbolIconSelect_MouseUp"/>
<Grid Margin="3,5,0,5">
<Image MouseUp="ImageDrawShape_MouseUp" MouseDown="Border_MouseDown" Margin="-2.5" Source="{DynamicResource DrawShapeImageSource.DrawShapeIcon}"/>
<Border x:Name="BorderDrawShape" Visibility="Visible" Background="#9FFFFFFF" BorderBrush="#BF666666" BorderThickness="1"
<Border x:Name="BorderDrawShape" Visibility="Visible" Background="{DynamicResource ToolBarBackground}" BorderBrush="{DynamicResource ToolBarBorderBrush}" BorderThickness="1"
CornerRadius="8" Margin="-100,-265,-100,30" Height="240">
<Viewbox Margin="0,0,0,2">
<ui:SimpleStackPanel Spacing="-8" Orientation="Vertical">
<TextBlock FontSize="16" Foreground="#666666"
<TextBlock FontSize="16" Foreground="{DynamicResource ToolBarForeground}"
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="#666666" HorizontalAlignment="Right"/>
<ui:SymbolIcon Margin="0,-20,8,15" Symbol="Pin" MouseDown="Border_MouseDown" MouseUp="SymbolIconPinBorderDrawShape_MouseUp" Foreground="{DynamicResource ToolBarForeground}" 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="#666666" FontSize="13" VerticalAlignment="Center"/>
<Label Margin="0,0,0,-2" Content="自动隐藏" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
<Viewbox Height="25">
<ui:ToggleSwitch Name="ToggleSwitchDrawShapeBorderAutoHide" Foreground="#666666" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" IsOn="True"/>
<ui:ToggleSwitch Name="ToggleSwitchDrawShapeBorderAutoHide" Foreground="{DynamicResource ToolBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" IsOn="True"/>
</Viewbox>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
@ -1133,7 +1140,7 @@
<Viewbox Height="40" Margin="-4,-4,0,0">
<ui:SimpleStackPanel>
<Image Height="55" Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Source="Resources/logo2.png"/>
<TextBlock Margin="0,-15,0,0" Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Text="二中专版" FontSize="11" FontWeight="Bold" HorizontalAlignment="Center" Foreground="#666666"/>
<TextBlock Margin="0,-15,0,0" Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Text="二中专版" FontSize="11" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource ToolBarForeground}"/>
</ui:SimpleStackPanel>
</Viewbox>
</ui:SimpleStackPanel>
@ -1141,11 +1148,11 @@
</Viewbox>
</Border>
</Grid>
<ui:SymbolIcon Symbol="Undo" Foreground="#666666" Margin="0,0,-2,0"
<ui:SymbolIcon Symbol="Undo" Foreground="{DynamicResource ToolBarForeground}" Margin="0,0,-2,0"
Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}"
IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}"
MouseUp="SymbolIconUndo_MouseUp" MouseDown="Border_MouseDown"/>
<ui:SymbolIcon Symbol="Redo" Foreground="#666666" Margin="-2,0,0,0"
<ui:SymbolIcon Symbol="Redo" Foreground="{DynamicResource ToolBarForeground}" Margin="-2,0,0,0"
Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}"
IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}"
MouseUp="SymbolIconRedo_MouseUp" MouseDown="Border_MouseDown"/>
@ -1158,7 +1165,7 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V64 H64 V0 H0 Z">
<DrawingGroup Opacity="1">
<GeometryDrawing Brush="#666666" Geometry="F1 M64,64z M0,0z M15.125,48.875L15.125,17.375 21.875,17.375 21.875,15.125 24.125,15.125 24.125,17.375 39.875,17.375 39.875,15.125 42.125,15.125 42.125,17.375 48.875,17.375 48.875,48.875 M46.625,46.625L46.625,26.375 17.375,26.375 17.375,46.625 M17.375,24.125L46.625,24.125 46.625,19.625 42.125,19.625 42.125,21.875 39.875,21.875 39.875,19.625 24.125,19.625 24.125,21.875 21.875,21.875 21.875,19.625 17.375,19.625 17.375,24.125z" />
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M64,64z M0,0z M15.125,48.875L15.125,17.375 21.875,17.375 21.875,15.125 24.125,15.125 24.125,17.375 39.875,17.375 39.875,15.125 42.125,15.125 42.125,17.375 48.875,17.375 48.875,48.875 M46.625,46.625L46.625,26.375 17.375,26.375 17.375,46.625 M17.375,24.125L46.625,24.125 46.625,19.625 42.125,19.625 42.125,21.875 39.875,21.875 39.875,19.625 24.125,19.625 24.125,21.875 21.875,21.875 21.875,19.625 17.375,19.625 17.375,24.125z" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -1170,43 +1177,43 @@
<Image Source="{DynamicResource ResourceKey=SeewoImageSource.PPTExitNormal}" Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}" MouseDown="Border_MouseDown" MouseUp="ImagePPTControlEnd_MouseUp" Margin="-2,1,10,2"/>
</Grid>
<ui:SimpleStackPanel Margin="0,5,10,5" Spacing="10" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<ui:SymbolIcon Margin="0,0,0,0" Symbol="Camera" Foreground="#666666" MouseDown="Border_MouseDown" MouseUp="SymbolIconScreenshot_MouseUp"/>
<ui:SymbolIcon Margin="0,0,0,0" Symbol="Camera" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconScreenshot_MouseUp"/>
<Grid Height="24" Width="20">
<ui:SymbolIcon Symbol="Repair" Foreground="#666666" MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp"/>
<Border Name="BorderTools" Margin="37,-157,-140,-6" CornerRadius="5" Background="#9FFFFFFF" BorderThickness="1" BorderBrush="#BF666666">
<ui:SymbolIcon Symbol="Repair" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp"/>
<Border Name="BorderTools" Margin="37,-157,-140,-6" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
<ui:SimpleStackPanel>
<Label Content="快捷设置" FontSize="14" Foreground="#666666"
<Label Content="快捷设置" FontSize="14" Foreground="{DynamicResource ToolBarForeground}"
HorizontalAlignment="Left" Margin="8,8"/>
<Viewbox Margin="12,0,0,0" Height="32" Width="50" HorizontalAlignment="Left" VerticalAlignment="Top">
<ui:SimpleStackPanel>
<Label Margin="0,0,0,-2" Content="墨迹识别" Foreground="#666666" FontSize="13" VerticalAlignment="Center"/>
<Label Margin="0,0,0,-2" Content="墨迹识别" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
<Viewbox Height="25">
<ui:ToggleSwitch Foreground="#666666" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableInkToShape_Toggled" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
<ui:ToggleSwitch Foreground="{DynamicResource ToolBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableInkToShape_Toggled" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
</Viewbox>
</ui:SimpleStackPanel>
</Viewbox>
<Viewbox Margin="0,-32,10,0" Height="32" Width="50" HorizontalAlignment="Right" VerticalAlignment="Top">
<ui:SimpleStackPanel>
<Label Margin="0,0,0,-2" Content="手指模式" Foreground="#666666" FontSize="13" VerticalAlignment="Center"/>
<Label Margin="0,0,0,-2" Content="手指模式" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
<Viewbox Height="25">
<ui:ToggleSwitch Foreground="#666666" IsOn="{Binding ElementName=ToggleSwitchModeFinger, Path=IsOn}" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Width="70"/>
<ui:ToggleSwitch Foreground="{DynamicResource ToolBarForeground}" IsOn="{Binding ElementName=ToggleSwitchModeFinger, Path=IsOn}" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Width="70"/>
</Viewbox>
</ui:SimpleStackPanel>
</Viewbox>
<Label Content="墨迹" FontSize="14" Foreground="#666666"
<Label Content="墨迹" FontSize="14" Foreground="{DynamicResource ToolBarForeground}"
HorizontalAlignment="Left" Margin="8,8"/>
<ui:SimpleStackPanel Orientation="Horizontal" Margin="12,0,0,0" Spacing="11">
<ui:SymbolIcon Symbol="Save" Foreground="#666666" MouseDown="Border_MouseDown" MouseUp="SymbolIconSaveStrokes_MouseUp"/>
<ui:SymbolIcon Symbol="OpenFile" Foreground="#666666" MouseDown="Border_MouseDown" MouseUp="SymbolIconOpenStrokes_MouseUp"/>
<Border Width="1" Height="20" BorderBrush="#666666" Background="#666666"/>
<ui:SymbolIcon Symbol="Save" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconSaveStrokes_MouseUp"/>
<ui:SymbolIcon Symbol="OpenFile" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconOpenStrokes_MouseUp"/>
<Border Width="1" Height="20" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<Grid MouseDown="Border_MouseDown" MouseUp="GridInkReplayButton_MouseUp">
<ui:SymbolIcon Symbol="Edit" Foreground="#666666"/>
<ui:SymbolIcon Symbol="Edit" Foreground="{DynamicResource ToolBarForeground}"/>
<Image Source="{DynamicResource AndroidRefreshDrawingImage}" VerticalAlignment="Bottom" HorizontalAlignment="Right"
Margin="0,0,-3,-3" Width="11">
</Image>
</Grid>
</ui:SimpleStackPanel>
<Label Content="工具" FontSize="14" Foreground="#666666"
<Label Content="工具" FontSize="14" Foreground="{DynamicResource ToolBarForeground}"
HorizontalAlignment="Left" Margin="8,8"/>
<ui:SimpleStackPanel Margin="12,0,0,0" Spacing="11" Orientation="Horizontal">
<Grid Width="20" Height="24" Margin="0,0,0,2">
@ -1216,7 +1223,7 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V64 H64 V0 H0 Z">
<DrawingGroup Opacity="1">
<GeometryDrawing Brush="#666666" Geometry="F1 M64,64z M0,0z M42.811,22.789C44.393,24.383 45.612,26.126 46.467,28.018 47.322,29.91 47.75,31.988 47.75,34.249 47.75,35.702 47.562,37.1 47.188,38.441 46.814,39.782 46.283,41.037 45.597,42.203 44.911,43.369 44.091,44.43 43.136,45.385 42.181,46.34 41.12,47.16 39.954,47.846 38.788,48.532 37.534,49.062 36.192,49.437 34.85,49.812 33.453,50 32,50 30.547,50 29.149,49.812 27.808,49.438 26.467,49.064 25.212,48.533 24.046,47.847 22.88,47.161 21.819,46.341 20.864,45.386 19.909,44.431 19.089,43.37 18.403,42.204 17.717,41.038 17.187,39.784 16.812,38.442 16.437,37.1 16.25,35.703 16.25,34.25 16.25,32.949 16.405,31.684 16.716,30.453 17.027,29.222 17.466,28.062 18.034,26.973 18.602,25.884 19.291,24.872 20.099,23.941 20.907,23.01 21.81,22.183 22.806,21.462 23.802,20.741 24.886,20.141 26.058,19.66 27.23,19.179 28.46,18.846 29.749,18.658L29.749,16.25 25.249,16.25 25.249,14 36.5,14 36.5,16.25 32,16.25 32,18.5C33.629,18.5 35.214,18.74 36.755,19.221 38.296,19.702 39.729,20.416 41.053,21.366L44.709,17.71 46.291,19.292 42.811,22.789z M32,47.75C33.863,47.75 35.612,47.396 37.247,46.687 38.882,45.978 40.311,45.011 41.536,43.787 42.761,42.563 43.727,41.133 44.436,39.498 45.145,37.863 45.5,36.113 45.5,34.25 45.5,32.387 45.146,30.638 44.437,29.003 43.728,27.368 42.761,25.939 41.537,24.714 40.313,23.489 38.883,22.523 37.248,21.814 35.613,21.105 33.863,20.75 32,20.75 30.137,20.75 28.388,21.104 26.753,21.813 25.118,22.522 23.689,23.489 22.464,24.713 21.239,25.937 20.273,27.367 19.564,29.002 18.855,30.637 18.5,32.387 18.5,34.25 18.5,36.113 18.854,37.862 19.563,39.497 20.272,41.132 21.239,42.561 22.463,43.786 23.687,45.011 25.117,45.977 26.752,46.686 28.387,47.395 30.137,47.75 32,47.75z M38.75,34.25L38.75,36.5 29.75,36.5 29.75,25.25 32,25.25 32,34.25 38.75,34.25z" />
<GeometryDrawing Brush="{DynamicResource ToolBarForeground}" Geometry="F1 M64,64z M0,0z M42.811,22.789C44.393,24.383 45.612,26.126 46.467,28.018 47.322,29.91 47.75,31.988 47.75,34.249 47.75,35.702 47.562,37.1 47.188,38.441 46.814,39.782 46.283,41.037 45.597,42.203 44.911,43.369 44.091,44.43 43.136,45.385 42.181,46.34 41.12,47.16 39.954,47.846 38.788,48.532 37.534,49.062 36.192,49.437 34.85,49.812 33.453,50 32,50 30.547,50 29.149,49.812 27.808,49.438 26.467,49.064 25.212,48.533 24.046,47.847 22.88,47.161 21.819,46.341 20.864,45.386 19.909,44.431 19.089,43.37 18.403,42.204 17.717,41.038 17.187,39.784 16.812,38.442 16.437,37.1 16.25,35.703 16.25,34.25 16.25,32.949 16.405,31.684 16.716,30.453 17.027,29.222 17.466,28.062 18.034,26.973 18.602,25.884 19.291,24.872 20.099,23.941 20.907,23.01 21.81,22.183 22.806,21.462 23.802,20.741 24.886,20.141 26.058,19.66 27.23,19.179 28.46,18.846 29.749,18.658L29.749,16.25 25.249,16.25 25.249,14 36.5,14 36.5,16.25 32,16.25 32,18.5C33.629,18.5 35.214,18.74 36.755,19.221 38.296,19.702 39.729,20.416 41.053,21.366L44.709,17.71 46.291,19.292 42.811,22.789z M32,47.75C33.863,47.75 35.612,47.396 37.247,46.687 38.882,45.978 40.311,45.011 41.536,43.787 42.761,42.563 43.727,41.133 44.436,39.498 45.145,37.863 45.5,36.113 45.5,34.25 45.5,32.387 45.146,30.638 44.437,29.003 43.728,27.368 42.761,25.939 41.537,24.714 40.313,23.489 38.883,22.523 37.248,21.814 35.613,21.105 33.863,20.75 32,20.75 30.137,20.75 28.388,21.104 26.753,21.813 25.118,22.522 23.689,23.489 22.464,24.713 21.239,25.937 20.273,27.367 19.564,29.002 18.855,30.637 18.5,32.387 18.5,34.25 18.5,36.113 18.854,37.862 19.563,39.497 20.272,41.132 21.239,42.561 22.463,43.786 23.687,45.011 25.117,45.977 26.752,46.686 28.387,47.395 30.137,47.75 32,47.75z M38.75,34.25L38.75,36.5 29.75,36.5 29.75,25.25 32,25.25 32,34.25 38.75,34.25z" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -1224,13 +1231,13 @@
</Image.Source>
</Image>
</Grid>
<Border Width="1" Height="20" BorderBrush="#666666" Background="#666666"/>
<ui:SymbolIcon Symbol="Shuffle" Foreground="#666666" MouseDown="Border_MouseDown" MouseUp="SymbolIconRand_MouseUp"/>
<Border Width="1" Height="20" BorderBrush="{DynamicResource ToolBarForeground}" Background="{DynamicResource ToolBarForeground}"/>
<ui:SymbolIcon Symbol="Shuffle" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconRand_MouseUp"/>
<Grid MouseUp="SymbolIconRandOne_MouseUp" MouseDown="Border_MouseDown">
<ui:SymbolIcon Symbol="Shuffle" Foreground="#666666"/>
<Border CornerRadius="50" BorderBrush="#666666" BorderThickness="1"
<ui:SymbolIcon Symbol="Shuffle" Foreground="{DynamicResource ToolBarForeground}"/>
<Border CornerRadius="50" BorderBrush="{DynamicResource ToolBarForeground}" BorderThickness="1"
HorizontalAlignment="Center" Margin="-2,0,0,-2" VerticalAlignment="Bottom" Height="9" Width="9">
<TextBlock Text="1" FontSize="7" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,-0.8,0,0" Foreground="#666666" />
<TextBlock Text="1" FontSize="7" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,-0.8,0,0" Foreground="{DynamicResource ToolBarForeground}" />
</Border>
</Grid>
</ui:SimpleStackPanel>

107
Ink Canvas/MainWindow.xaml.cs
View File

@ -1,4 +1,4 @@
using Ink_Canvas.Helpers;
using Ink_Canvas.Helpers;
using IWshRuntimeLibrary;
using Microsoft.Office.Interop.PowerPoint;
using Microsoft.VisualBasic;
@ -83,6 +83,8 @@ namespace Ink_Canvas
timeMachine.OnRedoStateChanged += TimeMachine_OnRedoStateChanged;
timeMachine.OnUndoStateChanged += TimeMachine_OnUndoStateChanged;
inkCanvas.Strokes.StrokesChanged += StrokesOnStrokesChanged;
Microsoft.Win32.SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
}
#endregion
@ -210,6 +212,15 @@ namespace Ink_Canvas
inkCanvas1.ForceCursor = false;
}
if (inkCanvas1.EditingMode == InkCanvasEditingMode.Ink) forcePointEraser = !forcePointEraser;
if (inkCanvas.EditingMode == InkCanvasEditingMode.Select)
{
SymbolIconSelect.Foreground = new SolidColorBrush(Color.FromRgb(0, 136, 255));
}
else
{
SymbolIconSelect.Foreground = new SolidColorBrush(toolBarForegroundColor);
}
}
#endregion Ink Canvas
@ -505,6 +516,7 @@ namespace Ink_Canvas
}
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
SystemEvents_UserPreferenceChanged(null, null);
TextBlockVersion.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString();
LogHelper.WriteLogToFile("Ink Canvas Loaded", LogHelper.LogType.Event);
@ -602,6 +614,8 @@ namespace Ink_Canvas
PptNavigationBtn.Visibility =
Settings.PowerPointSettings.IsShowPPTNavigation ? Visibility.Visible : Visibility.Collapsed;
ToggleSwitchShowButtonPPTNavigation.IsOn = Settings.PowerPointSettings.IsShowPPTNavigation;
ComboBoxTheme.SelectedIndex = Settings.Appearance.Theme;
if (Settings.Appearance.IsShowHideControlButton)
{
BtnHideControl.Visibility = Visibility.Visible;
@ -2691,6 +2705,15 @@ namespace Ink_Canvas
Settings.PowerPointSettings.IsShowPPTNavigation ? Visibility.Visible : Visibility.Collapsed;
}
private void ComboBoxTheme_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (!isLoaded) return;
Settings.Appearance.Theme = ComboBoxTheme.SelectedIndex;
SystemEvents_UserPreferenceChanged(null, null);
SaveSettingsToFile();
}
private void ToggleSwitchShowButtonHideControl_Toggled(object sender, RoutedEventArgs e)
{
if (!isLoaded) return;
@ -6373,6 +6396,88 @@ namespace Ink_Canvas
}
#endregion
#region Auto Theme
Color toolBarForegroundColor = 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) };
Application.Current.Resources.MergedDictionaries.Add(rd1);
ResourceDictionary rd2 = new ResourceDictionary() { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd2);
ResourceDictionary rd3 = new ResourceDictionary() { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd3);
ResourceDictionary rd4 = new ResourceDictionary() { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd4);
ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
toolBarForegroundColor = (Color)Application.Current.FindResource("ToolBarForegroundColor");
}
else if (theme == "Dark")
{
ResourceDictionary rd1 = new ResourceDictionary() { Source = new Uri("Resources/Styles/Dark.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd1);
ResourceDictionary rd2 = new ResourceDictionary() { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd2);
ResourceDictionary rd3 = new ResourceDictionary() { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd3);
ResourceDictionary rd4 = new ResourceDictionary() { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
Application.Current.Resources.MergedDictionaries.Add(rd4);
ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
toolBarForegroundColor = (Color)Application.Current.FindResource("ToolBarForegroundColor");
}
SymbolIconSelect.Foreground = new SolidColorBrush(toolBarForegroundColor);
SymbolIconDelete.Foreground = new SolidColorBrush(toolBarForegroundColor);
}
private void SystemEvents_UserPreferenceChanged(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e)
{
switch (Settings.Appearance.Theme)
{
case 0:
SetTheme("Light");
break;
case 1:
SetTheme("Dark");
break;
case 2:
if (IsSystemThemeLight()) SetTheme("Light");
else SetTheme("Dark");
break;
}
}
private bool IsSystemThemeLight()
{
bool light = false;
try
{
RegistryKey registryKey = Registry.CurrentUser;
RegistryKey themeKey = registryKey.OpenSubKey("software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize");
int keyValue = 0;
if (themeKey != null)
{
keyValue = (int)themeKey.GetValue("SystemUsesLightTheme");
}
if (keyValue == 1) light = true;
}
catch { }
return light;
}
#endregion
#endregion Functions
#region Screenshot

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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-65.71,-96.72">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-65.71,-96.72">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -514,7 +514,7 @@
<DrawingGroup ClipGeometry="M0,0 V813.58 H813.58 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="45" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="60" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Miter">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="85" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="85" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="50" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="150" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="75" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="57" StartLineCap="Round" EndLineCap="Round" LineJoin="Miter" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="#666666" 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 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" />
</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="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
<DrawingGroup Transform="1,0,0,1,-14,-14">
<GeometryDrawing Brush="#666666" 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 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" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
@ -41,7 +41,7 @@
<DrawingGroup ClipGeometry="M0,0 V890 H650 V0 H0 Z">
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" DashCap="Round" LineJoin="Round">
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource ToolBarForeground}" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" Thickness="54" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
<Pen Brush="{DynamicResource ToolBarForeground}" 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="#666666" 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 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" />
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>

44
Ink Canvas/Resources/SeewoImageDictionary.xaml
View File

@ -34,7 +34,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -84,7 +84,7 @@
<GeometryDrawing>
<GeometryDrawing.Brush>
<SolidColorBrush
Color="#FF666666"
Color="{DynamicResource ToolBarForegroundColor}"
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="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -183,7 +183,7 @@
<GeometryDrawing>
<GeometryDrawing.Brush>
<SolidColorBrush
Color="#FF666666"
Color="{DynamicResource ToolBarForegroundColor}"
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="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -273,7 +273,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<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="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -362,7 +362,7 @@
<GeometryDrawing>
<GeometryDrawing.Brush>
<SolidColorBrush
Color="#FF666666"
Color="{DynamicResource ToolBarForegroundColor}"
Opacity="1"
Transform="-1,0,0,1,33,0" />
</GeometryDrawing.Brush>
@ -414,7 +414,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -428,7 +428,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<PathGeometry
FillRule="EvenOdd"
@ -436,7 +436,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -445,7 +445,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -454,7 +454,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -463,7 +463,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -511,7 +511,7 @@
Transform="1,0,0,1,1,2">
<DrawingGroup.Children>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<PathGeometry
FillRule="EvenOdd"
@ -519,7 +519,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -528,7 +528,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -537,7 +537,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -546,7 +546,7 @@
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing
Brush="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<RectangleGeometry
RadiusX="0"
@ -597,7 +597,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
Thickness="2"
StartLineCap="Flat"
EndLineCap="Flat"
@ -614,7 +614,7 @@
Brush="{x:Null}">
<GeometryDrawing.Pen>
<Pen
Brush="#FF666666"
Brush="{DynamicResource ToolBarForeground}"
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="#FF666666">
Brush="{DynamicResource ToolBarForeground}">
<GeometryDrawing.Geometry>
<PathGeometry
FillRule="EvenOdd"

7
Ink Canvas/Resources/Styles/Dark.xaml Normal file
View File

@ -0,0 +1,7 @@
<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>

7
Ink Canvas/Resources/Styles/Light.xaml Normal file
View File

@ -0,0 +1,7 @@
<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>

3
Ink Canvas/Settings.cs
View File

@ -83,7 +83,8 @@ namespace Ink_Canvas
public bool IsShowLRSwitchButton { get; set; } = false;
[JsonProperty("isShowModeFingerToggleSwitch")]
public bool IsShowModeFingerToggleSwitch { get; set; } = true;
[JsonProperty("theme")]
public int Theme { get; set; } = 0;
}
public class PowerPointSettings