From 06abccb9f70c62cf488525c675f9e8ff302e5cdc Mon Sep 17 00:00:00 2001
From: kriastans <kriastans@protonmail.com>
Date: Sat, 15 Jun 2024 14:46:07 +0800
Subject: [PATCH] =?UTF-8?q?[v6]=20=E4=B8=BAICCX=EF=BC=88v6=EF=BC=89?=
 =?UTF-8?q?=E5=81=9A=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/App.xaml                       |  3 +--
 Ink Canvas/App.xaml.cs                    |  9 +++++++++
 Ink Canvas/InkCanvasForClass.csproj       |  3 +++
 Ink Canvas/InkCanvasForClass.csproj.user  |  4 ++++
 Ink Canvas/Properties/launchSettings.json | 11 +++++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 Ink Canvas/Properties/launchSettings.json

diff --git a/Ink Canvas/App.xaml b/Ink Canvas/App.xaml
index 6575dac..f9d1e67 100644
--- a/Ink Canvas/App.xaml	
+++ b/Ink Canvas/App.xaml	
@@ -3,8 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Ink_Canvas"
              xmlns:tb="http://www.hardcodet.net/taskbar"
-             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
-             StartupUri="MainWindow.xaml">
+             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <Application.Resources>
         <ResourceDictionary>
             <Style TargetType="ui:ScrollViewerEx">
diff --git a/Ink Canvas/App.xaml.cs b/Ink Canvas/App.xaml.cs
index c1fd08c..a9dc9c6 100644
--- a/Ink Canvas/App.xaml.cs	
+++ b/Ink Canvas/App.xaml.cs	
@@ -35,6 +35,7 @@ namespace Ink_Canvas
         }
 
         private TaskbarIcon _taskbar;
+        private MainWindow mainWin = null;
 
         void App_Startup(object sender, StartupEventArgs e)
         {
@@ -53,6 +54,14 @@ namespace Ink_Canvas
                 Environment.Exit(0);
             }
 
+            if (e.Args.Contains("--v6")) //-v6 进入ICCX（v6）
+            {
+                MessageBox.Show("检测到进入ICCX");
+            } else {
+                mainWin = new MainWindow();
+                mainWin.Show();
+            }
+
             _taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
 
             StartArgs = e.Args;
diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj
index fdd3406..fd8d650 100644
--- a/Ink Canvas/InkCanvasForClass.csproj	
+++ b/Ink Canvas/InkCanvasForClass.csproj	
@@ -558,4 +558,7 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="v6\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Ink Canvas/InkCanvasForClass.csproj.user b/Ink Canvas/InkCanvasForClass.csproj.user
index 92ed6d1..2d90d47 100644
--- a/Ink Canvas/InkCanvasForClass.csproj.user	
+++ b/Ink Canvas/InkCanvasForClass.csproj.user	
@@ -2,5 +2,9 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_LastSelectedProfileId>D:\vs\ica\Ink Canvas\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <ActiveDebugProfile>InkCanvasForClass</ActiveDebugProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Ink Canvas/Properties/launchSettings.json b/Ink Canvas/Properties/launchSettings.json
new file mode 100644
index 0000000..b6425a9
--- /dev/null
+++ b/Ink Canvas/Properties/launchSettings.json	
@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "InkCanvasForClass": {
+      "commandName": "Project"
+    },
+    "ICC v6": {
+      "commandName": "Project",
+      "commandLineArgs": "--v6"
+    }
+  }
+}
\ No newline at end of file