[v6] 为ICCX(v6)做准备

This commit is contained in:
Dubi906w 2024-06-15 14:46:07 +08:00
parent 0be11a9334
commit 06abccb9f7
5 changed files with 28 additions and 2 deletions

View File

@ -3,8 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Ink_Canvas" xmlns:local="clr-namespace:Ink_Canvas"
xmlns:tb="http://www.hardcodet.net/taskbar" xmlns:tb="http://www.hardcodet.net/taskbar"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
StartupUri="MainWindow.xaml">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<Style TargetType="ui:ScrollViewerEx"> <Style TargetType="ui:ScrollViewerEx">

View File

@ -35,6 +35,7 @@ namespace Ink_Canvas
} }
private TaskbarIcon _taskbar; private TaskbarIcon _taskbar;
private MainWindow mainWin = null;
void App_Startup(object sender, StartupEventArgs e) void App_Startup(object sender, StartupEventArgs e)
{ {
@ -53,6 +54,14 @@ namespace Ink_Canvas
Environment.Exit(0); Environment.Exit(0);
} }
if (e.Args.Contains("--v6")) //-v6 进入ICCXv6
{
MessageBox.Show("检测到进入ICCX");
} else {
mainWin = new MainWindow();
mainWin.Show();
}
_taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon"); _taskbar = (TaskbarIcon)FindResource("TaskbarTrayIcon");
StartArgs = e.Args; StartArgs = e.Args;

View File

@ -558,4 +558,7 @@
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="v6\" />
</ItemGroup>
</Project> </Project>

View File

@ -2,5 +2,9 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<_LastSelectedProfileId>D:\vs\ica\Ink Canvas\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId> <_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> </PropertyGroup>
</Project> </Project>

View File

@ -0,0 +1,11 @@
{
"profiles": {
"InkCanvasForClass": {
"commandName": "Project"
},
"ICC v6": {
"commandName": "Project",
"commandLineArgs": "--v6"
}
}
}