update to latest

ChangSakura · Jul 17, 2024 · 06492b2 · 06492b2
1 parent a1d8be3
commit 06492b2
Show file tree

Hide file tree

Showing 45 changed files with 728 additions and 1,699 deletions.
diff --git a/AutomaticUpdateVersionControl.txt b/AutomaticUpdateVersionControl.txt
@@ -1 +1 @@
-4.9.2
+4.9.3
diff --git a/Ink Canvas/App.xaml b/Ink Canvas/App.xaml
@@ -20,10 +20,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources RequestedTheme="Light" />
                 <ui:XamlControlsResources />
-                <ResourceDictionary Source="Resources/SeewoImageDictionary.xaml" />
-                <ResourceDictionary Source="Resources/DrawShapeImageDictionary.xaml" />
-                <ResourceDictionary Source="Resources/BoardDrawShapeImageDictionary.xaml" />
-                <ResourceDictionary Source="Resources/IconImageDictionary.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Light.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Light-Board.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Light-PopupWindow.xaml" />

diff --git a/Ink Canvas/Helpers/AutoUpdateHelper.cs b/Ink Canvas/Helpers/AutoUpdateHelper.cs
@@ -19,7 +19,7 @@ public static async Task<string> CheckForUpdates(string proxy = null)
             {
                 string localVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString();
                 string remoteAddress = proxy;
-                remoteAddress += "https://raw.githubusercontent.com/ChangSakura/Ink-Canvas/master/AutomaticUpdateVersionControl.txt";
+                remoteAddress += "https://raw.githubusercontent.com/InkCanvas/Ink-Canvas-Artistry/master/AutomaticUpdateVersionControl.txt";
                 string remoteVersion = await GetRemoteVersion(remoteAddress);
 
                 if (remoteVersion != null)
@@ -85,7 +85,7 @@ public static async Task<bool> DownloadSetupFileAndSaveStatus(string version, st
                     return true;
                 }
 
-                string downloadUrl = $"{proxy}https://github.com/ChangSakura/Ink-Canvas/releases/download/v{version}/Ink.Canvas.Artistry.V{version}.Setup.exe";
+                string downloadUrl = $"{proxy}https://github.com/InkCanvas/Ink-Canvas-Artistry/releases/download/v{version}/Ink.Canvas.Artistry.V{version}.Setup.exe";
 
                 SaveDownloadStatus(false);
                 await DownloadFile(downloadUrl, $"{updatesFolderPath}\\Ink.Canvas.Artistry.V{version}.Setup.exe");

diff --git a/Ink Canvas/Helpers/Converters.cs b/Ink Canvas/Helpers/Converters.cs
diff --git a/Ink Canvas/Helpers/Hotkey.cs b/Ink Canvas/Helpers/Hotkey.cs
@@ -59,6 +59,7 @@ static IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bo
                 {
                     callback();
                 }
+                handled = true;
             }
             return IntPtr.Zero;
         }
@@ -77,7 +78,6 @@ public static void UnRegist(IntPtr hWnd, HotKeyCallBackHanlder callBack)
             }
         }
 
-
         const int WM_HOTKEY = 0x312;
         static int keyid = 10;
         static Dictionary<int, HotKeyCallBackHanlder> keymap = new Dictionary<int, HotKeyCallBackHanlder>();
@@ -92,5 +92,4 @@ enum HotkeyModifiers
         MOD_SHIFT = 0x4,
         MOD_WIN = 0x8
     }
-
 }
diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj
@@ -30,6 +30,7 @@
 		<Platforms>AnyCPU;x86;x64;ARM64</Platforms>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<PlatformTarget>AnyCPU</PlatformTarget>
+		<UserSecretsId>f49ced3b-26c5-4244-91af-88faafb1a4e5</UserSecretsId>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 	  <Prefer32Bit>True</Prefer32Bit>
@@ -144,12 +145,6 @@
 		<Resource Include="Resources\Icons-png\checked-white.png" />
 		<Resource Include="Resources\Icons-png\Desmos.png" />
 		<Resource Include="Resources\Icons-png\EasiCamera.png" />
-		<Resource Include="Resources\Icons-png\ic_fluent_arrow_clockwise_24_regular.png" />
-		<Resource Include="Resources\Icons-png\ic_fluent_calendar_sync_24_regular.png" />
-		<Resource Include="Resources\Icons-png\ic_fluent_clock_24_regular.png" />
-		<Resource Include="Resources\Icons-png\ic_fluent_control_button_24_regular.png" />
-		<Resource Include="Resources\Icons-png\ic_fluent_power_24_regular.png" />
-		<Resource Include="Resources\Icons-png\ic_fluent_scales_24_regular.png" />
 		<Resource Include="Resources\Icons-png\penUpright.png" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/Ink Canvas/Ink Canvas.csproj.user b/Ink Canvas/Ink Canvas.csproj.user
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <Page Update="Resources\Styles\Dark-PopupWindow.xaml">
       <SubType>Designer</SubType>