mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-15 17:30:27 +08:00
fix: vertical alignment to top instead of center for updatesettings (#15359)
* fix: vertical alignment to top instead of center for updatesettings * perf: 调整界面布局 --------- Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
This commit is contained in:
Constrat
@@ -43,140 +43,139 @@
|
||||
<StackPanel
|
||||
Grid.Row="0"
|
||||
Grid.Column="0"
|
||||
VerticalAlignment="Center">
|
||||
<StackPanel VerticalAlignment="Center">
|
||||
VerticalAlignment="Top">
|
||||
<CheckBox
|
||||
Margin="8"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource StartupUpdateCheck}"
|
||||
IsChecked="{Binding StartupUpdateCheck}"
|
||||
IsEnabled="False" />
|
||||
<StackPanel Margin="8" Orientation="Horizontal">
|
||||
<CheckBox
|
||||
Margin="8"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource StartupUpdateCheck}"
|
||||
IsChecked="{Binding StartupUpdateCheck}"
|
||||
IsEnabled="False" />
|
||||
<StackPanel Margin="8" Orientation="Horizontal">
|
||||
<CheckBox
|
||||
Content="{DynamicResource UpdateAutoCheck}"
|
||||
IsChecked="{Binding UpdateAutoCheck}" />
|
||||
<controls:TooltipBlock TooltipText="{DynamicResource UpdateAutoCheckTip}" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
Margin="8"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource UpdateAutoDownload}"
|
||||
IsChecked="{Binding AutoDownloadUpdatePackage}" />
|
||||
<CheckBox
|
||||
Margin="8"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource AutoInstallUpdatePackage}"
|
||||
IsChecked="{Binding AutoInstallUpdatePackage}" />
|
||||
<StackPanel
|
||||
Margin="8"
|
||||
Orientation="Horizontal"
|
||||
Visibility="{c:Binding 'UpdateSource == "Github"'}">
|
||||
<CheckBox
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource ForceGithubGlobalSource}"
|
||||
IsChecked="{Binding ForceGithubGlobalSource}" />
|
||||
<controls:TooltipBlock TooltipText="{DynamicResource ForceGithubGlobalSourceTip}" />
|
||||
</StackPanel>
|
||||
<StackPanel Margin="8">
|
||||
<StackPanel Margin="0,0,0,5" Orientation="Horizontal">
|
||||
<controls:TextBlock
|
||||
Margin="8,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource UpdateAutoCheck}"
|
||||
IsChecked="{Binding UpdateAutoCheck}" />
|
||||
<controls:TooltipBlock TooltipText="{DynamicResource UpdateAutoCheckTip}" />
|
||||
Text="{DynamicResource UpdateCheck}" />
|
||||
<controls:TooltipBlock TooltipMaxWidth="350" TooltipText="{DynamicResource UpdateCheckTip}" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
Margin="8"
|
||||
<hc:ComboBox
|
||||
Width="150"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource UpdateAutoDownload}"
|
||||
IsChecked="{Binding AutoDownloadUpdatePackage}" />
|
||||
<CheckBox
|
||||
Margin="8"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource AutoInstallUpdatePackage}"
|
||||
IsChecked="{Binding AutoInstallUpdatePackage}" />
|
||||
<StackPanel
|
||||
Margin="8"
|
||||
Orientation="Horizontal"
|
||||
Visibility="{c:Binding 'UpdateSource == "Github"'}">
|
||||
<CheckBox
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="{DynamicResource ForceGithubGlobalSource}"
|
||||
IsChecked="{Binding ForceGithubGlobalSource}" />
|
||||
<controls:TooltipBlock TooltipText="{DynamicResource ForceGithubGlobalSourceTip}" />
|
||||
</StackPanel>
|
||||
DisplayMemberPath="Display"
|
||||
ItemsSource="{Binding VersionTypeList}"
|
||||
SelectedValue="{Binding VersionType}"
|
||||
SelectedValuePath="Value" />
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel>
|
||||
<StackPanel Margin="8">
|
||||
<StackPanel Margin="0,0,0,5" Orientation="Horizontal">
|
||||
<controls:TextBlock
|
||||
Margin="8,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
Text="{DynamicResource UpdateCheck}" />
|
||||
<controls:TooltipBlock TooltipMaxWidth="350" TooltipText="{DynamicResource UpdateCheckTip}" />
|
||||
Text="{DynamicResource UpdateSource}" />
|
||||
<controls:TooltipBlock TooltipMaxWidth="350" TooltipText="{DynamicResource UpdateSourceTip}" />
|
||||
</StackPanel>
|
||||
<hc:ComboBox
|
||||
Width="150"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
DisplayMemberPath="Display"
|
||||
ItemsSource="{Binding VersionTypeList}"
|
||||
SelectedValue="{Binding VersionType}"
|
||||
ItemsSource="{Binding UpdateSourceList}"
|
||||
SelectedValue="{Binding UpdateSource}"
|
||||
SelectedValuePath="Value" />
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel>
|
||||
<StackPanel Margin="8">
|
||||
<StackPanel Margin="0,0,0,5" Orientation="Horizontal">
|
||||
<controls:TextBlock
|
||||
Margin="8,0,0,0"
|
||||
HorizontalAlignment="Left"
|
||||
Text="{DynamicResource UpdateSource}" />
|
||||
<controls:TooltipBlock TooltipMaxWidth="350" TooltipText="{DynamicResource UpdateSourceTip}" />
|
||||
</StackPanel>
|
||||
<hc:ComboBox
|
||||
Width="150"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
DisplayMemberPath="Display"
|
||||
ItemsSource="{Binding UpdateSourceList}"
|
||||
SelectedValue="{Binding UpdateSource}"
|
||||
SelectedValuePath="Value" />
|
||||
</StackPanel>
|
||||
<StackPanel Margin="8" Visibility="{c:Binding 'UpdateSource == "MirrorChyan"'}">
|
||||
<controls:TextBlock Margin="8,0,0,5" HorizontalAlignment="Left">
|
||||
<TextBlock.Text>
|
||||
<MultiBinding StringFormat="{}{0} CDK">
|
||||
<Binding Source="{StaticResource MirrorChyan}" />
|
||||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
</controls:TextBlock>
|
||||
<Grid Width="150">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<hc:PasswordBox
|
||||
hc:BorderElement.CornerRadius="4,0,0,4"
|
||||
IsSafeEnabled="False"
|
||||
ShowEyeButton="True"
|
||||
UnsafePassword="{Binding MirrorChyanCdk}" />
|
||||
<Button
|
||||
Grid.Column="1"
|
||||
hc:BorderElement.CornerRadius="0,4,4,0"
|
||||
BorderThickness="0,1,1,1"
|
||||
Command="{s:Action MirrorChyanCdkCopy}"
|
||||
Content="{DynamicResource Copy}" />
|
||||
</Grid>
|
||||
<controls:TextBlock
|
||||
MaxWidth="150"
|
||||
Margin="0,5,0,0"
|
||||
Foreground="{DynamicResource ErrorLogBrush}"
|
||||
Text="{DynamicResource MirrorChyanCdkFetchFailed}"
|
||||
TextWrapping="Wrap"
|
||||
Visibility="{c:Binding MirrorChyanCdkFetchFailed}" />
|
||||
<controls:TextBlock
|
||||
MaxWidth="150"
|
||||
Margin="0,5,0,0"
|
||||
d:Foreground="{DynamicResource SuccessLogBrush}"
|
||||
d:Text="{DynamicResource MirrorChyanCdkRemainingDays}"
|
||||
uiBehaviors:ResourceReferenceHelper.ForegroundResourceKey="{Binding MirrorChyanCdkRemainingBrush}"
|
||||
Text="{Binding MirrorChyanCdkRemainingText}"
|
||||
TextWrapping="Wrap"
|
||||
ToolTip="{Binding MirrorChyanCdkExpiredLocalTime}" />
|
||||
</StackPanel>
|
||||
<controls:TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Hyperlink
|
||||
Cursor="Hand"
|
||||
NavigateUri="{Binding Source={x:Static constants:MaaUrls.MirrorChyanWebsite}}"
|
||||
TextDecorations="None">
|
||||
<TextBlock Text="{DynamicResource MirrorChyan}" />
|
||||
</Hyperlink>
|
||||
<StackPanel Margin="8" Visibility="{c:Binding 'UpdateSource == "MirrorChyan"'}">
|
||||
<controls:TextBlock Margin="8,0,0,5" HorizontalAlignment="Left">
|
||||
<TextBlock.Text>
|
||||
<MultiBinding StringFormat="{}{0} CDK">
|
||||
<Binding Source="{StaticResource MirrorChyan}" />
|
||||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
</controls:TextBlock>
|
||||
<Grid Width="150">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<hc:PasswordBox
|
||||
hc:BorderElement.CornerRadius="4,0,0,4"
|
||||
IsSafeEnabled="False"
|
||||
ShowEyeButton="True"
|
||||
UnsafePassword="{Binding MirrorChyanCdk}" />
|
||||
<Button
|
||||
Grid.Column="1"
|
||||
hc:BorderElement.CornerRadius="0,4,4,0"
|
||||
BorderThickness="0,1,1,1"
|
||||
Command="{s:Action MirrorChyanCdkCopy}"
|
||||
Content="{DynamicResource Copy}" />
|
||||
</Grid>
|
||||
<controls:TextBlock
|
||||
MaxWidth="150"
|
||||
Margin="0,5,0,0"
|
||||
Foreground="{DynamicResource ErrorLogBrush}"
|
||||
Text="{DynamicResource MirrorChyanCdkFetchFailed}"
|
||||
TextWrapping="Wrap"
|
||||
Visibility="{c:Binding MirrorChyanCdkFetchFailed}" />
|
||||
<controls:TextBlock
|
||||
MaxWidth="150"
|
||||
Margin="0,5,0,0"
|
||||
d:Foreground="{DynamicResource SuccessLogBrush}"
|
||||
d:Text="{DynamicResource MirrorChyanCdkRemainingDays}"
|
||||
uiBehaviors:ResourceReferenceHelper.ForegroundResourceKey="{Binding MirrorChyanCdkRemainingBrush}"
|
||||
Text="{Binding MirrorChyanCdkRemainingText}"
|
||||
TextWrapping="Wrap"
|
||||
ToolTip="{Binding MirrorChyanCdkExpiredLocalTime}"
|
||||
Visibility="{c:Binding 'MirrorChyanCdkRemainingText != ""'}" />
|
||||
</StackPanel>
|
||||
<controls:TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Hyperlink
|
||||
Cursor="Hand"
|
||||
NavigateUri="{Binding Source={x:Static constants:MaaUrls.MirrorChyanWebsite}}"
|
||||
TextDecorations="None">
|
||||
<TextBlock Text="{DynamicResource MirrorChyan}" />
|
||||
</Hyperlink>
|
||||
</controls:TextBlock>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<Grid
|
||||
Grid.Row="0"
|
||||
Grid.Column="1"
|
||||
Margin="3"
|
||||
VerticalAlignment="Center">
|
||||
VerticalAlignment="Top">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
|
||||
Reference in New Issue
Block a user