1.1.3 -> 1.1.4 第60次更新

This commit is contained in:
Space Time 2024-12-14 00:56:16 +08:00
parent 8dc34243bd
commit bf73c635d3
4 changed files with 17 additions and 9 deletions

View File

@ -10,8 +10,9 @@ internal class AboutVersionButtonContentConv : IMultiValueConverter
{ {
string versionButtonLabelContent = (string)values[0]; string versionButtonLabelContent = (string)values[0];
string versionButtonVersionContent = (string)values[1]; string versionButtonVersionContent = (string)values[1];
bool isSheasCealerUtd = (bool)values[2];
return $"{versionButtonLabelContent} {versionButtonVersionContent}"; return $"{versionButtonLabelContent} {versionButtonVersionContent}" + (isSheasCealerUtd ? string.Empty : " *");
} }
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();

View File

@ -11,7 +11,7 @@ internal class MainUpdateHostButtonContentConv : IValueConverter
{ {
bool isUpstreamHostUtd = (bool)value; bool isUpstreamHostUtd = (bool)value;
return isUpstreamHostUtd ? MainConst.UpdateUpstreamHostButtonContent : $"{MainConst.UpdateUpstreamHostButtonContent} *"; return MainConst.UpdateUpstreamHostButtonContent + (isUpstreamHostUtd ? string.Empty : " *");
} }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();

View File

@ -1,3 +1,9 @@
namespace Sheas_Cealer.Preses; using CommunityToolkit.Mvvm.ComponentModel;
internal partial class AboutPres : GlobalPres; namespace Sheas_Cealer.Preses;
internal partial class AboutPres : GlobalPres
{
[ObservableProperty]
private bool isSheasCealerUtd = true;
}

View File

@ -16,7 +16,7 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1.1*" /> <ColumnDefinition Width="1.16*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
@ -33,7 +33,7 @@
</Button.Foreground> </Button.Foreground>
</Button> </Button>
<Button x:Name="VersionButton" <Button x:Name="VersionButton"
Grid.Row="1" Grid.Column="0" Margin="5" d:Foreground="#2196F3" ToolTip="{Binding Source={x:Static consts:AboutConst.VersionButtonUrl}, Mode=OneTime}" Grid.Row="1" Grid.Column="0" Margin="5" d:Foreground="#2196F3" d:Content="# # #: #.#.#" ToolTip="{Binding Source={x:Static consts:AboutConst.VersionButtonUrl}, Mode=OneTime}"
Click="AboutButton_Click"> Click="AboutButton_Click">
<Button.Foreground> <Button.Foreground>
<Binding Path="AccentForegroundColor"> <Binding Path="AccentForegroundColor">
@ -43,13 +43,14 @@
</Binding> </Binding>
</Button.Foreground> </Button.Foreground>
<Button.Content> <Button.Content>
<MultiBinding Mode="OneTime"> <MultiBinding>
<MultiBinding.Converter> <MultiBinding.Converter>
<convs:AboutVersionButtonContentConv /> <convs:AboutVersionButtonContentConv />
</MultiBinding.Converter> </MultiBinding.Converter>
<Binding Source="{x:Static consts:AboutConst.VersionButtonLabelContent}" /> <Binding Source="{x:Static consts:AboutConst.VersionButtonLabelContent}" Mode="OneTime" />
<Binding Source="{x:Static consts:AboutConst.VersionButtonVersionContent}" /> <Binding Source="{x:Static consts:AboutConst.VersionButtonVersionContent}" Mode="OneTime" />
<Binding Path="IsSheasCealerUtd" />
</MultiBinding> </MultiBinding>
</Button.Content> </Button.Content>
</Button> </Button>