diff --git a/.idea/.idea.Ink Canvas/.idea/indexLayout.xml b/.idea/.idea.Ink Canvas/.idea/indexLayout.xml index 7b08163c..dd163eb2 100644 --- a/.idea/.idea.Ink Canvas/.idea/indexLayout.xml +++ b/.idea/.idea.Ink Canvas/.idea/indexLayout.xml @@ -1,7 +1,9 @@ - + + ../../ICC CE main + diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index 913955dd..95e5a495 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -1,4 +1,4 @@ -using Ink_Canvas.Helpers; +using Ink_Canvas.Helpers; using iNKORE.UI.WPF.Modern; using Microsoft.Office.Core; using Microsoft.Office.Interop.PowerPoint; @@ -29,11 +29,28 @@ namespace Ink_Canvas { private void BtnCheckPPT_Click(object sender, RoutedEventArgs e) { try { - pptApplication = - (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application"); - + // 优先尝试获取 WPS 实例 + if (Settings.PowerPointSettings.IsSupportWPS) { + try { + pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application"); + } + catch (COMException) { + pptApplication = null; + } + } + + // 如果 WPS 实例未获取到，尝试获取 PowerPoint 实例 + if (pptApplication == null) { + try { + pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application"); + } + catch (COMException) { + pptApplication = null; + } + } + if (pptApplication != null) { - //获得演示文稿对象 + // 获得演示文稿对象 presentation = pptApplication.ActivePresentation; pptApplication.SlideShowBegin += PptApplication_SlideShowBegin; pptApplication.SlideShowNextSlide += PptApplication_SlideShowNextSlide; @@ -81,138 +98,95 @@ namespace Ink_Canvas { public static bool IsShowingRestoreHiddenSlidesWindow = false; private static bool IsShowingAutoplaySlidesWindow = false; private bool isPowerPointInitialized = false; - - - private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) - { + private void TimerCheckPPT_Elapsed(object sender, ElapsedEventArgs e) { // 如果正在显示特定窗口，则跳过检查 if (IsShowingRestoreHiddenSlidesWindow || IsShowingAutoplaySlidesWindow) return; - try - { + try { // 检查是否已有初始化的 PowerPoint 实例 - if (!isPowerPointInitialized) - { - // 检查 WPS 进程（如果不支持则返回） - var wpsProcesses = Process.GetProcessesByName("wpp"); - if (wpsProcesses.Length > 0 && !isWPSSupportOn) - return; - - try - { - if (isWPSSupportOn && wpsProcesses.Length > 0) - { - // 优先获取WPS实例 - try - { - pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application"); - } - catch (COMException) - { - // WPS未启动或未注册 - pptApplication = null; - } + if (!isPowerPointInitialized) { + // 优先尝试获取 WPS 实例 + if (isWPSSupportOn) { + try { + pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("wpp.Application"); } - if (pptApplication == null) - { - // 获取PowerPoint实例 - try - { - pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application"); - } - catch (COMException) - { - pptApplication = null; - } + catch (COMException) { + pptApplication = null; } } - catch (Exception) - { - pptApplication = null; + + // 如果 WPS 实例未获取到，尝试获取 PowerPoint 实例 + if (pptApplication == null) { + try { + pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application"); + } + catch (COMException) { + pptApplication = null; + } } // 如果没有找到运行中的实例，则创建新实例 - if (pptApplication == null) - { - try - { - pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( - Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B"))); - } - catch - { - // 如果WPS支持开启，尝试创建WPS实例 - if (isWPSSupportOn) - { - try - { - pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( - Type.GetTypeFromProgID("wpp.Application")); - } - catch - { - pptApplication = null; - } + if (pptApplication == null) { + try { + if (isWPSSupportOn) { + pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( + Type.GetTypeFromProgID("wpp.Application")); } + else { + pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( + Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B"))); + } + } + catch (Exception) { + pptApplication = null; } } isPowerPointInitialized = true; return; } - + // 检查 PowerPoint 进程是否还在 var pptProcesses = Process.GetProcessesByName("POWERPNT"); var wpsProcessesCheck = Process.GetProcessesByName("wpp"); bool isWpsMode = isWPSSupportOn && wpsProcessesCheck.Length > 0; - if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0)) - { + if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0)) { // 进程已关闭，清理对象 - if (pptApplication != null) - { + if (pptApplication != null) { try { Marshal.ReleaseComObject(pptApplication); } catch { } pptApplication = null; } - if (presentation != null) - { + if (presentation != null) { try { Marshal.ReleaseComObject(presentation); } catch { } presentation = null; } - if (slides != null) - { + if (slides != null) { try { Marshal.ReleaseComObject(slides); } catch { } slides = null; } slide = null; isPowerPointInitialized = false; // 这里可以选择自动重启 PowerPoint 或 WPS 或等待用户操作 - try - { - if (isWpsMode) - { - // 自动重启WPS + try { + if (isWpsMode) { + // 自动重启 WPS Process.Start("wpp.exe"); - Thread.Sleep(2000); // 等待WPS启动 + Thread.Sleep(2000); // 等待 WPS 启动 pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( Type.GetTypeFromProgID("wpp.Application")); } - else - { + else { pptApplication = (Microsoft.Office.Interop.PowerPoint.Application)Activator.CreateInstance( Marshal.GetTypeFromCLSID(new Guid("91493441-5A91-11CF-8700-00AA0060263B"))); } isPowerPointInitialized = true; } - catch (Exception ex) - { + catch (Exception ex) { LogHelper.WriteLogToFile("PowerPoint/WPS 守护重启失败: " + ex.ToString(), LogHelper.LogType.Error); } return; } - - - if (pptApplication != null) { // 检查是否有活动演示文稿 @@ -220,7 +194,7 @@ namespace Ink_Canvas { return; // 退出方法，避免后续代码执行 isPowerPointInitialized = false; timerCheckPPT.Stop(); - //获得演示文稿对象 + // 获得演示文稿对象 presentation = pptApplication.ActivePresentation; // 获得幻灯片对象集合 @@ -258,25 +232,26 @@ namespace Ink_Canvas { BtnPPTSlideShow.Visibility = Visibility.Collapsed; BtnPPTSlideShowEnd.Visibility = Visibility.Visible; UpdatePPTBtnDisplaySettingsStatus(); - } else { + } + else { BtnPPTSlideShow.Visibility = Visibility.Visible; BtnPPTSlideShowEnd.Visibility = Visibility.Collapsed; } - } catch (Exception ex) { + } + catch (Exception ex) { LogHelper.WriteLogToFile("Failed to update button visibility: " + ex.ToString(), LogHelper.LogType.Error); } }); } if (pptApplication == null) return; - + // 此处是已经开启了 Application.Current.Dispatcher.Invoke(() => { PptApplication_PresentationOpen(null); }); - - //如果检测到已经开始放映，则立即进入画板模式 + // 如果检测到已经开始放映，则立即进入画板模式 if (pptApplication.SlideShowWindows.Count >= 1) { Application.Current.Dispatcher.Invoke(() => { PptApplication_SlideShowBegin(pptApplication.SlideShowWindows[1]); @@ -1048,36 +1023,47 @@ namespace Ink_Canvas { } } - private async void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) { - try { - Application.Current.Dispatcher.Invoke(() => { - try { - var ms = new MemoryStream(); - inkCanvas.Strokes.Save(ms); - ms.Position = 0; - memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms; - timeMachine.ClearStrokeHistory(); - } - catch (Exception ex) { - LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error); - } - }); - - new Thread(new ThreadStart(() => { - try { - pptApplication.SlideShowWindows[1].View.Exit(); - } - catch (Exception ex) { - LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error); - } - })).Start(); + private void BtnPPTSlideShowEnd_Click(object sender, RoutedEventArgs e) + { + try + { + // 检查 PowerPoint 进程是否还在运行 + var pptProcesses = Process.GetProcessesByName("POWERPNT"); + var wpsProcessesCheck = Process.GetProcessesByName("wpp"); + bool isWpsMode = Settings.PowerPointSettings.IsSupportWPS && wpsProcessesCheck.Length > 0; + if ((isWpsMode && wpsProcessesCheck.Length == 0) || (!isWpsMode && pptProcesses.Length == 0)) + { + LogHelper.WriteLogToFile("PowerPoint/WPS 进程已关闭，无法结束幻灯片放映", LogHelper.LogType.Error); + return; + } - HideSubPanels("cursor"); - await Task.Delay(150); - ViewboxFloatingBarMarginAnimation(100, true); + if (pptApplication != null && pptApplication.SlideShowWindows.Count >= 1) + { + var slideShowWindow = pptApplication.SlideShowWindows[1]; + var slideShowView = slideShowWindow.View; + + // 检查 SlideShowView 对象是否有效 + if (slideShowView != null) + { + try + { + // 尝试结束幻灯片放映 + slideShowView.Exit(); + } + catch (COMException ex) + { + LogHelper.WriteLogToFile($"结束幻灯片放映时发生 COM 异常: {ex.ToString()}", LogHelper.LogType.Error); + } + } + else + { + LogHelper.WriteLogToFile("SlideShowView 对象无效，无法结束幻灯片放映", LogHelper.LogType.Error); + } + } } - catch (Exception ex) { - LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error); + catch (Exception ex) + { + LogHelper.WriteLogToFile($"结束幻灯片放映时发生异常: {ex.ToString()}", LogHelper.LogType.Error); } } diff --git a/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs b/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs index 5980144b..9f18e8ec 100644 --- a/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs +++ b/Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs @@ -1,4 +1,4 @@ -using Ink_Canvas.Helpers; +using Ink_Canvas.Helpers; using Microsoft.Win32; using System; using System.IO; @@ -20,7 +20,7 @@ namespace Ink_Canvas { SaveInkCanvasStrokes(true, true); } - private void SaveInkCanvasStrokes(bool newNotice = true, bool saveByUser = false) { + private void SaveInkCanvasStrokes(Boolean newNotice, Boolean saveByUser) { try { var savePath = Settings.Automation.AutoSavedStrokesLocation + (saveByUser ? @"\User Saved - " : @"\Auto Saved - ") @@ -33,8 +33,36 @@ namespace Ink_Canvas { else //savePathWithName = savePath + @"\" + DateTime.Now.ToString("u").Replace(':', '-') + ".icstk"; savePathWithName = savePath + @"\" + DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss-fff") + ".icstk"; - var fs = new FileStream(savePathWithName, FileMode.Create); - inkCanvas.Strokes.Save(fs); + + try { + using (FileStream fs = new FileStream(savePathWithName, FileMode.Create)) { // 修复未定义的filePath引用 + inkCanvas.Strokes.Save(fs); + } + } + catch (Exception ex) when (ex is UnauthorizedAccessException || ex is DirectoryNotFoundException) { + var docPath = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), + "Auto Saved - Annotation Strokes", + DateTime.Now.ToString("yyyyMMdd"), + Path.GetFileNameWithoutExtension(savePathWithName) + "_retry.icstk"); // 使用正确的原始文件名 + + try { + Directory.CreateDirectory(Path.GetDirectoryName(docPath)); + using (FileStream fs = new FileStream(docPath, FileMode.Create)) { + inkCanvas.Strokes.Save(fs); + savePathWithName = docPath; // 更新通知使用的路径变量 + } + } + catch (Exception fallbackEx) { + ShowNotification($"墨迹保存失败: {fallbackEx.Message}"); + return; + } + } + catch (Exception ex) { + ShowNotification($"墨迹保存失败: {ex.Message}"); + return; + } + if (newNotice) ShowNotification("墨迹成功保存至 " + savePathWithName); } catch (Exception ex) { diff --git a/Ink Canvas/MainWindow_cs/MW_Screenshot.cs b/Ink Canvas/MainWindow_cs/MW_Screenshot.cs index d9896065..d891ad5e 100644 --- a/Ink Canvas/MainWindow_cs/MW_Screenshot.cs +++ b/Ink Canvas/MainWindow_cs/MW_Screenshot.cs @@ -1,6 +1,7 @@ -using System; +using System; using System.Drawing.Imaging; using System.IO; +using System.Runtime.InteropServices; using System.Windows; namespace Ink_Canvas { @@ -35,17 +36,49 @@ namespace Ink_Canvas { using (var memoryGraphics = System.Drawing.Graphics.FromImage(bitmap)) { memoryGraphics.CopyFromScreen(rc.X, rc.Y, 0, 0, rc.Size, System.Drawing.CopyPixelOperation.SourceCopy); - // 确保目录存在 var directory = Path.GetDirectoryName(savePath); if (!Directory.Exists(directory)) { Directory.CreateDirectory(directory); } - - bitmap.Save(savePath, ImageFormat.Png); + + try { + // 新增双重目录检查 + Directory.CreateDirectory(directory); // 防止多线程场景下的竞争条件 + bitmap.Save(savePath, ImageFormat.Png); + } + catch (Exception ex) when (ex is IOException || + ex is UnauthorizedAccessException || + ex is ExternalException) { // 新增GDI+异常捕获 + // 改进备用路径处理 + var docPath = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), + "Auto Saved - Screenshots", + DateTime.Now.ToString("yyyyMMdd"), + Path.GetFileNameWithoutExtension(savePath) + "_retry.png"); // 添加重试后缀 + + try { + var docDir = Path.GetDirectoryName(docPath); + Directory.CreateDirectory(docDir); + bitmap.Save(docPath, ImageFormat.Png); + savePath = docPath; + } + catch (Exception fallbackEx) { + // 最终错误处理 + if (!isHideNotification) { + ShowNotification($"截图保存失败: {fallbackEx.Message}"); + } + return; + } + } } if (!isHideNotification) { - ShowNotification($"截图成功保存至 {savePath}"); + try { + ShowNotification($"截图成功保存至 {savePath}"); + } + catch { + // 防止通知系统自身异常导致崩溃 + } } } @@ -57,20 +90,39 @@ namespace Ink_Canvas { var basePath = Settings.Automation.AutoSavedStrokesLocation; var dateFolder = DateTime.Now.ToString("yyyyMMdd"); - - return Path.Combine( + var fullPath = Path.Combine( basePath, "Auto Saved - Screenshots", - dateFolder, - $"{fileName}.png"); + dateFolder); + + try { + if (!Directory.Exists(fullPath)) { + Directory.CreateDirectory(fullPath); + } + } + catch (Exception) { + // 如果创建失败则使用文档目录 + basePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + fullPath = Path.Combine(basePath, "Auto Saved - Screenshots", dateFolder); + Directory.CreateDirectory(fullPath); + } + + return Path.Combine(fullPath, $"{fileName}.png"); } - // 获取默认文件夹路径 private string GetDefaultFolderPath() { var basePath = Settings.Automation.AutoSavedStrokesLocation; var screenshotsFolder = Path.Combine(basePath, "Auto Saved - Screenshots"); - - if (!Directory.Exists(screenshotsFolder)) { + + try { + if (!Directory.Exists(screenshotsFolder)) { + Directory.CreateDirectory(screenshotsFolder); + } + } + catch (Exception) { + // 如果创建失败则使用文档目录 + basePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); + screenshotsFolder = Path.Combine(basePath, "Auto Saved - Screenshots"); Directory.CreateDirectory(screenshotsFolder); } diff --git a/Ink Canvas/obj/Debug/net472/App.g.cs b/Ink Canvas/obj/Debug/net472/App.g.cs index dc4c3154..26add40a 100644 --- a/Ink Canvas/obj/Debug/net472/App.g.cs +++ b/Ink Canvas/obj/Debug/net472/App.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/App.g.i.cs b/Ink Canvas/obj/Debug/net472/App.g.i.cs index dc4c3154..26add40a 100644 --- a/Ink Canvas/obj/Debug/net472/App.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/App.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs b/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs index d4c30edf..11dc262e 100644 --- a/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs +++ b/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.i.cs b/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.i.cs index d4c30edf..11dc262e 100644 --- a/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.i.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig index 5fc8f8b8..2ed04ef5 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig @@ -1,6 +1,6 @@ is_global = true build_property.RootNamespace = Ink_Canvas -build_property.ProjectDir = D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\ +build_property.ProjectDir = E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.CsWinRTUseWindowsUIXamlProjections = false diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.assets.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.assets.cache index b8b8f1f7..f250a1e2 100644 Binary files a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.assets.cache and b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.assets.cache differ diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index bf6c48f8..ef098d71 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 b0b92eab..9d542157 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6bec4b6c35e0db47d20b56052b5c758a3faa3a06e85bf45a6282c814868af147 +cfae595a93b6c81be8a910a33f627301d3c3cf05ca24ac0f4e2d65c6094a6d68 diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt index 05ec580e..929347a8 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt @@ -334,3 +334,60 @@ D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClas 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 +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe.config +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\ICSharpCode.AvalonEdit.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Hardcodet.NotifyIcon.Wpf.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.Controls.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.Plugins.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Microsoft.Office.Interop.PowerPoint.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Office.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Newtonsoft.Json.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.Wpf.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\OSVersionExt.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\System.ValueTuple.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IACore.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IALoader.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IAWinFX.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.AssemblyReference.cache +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Interop.IWshRuntimeLibrary.dll +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.ResolveComReference.cache +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\DrawShapeImageDictionary.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\IconImageDictionary.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\SeewoImageDictionary.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Dark.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Light.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\App.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.cache +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.lref +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\App.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.baml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.g.resources +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Ink_Canvas.Properties.Resources.resources +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.GenerateResource.cache +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.CoreCompileInputs.cache +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.sourcelink.json +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe +E:\ICC CE\ICC CE main\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 6389abfc..a7f37137 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 2d530034..ce5fac1f 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 0548b80b..b704e98c 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 73dcebb9..b69e6a9a 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\obj\Debug\net472\ +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\ Ink_Canvas none false TRACE;DEBUG;NETFRAMEWORK;NET472;;NET30_OR_GREATER;NET35_OR_GREATER;NET40_OR_GREATER;NET45_OR_GREATER;NET451_OR_GREATER;NET452_OR_GREATER;NET46_OR_GREATER;NET461_OR_GREATER;NET462_OR_GREATER;NET47_OR_GREATER;NET471_OR_GREATER;NET472_OR_GREATER -D:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\App.xaml +E:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml 13173459795 56-1167124909 -46937853727 +461490143614 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; False diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.lref b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.lref index 04b70810..b4fba6bc 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.lref +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.lref @@ -1,11 +1,11 @@  -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\App.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\MainWindow.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\CountdownTimerWindow.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\CycleProcessBar.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\HasNewUpdateWindow.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\NamesInputWindow.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\OperatingGuideWindow.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\RandWindow.xaml;; -FD:\Hydrogen\Documents\GitHub\ICC-CE\Ink Canvas\Windows\YesOrNoNotificationWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\MainWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\CountdownTimerWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\CycleProcessBar.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\HasNewUpdateWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\NamesInputWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\OperatingGuideWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\RandWindow.xaml;; +FE:\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\YesOrNoNotificationWindow.xaml;; diff --git a/Ink Canvas/obj/Debug/net472/MainWindow.g.cs b/Ink Canvas/obj/Debug/net472/MainWindow.g.cs index c4d4f18c..7be1597e 100644 --- a/Ink Canvas/obj/Debug/net472/MainWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/MainWindow.g.cs @@ -1,11 +1,11 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7B34AAE1EC1DB9AB4585A1A4FEF656DB4C60F71" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A38C87817F8EDF2FE85AD10C301660AF08513462" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs index c4d4f18c..7be1597e 100644 --- a/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/MainWindow.g.i.cs @@ -1,11 +1,11 @@ -#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7B34AAE1EC1DB9AB4585A1A4FEF656DB4C60F71" +#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A38C87817F8EDF2FE85AD10C301660AF08513462" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs index ceb2346a..42f170a6 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.i.cs index ceb2346a..42f170a6 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs b/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs index f4500c52..baa94e2c 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.i.cs index f4500c52..baa94e2c 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs index 6ce93eac..9fd899fc 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.i.cs index 6ce93eac..9fd899fc 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs index b438689e..575906c1 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.i.cs index b438689e..575906c1 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs index ad30d59f..d40d405c 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.i.cs index ad30d59f..d40d405c 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs index c67c3830..910b71fb 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.i.cs index c67c3830..910b71fb 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs index a35e04e4..f4e89e9a 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.i.cs b/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.i.cs index a35e04e4..f4e89e9a 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.i.cs @@ -1,11 +1,11 @@ #pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB" //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ diff --git a/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.dgspec.json b/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.dgspec.json index d2c73031..8c462bf6 100644 --- a/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.dgspec.json +++ b/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": {} + "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": {} }, "projects": { - "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": { + "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj": { "version": "5.0.4", "restore": { - "projectUniqueName": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", + "projectUniqueName": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", "projectName": "InkCanvasForClass", - "projectPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", - "packagesPath": "C:\\Users\\Hydrogen\\.nuget\\packages\\", - "outputPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\obj\\", + "projectPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "E:\\Program Files\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "D:\\Hydrogen\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], diff --git a/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.g.props b/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.g.props index 214e1730..088b2082 100644 --- a/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.g.props +++ b/Ink Canvas/obj/InkCanvasForClass.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Hydrogen\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Administrator\.nuget\packages\;E:\Program Files\Microsoft Visual Studio\Shared\NuGetPackages PackageReference 6.13.2 - - + + \ No newline at end of file diff --git a/Ink Canvas/obj/project.assets.json b/Ink Canvas/obj/project.assets.json index f33974c3..7f509285 100644 --- a/Ink Canvas/obj/project.assets.json +++ b/Ink Canvas/obj/project.assets.json @@ -1119,23 +1119,23 @@ ] }, "packageFolders": { - "C:\\Users\\Hydrogen\\.nuget\\packages\\": {}, - "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "E:\\Program Files\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "5.0.4", "restore": { - "projectUniqueName": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", + "projectUniqueName": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", "projectName": "InkCanvasForClass", - "projectPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", - "packagesPath": "C:\\Users\\Hydrogen\\.nuget\\packages\\", - "outputPath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\obj\\", + "projectPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "E:\\Program Files\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "D:\\Hydrogen\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], diff --git a/Ink Canvas/obj/project.nuget.cache b/Ink Canvas/obj/project.nuget.cache index 683efb03..58128915 100644 --- a/Ink Canvas/obj/project.nuget.cache +++ b/Ink Canvas/obj/project.nuget.cache @@ -1,21 +1,21 @@ { "version": 2, - "dgSpecHash": "FF5F4tAvbvA=", + "dgSpecHash": "asCIyEp3RNM=", "success": true, - "projectFilePath": "D:\\Hydrogen\\Documents\\GitHub\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", + "projectFilePath": "E:\\ICC CE\\ICC CE main\\ICC-CE\\Ink Canvas\\InkCanvasForClass.csproj", "expectedPackageFiles": [ - "C:\\Users\\Hydrogen\\.nuget\\packages\\avalonedit\\6.3.0.90\\avalonedit.6.3.0.90.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\hardcodet.notifyicon.wpf\\1.1.0\\hardcodet.notifyicon.wpf.1.1.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\inkore.ui.wpf.modern\\0.9.27\\inkore.ui.wpf.modern.0.9.27.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\mdxaml\\1.27.0\\mdxaml.1.27.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\mdxaml.plugins\\1.27.0\\mdxaml.plugins.1.27.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\microsoft.office.interop.powerpoint\\15.0.4420.1018\\microsoft.office.interop.powerpoint.15.0.4420.1018.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\microsoftofficecore\\15.0.0\\microsoftofficecore.15.0.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\nhotkey\\3.0.0\\nhotkey.3.0.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\nhotkey.wpf\\3.0.0\\nhotkey.wpf.3.0.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\osversionext\\3.0.0\\osversionext.3.0.0.nupkg.sha512", - "C:\\Users\\Hydrogen\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\avalonedit\\6.3.0.90\\avalonedit.6.3.0.90.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\hardcodet.notifyicon.wpf\\1.1.0\\hardcodet.notifyicon.wpf.1.1.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\inkore.ui.wpf.modern\\0.9.27\\inkore.ui.wpf.modern.0.9.27.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mdxaml\\1.27.0\\mdxaml.1.27.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mdxaml.plugins\\1.27.0\\mdxaml.plugins.1.27.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.office.interop.powerpoint\\15.0.4420.1018\\microsoft.office.interop.powerpoint.15.0.4420.1018.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoftofficecore\\15.0.0\\microsoftofficecore.15.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\nhotkey\\3.0.0\\nhotkey.3.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\nhotkey.wpf\\3.0.0\\nhotkey.wpf.3.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\osversionext\\3.0.0\\osversionext.3.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file