diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 41b19366..41e2a364 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -1724,7 +1724,7 @@ - - 0) arg += " /IM \"智绘教.exe\""; + var processes = Process.GetProcessesByName("Inkeys"); + if (processes.Length > 0) arg += " /IM \"Inkeys.exe\""; } if (Settings.Automation.IsAutoKillSeewoLauncher2DesktopAnnotation) { @@ -162,9 +162,9 @@ namespace Ink_Canvas { }); } - if (arg.Contains("智绘教")) { + if (arg.Contains("Inkeys")) { Dispatcher.Invoke(() => { - ShowNotification("“智绘教”已自动关闭"); + ShowNotification("“智绘教Inkeys”已自动关闭"); }); } @@ -178,7 +178,7 @@ namespace Ink_Canvas { if (arg.Contains("DesktopAnnotation")) { Dispatcher.Invoke(() => { - ShowNotification("“DesktopAnnotation”已自动关闭"); + ShowNotification("“希沃桌面2.0 桌面批注”已自动关闭"); }); } } diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index aee633bb..bf6c48f8 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache index 9b7ce2fe..b0b92eab 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -621490517f28a1c123f212159cb484999ff22ac079960d4950ab91a40d3a79c8 +6bec4b6c35e0db47d20b56052b5c758a3faa3a06e85bf45a6282c814868af147 diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt index 192ad1f9..05ec580e 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt @@ -277,3 +277,60 @@ C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.4.1\Ink Canvas\obj\Debug\net472\I C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.4.1\Ink Canvas\obj\Debug\net472\InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.4.1\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.CoreCompileInputs.cache C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.4.1\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe.config +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\ICSharpCode.AvalonEdit.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\Hardcodet.NotifyIcon.Wpf.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.Controls.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.Plugins.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\Microsoft.Office.Interop.PowerPoint.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\Office.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\Newtonsoft.Json.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.Wpf.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\OSVersionExt.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\System.ValueTuple.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\IACore.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\IALoader.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\bin\Debug\net472\IAWinFX.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.AssemblyReference.cache +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Interop.IWshRuntimeLibrary.dll +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.ResolveComReference.cache +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\DrawShapeImageDictionary.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\IconImageDictionary.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\SeewoImageDictionary.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Dark.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Light.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\App.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.cache +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.lref +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\App.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.baml +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.g.resources +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\Ink_Canvas.Properties.Resources.resources +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.GenerateResource.cache +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.CoreCompileInputs.cache +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.sourcelink.json +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe +D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe.config diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.GenerateResource.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.GenerateResource.cache index 9b00ec1c..6389abfc 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.GenerateResource.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.GenerateResource.cache differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.ResolveComReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.ResolveComReference.cache index d8979118..2d530034 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.ResolveComReference.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.ResolveComReference.cache differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.g.resources b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.g.resources index 6e95ddf1..0548b80b 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.g.resources and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.g.resources differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache index 1e01d688..73dcebb9 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache @@ -13,8 +13,8 @@ D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\App.xaml 13173459795 56-1167124909 -45-222959523 +46937853727 MainWindow.xaml;Resources\DrawShapeImageDictionary.xaml;Resources\IconImageDictionary.xaml;Resources\SeewoImageDictionary.xaml;Resources\Styles\Dark.xaml;Resources\Styles\Light.xaml;Windows\CountdownTimerWindow.xaml;Windows\CycleProcessBar.xaml;Windows\HasNewUpdateWindow.xaml;Windows\NamesInputWindow.xaml;Windows\OperatingGuideWindow.xaml;Windows\RandWindow.xaml;Windows\YesOrNoNotificationWindow.xaml; -True +False diff --git a/Ink Canvas/obj/Debug/net472/MainWindow.g.cs b/Ink Canvas/obj/Debug/net472/MainWindow.g.cs index 621fe384..c4d4f18c 100644 --- a/Ink Canvas/obj/Debug/net472/MainWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "823BE77D8C58131B5D658401406AC1946F5ADB16" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7B34AAE1EC1DB9AB4585A1A4FEF656DB4C60F71" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs index 621fe384..c4d4f18c 100644 --- a/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "823BE77D8C58131B5D658401406AC1946F5ADB16" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7B34AAE1EC1DB9AB4585A1A4FEF656DB4C60F71" //------------------------------------------------------------------------------ // // This code was generated by a tool.