diff --git a/InkCanvasForClass/.gitignore b/InkCanvasForClass/.gitignore
index 8adf31f..c522015 100644
--- a/InkCanvasForClass/.gitignore
+++ b/InkCanvasForClass/.gitignore
@@ -1,2 +1,3 @@
/.vs
-/.idea
\ No newline at end of file
+/.idea
+custom-copyright-banner.png
\ No newline at end of file
diff --git a/InkCanvasForClass/App.xaml.cs b/InkCanvasForClass/App.xaml.cs
index af2a2a8..4871188 100644
--- a/InkCanvasForClass/App.xaml.cs
+++ b/InkCanvasForClass/App.xaml.cs
@@ -15,6 +15,7 @@ using Window = System.Windows.Window;
using System.Windows.Shell;
using Ookii.Dialogs.Wpf;
using System.Diagnostics;
+using Lierda.WPFHelper;
namespace Ink_Canvas
{
@@ -36,7 +37,7 @@ namespace Ink_Canvas
private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
{
- Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。", true);
+ Ink_Canvas.MainWindow.ShowNewMessage("抱歉，出现未预期的异常，可能导致 InkCanvasForClass 运行不稳定。\n建议保存墨迹后重启应用。");
LogHelper.NewLog(e.Exception.ToString());
e.Handled = true;
}
@@ -117,6 +118,9 @@ namespace Ink_Canvas
_taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
+ LierdaCracker cracker = new LierdaCracker();
+ cracker.Cracker();
+
StartArgs = e.Args;
}
diff --git a/InkCanvasForClass/FodyWeavers.xml b/InkCanvasForClass/FodyWeavers.xml
new file mode 100644
index 0000000..1bf26da
--- /dev/null
+++ b/InkCanvasForClass/FodyWeavers.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/InkCanvasForClass/FodyWeavers.xsd b/InkCanvasForClass/FodyWeavers.xsd
new file mode 100644
index 0000000..05e92c1
--- /dev/null
+++ b/InkCanvasForClass/FodyWeavers.xsd
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+ A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
+
+
+
+
+ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
+
+
+
+
+ A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
+
+
+
+
+ A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
+
+
+
+
+ A list of unmanaged 32 bit assembly names to include, delimited with line breaks.
+
+
+
+
+ A list of unmanaged 64 bit assembly names to include, delimited with line breaks.
+
+
+
+
+ The order of preloaded assemblies, delimited with line breaks.
+
+
+
+
+
+ This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.
+
+
+
+
+ Controls if .pdbs for reference assemblies are also embedded.
+
+
+
+
+ Controls if runtime assemblies are also embedded.
+
+
+
+
+ Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.
+
+
+
+
+ Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.
+
+
+
+
+ As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.
+
+
+
+
+ Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.
+
+
+
+
+ Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.
+
+
+
+
+ A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
+
+
+
+
+ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.
+
+
+
+
+ A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
+
+
+
+
+ A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.
+
+
+
+
+ A list of unmanaged 32 bit assembly names to include, delimited with |.
+
+
+
+
+ A list of unmanaged 64 bit assembly names to include, delimited with |.
+
+
+
+
+ The order of preloaded assemblies, delimited with |.
+
+
+
+
+
+
+
+ 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
+
+
+
+
+ A comma-separated list of error codes that can be safely ignored in assembly verification.
+
+
+
+
+ 'false' to turn off automatic generation of the XML Schema file.
+
+
+
+
+
\ No newline at end of file
diff --git a/InkCanvasForClass/Helpers/InkRecognizeHelper.cs b/InkCanvasForClass/Helpers/InkRecognizeHelper.cs
index af13de8..7d5ed2a 100644
--- a/InkCanvasForClass/Helpers/InkRecognizeHelper.cs
+++ b/InkCanvasForClass/Helpers/InkRecognizeHelper.cs
@@ -67,13 +67,6 @@ namespace Ink_Canvas.Helpers
//Recognizer 的实现
- public enum RecognizeLanguage
- {
- SimplifiedChinese = 0x0804,
- TraditionalChinese = 0x7c03,
- English = 0x0809
- }
-
public class ShapeRecognizeResult
{
public ShapeRecognizeResult(Point centroid, PointCollection hotPoints, AnalysisAlternate analysisAlternate, InkDrawingNode node)
diff --git a/InkCanvasForClass/InkCanvasForClass.csproj b/InkCanvasForClass/InkCanvasForClass.csproj
index dfbd0d9..ff222db 100644
--- a/InkCanvasForClass/InkCanvasForClass.csproj
+++ b/InkCanvasForClass/InkCanvasForClass.csproj
@@ -1,594 +1,590 @@
- win;win-x86;win-x64;win-arm64
- WinExe
- Ink_Canvas
- InkCanvasForClass
- net472
- {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- true
- false
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 2
- 2.0.2.%2a
- false
- false
- False
- true
- Debug;Release;x86 Debug
+ win;win-x86;win-x64;win-arm64
+ WinExe
+ Ink_Canvas
+ InkCanvasForClass
+ net472
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+ false
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 2
+ 2.0.2.%2a
+ false
+ false
+ False
+ true
+ Debug;Release;x86 Debug
- embedded
- bin\$(Configuration)\
- True
+ embedded
+ bin\$(Configuration)\
+ True
- embedded
- bin\$(Configuration)\
- True
+ embedded
+ bin\$(Configuration)\
+ True
- embedded
- bin\$(Configuration)\
- True
+ embedded
+ bin\$(Configuration)\
+ True
- Resources\icc.ico
+ Resources\icc.ico
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ full
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ full
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- pdbonly
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ pdbonly
+ 7.3
+ true
- app.manifest
- InkCanvasForClass
- 5.0.4
- Dubi906w
- InkCanvasForClass
- © Copyright HARKOTEK Studio 2024-now
- https://icc.bliemhax.com
- bundled
- False
- AnyCPU
+ app.manifest
+ InkCanvasForClass
+ 5.0.4
+ Dubi906w
+ InkCanvasForClass
+ © Copyright HARKOTEK Studio 2024-now
+ https://icc.bliemhax.com
+ bundled
+ False
+ AnyCPU
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ full
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ full
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- pdbonly
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ pdbonly
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ full
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- full
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ full
+ 7.3
+ true
- bin\$(Platform)\$(Configuration)\
- pdbonly
- 7.3
- true
+ bin\$(Platform)\$(Configuration)\
+ pdbonly
+ 7.3
+ true
-
- .\IACore.dll
-
-
- .\IALoader.dll
-
-
- .\IAWinFX.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}
- 1
- 0
- 0
- tlbimp
- False
- True
-
-
- {00020430-0000-0000-C000-000000000046}
- 2
- 0
- 0
- primary
- False
- True
-
-
- {0002E157-0000-0000-C000-000000000046}
- 5
- 3
- 0
- primary
- False
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ .\IACore.dll
+
+
+ .\IALoader.dll
+
+
+ .\IAWinFX.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}
+ 1
+ 0
+ 0
+ tlbimp
+ False
+ True
+
+
+ {00020430-0000-0000-C000-000000000046}
+ 2
+ 0
+ 0
+ primary
+ False
+ True
+
+
+ {0002E157-0000-0000-C000-000000000046}
+ 5
+ 3
+ 0
+ primary
+ False
+ True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
- True
- Settings.settings
-
-
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+ True
+ Settings.settings
+
+
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+ PreserveNewest
+
+
+
+
\ No newline at end of file
diff --git a/InkCanvasForClass/InkCanvasForClass.csproj.user b/InkCanvasForClass/InkCanvasForClass.csproj.user
index a01fe20..7bdca1a 100644
--- a/InkCanvasForClass/InkCanvasForClass.csproj.user
+++ b/InkCanvasForClass/InkCanvasForClass.csproj.user
@@ -8,6 +8,9 @@
ProjectDebugger
+
+ Code
+
Code
@@ -22,6 +25,9 @@
Designer
+
+ Designer
+
Designer
diff --git a/InkCanvasForClass/MainWindow.xaml b/InkCanvasForClass/MainWindow.xaml
index 4628ccd..a4eb1a6 100644
--- a/InkCanvasForClass/MainWindow.xaml
+++ b/InkCanvasForClass/MainWindow.xaml
@@ -118,7 +118,7 @@
-
+
@@ -130,7 +130,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3015,14 +2981,8 @@
-
-
-
-
-
+
+
+