From a1e12895ad69bb72227ec2181f69bb2202995b87 Mon Sep 17 00:00:00 2001 From: Raspberry Kan Date: Sun, 23 Apr 2023 15:15:45 +0800 Subject: [PATCH 1/4] Update Actions Dependencies --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35bfe56c..bf94e72a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,19 +13,19 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3.5.2 with: fetch-depth: 0 # 安装 .NET Core - name: Install .NET Core - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3.0.3 with: dotnet-version: '6.0.x' # 安装 NuGet - name: Setup NuGet - uses: nuget/setup-nuget@v1 + uses: NuGet/setup-nuget@v1.2.0 with: nuget-version: '5.x' @@ -35,7 +35,7 @@ jobs: # 添加 MSBuild.exe 到环境变量: https://github.com/microsoft/setup-msbuild - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.3.1 # 编译整个项目 - name: Build the solution From 3f083b1bcfe51558d660180a4a2b588e1ceef6f0 Mon Sep 17 00:00:00 2001 From: XY Wang Date: Sun, 23 Apr 2023 16:07:01 +0800 Subject: [PATCH 2/4] Slight changes on UI and made settings file compatible with previous version --- Ink Canvas/MainWindow.xaml | 37 +++++++++++++++++++------------------ Ink Canvas/Settings.cs | 5 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index dd87c3dd..510cd17a 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -465,14 +465,13 @@ - + - + - + - @@ -480,11 +479,11 @@ - + - - + + @@ -492,7 +491,7 @@ - + - - + + + @@ -562,7 +563,7 @@ 开发者: XY Wang (WXRIW) - + 贡献者: Kengwang, jiajiaxd, CN-Ironegg, Raspberry Kan diff --git a/Ink Canvas/Settings.cs b/Ink Canvas/Settings.cs index d0263694..d5236495 100644 --- a/Ink Canvas/Settings.cs +++ b/Ink Canvas/Settings.cs @@ -10,7 +10,7 @@ public class Settings public Appearance Appearance { get; set; } = new Appearance(); [JsonProperty("automation")] public Automation Automation { get; set; } = new Automation(); - [JsonProperty("powerpoint")] + [JsonProperty("behavior")] public PowerPointSettings PowerPointSettings { get; set; } = new PowerPointSettings(); [JsonProperty("canvas")] public Canvas Canvas { get; set; } = new Canvas(); @@ -76,7 +76,6 @@ public class Appearance } - public class PowerPointSettings { [JsonProperty("isShowPPTNavigation")] @@ -94,7 +93,7 @@ public class PowerPointSettings [JsonProperty("isAutoSaveScreenShotInPowerPoint")] public bool IsAutoSaveScreenShotInPowerPoint { get; set; } = false; [JsonProperty("isNotifyPreviousPage")] - public bool IsNotifyPreviousPage { get; set; } = true; + public bool IsNotifyPreviousPage { get; set; } = false; [JsonProperty("isNotifyHiddenPage")] public bool IsNotifyHiddenPage { get; set; } = true; [JsonProperty("isEnableTwoFingerGestureInPresentationMode")] From 0cb246f09c072713efbdba5f364c0bc30cd16fc1 Mon Sep 17 00:00:00 2001 From: XY Wang Date: Sun, 23 Apr 2023 16:10:47 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3fc531af..f9c06257 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
-[![LOGO](https://github.com/WXRIW/Ink-Canvas/blob/master/Ink%20Canvas/Resources/InkCanvas.png?raw=true "LOGO")](# "LOGO") +[![LOGO](Ink%20Canvas/Resources/InkCanvas.png?raw=true "LOGO")](# "LOGO") # Ink-Canvas @@ -46,7 +46,7 @@ A fantastic Ink Canvas in WPF/C#, with fantastic support for Seewo Boards. ## 感谢 感谢 [yuwenhui2020](https://github.com/yuwenhui2020) 为 `Ink Canvas 使用说明` 做出的贡献！ -感谢 [CN-Ironegg](https://github.com/CN-Ironegg)、 [jiajiaxd](https://github.com/jiajiaxd)、 [Kengwang](https://github.com/kengwang) 为本项目贡献代码！ +感谢 [CN-Ironegg](https://github.com/CN-Ironegg)、[jiajiaxd](https://github.com/jiajiaxd)、[Kengwang](https://github.com/kengwang)、[Raspberry Kan](https://github.com/Raspberry-Monster) 为本项目贡献代码！ ## License [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FWXRIW%2FInk-Canvas.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FWXRIW%2FInk-Canvas?ref=badge_large) From 37dc484a48fee85c8039f83208f47167d3e8f49b Mon Sep 17 00:00:00 2001 From: XY Wang Date: Sun, 23 Apr 2023 16:37:34 +0800 Subject: [PATCH 4/4] Add ARM64 compile ability --- Ink Canvas/Ink Canvas.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj index f7cb2c8f..474d14a5 100644 --- a/Ink Canvas/Ink Canvas.csproj +++ b/Ink Canvas/Ink Canvas.csproj @@ -2,6 +2,7 @@ + win;win-x86;win-x64;win-arm64 Debug AnyCPU {8D0EDFC7-F974-4571-BC49-6F3A6653FE81}