From ccca4afc534ffddacf294fa3226737f1fbc358cb Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:34:02 +0800
Subject: [PATCH] =?UTF-8?q?rft:=20WpfGui=E9=87=8D=E6=9E=84=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=8B=86=E5=88=86`=E8=AE=BE=E7=BD=AE-=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E`=20(#11330)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Views/UI/SettingsView.xaml              |  2 +-
 .../UserControl/{ => Settings}/AboutUserControl.xaml  | 11 ++++-------
 .../{ => Settings}/AboutUserControl.xaml.cs           |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename src/MaaWpfGui/Views/UserControl/{ => Settings}/AboutUserControl.xaml (94%)
 rename src/MaaWpfGui/Views/UserControl/{ => Settings}/AboutUserControl.xaml.cs (95%)

diff --git a/src/MaaWpfGui/Views/UI/SettingsView.xaml b/src/MaaWpfGui/Views/UI/SettingsView.xaml
index 8060ad9d25..0c5e7155ad 100644
--- a/src/MaaWpfGui/Views/UI/SettingsView.xaml
+++ b/src/MaaWpfGui/Views/UI/SettingsView.xaml
@@ -108,7 +108,7 @@
                     DataContext="{Binding VersionUpdateSettings}" />
 
                 <hc:Divider Content="{Binding ListTitle[11]}" />
-                <userControl:AboutUserControl Margin="0,20" HorizontalAlignment="Center" />
+                <settingsViews:AboutUserControl Margin="0,20" HorizontalAlignment="Center" />
                 <!--<Rectangle HorizontalAlignment="Stretch" Fill="{DynamicResource BorderBrush}" Height="1" />-->
             </StackPanel>
         </hc:ScrollViewer>
diff --git a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/AboutUserControl.xaml
similarity index 94%
rename from src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
rename to src/MaaWpfGui/Views/UserControl/Settings/AboutUserControl.xaml
index 95753f3a03..e0a585b577 100644
--- a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/AboutUserControl.xaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="MaaWpfGui.Views.UserControl.AboutUserControl"
+    x:Class="MaaWpfGui.Views.UserControl.Settings.AboutUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:constants="clr-namespace:MaaWpfGui.Constants"
@@ -7,13 +7,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dd="urn:gong-wpf-dragdrop"
     xmlns:helper="clr-namespace:MaaWpfGui.Helper"
-    xmlns:local="clr-namespace:MaaWpfGui"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
-    xmlns:styles="clr-namespace:MaaWpfGui.Styles"
     xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
-    xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels"
-    xmlns:vm="clr-namespace:MaaWpfGui"
+    d:Background="White"
     d:DataContext="{d:DesignInstance {x:Type ui:SettingsViewModel}}"
     d:DesignWidth="550"
     mc:Ignorable="d">
@@ -113,10 +110,10 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <Hyperlink
+                    Command="{s:Action SetAcknowledgedNightlyWarning}"
                     Cursor="Hand"
                     NavigateUri="{Binding Source={x:Static constants:MaaUrls.GitHubIssues}}"
-                    TextDecorations="None"
-                    Command="{s:Action SetAcknowledgedNightlyWarning}">
+                    TextDecorations="None">
                     <TextBlock Text="{DynamicResource Issue}" />
                 </Hyperlink>
             </controls:TextBlock>
diff --git a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/Settings/AboutUserControl.xaml.cs
similarity index 95%
rename from src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs
rename to src/MaaWpfGui/Views/UserControl/Settings/AboutUserControl.xaml.cs
index 05cfea1efa..cdc33373f9 100644
--- a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml.cs
+++ b/src/MaaWpfGui/Views/UserControl/Settings/AboutUserControl.xaml.cs
@@ -11,7 +11,7 @@
 // but WITHOUT ANY WARRANTY
 // </copyright>
 
-namespace MaaWpfGui.Views.UserControl
+namespace MaaWpfGui.Views.UserControl.Settings
 {
     /// <summary>
     /// AboutUserControl.xaml 的交互逻辑