From bb6c6bab3b6c8b4477f4dae5e8b275597e607755 Mon Sep 17 00:00:00 2001 From: kriastans Date: Thu, 2 May 2024 15:49:23 +0800 Subject: [PATCH] =?UTF-8?q?[feature]=20=E5=BC=80=E4=B8=AA=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=8F=98=E6=88=90ICC=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/Ink Canvas.csproj | 49 +++- Ink Canvas/Ink Canvas.csproj.user | 14 + Ink Canvas/MainWindow.xaml | 260 +++++++++++------- Ink Canvas/MainWindow.xaml.cs | 1 + .../MainWindow_cs/MW_FloatingBarIcons.cs | 175 +++++++++--- Ink Canvas/Properties/AssemblyInfo.cs | 12 +- .../Resources/DeveloperAvatars/dubi906w.jpg | Bin 0 -> 30799 bytes .../Icons-png/check-box-background.png | Bin 1221 -> 606 bytes .../Icons-png/check-box-background1.png | Bin 0 -> 1221 bytes .../Icons-png/check-box-background2.png | Bin 0 -> 680 bytes Ink Canvas/Resources/Styles/Light.xaml | 8 +- Ink Canvas/Resources/new-icons/blackboard.png | Bin 0 -> 1185 bytes .../new-icons/circle-eraser-lined.png | Bin 0 -> 1693 bytes .../new-icons/circle-eraser-solid.png | Bin 0 -> 1551 bytes .../Resources/new-icons/cursor-clear.png | Bin 0 -> 1653 bytes .../Resources/new-icons/cursor-lined.png | Bin 0 -> 1935 bytes .../Resources/new-icons/cursor-solid.png | Bin 0 -> 1447 bytes .../Resources/new-icons/eraser-lined.png | Bin 0 -> 1475 bytes .../Resources/new-icons/eraser-solid.png | Bin 0 -> 1284 bytes Ink Canvas/Resources/new-icons/eye-off.png | Bin 0 -> 2223 bytes .../Resources/new-icons/gesture-enabled.png | Bin 0 -> 2058 bytes Ink Canvas/Resources/new-icons/gesture.png | Bin 0 -> 1968 bytes Ink Canvas/Resources/new-icons/grid.png | Bin 0 -> 1496 bytes .../new-icons/lasso-select-lined.png | Bin 0 -> 2435 bytes .../new-icons/lasso-select-solid.png | Bin 0 -> 2221 bytes Ink Canvas/Resources/new-icons/pen-lined.png | Bin 0 -> 1314 bytes Ink Canvas/Resources/new-icons/pen-solid.png | Bin 0 -> 1118 bytes Ink Canvas/Resources/new-icons/shapes.png | Bin 0 -> 1461 bytes Ink Canvas/Resources/new-icons/trash.png | Bin 0 -> 1401 bytes 29 files changed, 372 insertions(+), 147 deletions(-) create mode 100644 Ink Canvas/Ink Canvas.csproj.user create mode 100644 Ink Canvas/Resources/DeveloperAvatars/dubi906w.jpg create mode 100644 Ink Canvas/Resources/Icons-png/check-box-background1.png create mode 100644 Ink Canvas/Resources/Icons-png/check-box-background2.png create mode 100644 Ink Canvas/Resources/new-icons/blackboard.png create mode 100644 Ink Canvas/Resources/new-icons/circle-eraser-lined.png create mode 100644 Ink Canvas/Resources/new-icons/circle-eraser-solid.png create mode 100644 Ink Canvas/Resources/new-icons/cursor-clear.png create mode 100644 Ink Canvas/Resources/new-icons/cursor-lined.png create mode 100644 Ink Canvas/Resources/new-icons/cursor-solid.png create mode 100644 Ink Canvas/Resources/new-icons/eraser-lined.png create mode 100644 Ink Canvas/Resources/new-icons/eraser-solid.png create mode 100644 Ink Canvas/Resources/new-icons/eye-off.png create mode 100644 Ink Canvas/Resources/new-icons/gesture-enabled.png create mode 100644 Ink Canvas/Resources/new-icons/gesture.png create mode 100644 Ink Canvas/Resources/new-icons/grid.png create mode 100644 Ink Canvas/Resources/new-icons/lasso-select-lined.png create mode 100644 Ink Canvas/Resources/new-icons/lasso-select-solid.png create mode 100644 Ink Canvas/Resources/new-icons/pen-lined.png create mode 100644 Ink Canvas/Resources/new-icons/pen-solid.png create mode 100644 Ink Canvas/Resources/new-icons/shapes.png create mode 100644 Ink Canvas/Resources/new-icons/trash.png diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj index 805edf1..fc0ddb9 100644 --- a/Ink Canvas/Ink Canvas.csproj +++ b/Ink Canvas/Ink Canvas.csproj @@ -377,7 +377,7 @@ False - Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + Microsoft .NET Framework 4.7.2 %28x86 和 x64%29 true @@ -515,5 +515,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Ink Canvas/Ink Canvas.csproj.user b/Ink Canvas/Ink Canvas.csproj.user new file mode 100644 index 0000000..cebb4cf --- /dev/null +++ b/Ink Canvas/Ink Canvas.csproj.user @@ -0,0 +1,14 @@ + + + + ProjectFiles + publish\ + + + + + + zh-CN + false + + \ No newline at end of file diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index c79dd61..9e4c6b3 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -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 @@ + - 本项目仓库源: + ICC仓库源: - + - + + + + + + + + + + + + ICA仓库源: + + + + + + @@ -1044,13 +1062,13 @@ - 原项目仓库源: + IC仓库源: - + @@ -1059,7 +1077,7 @@ - + @@ -1137,7 +1155,7 @@ - + @@ -1345,8 +1363,8 @@ - + @@ -1358,38 +1376,39 @@ - + - - + Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2"> + + - - + Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2"> + + - + Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2"> + + - + - - + + - @@ -1398,7 +1417,7 @@ - @@ -1407,60 +1426,61 @@ - - + - - - - - - - - + + + + + + + + - + - + - + + + + + + - - - - - - - - + + + + - + - + @@ -1476,22 +1496,26 @@ - - + + + - - + + + - - + + + - - + + + + CornerRadius="5" Margin="-112,-262,-88,22" Height="240"> @@ -1557,29 +1581,38 @@ - - + + + - - + + + - + Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center" Width="28" Margin="0,-2"> + + - - + + - - + + + - - + + + + + + + - + @@ -1612,30 +1645,69 @@ - + + + + - - - - -