From cff5d795799b3cf0ea272fb48a1011e9d7d17e60 Mon Sep 17 00:00:00 2001 From: arcwolf1 <16623722+arcwolf1@user.noreply.gitee.com> Date: Wed, 1 Apr 2026 23:40:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E5=85=B3=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Actions/AdvancedShutdownAction.cs | 3 +- Properties/launchSettings.json | 4 +- Views/AdvancedShutdownDialog.axaml | 57 +++++++++++++-------------- Views/AdvancedShutdownDialog.axaml.cs | 3 +- Views/ExtendShutdownDialog.axaml | 9 +++-- Views/ExtendShutdownDialog.axaml.cs | 3 +- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/Actions/AdvancedShutdownAction.cs b/Actions/AdvancedShutdownAction.cs index 1a3efca..6b52c57 100644 --- a/Actions/AdvancedShutdownAction.cs +++ b/Actions/AdvancedShutdownAction.cs @@ -290,8 +290,7 @@ private async Task ShowStyledDialogAsync() var dialog = new AdvancedShutdownDialog { - CanResize = false, - SystemDecorations = SystemDecorations.Full + CanResize = false }; _activeDialog = dialog; diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json index 62679e7..0f8cbe2 100644 --- a/Properties/launchSettings.json +++ b/Properties/launchSettings.json @@ -2,9 +2,9 @@ "profiles": { "ClassIsland 插件": { "commandName": "Executable", - "executablePath": "F:\\ci\\Newest\\app-2.0.2.0-0\\ClassIsland.Desktop.exe", + "executablePath": "C:\\Users\\arcwolf\\source\\repos\\ClassIsland\\ClassIsland.Desktop\\bin\\Debug\\net8.0-windows10.0.19041.0\\ClassIsland.Desktop.exe", "commandLineArgs": "-epp $(TargetDir)", - "workingDirectory": "F:\\ci\\Newest\\" + "workingDirectory": "D:\\Users\\arcwolf\\Documents\\ci" } } } \ No newline at end of file diff --git a/Views/AdvancedShutdownDialog.axaml b/Views/AdvancedShutdownDialog.axaml index 55c7da0..40435f3 100644 --- a/Views/AdvancedShutdownDialog.axaml +++ b/Views/AdvancedShutdownDialog.axaml @@ -1,4 +1,4 @@ - + Title="高级计时关机" + ShowAsDialog="True"> - - - - - - - - + + - + + + + + - - - + - - + - - - - + + + - + diff --git a/Views/AdvancedShutdownDialog.axaml.cs b/Views/AdvancedShutdownDialog.axaml.cs index 26065fe..fc63f30 100644 --- a/Views/AdvancedShutdownDialog.axaml.cs +++ b/Views/AdvancedShutdownDialog.axaml.cs @@ -3,10 +3,11 @@ using Avalonia.Markup.Xaml; using System; using Avalonia.Threading; +using ClassIsland.Core.Controls; namespace SystemTools.Views; -public partial class AdvancedShutdownDialog : Window +public partial class AdvancedShutdownDialog : MyWindow { public AdvancedShutdownDialog() { diff --git a/Views/ExtendShutdownDialog.axaml b/Views/ExtendShutdownDialog.axaml index f70aefd..dafd77a 100644 --- a/Views/ExtendShutdownDialog.axaml +++ b/Views/ExtendShutdownDialog.axaml @@ -1,4 +1,4 @@ - + Title="延长关机时间" + ShowAsDialog="True"> - @@ -24,4 +25,4 @@ - + diff --git a/Views/ExtendShutdownDialog.axaml.cs b/Views/ExtendShutdownDialog.axaml.cs index 645df85..632ddb1 100644 --- a/Views/ExtendShutdownDialog.axaml.cs +++ b/Views/ExtendShutdownDialog.axaml.cs @@ -4,10 +4,11 @@ using Avalonia; using System; using Avalonia.Threading; +using ClassIsland.Core.Controls; namespace SystemTools.Views; -public partial class ExtendShutdownDialog : Window +public partial class ExtendShutdownDialog : MyWindow { public int? ResultMinutes { get; private set; }