1.1.3 -> 1.1.4 第57次更新

This commit is contained in:
Space Time 2024-12-13 23:59:11 +08:00
parent dc73a30540
commit 2660c63311
3 changed files with 48 additions and 18 deletions

View File

@ -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();
}

View File

@ -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}}"

View File

@ -420,13 +420,15 @@ 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 if (sender != null)
if (localUpstreamHostString == upstreamUpstreamHostString || localUpstreamHostString.ReplaceLineEndings() == upstreamUpstreamHostString.ReplaceLineEndings())
{
MainPres.IsUpstreamHostUtd = true;
MessageBox.Show(MainConst._UpstreamHostUtdMsg);
}
else
{
MessageBoxResult overrideOptionResult = MessageBox.Show(MainConst._OverrideUpstreamHostPrompt, string.Empty, MessageBoxButton.YesNoCancel);
@ -434,6 +436,9 @@ public partial class MainWin : Window
if (overrideOptionResult == MessageBoxResult.Yes)
{
File.WriteAllText(MainConst.UpstreamHostPath, upstreamUpstreamHostString);
MainPres.IsUpstreamHostUtd = true;
MessageBox.Show(MainConst._UpdateUpstreamHostSuccessMsg);
}
else if (overrideOptionResult == MessageBoxResult.No)