From 2e2c33bcf2e31af289d186579b25bc10c463502d Mon Sep 17 00:00:00 2001 From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com> Date: Sat, 31 May 2025 21:13:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=94=B6=E7=BA=B3=E4=B8=8D=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.idea.Ink Canvas/.idea/indexLayout.xml | 4 +- Ink Canvas/MainWindow.xaml.cs | 5 ++ Ink Canvas/MainWindow_cs/MW_AutoFold.cs | 2 +- .../MainWindow_cs/MW_FloatingBarIcons.cs | 29 ++++---- Ink Canvas/obj/Debug/net472/App.g.cs | 2 +- Ink Canvas/obj/Debug/net472/App.g.i.cs | 2 +- .../net472/GeneratedInternalTypeHelper.g.cs | 62 +++++++++++++++++- ...vasForClass.csproj.AssemblyReference.cache | Bin 34776 -> 34836 bytes ...vasForClass.csproj.CoreCompileInputs.cache | 2 +- ...CanvasForClass.csproj.FileListAbsolute.txt | 57 ++++++++++++++++ ...nvasForClass.csproj.GenerateResource.cache | Bin 128 -> 128 bytes ...sForClass.csproj.ResolveComReference.cache | Bin 570 -> 570 bytes .../InkCanvasForClass_MarkupCompile.cache | 6 +- .../InkCanvasForClass_MarkupCompile.lref | 20 +++--- .../net472/Windows/CountdownTimerWindow.g.cs | 2 +- .../Windows/CountdownTimerWindow.g.i.cs | 2 +- .../Debug/net472/Windows/CycleProcessBar.g.cs | 2 +- .../net472/Windows/CycleProcessBar.g.i.cs | 2 +- .../net472/Windows/HasNewUpdateWindow.g.cs | 2 +- .../net472/Windows/HasNewUpdateWindow.g.i.cs | 2 +- .../net472/Windows/NamesInputWindow.g.cs | 2 +- .../net472/Windows/NamesInputWindow.g.i.cs | 2 +- .../net472/Windows/OperatingGuideWindow.g.cs | 2 +- .../Windows/OperatingGuideWindow.g.i.cs | 2 +- .../obj/Debug/net472/Windows/RandWindow.g.cs | 2 +- .../Debug/net472/Windows/RandWindow.g.i.cs | 2 +- .../Windows/YesOrNoNotificationWindow.g.cs | 2 +- .../Windows/YesOrNoNotificationWindow.g.i.cs | 2 +- 28 files changed, 173 insertions(+), 46 deletions(-) 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.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index f921ed2a..5873898f 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -199,6 +199,11 @@ namespace Ink_Canvas { } SystemEvents.DisplaySettingsChanged += SystemEventsOnDisplaySettingsChanged; + // 自动收纳到侧边栏 + if (Settings.Startup.IsFoldAtStartup) + { + FoldFloatingBar_MouseUp(null, null); + } } private void SystemEventsOnDisplaySettingsChanged(object sender, EventArgs e) { diff --git a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs index ee0c69df..58073662 100644 --- a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs +++ b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs @@ -54,7 +54,7 @@ namespace Ink_Canvas { // FloatingBarIcons_MouseUp_New(sender); if (sender == null) - foldFloatingBarByUser = false; + foldFloatingBarByUser = true; else foldFloatingBarByUser = true; unfoldFloatingBarByUser = false; diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index bcd4c143..257a7da2 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -29,7 +29,7 @@ namespace Ink_Canvas { #region “手勢”按鈕 /// - /// 用於浮動工具欄的“手勢”按鈕和白板工具欄的“手勢”按鈕的點擊事件 + /// 用於浮動工具欄的"手勢"按鈕和白板工具欄的"手勢"按鈕的點擊事件 /// private void TwoFingerGestureBorder_MouseUp(object sender, RoutedEventArgs e) { if (TwoFingerGestureBorder.Visibility == Visibility.Visible) { @@ -63,7 +63,7 @@ namespace Ink_Canvas { } /// - /// 用於更新浮動工具欄的“手勢”按鈕和白板工具欄的“手勢”按鈕的樣式(開啟和關閉狀態) + /// 用於更新浮動工具欄的"手勢"按鈕和白板工具欄的"手勢"按鈕的樣式(開啟和關閉狀態) /// private void CheckEnableTwoFingerGestureBtnColorPrompt() { if (ToggleSwitchEnableMultiTouchMode.IsOn) { @@ -111,7 +111,7 @@ namespace Ink_Canvas { } /// - /// 控制是否顯示浮動工具欄的“手勢”按鈕 + /// 控制是否顯示浮動工具欄的"手勢"按鈕 /// private void CheckEnableTwoFingerGestureBtnVisibility(bool isVisible) { if (StackPanelCanvasControls.Visibility != Visibility.Visible @@ -128,7 +128,7 @@ namespace Ink_Canvas { } } - #endregion “手勢”按鈕 + #endregion "手勢"按鈕 #region 浮動工具欄的拖動實現 @@ -217,22 +217,22 @@ namespace Ink_Canvas { /// /// /// - /// 隱藏浮動工具欄和白板模式下的“更多功能”面板 + /// 隱藏浮動工具欄和白板模式下的"更多功能"面板 /// /// /// 隱藏白板模式下和浮動工具欄的畫筆調色盤 /// /// - /// 隱藏白板模式下的“清屏”按鈕(已作廢) + /// 隱藏白板模式下的"清屏"按鈕(已作廢) /// /// /// 負責給Settings設置面板做隱藏動畫 /// /// - /// 隱藏白板模式下和浮動工具欄的“手勢”面板 + /// 隱藏白板模式下和浮動工具欄的"手勢"面板 /// /// - /// 當ToggleSwitchDrawShapeBorderAutoHide開啟時,會自動隱藏白板模式下和浮動工具欄的“形狀”面板 + /// 當ToggleSwitchDrawShapeBorderAutoHide開啟時,會自動隱藏白板模式下和浮動工具欄的"形狀"面板 /// /// /// 按需高亮指定的浮動工具欄和白板工具欄中的按鈕,通過param: 來指定 @@ -254,16 +254,16 @@ namespace Ink_Canvas { /// 當!="clear"時,會先取消高亮所有工具欄按鈕,然後根據下面的情況進行高亮處理 /// /// - /// 當=="color" || =="pen"時,會高亮浮動工具欄和白板工具欄中的“批註”,“筆”按鈕 + /// 當=="color" || =="pen"時,會高亮浮動工具欄和白板工具欄中的"批註","筆"按鈕 /// /// - /// 當=="eraser"時,會高亮白板工具欄中的“橡皮”和浮動工具欄中的“面積擦”按鈕 + /// 當=="eraser"時,會高亮白板工具欄中的"橡皮"和浮動工具欄中的"面積擦"按鈕 /// /// - /// 當=="eraserByStrokes"時,會高亮白板工具欄中的“橡皮”和浮動工具欄中的“墨跡擦”按鈕 + /// 當=="eraserByStrokes"時,會高亮白板工具欄中的"橡皮"和浮動工具欄中的"墨跡擦"按鈕 /// /// - /// 當=="select"時,會高亮浮動工具欄和白板工具欄中的“選擇”,“套索選”按鈕 + /// 當=="select"時,會高亮浮動工具欄和白板工具欄中的"選擇","套索選"按鈕 /// /// /// @@ -664,7 +664,7 @@ namespace Ink_Canvas { #region 主要的工具按鈕事件 /// - /// 浮動工具欄的“套索選”按鈕事件,重定向到舊UI的BtnSelect_Click方法 + /// 浮動工具欄的"套索選"按鈕事件,重定向到舊UI的BtnSelect_Click方法 /// /// sender /// MouseButtonEventArgs @@ -1891,5 +1891,8 @@ namespace Ink_Canvas { } #endregion + + + } } \ No newline at end of file diff --git a/Ink Canvas/obj/Debug/net472/App.g.cs b/Ink Canvas/obj/Debug/net472/App.g.cs index 9783c04c..26add40a 100644 --- a/Ink Canvas/obj/Debug/net472/App.g.cs +++ b/Ink Canvas/obj/Debug/net472/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1E327457A4903FFFEEF5296A4E0B282BD14654E1" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/App.g.i.cs b/Ink Canvas/obj/Debug/net472/App.g.i.cs index 9783c04c..26add40a 100644 --- a/Ink Canvas/obj/Debug/net472/App.g.i.cs +++ b/Ink Canvas/obj/Debug/net472/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1E327457A4903FFFEEF5296A4E0B282BD14654E1" +#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2F83C72861203F56E137DC704561E979347ABF79" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs b/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs index c65238fb..11dc262e 100644 --- a/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs +++ b/Ink Canvas/obj/Debug/net472/GeneratedInternalTypeHelper.g.cs @@ -1,2 +1,62 @@ - +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "9.0.5.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index 702ba8caef3f5617c0f5c391848f904e06c4d44e..08929b3f35b274e1d2fdc466f62191fb2a85fde8 100644 GIT binary patch delta 164 zcmcc7&opHM(}tBylNF*kCg;R+Oy*;=0JA?bIZZy`%`sV~nrE^zGf0eWvOo;$<|gL1 zj9>-DtlpFNr*llU;Bc6Hph*C#5u(VK?KwmdSkjwwvRx$4~M b#V2cVLfGj*+h8u(0u+PT#=iM0=i^!c@K`t) delta 140 zcmbO-f$2s+(}tBylN-c%CTp=-Om5&|nf#wwYO=VY*5t5izRCW~7Lymavu~cn{FV_c z+0N=c`GXM4WL-uHup&PNF0e+BqFlD;Kt*D#ll2(I!IBcD{F9kEEhcN2i-BpAAnD0b WKz=fl8`#D-K=uN6&dr8gk81&~BrNCv diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache index 24e6f6d6..0b79c94a 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dd3521e0580a824c786b5e414f7bde2cc7a0863577f79e73e0c08336bfbd95ae +3a4ab0ca76e23d54981c3a790f2a0df53f0b0f82e24f2059afcc59b96ea802d6 diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt index 96760d81..8b424544 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.FileListAbsolute.txt @@ -163,3 +163,60 @@ C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\obj\Debug\net472\I C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.CoreCompileInputs.cache C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe.config +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\InkCanvasForClass.exe +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\ICSharpCode.AvalonEdit.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Hardcodet.NotifyIcon.Wpf.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.Controls.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.Modern.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\iNKORE.UI.WPF.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\MdXaml.Plugins.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Microsoft.Office.Interop.PowerPoint.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Office.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\Newtonsoft.Json.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\NHotkey.Wpf.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\OSVersionExt.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\System.ValueTuple.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IACore.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IALoader.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\bin\Debug\net472\IAWinFX.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.AssemblyReference.cache +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Interop.IWshRuntimeLibrary.dll +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.ResolveComReference.cache +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\DrawShapeImageDictionary.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\IconImageDictionary.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\SeewoImageDictionary.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Dark.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Resources\Styles\Light.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\App.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.cache +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass_MarkupCompile.lref +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\App.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\MainWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CountdownTimerWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\CycleProcessBar.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\HasNewUpdateWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\NamesInputWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\OperatingGuideWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\RandWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Windows\YesOrNoNotificationWindow.baml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.g.resources +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\Ink_Canvas.Properties.Resources.resources +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.GenerateResource.cache +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.csproj.CoreCompileInputs.cache +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.sourcelink.json +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanva.0F57E7D5.Up2Date +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\obj\Debug\net472\InkCanvasForClass.exe +C:\Users\Administrator\Desktop\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 9b00ec1c0eabdb85648f13be33e24564ff5a5320..0b849715a357e25808b49d1ee610f2112be6ff1e 100644 GIT binary patch delta 22 bcmZo*Y+#&F$iM%h?xC0kcR3gt89)F4Tond& delta 22 bcmZo*Y+#&F$j{)kd)0L3yBv&+3?KjiP7eip diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.ResolveComReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.ResolveComReference.cache index 1f8dbcfc17b2e179c49a1e5b8c38e73fdb2a8d74..a95a750633f24869e400eabafc27b2cd07cadb45 100644 GIT binary patch delta 18 acmdnRvWsPdDI=Sg%`p+#1(U5A{{sLyZ3a{T delta 18 ZcmdnRvWsPdDI?p~d~MIF%*ob_{{cN52C@JE diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.cache index bab1175e..304ea39d 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 -C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\obj\Debug\net472\ +C:\Users\Administrator\Desktop\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 -C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\App.xaml +C:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml 13173459795 55-769182680 -461406129672 +461000360499 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 2cae1c57..e19bdbd2 100644 --- a/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.lref +++ b/Ink Canvas/obj/Debug/net472/InkCanvasForClass_MarkupCompile.lref @@ -1,11 +1,11 @@ -C:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\App.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\MainWindow.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\CountdownTimerWindow.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\CycleProcessBar.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\HasNewUpdateWindow.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\NamesInputWindow.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\OperatingGuideWindow.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\RandWindow.xaml;; -FC:\Users\Administrator\Desktop\ICC CE\ICC CE 1.2.3\Ink Canvas\Windows\YesOrNoNotificationWindow.xaml;; + +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\App.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\MainWindow.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\CountdownTimerWindow.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\CycleProcessBar.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\HasNewUpdateWindow.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\NamesInputWindow.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\OperatingGuideWindow.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\RandWindow.xaml;; +FC:\Users\Administrator\Desktop\ICC CE\ICC CE main\ICC-CE\Ink Canvas\Windows\YesOrNoNotificationWindow.xaml;; diff --git a/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs index 3e25a671..42f170a6 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/CountdownTimerWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6F0867438FA51D9A7933293AB63597EAB4BB202C" +#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 3e25a671..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6F0867438FA51D9A7933293AB63597EAB4BB202C" +#pragma checksum "..\..\..\..\Windows\CountdownTimerWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85F57BA392C75B7B6E1F2FA532105D03A2028A0E" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs b/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs index ac17dfda..baa94e2c 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/CycleProcessBar.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BA19DDDB9767BC7236A1FD27CF7870819D17BDF6" +#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 ac17dfda..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BA19DDDB9767BC7236A1FD27CF7870819D17BDF6" +#pragma checksum "..\..\..\..\Windows\CycleProcessBar.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D130C26D74445B5E09CDAA42FEF4734A6D257250" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs index 4b4af34a..9fd899fc 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/HasNewUpdateWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F175FD074CC52DB5BA92934B39B401618F102C52" +#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 4b4af34a..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F175FD074CC52DB5BA92934B39B401618F102C52" +#pragma checksum "..\..\..\..\Windows\HasNewUpdateWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "237DE391CCBF9084C9908BFD5D5B61E01AF3B610" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs index 677cb0e1..575906c1 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/NamesInputWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94598B72FAE3B046C627B4D990E7014E73354BFE" +#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 677cb0e1..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94598B72FAE3B046C627B4D990E7014E73354BFE" +#pragma checksum "..\..\..\..\Windows\NamesInputWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9FEEA82AF23EB1521F5089E2975D1B2389373FF8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs index 47806c61..d40d405c 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/OperatingGuideWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "064624323549B036812125DBE67746F73944DF2D" +#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 47806c61..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "064624323549B036812125DBE67746F73944DF2D" +#pragma checksum "..\..\..\..\Windows\OperatingGuideWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "66D9A0A5E55C9B504151A1C0723C930C97D705DA" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs index acf75820..910b71fb 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/RandWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FD9A73B991636613BD6C7B0522D40D93923F9AAC" +#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 acf75820..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FD9A73B991636613BD6C7B0522D40D93923F9AAC" +#pragma checksum "..\..\..\..\Windows\RandWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "438AC48A5442919DB1E24FC876DEC488281105D7" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs b/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs index 5d68c2a6..f4e89e9a 100644 --- a/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs +++ b/Ink Canvas/obj/Debug/net472/Windows/YesOrNoNotificationWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FDB33A27E5749FEDB5D64193EE52D5001933FAD" +#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 5d68c2a6..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,4 +1,4 @@ -#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FDB33A27E5749FEDB5D64193EE52D5001933FAD" +#pragma checksum "..\..\..\..\Windows\YesOrNoNotificationWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "40DC779A3AC6B5F7F1D1CDBB7E7D7EEFD90FE7BB" //------------------------------------------------------------------------------ // // 此代码由工具生成。