From 2660c6331125688c2c58287e18bc8ea72cdeb30c Mon Sep 17 00:00:00 2001
From: Space Time <Zeus6_6@163.com>
Date: Fri, 13 Dec 2024 23:59:11 +0800
Subject: [PATCH] =?UTF-8?q?1.1.3=20->=201.1.4=20=E7=AC=AC57=E6=AC=A1?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Convs/MainUpdateHostButtonContentConv.cs | 18 +++++++++++
 Wins/MainWin.xaml                        |  9 +++++-
 Wins/MainWin.xaml.cs                     | 39 +++++++++++++-----------
 3 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 Convs/MainUpdateHostButtonContentConv.cs

diff --git a/Convs/MainUpdateHostButtonContentConv.cs b/Convs/MainUpdateHostButtonContentConv.cs
new file mode 100644
index 0000000..c5dfa26
--- /dev/null
+++ b/Convs/MainUpdateHostButtonContentConv.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using Sheas_Cealer.Consts;
+
+namespace Sheas_Cealer.Convs;
+
+internal class MainUpdateHostButtonContentConv : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        bool isUpstreamHostUtd = (bool)value;
+
+        return isUpstreamHostUtd ? MainConst.UpdateUpstreamHostButtonContent : $"{MainConst.UpdateUpstreamHostButtonContent} *";
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
+}
\ No newline at end of file
diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml
index 201dbb3..0a6f706 100644
--- a/Wins/MainWin.xaml
+++ b/Wins/MainWin.xaml
@@ -283,7 +283,7 @@
                 </ColumnDefinition>
             </Grid.ColumnDefinitions>
 
-            <Button Grid.Column="0" Margin="5" Content="{Binding Source={x:Static consts:MainConst.UpdateUpstreamHostButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.UpdateUpstreamHostButtonToolTip}}"
+            <Button Grid.Column="0" Margin="5" d:Content="# # # # # #" ToolTip="{Binding Source={x:Static consts:MainConst.UpdateUpstreamHostButtonToolTip}}"
                     Click="UpdateUpstreamHostButton_Click">
                 <Button.IsEnabled>
                     <Binding Path="UpstreamUrl">
@@ -292,6 +292,13 @@
                         </Binding.Converter>
                     </Binding>
                 </Button.IsEnabled>
+                <Button.Content>
+                    <Binding Path="IsUpstreamHostUtd">
+                        <Binding.Converter>
+                            <convs:MainUpdateHostButtonContentConv />
+                        </Binding.Converter>
+                    </Binding>
+                </Button.Content>
             </Button>
             <Button x:Name="EditHostsConfButton"
                     Grid.Column="1" Margin="5" Content="{Binding Source={x:Static consts:MainConst.EditHostsConfButtonContent}}" ToolTip="{Binding Source={x:Static consts:MainConst.EditHostsConfButtonToolTip}}"
diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs
index 1d8eafd..ad6e710 100644
--- a/Wins/MainWin.xaml.cs
+++ b/Wins/MainWin.xaml.cs
@@ -420,26 +420,31 @@ public partial class MainWin : Window
         try { upstreamUpstreamHostString = Encoding.UTF8.GetString(Convert.FromBase64String(upstreamUpstreamHostString)); }
         catch { }
 
-        if (localUpstreamHostString == upstreamUpstreamHostString || localUpstreamHostString.ReplaceLineEndings() == upstreamUpstreamHostString.ReplaceLineEndings())
-            if (sender == null)
-                MainPres.IsUpstreamHostUtd = true;
-            else
-                MessageBox.Show(MainConst._UpstreamHostUtdMsg);
-        else if (sender == null)
+        if (sender == null && (localUpstreamHostString != upstreamUpstreamHostString && localUpstreamHostString.ReplaceLineEndings() != upstreamUpstreamHostString.ReplaceLineEndings()))
             MainPres.IsUpstreamHostUtd = false;
-        else
-        {
-            MessageBoxResult overrideOptionResult = MessageBox.Show(MainConst._OverrideUpstreamHostPrompt, string.Empty, MessageBoxButton.YesNoCancel);
-
-            if (overrideOptionResult == MessageBoxResult.Yes)
+        else if (sender != null)
+            if (localUpstreamHostString == upstreamUpstreamHostString || localUpstreamHostString.ReplaceLineEndings() == upstreamUpstreamHostString.ReplaceLineEndings())
             {
-                File.WriteAllText(MainConst.UpstreamHostPath, upstreamUpstreamHostString);
-                MessageBox.Show(MainConst._UpdateUpstreamHostSuccessMsg);
+                MainPres.IsUpstreamHostUtd = true;
+
+                MessageBox.Show(MainConst._UpstreamHostUtdMsg);
+            }
+            else
+            {
+                MessageBoxResult overrideOptionResult = MessageBox.Show(MainConst._OverrideUpstreamHostPrompt, string.Empty, MessageBoxButton.YesNoCancel);
+
+                if (overrideOptionResult == MessageBoxResult.Yes)
+                {
+                    File.WriteAllText(MainConst.UpstreamHostPath, upstreamUpstreamHostString);
+
+                    MainPres.IsUpstreamHostUtd = true;
+
+                    MessageBox.Show(MainConst._UpdateUpstreamHostSuccessMsg);
+                }
+                else if (overrideOptionResult == MessageBoxResult.No)
+                    try { Process.Start(new ProcessStartInfo(upstreamUpstreamHostUrl) { UseShellExecute = true }); }
+                    catch (UnauthorizedAccessException) { Process.Start(new ProcessStartInfo(upstreamUpstreamHostUrl) { UseShellExecute = true, Verb = "RunAs" }); }
             }
-            else if (overrideOptionResult == MessageBoxResult.No)
-                try { Process.Start(new ProcessStartInfo(upstreamUpstreamHostUrl) { UseShellExecute = true }); }
-                catch (UnauthorizedAccessException) { Process.Start(new ProcessStartInfo(upstreamUpstreamHostUrl) { UseShellExecute = true, Verb = "RunAs" }); }
-        }
     }
 
     private void SettingsButton_Click(object sender, RoutedEventArgs e) => new SettingsWin().ShowDialog();