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

[feature] 开个分支变成ICC了

Browse Source
This commit is contained in:
Dubi906w 2024-05-02 15:49:23 +08:00
parent 7b143730fd
commit bb6c6bab3b
29 changed files with 372 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Ink Canvas/Ink Canvas.csproj
View File

@ -377,7 +377,7 @@
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 和 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@ -515,5 +515,52 @@
<ItemGroup>
<Resource Include="Resources\Icons-Fluent\ic_fluent_people_24_regular.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\pen-lined.png" />
<Resource Include="Resources\new-icons\pen-solid.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\cursor-lined.png" />
<Resource Include="Resources\new-icons\cursor-solid.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\eraser-lined.png" />
<Resource Include="Resources\new-icons\eraser-solid.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\circle-eraser-lined.png" />
<Resource Include="Resources\new-icons\circle-eraser-solid.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\lasso-select-lined.png" />
<Resource Include="Resources\new-icons\lasso-select-solid.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\trash.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\shapes.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\eye-off.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\grid.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\blackboard.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\cursor-clear.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\DeveloperAvatars\dubi906w.jpg" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\gesture.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\new-icons\gesture-enabled.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

14
Ink Canvas/Ink Canvas.csproj.user Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
</Project>

260
Ink Canvas/MainWindow.xaml
View File

@ -15,7 +15,7 @@
Loaded="Window_Loaded"
Background="Transparent"
ShowInTaskbar="False"
Title="Ink Canvas 画板"
Title="Ink Canvas for Class"
Topmost="True"
KeyDown="Window_KeyDown"
Closing="Window_Closing"
@ -1029,14 +1029,32 @@
<TextBlock Text="GNU General Public License v3.0" FontSize="15"/>
</WrapPanel>
</Border>
<TextBlock FontSize="15">
<Bold>本项目仓库源:</Bold>
<Bold>ICC仓库源:</Bold>
<Hyperlink Click="HyperlinkSourceToPresentRepository_Click">
<TextBlock Margin="2,0" Width="250" Text="https://github.com/ChangSakura/Ink-Canvas" TextWrapping="Wrap"/>
<TextBlock Margin="2,0" Text="gitea.bliemhax.com/kriastans/ICC" TextWrapping="Wrap"/>
</Hyperlink>
</TextBlock>
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock Text="本项目开发者: " FontSize="15" FontWeight="Bold"/>
<TextBlock Text="ICC开发者: " FontSize="15" FontWeight="Bold"/>
<Image Source="/Resources/DeveloperAvatars/dubi906w.jpg" RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0" Width="20" Height="20">
<Image.Clip>
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
</Image.Clip>
</Image>
<TextBlock Text="Dubi906w (Kriastans)" FontSize="15"/>
</WrapPanel>
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="350" Y2="0" Stroke="Black" StrokeThickness="2"/>
<TextBlock FontSize="15">
<Bold>ICA仓库源:</Bold>
<Hyperlink Click="HyperlinkSourceToPresentRepository_Click">
<TextBlock Margin="2,0" Text="ChangSakura/Ink-Canvas" TextWrapping="Wrap"/>
</Hyperlink>
</TextBlock>
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock Text="ICA开发者: " FontSize="15" FontWeight="Bold"/>
<Image Source="/Resources/DeveloperAvatars/ChangSakura.png" RenderOptions.BitmapScalingMode="HighQuality" Width="20" Height="20"/>
<TextBlock Text="CJ Wu (ChangSakura)" FontSize="15"/>
</WrapPanel>
@ -1044,13 +1062,13 @@
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="350" Y2="0" Stroke="Black" StrokeThickness="2"/>
<TextBlock FontSize="15">
<Bold>原项目仓库源:</Bold>
<Bold>IC仓库源:</Bold>
<Hyperlink Click="HyperlinkSourceToOringinalRepository_Click">
<TextBlock Margin="2,0" Text="https://github.com/WXRIW/Ink-Canvas"></TextBlock>
</Hyperlink>
</TextBlock>
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock Text="原项目开发者: " FontSize="15" FontWeight="Bold"/>
<TextBlock Text="IC开发者: " FontSize="15" FontWeight="Bold"/>
<Image Source="/Resources/DeveloperAvatars/WXRIW.png" RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0" Width="20" Height="20">
<Image.Clip>
<EllipseGeometry Center="10,10" RadiusX="10" RadiusY="10" />
@ -1059,7 +1077,7 @@
<TextBlock Text="XY Wang (WXRIW)" FontSize="15"/>
</WrapPanel>
<WrapPanel VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock Text="原项目贡献者: " FontSize="15" FontWeight="Bold" Margin="0,0,0,5"/>
<TextBlock Text="IC贡献者: " FontSize="15" FontWeight="Bold" Margin="0,0,0,5"/>
<ui:SimpleStackPanel Orientation="Horizontal" Margin="0,0,0,5">
<Image Source="/Resources/DeveloperAvatars/Kengwang.png" RenderOptions.BitmapScalingMode="HighQuality" Margin="3,0" Width="20" Height="20">
<Image.Clip>
@ -1137,7 +1155,7 @@
</EventTrigger>
</Image.Triggers>
</Image>
<TextBlock Margin="10,-2,0,0" Text="详细设置" FontSize="26"/>
<TextBlock Margin="10,-2,0,0" Text="ICC设置" FontWeight="Bold" FontSize="26"/>
</ui:SimpleStackPanel>
</Grid>
<Grid VerticalAlignment="Bottom" Height="50">
@ -1345,8 +1363,8 @@
</Border>
</Viewbox>
<Viewbox Name="ViewboxFloatingBar" Margin="100,10,-2000,-200"
HorizontalAlignment="Left" Height="50" VerticalAlignment="Top">
<Viewbox Name="ViewboxFloatingBar" Margin="100,5,0,0"
HorizontalAlignment="Left" Height="58" VerticalAlignment="Top" Width="733">
<Viewbox.LayoutTransform>
<ScaleTransform x:Name="ViewboxFloatingBarScaleTransform" ScaleX="1" ScaleY="1"/>
</Viewbox.LayoutTransform>
@ -1358,38 +1376,39 @@
<ui:SymbolIcon Name="SymbolIconEmoji" Symbol="Emoji2" Foreground="{DynamicResource FloatBarForeground}"/>
</ui:SimpleStackPanel>
</Border>
<Border Padding="2" Margin="2,0,0,0" Visibility="Visible" Height="36" Name="BorderFloatingBarMainControls" Background="{DynamicResource FloatBarBackground}" CornerRadius="5" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Border Margin="2,0,0,0" Padding="2" Visibility="Visible" Height="36" Name="BorderFloatingBarMainControls" Background="{DynamicResource FloatBarBackground}" CornerRadius="5" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<ui:SimpleStackPanel Margin="2,0" Name="StackPanelFloatingBar" Orientation="Horizontal">
<ui:SimpleStackPanel Name="Cursor_Icon" MouseDown="Border_MouseDown" MouseUp="CursorIcon_Click"
Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center" Width="28">
<Image Source="/Resources/Icons-Fluent/ic_fluent_cursor_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image Source="/Resources/new-icons/cursor-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0" x:Name="CursorToolbarIconImage"/>
<TextBlock x:Name="SelectionToolBarTextBlock" Text="鼠标" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="Pen_Icon" MouseDown="Border_MouseDown" MouseUp="PenIcon_Click"
Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center" Width="28">
<Image x:Name="PenIcon" Source="/Resources/Icons-Fluent/ic_fluent_signature_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image x:Name="PenIcon" Source="/Resources/new-icons/pen-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="PenToolbarTextBlock" Text="批注" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="SymbolIconDelete" MouseDown="Border_MouseDown" MouseUp="SymbolIconDelete_MouseUp"
Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center" Width="28">
<Image Source="/Resources/Icons-Fluent/ic_fluent_delete_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image Source="/Resources/new-icons/trash.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="TrashBinToolbarTextBlock" Text="清空" Foreground="#B91C1C" FontWeight="Bold" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<ui:SimpleStackPanel Width="0" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<Grid Margin="0,5,0,5" Width="0" RenderTransformOrigin="0.5,0.5">
<Border x:Name="PenPalette" Visibility="Visible" Background="white" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="8" Margin="-160,-190,-70,35">
<Border x:Name="PenPalette" Visibility="Visible" Background="white" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="8" Margin="-160,-140,-33,32">
<Viewbox>
<StackPanel Margin="20 10">
<Viewbox Margin="0,-1,0,0">
<StackPanel Margin="15 10">
<Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:SimpleStackPanel>
<Controls:UniformGrid Columns="2" Width="300" Height="55">
<ui:SimpleStackPanel Orientation="Horizontal" Height="35">
<Label Content="笔锋" Margin="0,0,12,0" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Label Content="笔锋" Margin="0,0,6,0" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" FontWeight="Bold" VerticalAlignment="Center"/>
<ComboBox Height="30" VerticalAlignment="Center" Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
<ComboBoxItem Content="抬笔笔锋" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="速度笔锋" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="关闭笔锋" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="基于点集" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="基于速率" FontFamily="Microsoft YaHei UI"/>
<ComboBoxItem Content="无笔锋" FontFamily="Microsoft YaHei UI"/>
</ComboBox>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Margin="0,-5,0,-5" VerticalAlignment="Center">
@ -1398,7 +1417,7 @@
<ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode" MinWidth="0" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Horizontal" Width="140">
<Label Margin="0,0,10,0" Content="墨迹识别" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Label Margin="0,0,10,0" Content="墨迹纠正" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch Foreground="{DynamicResource FloatBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关"
Toggled="ToggleSwitchEnableInkToShape_Toggled" MinWidth="0" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
</ui:SimpleStackPanel>
@ -1407,60 +1426,61 @@
<StackPanel Orientation="Horizontal" Height="30">
<Label Margin="0,0,10,0" Content="粗细" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
<Slider x:Name="InkWidthSlider" Minimum="1" Maximum="15" Width="230" FontFamily="Microsoft YaHei UI"
FontSize="20" IsSnapToTickEnabled="True" Value="5" TickFrequency="1" TickPlacement="None" ValueChanged="InkWidthSlider_ValueChanged"/>
<TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}" VerticalAlignment="Bottom" Margin="10,0,0,8" FontSize="14"/>
<Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" VerticalAlignment="Center"/>
<Slider x:Name="InkWidthSlider" Minimum="1" Maximum="15" Width="208" FontFamily="Microsoft YaHei UI"
FontSize="20" IsSnapToTickEnabled="True" Value="5" TickFrequency="0.1" TickPlacement="None" ValueChanged="InkWidthSlider_ValueChanged"/>
<TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}" FontFamily="Consolas" VerticalAlignment="Bottom" Margin="10,0,0,4.5" FontSize="15"/>
</StackPanel>
</ui:SimpleStackPanel>
</Viewbox>
<ui:SimpleStackPanel Width="300">
<ui:SimpleStackPanel Width="300" Margin="0,8,0,0">
<!--<TextBlock FontSize="25">画笔颜色</TextBlock>-->
<Border Width="300" Height="130" BorderBrush="Black" BorderThickness="0" CornerRadius="5">
<Controls:UniformGrid Rows="2" Height="130">
<ui:SimpleStackPanel Height="55" Orientation="Horizontal" Width="270">
<Controls:UniformGrid Columns="4" Width="270">
<Border BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseDown="Border_MouseDown" MouseUp="ColorThemeSwitch_MouseUp">
<Grid Margin="5">
<Image x:Name="ColorThemeSwitchIcon" Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="26" Height="26"/>
<TextBlock x:Name="ColorThemeSwitchTextBlock" Text="亮系" Foreground="Black" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="13"/>
<Border Width="300" Height="100" BorderBrush="Black" BorderThickness="0" CornerRadius="5">
<Controls:UniformGrid Rows="2" Height="100">
<ui:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
<Controls:UniformGrid Columns="5" Width="270" Margin="0">
<Border BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseDown="Border_MouseDown" MouseUp="ColorThemeSwitch_MouseUp">
<Grid Margin="3">
<Image x:Name="ColorThemeSwitchIcon" Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24"/>
<TextBlock x:Name="ColorThemeSwitchTextBlock" Text="亮系" Foreground="Black" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="10"/>
</Grid>
</Border>
<Border x:Name="BorderPenColorBlack" Background="Black" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorBlack_Click">
<Border x:Name="BorderPenColorBlack" Background="Black" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorBlack_Click">
<Viewbox Name="ViewboxBtnColorBlackContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
</Border>
<Border x:Name="BorderPenColorWhite" Background="White" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorWhite_Click">
<Border x:Name="BorderPenColorWhite" Background="White" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorWhite_Click">
<Viewbox x:Name="ViewboxBtnColorWhiteContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="Black"/>
</Viewbox>
</Border>
<Border x:Name="BorderPenColorRed" Background="red" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorRed_Click">
<Border x:Name="BorderPenColorRed" Background="#dc2626" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorRed_Click">
<Viewbox Name="ViewboxBtnColorRedContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
</Border>
<Border x:Name="BorderPenColorYellow" Background="#F38B00" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorYellow_Click">
<Viewbox x:Name="ViewboxBtnColorYellowContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
</Border>
</Controls:UniformGrid>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Height="55" Orientation="Horizontal" Width="270">
<Controls:UniformGrid Columns="4" Width="270">
<Border x:Name="BorderPenColorYellow" Background="#F38B00" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorYellow_Click">
<Viewbox x:Name="ViewboxBtnColorYellowContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
</Border>
<Border x:Name="BorderPenColorGreen" Background="#169141" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorGreen_Click">
<ui:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
<Controls:UniformGrid Columns="3" Width="270" Margin="0">
<Border x:Name="BorderPenColorGreen" Background="#169141" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorGreen_Click">
<Viewbox Name="ViewboxBtnColorGreenContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
</Border>
<Border x:Name="BorderPenColorBlue" Background="#239AD6" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorBlue_Click">
<Border x:Name="BorderPenColorBlue" Background="#239AD6" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorBlue_Click">
<Viewbox x:Name="ViewboxBtnColorBlueContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
</Border>
<Border x:Name="BorderPenColorPink" Background="#c72ec7" BorderBrush="Black" BorderThickness="1.5" CornerRadius="15" Width="55" MouseUp="BtnColorPink_Click">
<Border x:Name="BorderPenColorPink" Background="#c72ec7" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorPink_Click">
<Viewbox x:Name="ViewboxBtnColorPinkContent" Visibility="Collapsed" Margin="6">
<ui:SymbolIcon Symbol="Accept" Foreground="White"/>
</Viewbox>
@ -1476,22 +1496,26 @@
</Grid>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="Eraser_Icon" MouseUp="EraserIcon_Click" MouseDown="Border_MouseDown" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-png/eraser-outline.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
<ui:SimpleStackPanel Name="Eraser_Icon" MouseUp="EraserIcon_Click" MouseDown="Border_MouseDown" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Margin="0,-2" Width="28">
<Image x:Name="CircleEraserToolbarIconImage" Source="/Resources/new-icons/circle-eraser-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="CircleEraserToolbarTextBlock" Text="圆擦" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="EraserByStrokes_Icon" MouseUp="EraserIconByStrokes_Click" MouseDown="Border_MouseDown" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-png/eraser-line.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
<ui:SimpleStackPanel Name="EraserByStrokes_Icon" MouseUp="EraserIconByStrokes_Click" MouseDown="Border_MouseDown" Background="Transparent" Orientation="Vertical" Width="28" Margin="0,-2" HorizontalAlignment="Center">
<Image x:Name="StrokeEraserToolbarIconImage" Source="/Resources/new-icons/eraser-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="InkEraserToolbarTextBlock" Text="线擦" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Name="SymbolIconSelect" MouseDown="Border_MouseDown" MouseUp="SymbolIconSelect_MouseUp" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_lasso_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
<ui:SimpleStackPanel Name="SymbolIconSelect" MouseDown="Border_MouseDown" MouseUp="SymbolIconSelect_MouseUp" Background="Transparent" Orientation="Vertical" Margin="0,-2" Width="28" HorizontalAlignment="Center">
<Image x:Name="LassoSelect" Source="/Resources/new-icons/lasso-select-lined.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="LassoToolToolbarTextBlock" Text="套索选" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="ImageDrawShape_MouseUp" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_shapes_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="23" Width="28"/>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="ImageDrawShape_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Margin="0,-2" Width="28">
<Image Source="/Resources/new-icons/shapes.png" RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="ShapesToolbarTextBlock" Text="几何" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<Grid Width="0">
<Border x:Name="BorderDrawShape" Visibility="Visible" Background="White" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"
CornerRadius="5" Margin="-112,-262,-88,27" Height="240">
CornerRadius="5" Margin="-112,-262,-88,22" Height="240">
<Viewbox>
<ui:SimpleStackPanel Spacing="-8" Orientation="Vertical">
<TextBlock FontSize="16" Foreground="{DynamicResource FloatBarForeground}" HorizontalAlignment="Left" Margin="10,8">
@ -1557,29 +1581,38 @@
</Viewbox>
</Border>
</Grid>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}">
<Image Source="/Resources/Icons-png/undo.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="28" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}"/>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Margin="0,-2" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Width="28">
<Image Source="/Resources/Icons-png/undo.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="UndoToolbarTextBlock" Text="撤销" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}">
<Image Source="/Resources/Icons-png/redo.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="28" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}"/>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Width="28" Margin="0,-2">
<Image Source="/Resources/Icons-png/redo.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="RedoToolbarTextBlock" Text="重做" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="CursorWithDelIcon_Click"
Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Margin="-1,0,2,0" Source="/Resources/Icons-Fluent/ic_fluent_cursorWITHdelete_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="24" Width="26"/>
Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image Source="/Resources/new-icons/cursor-clear.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="ClearAndMouseToolbarTextBlock" Text="清并鼠" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
<Border Margin="0,2" BorderBrush="Black" BorderThickness="1,0,0,0" MouseDown="Border_MouseDown" MouseUp="ImageBlackboard_MouseUp">
<Image Margin="2,0,0,0" Source="/Resources/Icons-Fluent/ic_fluent_whiteboard_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
<Border Margin="2,0,2,0" BorderBrush="#71717a" BorderThickness="1,0,0,0" >
</Border>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-png/setting.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="28"/>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="ImageBlackboard_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image Source="/Resources/new-icons/blackboard.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="WhiteboardToolbarTextBlock" Text="白板" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel x:Name="Fold_Icon" MouseDown="Border_MouseDown" MouseUp="FoldFloatingBar_MouseUp" Background="Transparent" Orientation="Horizontal" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_dual_screen_span_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="22" Width="28"/>
<ui:SimpleStackPanel MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image Source="/Resources/new-icons/grid.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="ToolsToolbarTextBlock" Text="工具" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel x:Name="Fold_Icon" MouseDown="Border_MouseDown" MouseUp="FoldFloatingBar_MouseUp" Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2">
<Image Source="/Resources/new-icons/eye-off.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17" Margin="0,3,0,0"/>
<TextBlock x:Name="HideToolbarTextBlock" Text="隐藏" Foreground="Black" FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
<Grid Width="0">
<Border Name="BorderTools" Margin="-117,-148,-35,40" CornerRadius="5" Background="White" Opacity="0.9" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<Border Name="BorderTools" Margin="-117,-148,-35,37" CornerRadius="5" Background="White" Opacity="0.9" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
<ui:SimpleStackPanel>
<Image HorizontalAlignment="Right" Margin="0,2,2,-27" Source="/Resources/Icons-png/close-circle.png" RenderOptions.BitmapScalingMode="HighQuality" Height="25" Width="25" MouseDown="Border_MouseDown" MouseUp="CloseBordertools_MouseUp"/>
<ui:SimpleStackPanel Margin="10">
@ -1612,30 +1645,69 @@
<Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36" Height="36" MouseUp="TwoFingerGestureBorder_MouseUp" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" >
<Image x:Name="EnableTwoFingerGestureBtn" Source="/Resources/Icons-png/twoFingelMove.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="30"/>
<ui:SimpleStackPanel Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0">
<Image x:Name="EnableTwoFingerGestureBtn" Source="/Resources/new-icons/gesture.png" RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="18" Margin="0,3,0,0"/>
<TextBlock x:Name="gestureiconText" Text="手势" Foreground="Black" FontSize="8" Margin="0,0,0,0" TextAlignment="Center"/>
</ui:SimpleStackPanel>
</Border>
<Grid Width="0">
<Border Name="TwoFingerGestureBorder" Visibility="Visible" Margin="-105,-158,-67,44" CornerRadius="5" Background="white" Opacity="0.9" BorderBrush="Black" BorderThickness="1">
<ui:SimpleStackPanel Margin="10">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_people_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="多指书写" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Name="ToggleSwitchEnableMultiTouchMode" FontFamily="Microsoft YaHei UI" IsOn="False" OnContent="" OffContent="" Toggled="ToggleSwitchEnableMultiTouchMode_Toggled"/>
<Border Name="TwoFingerGestureBorder" Visibility="Visible" Margin="-86,-104,-38,40" CornerRadius="5" Background="white" Opacity="0.9" BorderBrush="Black" BorderThickness="1">
<ui:SimpleStackPanel Margin="5">
<ui:SimpleStackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_people_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="14" Width="14"/>
<Label Content="多指书写" FontSize="10" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Height="27" Margin="2,-5,0,0" Name="ToggleSwitchEnableMultiTouchMode" FontFamily="Microsoft YaHei UI" IsOn="False" OnContent="" OffContent="" Toggled="ToggleSwitchEnableMultiTouchMode_Toggled" RenderTransformOrigin="0.5,0.5">
<ui:ToggleSwitch.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="0.7" ScaleY="0.7"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform Y="1" X="4"/>
</TransformGroup>
</ui:ToggleSwitch.RenderTransform>
</ui:ToggleSwitch>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Opacity="1" x:Name="TwoFingerGestureSimpleStackPanel" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_drag_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="双指移动" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" OnContent="" OffContent="" Name="ToggleSwitchEnableTwoFingerTranslate" FontFamily="Microsoft YaHei UI" IsOn="False" Toggled="ToggleSwitchEnableTwoFingerTranslate_Toggled"/>
<ui:SimpleStackPanel Opacity="1" x:Name="TwoFingerGestureSimpleStackPanel" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_drag_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="14" Width="14"/>
<Label Content="双指移动" FontSize="10" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Height="27" Margin="2,-5,0,0" OnContent="" OffContent="" Name="ToggleSwitchEnableTwoFingerTranslate" FontFamily="Microsoft YaHei UI" IsOn="False" Toggled="ToggleSwitchEnableTwoFingerTranslate_Toggled" RenderTransformOrigin="0.5,0.5">
<ui:ToggleSwitch.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="0.7" ScaleY="0.7"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform Y="1" X="4"/>
</TransformGroup>
</ui:ToggleSwitch.RenderTransform>
</ui:ToggleSwitch>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_scale_fit_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="双指缩放" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" OnContent="" OffContent="" Name="ToggleSwitchEnableTwoFingerZoom" FontFamily="Microsoft YaHei UI" IsOn="False" Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled"/>
<ui:SimpleStackPanel Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_scale_fit_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="14" Width="14"/>
<Label Content="双指缩放" FontSize="10" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Height="27" Margin="2,-5,0,0" OnContent="" OffContent="" Name="ToggleSwitchEnableTwoFingerZoom" FontFamily="Microsoft YaHei UI" IsOn="False" Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled" RenderTransformOrigin="0.5,0.5">
<ui:ToggleSwitch.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="0.7" ScaleY="0.7"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform Y="1" X="4"/>
</TransformGroup>
</ui:ToggleSwitch.RenderTransform>
</ui:ToggleSwitch>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20"/>
<Label Content="双指旋转" FontSize="15" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" OnContent="" OffContent="" Name="ToggleSwitchEnableTwoFingerRotation" FontFamily="Microsoft YaHei UI" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>
<ui:SimpleStackPanel Opacity="{Binding ElementName=TwoFingerGestureSimpleStackPanel, Path=Opacity}" Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" HorizontalAlignment="Center">
<Image Source="/Resources/Icons-Fluent/ic_fluent_arrow_rotate_clockwise_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" Height="14" Width="14"/>
<Label Content="双指旋转" FontSize="10" VerticalAlignment="Center"/>
<ui:ToggleSwitch MinWidth="0" Width="42" Height="27" Margin="2,-5,0,0" OnContent="" OffContent="" Name="ToggleSwitchEnableTwoFingerRotation" FontFamily="Microsoft YaHei UI" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled" RenderTransformOrigin="0.5,0.5">
<ui:ToggleSwitch.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="0.7" ScaleY="0.7"/>
<SkewTransform/>
<RotateTransform/>
<TranslateTransform X="4" Y="1"/>
</TransformGroup>
</ui:ToggleSwitch.RenderTransform>
</ui:ToggleSwitch>
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</Border>

1
Ink Canvas/MainWindow.xaml.cs
View File

@ -203,5 +203,6 @@ namespace Ink_Canvas {
}
#endregion Definations and Loading
}
}

175
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
View File

@ -33,16 +33,16 @@ namespace Ink_Canvas {
private void CheckEnableTwoFingerGestureBtnColorPrompt() {
if (ToggleSwitchEnableMultiTouchMode.IsOn) {
TwoFingerGestureSimpleStackPanel.Opacity = 0.5;
EnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/Icons-png/twoFingelMove.png", UriKind.Relative));
BoardEnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/Icons-png/twoFingelMove.png", UriKind.Relative));
EnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/new-icons/gesture.png", UriKind.Relative));
BoardEnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/new-icons/gesture.png", UriKind.Relative));
} else {
TwoFingerGestureSimpleStackPanel.Opacity = 1;
if (Settings.Gesture.IsEnableTwoFingerGesture) {
EnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/Icons-png/twoFingelMove-Blue.png", UriKind.Relative));
BoardEnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/Icons-png/twoFingelMove-Blue.png", UriKind.Relative));
EnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/new-icons/gesture-enabled.png", UriKind.Relative));
BoardEnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/new-icons/gesture-enabled.png", UriKind.Relative));
} else {
EnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/Icons-png/twoFingelMove.png", UriKind.Relative));
BoardEnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/Icons-png/twoFingelMove.png", UriKind.Relative));
EnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/new-icons/gesture.png", UriKind.Relative));
BoardEnableTwoFingerGestureBtn.Source = new BitmapImage(new Uri("/Resources/new-icons/gesture.png", UriKind.Relative));
}
}
}
@ -148,20 +148,100 @@ namespace Ink_Canvas {
BoardSelect.Background = new SolidColorBrush(Colors.LightGray);
EraserByStrokes_Icon.Background = null;
BoardEraserByStrokes.Background = new SolidColorBrush(Colors.LightGray);
ImageSource cursorSolidIS = new BitmapImage(new Uri("/Resources/new-icons/cursor-solid.png", UriKind.Relative));
ImageSource penLinedIS = new BitmapImage(new Uri("/Resources/new-icons/pen-lined.png", UriKind.Relative));
ImageSource strokeEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/eraser-lined.png", UriKind.Relative));
ImageSource circleEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/circle-eraser-lined.png", UriKind.Relative));
ImageSource selectLinedIS = new BitmapImage(new Uri("/Resources/new-icons/lasso-select-lined.png", UriKind.Relative));
// 修改鼠标icon为solid
CursorToolbarIconImage.Source = cursorSolidIS;
// 修改批注icon为lined
PenIcon.Source = penLinedIS;
// 修改笔记擦icon为lined
StrokeEraserToolbarIconImage.Source = strokeEraserLinedIS;
// 修改擦icon为lined
CircleEraserToolbarIconImage.Source = circleEraserLinedIS;
// 修改select icon为lined
LassoSelect.Source = selectLinedIS;
}
if (mode == "pen" || mode == "color") {
BoardPen.Background = new SolidColorBrush(Color.FromRgb(103, 156, 244));
Pen_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 0.75 };
Pen_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 1 };
ImageSource cursorLinedIS = new BitmapImage(new Uri("/Resources/new-icons/cursor-lined.png", UriKind.Relative));
ImageSource penSolidIS = new BitmapImage(new Uri("/Resources/new-icons/pen-solid.png", UriKind.Relative));
ImageSource strokeEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/eraser-lined.png", UriKind.Relative));
ImageSource circleEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/circle-eraser-lined.png", UriKind.Relative));
ImageSource selectLinedIS = new BitmapImage(new Uri("/Resources/new-icons/lasso-select-lined.png", UriKind.Relative));
// 修改鼠标icon为lined
CursorToolbarIconImage.Source = cursorLinedIS;
// 修改批注icon为sollid
PenIcon.Source = penSolidIS;
// 修改笔记擦icon为lined
StrokeEraserToolbarIconImage.Source = strokeEraserLinedIS;
// 修改擦icon为lined
CircleEraserToolbarIconImage.Source = circleEraserLinedIS;
// 修改select icon为lined
LassoSelect.Source = selectLinedIS;
} else {
if (mode == "eraser") {
Eraser_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 0.75 };
Eraser_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 1 };
BoardEraser.Background = new SolidColorBrush(Color.FromRgb(103, 156, 244));
ImageSource cursorLinedIS = new BitmapImage(new Uri("/Resources/new-icons/cursor-lined.png", UriKind.Relative));
ImageSource strokeEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/eraser-lined.png", UriKind.Relative));
ImageSource penLinedIS = new BitmapImage(new Uri("/Resources/new-icons/pen-lined.png", UriKind.Relative));
ImageSource circleEraserSolidIS = new BitmapImage(new Uri("/Resources/new-icons/circle-eraser-solid.png", UriKind.Relative));
ImageSource selectLinedIS = new BitmapImage(new Uri("/Resources/new-icons/lasso-select-lined.png", UriKind.Relative));
// 修改鼠标icon为lined
CursorToolbarIconImage.Source = cursorLinedIS;
// 修改批注icon为lined
PenIcon.Source = penLinedIS;
// 修改笔记擦icon为lined
StrokeEraserToolbarIconImage.Source = strokeEraserLinedIS;
// 修改擦icon为solid
CircleEraserToolbarIconImage.Source = circleEraserSolidIS;
// 修改select icon为lined
LassoSelect.Source = selectLinedIS;
} else if (mode == "eraserByStrokes") {
EraserByStrokes_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 0.75 };
EraserByStrokes_Icon.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 1 };
BoardEraserByStrokes.Background = new SolidColorBrush(Color.FromRgb(103, 156, 244));
ImageSource cursorLinedIS = new BitmapImage(new Uri("/Resources/new-icons/cursor-lined.png", UriKind.Relative));
ImageSource strokeEraserSolidIS = new BitmapImage(new Uri("/Resources/new-icons/eraser-solid.png", UriKind.Relative));
ImageSource penLinedIS = new BitmapImage(new Uri("/Resources/new-icons/pen-lined.png", UriKind.Relative));
ImageSource circleEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/circle-eraser-lined.png", UriKind.Relative));
ImageSource selectLinedIS = new BitmapImage(new Uri("/Resources/new-icons/lasso-select-lined.png", UriKind.Relative));
// 修改鼠标icon为lined
CursorToolbarIconImage.Source = cursorLinedIS;
// 修改批注icon为lined
PenIcon.Source = penLinedIS;
// 修改笔记擦icon为solid
StrokeEraserToolbarIconImage.Source = strokeEraserSolidIS;
// 修改擦icon为lined
CircleEraserToolbarIconImage.Source = circleEraserLinedIS;
// 修改select icon为lined
LassoSelect.Source = selectLinedIS;
} else if (mode == "select") {
BoardSelect.Background = new SolidColorBrush(Color.FromRgb(103, 156, 244));
SymbolIconSelect.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 0.75 };
SymbolIconSelect.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Resources/Icons-png/check-box-background.png"))) { Opacity = 1 };
ImageSource cursorLinedIS = new BitmapImage(new Uri("/Resources/new-icons/cursor-lined.png", UriKind.Relative));
ImageSource penLinedIS = new BitmapImage(new Uri("/Resources/new-icons/pen-lined.png", UriKind.Relative));
ImageSource strokeEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/eraser-lined.png", UriKind.Relative));
ImageSource circleEraserLinedIS = new BitmapImage(new Uri("/Resources/new-icons/circle-eraser-lined.png", UriKind.Relative));
ImageSource selectSolidIS = new BitmapImage(new Uri("/Resources/new-icons/lasso-select-solid.png", UriKind.Relative));
// 修改鼠标icon为lined
CursorToolbarIconImage.Source = cursorLinedIS;
// 修改批注icon为lined
PenIcon.Source = penLinedIS;
// 修改笔记擦icon为lined
StrokeEraserToolbarIconImage.Source = strokeEraserLinedIS;
// 修改擦icon为lined
CircleEraserToolbarIconImage.Source = circleEraserLinedIS;
// 修改select icon为solid
LassoSelect.Source = selectSolidIS;
}
}
@ -359,7 +439,8 @@ namespace Ink_Canvas {
if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动启用多指书写
{
ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
// 2024.5.2 need to be tested
// if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
}
}
@ -1324,43 +1405,48 @@ namespace Ink_Canvas {
if (inkColor == 0) { // Black
inkCanvas.DefaultDrawingAttributes.Color = Colors.Black;
} else if (inkColor == 5) { // White
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFEFEFE");
inkCanvas.DefaultDrawingAttributes.Color = Colors.White;
} else if (isUselightThemeColor) {
if (inkColor == 1) { // Red
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFF3333");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(239,68,68);
} else if (inkColor == 2) { // Green
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF1ED760");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(34,197,94);
} else if (inkColor == 3) { // Blue
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF23C0D6");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(59,130,246);
} else if (inkColor == 4) { // Yellow
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFC000");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(250,204,21);
} else if (inkColor == 6) { // Pink
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF#c72ec7");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(236,72,153);
}
} else {
if (inkColor == 1) { // Red
inkCanvas.DefaultDrawingAttributes.Color = Colors.Red;
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(220,38,38);
} else if (inkColor == 2) { // Green
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF169141");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(22,163,74);
} else if (inkColor == 3) { // Blue
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF239AD6");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(37,99,235);
} else if (inkColor == 4) { // Yellow
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFF38B00");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(234,179,8);
} else if (inkColor == 6) { // Pink ( Purple )
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF331EB5");
inkCanvas.DefaultDrawingAttributes.Color = Color.FromRgb(147,51,234);
}
}
if (isUselightThemeColor) { // 亮系
BorderPenColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333"));
BorderPenColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760"));
BorderPenColorBlue.Background = new SolidColorBrush(StringToColor("#FF23C0D6"));
BorderPenColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000"));
BorderPenColorPink.Background = new SolidColorBrush(StringToColor("#FF#c72ec7"));
BoardBorderPenColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333"));
BoardBorderPenColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760"));
BoardBorderPenColorBlue.Background = new SolidColorBrush(StringToColor("#FF23C0D6"));
BoardBorderPenColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000"));
BoardBorderPenColorPink.Background = new SolidColorBrush(StringToColor("#FF#c72ec7"));
// 亮色的红色
BorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(239, 68, 68));
BoardBorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(239, 68, 68));
// 亮色的绿色
BorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(34, 197, 94));
BoardBorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(34, 197, 94));
// 亮色的蓝色
BorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(59, 130, 246));
BoardBorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(59, 130, 246));
// 亮色的黄色
BorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(250, 204, 21));
BoardBorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(250, 204, 21));
// 亮色的粉色
BorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(236, 72, 153));
BoardBorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(236, 72, 153));
BitmapImage newImageSource = new BitmapImage();
newImageSource.BeginInit();
@ -1372,16 +1458,21 @@ namespace Ink_Canvas {
ColorThemeSwitchTextBlock.Text = "暗系";
BoardColorThemeSwitchTextBlock.Text = "暗系";
} else { // 暗系
BorderPenColorRed.Background = new SolidColorBrush(Colors.Red);
BorderPenColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141"));
BorderPenColorBlue.Background = new SolidColorBrush(StringToColor("#FF239AD6"));
BorderPenColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00"));
BorderPenColorPink.Background = new SolidColorBrush(StringToColor("#FF331EB5"));
BoardBorderPenColorRed.Background = new SolidColorBrush(Colors.Red);
BoardBorderPenColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141"));
BoardBorderPenColorBlue.Background = new SolidColorBrush(StringToColor("#FF239AD6"));
BoardBorderPenColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00"));
BoardBorderPenColorPink.Background = new SolidColorBrush(StringToColor("#FF331EB5"));
// 暗色的红色
BorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(220, 38, 38));
BoardBorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(220, 38, 38));
// 暗色的绿色
BorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(22, 163, 74));
BoardBorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(22, 163, 74));
// 暗色的蓝色
BorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
BoardBorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
// 暗色的黄色
BorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(234, 179, 8));
BoardBorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(234, 179, 8));
// 暗色的紫色对应亮色的粉色
BorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(147, 51, 234));
BoardBorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(147, 51, 234));
BitmapImage newImageSource = new BitmapImage();
newImageSource.BeginInit();

12
Ink Canvas/Properties/AssemblyInfo.cs
View File

@ -5,12 +5,12 @@ using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Ink Canvas")]
[assembly: AssemblyTitle("Ink Canvas for Class")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("WXRIW")]
[assembly: AssemblyProduct("Ink Canvas")]
[assembly: AssemblyCopyright("Copyright © XY Wang 2023")]
[assembly: AssemblyCompany("Dubi906w")]
[assembly: AssemblyProduct("Ink Canvas for Class")]
[assembly: AssemblyCopyright("Copyright © HARKOTEK Studio 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -49,5 +49,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.5.6.0")]
[assembly: AssemblyFileVersion("4.5.6.0")]
[assembly: AssemblyVersion("4.5.8.0")]
[assembly: AssemblyFileVersion("4.5.8.0")]

BIN
Ink Canvas/Resources/DeveloperAvatars/dubi906w.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
Ink Canvas/Resources/Icons-png/check-box-background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 606 B

BIN
Ink Canvas/Resources/Icons-png/check-box-background1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Ink Canvas/Resources/Icons-png/check-box-background2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 680 B

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

@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="FloatBarBackground" Color="#9FFFFFFF" Opacity="0.6"/>
<SolidColorBrush x:Key="FloatBarBorderBrush" Color="Black" Opacity="0.6"/>
<SolidColorBrush x:Key="FloatBarForeground" Color="Black"/>
<Color x:Key="FloatBarForegroundColor">#FF666666</Color>
<SolidColorBrush x:Key="FloatBarBackground" Color="#fafafa" Opacity="0.95"/>
<SolidColorBrush x:Key="FloatBarBorderBrush" Color="#52525b" Opacity="0.6"/>
<SolidColorBrush x:Key="FloatBarForeground" Color="#18181b"/>
<Color x:Key="FloatBarForegroundColor">#18181b</Color>
</ResourceDictionary>

BIN
Ink Canvas/Resources/new-icons/blackboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Ink Canvas/Resources/new-icons/circle-eraser-lined.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Ink Canvas/Resources/new-icons/circle-eraser-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Ink Canvas/Resources/new-icons/cursor-clear.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Ink Canvas/Resources/new-icons/cursor-lined.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Ink Canvas/Resources/new-icons/cursor-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Ink Canvas/Resources/new-icons/eraser-lined.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Ink Canvas/Resources/new-icons/eraser-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Ink Canvas/Resources/new-icons/eye-off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Ink Canvas/Resources/new-icons/gesture-enabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
Ink Canvas/Resources/new-icons/gesture.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Ink Canvas/Resources/new-icons/grid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Ink Canvas/Resources/new-icons/lasso-select-lined.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Ink Canvas/Resources/new-icons/lasso-select-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Ink Canvas/Resources/new-icons/pen-lined.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Ink Canvas/Resources/new-icons/pen-solid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Ink Canvas/Resources/new-icons/shapes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Ink Canvas/Resources/new-icons/trash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB