删除无用using

Ink Canvas/App.xaml.cs

@@ -5,15 +5,12 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.Win32;
-using System.Security;  
+using System.Security;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows;
-using System.Windows.Threading;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using MessageBox = System.Windows.MessageBox;
-using Window = System.Windows.Window;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Net;

Ink Canvas/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.7")]
+[assembly: AssemblyVersion("1.7.1.8")]
-[assembly: AssemblyFileVersion("1.7.1.7")]
+[assembly: AssemblyFileVersion("1.7.1.8")]

Ink Canvas/Helpers/AdvancedBezierSmoothing.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
-using System.Windows.Media;
-using Point = System.Windows.Point;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/AutoUpdateHelper.cs

@@ -8,7 +8,6 @@ using System.Windows;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Controls;
-using System.IO.Compression;
 using System.Text;
 using System.Collections.Generic;
 using Newtonsoft.Json;

Ink Canvas/Helpers/AvoidFullScreenHelper.cs

@@ -2,7 +2,6 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
-using System.Windows.Forms;
 
 namespace Ink_Canvas.Helpers
 {

Ink Canvas/Helpers/DelAutoSavedFiles.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Windows;
 
 namespace Ink_Canvas.Helpers {
     internal class DelAutoSavedFiles {

Ink Canvas/Helpers/DelayActionHelper.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Timers;
 
 namespace Ink_Canvas.Helpers

Ink Canvas/Helpers/FullScreenHelper.Win32.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 // 由衷感謝 lindexi 提供的 《WPF 稳定的全屏化窗口方法》
 // 文章鏈接：https://blog.lindexi.com/post/WPF-%E7%A8%B3%E5%AE%9A%E7%9A%84%E5%85%A8%E5%B1%8F%E5%8C%96%E7%AA%97%E5%8F%A3%E6%96%B9%E6%B3%95.html

Ink Canvas/Helpers/IsOutsideOfScreenHelper.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Interop;
 using System.Windows;
 

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs

@@ -3,7 +3,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Shapes;
 using iNKORE.UI.WPF.Modern.Controls;
 
 namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher

Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Collections.Generic;
 
 namespace Ink_Canvas.Helpers.Plugins
 {

Ink Canvas/Helpers/Plugins/IPlugin.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows;
 using System.Windows.Controls;
 
 namespace Ink_Canvas.Helpers.Plugins

Ink Canvas/Helpers/StartupCount.cs

@@ -1,4 +1,3 @@
- using System;
 using System.IO;
 
 namespace Ink_Canvas.Helpers

Ink Canvas/Helpers/TimeMachine.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Windows.Ink;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows; // Added for UIElement
 
 namespace Ink_Canvas.Helpers

Ink Canvas/MainWindow.xaml.cs

@@ -1,7 +1,6 @@
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern;
 using System;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
@@ -12,15 +11,10 @@ using File = System.IO.File;
 using MessageBox = System.Windows.MessageBox;
 using System.Runtime.InteropServices;
 using System.Windows.Interop;
-using System.Windows.Controls.Primitives;
-using System.Drawing;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Win32;
 using System.Windows.Input;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media.Animation;
 using System.Reflection;
 using Brushes = System.Windows.Media.Brushes;
 using Point = System.Windows.Point;

Ink Canvas/MainWindow_cs/MW_AutoFold.cs

@@ -1,7 +1,6 @@
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -9,7 +8,6 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {

Ink Canvas/MainWindow_cs/MW_AutoStart.cs

@@ -1,6 +1,6 @@
-using IWshRuntimeLibrary;
+using System;
-using System;
 using System.Windows;
+using IWshRuntimeLibrary;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -1,16 +1,12 @@
 using Ink_Canvas.Helpers;
 using System;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Xml.Linq;
 using System.Windows.Controls;
 using Newtonsoft.Json;
 using System.Collections.Generic;

Ink Canvas/MainWindow_cs/MW_BoardIcons.cs

@@ -6,8 +6,6 @@ using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Controls.Primitives;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {

Ink Canvas/MainWindow_cs/MW_Colors.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Ink;

Ink Canvas/MainWindow_cs/MW_Eraser.cs

@@ -7,8 +7,6 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using Ink_Canvas.Helpers;
-using System.Windows.Shapes;
-using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {

Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs

@@ -15,13 +15,6 @@ using System.Threading;
 using Application = System.Windows.Application;
 using Point = System.Windows.Point;
 using System.Diagnostics;
-using iNKORE.UI.WPF.Modern.Controls;
-using System.IO;
-using System.Windows.Media.Effects;
-using static System.Net.Mime.MediaTypeNames;
-using System.Text;
-using System.Globalization;
-using System.Windows.Data;
 using System.Xml.Linq;
 using Image = System.Windows.Controls.Image;
 using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
@@ -1434,6 +1427,10 @@ namespace Ink_Canvas {
                     }
                 }
                 else {
+                    // 切换到批注模式时，确保保存当前图片信息
+                    if (currentMode != 0) {
+                        SaveStrokes();
+                    }
                     inkCanvas.EditingMode = InkCanvasEditingMode.Ink;
                     ColorSwitchCheck();
                     HideSubPanels("pen", true);
@@ -1455,9 +1452,14 @@ namespace Ink_Canvas {
             isLastTouchEraser = false;
             drawingShapeMode = 0;
 
+            // 切换到橡皮擦模式时，确保保存当前图片信息
+            if (!isAlreadyEraser && currentMode != 0) {
+                SaveStrokes();
+            }
+
             // 启用新的高级橡皮擦系统
             EnableAdvancedEraserSystem();
-            
+
             // 使用新的高级橡皮擦系统
             inkCanvas.EditingMode = InkCanvasEditingMode.EraseByPoint;
             ApplyAdvancedEraserShape(); // 使用新的橡皮擦形状应用方法

Ink Canvas/MainWindow_cs/MW_Icons.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Ink_Canvas {
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas {
     public static class XamlGraphicsIconGeometries {
         public static string LinedCursorIcon =
             "F1 M24,24z M0,0z M5.72106,15.9716L3.71327,3.00395C3.6389,2.6693 3.65747,2.41831 3.76902,2.25099 3.88057,2.08366 4.0479,2 4.271,2 4.4941,2 4.71711,2.07437 4.94021,2.2231 6.72502,3.39438 9.28149,5.10481 12.6094,7.3544 15.677,9.45526 18.1125,11.1285 19.9159,12.3742 20.1204,12.5229 20.2505,12.6995 20.3062,12.904 20.362,13.1085 20.3249,13.2944 20.1947,13.4618 20.0832,13.6105 19.8973,13.6849 19.637,13.6849L13.3902,13.6849 17.6291,19.7365C17.722,19.8666 17.75,20.0153 17.7128,20.1827 17.6942,20.3314 17.6198,20.4522 17.4897,20.5452L15.5654,21.8838C15.4353,21.9768 15.2865,22.0139 15.1192,21.9953 14.9704,21.9582 14.8496,21.8745 14.7566,21.7444L10.2389,15.2745 7.58956,19.9038C7.45942,20.1269 7.30144,20.2756 7.11552,20.35 6.92961,20.4058 6.75292,20.3872 6.5856,20.2942 6.43686,20.2013 6.34392,20.0339 6.30673,19.7922L6.00007,17.8959C5.88852,17.0779,5.79543,16.4364,5.72106,15.9716z";

Ink Canvas/MainWindow_cs/MW_PageListView.cs

@@ -1,17 +1,9 @@
-using System;
+using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Forms;
 using System.Windows.Ink;
 using System.Windows.Input;
-using System.Windows.Media;
 using Ink_Canvas.Helpers;
 
 namespace Ink_Canvas

Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs

@@ -1,15 +1,12 @@
 using Ink_Canvas.Helpers;
-using Microsoft.Win32;
 using System;
 using System.IO;
-using System.IO.Compression;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Input;
 using File = System.IO.File;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Forms;
 using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 using System.Collections.Generic;
 using System.Windows.Controls;

Ink Canvas/MainWindow_cs/MW_SelectionGestures.cs

@@ -3,11 +3,9 @@ using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using Point = System.Windows.Point;
 
 namespace Ink_Canvas {

Ink Canvas/MainWindow_cs/MW_Settings.cs

@@ -8,7 +8,6 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using File = System.IO.File;
 using System.Windows.Media;
-using System.Windows.Ink;
 using System.Windows.Media.Imaging;
 using System.Windows.Interop;
 using Hardcodet.Wpf.TaskbarNotification;

Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs

@@ -10,7 +10,6 @@ using System.Windows.Ink;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using File = System.IO.File;
 using OperatingSystem = OSVersionExtension.OperatingSystem;
 

Ink Canvas/MainWindow_cs/MW_TimeMachine.cs

@@ -7,7 +7,6 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Diagnostics;
-using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas {
     public partial class MainWindow : Window {

Ink Canvas/MainWindow_cs/MW_Timer.cs

@@ -5,7 +5,6 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Timers;
 using System.Windows;
-using MessageBox = System.Windows.MessageBox;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;

Ink Canvas/MainWindow_cs/MW_TrayIcon.cs

@@ -1,17 +1,10 @@
 using Ink_Canvas.Helpers;
 using iNKORE.UI.WPF.Modern.Controls;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Forms.VisualStyles;
 using System.Windows.Interop;
-using System.Windows.Media.Animation;
 using Hardcodet.Wpf.TaskbarNotification;
 
 namespace Ink_Canvas

Ink Canvas/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1.7")]
+[assembly: AssemblyVersion("1.7.1.8")]
-[assembly: AssemblyFileVersion("1.7.1.7")]
+[assembly: AssemblyFileVersion("1.7.1.8")]

Ink Canvas/Resources/ChickenSoup.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Ink_Canvas
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas
 {
     public static class ChickenSoup {
         public static string[] OSUPlayerYuLu = new string[] {

Ink Canvas/Windows/CountdownTimerWindow.xaml.cs

@@ -1,7 +1,6 @@
 using Ink_Canvas.Helpers;
 using System;
 using System.Media;
-using System.Runtime.InteropServices;
 using System.Timers;
 using System.Windows;
 using System.Windows.Input;

Ink Canvas/Windows/CustomIconWindow.xaml.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Controls;

Ink Canvas/Windows/HasNewUpdateWindow.xaml.cs

@@ -1,21 +1,12 @@
 using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace Ink_Canvas
 {

Ink Canvas/Windows/PluginSettingsWindow.xaml.cs

@@ -1,6 +1,4 @@
 using Ink_Canvas.Helpers.Plugins;
-using Ink_Canvas.Helpers.Plugins.BuiltIn;
-using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
 using Microsoft.Win32;
 using System;
 using System.Collections.ObjectModel;