Release 1.5.20240423.0

BuIlDaLiBlE · Apr 23, 2024 · 1c60203 · 1c60203
1 parent 165ec42
commit 1c60203
Show file tree

Hide file tree

Showing 10 changed files with 256 additions and 243 deletions.
diff --git a/Assets/Images/GitHubREADME.webp → .github/GitHubREADME.webp b/Assets/Images/GitHubREADME.webp → .github/GitHubREADME.webp
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -14,7 +14,7 @@ namespace BetterHI3Launcher
 {
 	public partial class App : Application
 	{
-		public static readonly LauncherVersion LocalLauncherVersion = new LauncherVersion("1.5.20240227.0");
+		public static readonly LauncherVersion LocalLauncherVersion = new LauncherVersion("1.5.20240423.0");
 		public static readonly string LauncherRootPath = AppDomain.CurrentDomain.BaseDirectory;
 		public static readonly string LocalLowPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}Low";
 		public static readonly string LauncherDataPath = Path.Combine(LocalLowPath, @"Bp\Better HI3 Launcher");

diff --git a/Assets/Images/Button_Close_Pressed.png b/Assets/Images/Button_Close_Pressed.png
diff --git a/Assets/Images/Button_Minimize_Highlighted.png b/Assets/Images/Button_Minimize_Highlighted.png
diff --git a/BetterHI3Launcher.csproj b/BetterHI3Launcher.csproj
@@ -272,10 +272,10 @@
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="Squid-Box.SevenZipSharp">
-      <Version>1.6.1.23</Version>
+      <Version>1.6.2.24</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.DiagnosticSource">
-      <Version>8.0.0</Version>
+      <Version>8.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Globalization.Calendars">
       <Version>4.3.0</Version>

diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -694,23 +694,29 @@
 					</StackPanel>
 				</Grid>
 			</Grid>
-			<StackPanel Name="DownloadProgressBarStackPanel" Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="50,20">
-				<TextBlock Name="DownloadProgressText" VerticalAlignment="Center" HorizontalAlignment="Left" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="White">
-					<TextBlock.Effect>
-						<DropShadowEffect BlurRadius="1" ShadowDepth="2"/>
-					</TextBlock.Effect>
-				</TextBlock>
-				<TextBlock Name="DownloadETAText" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,-15,3,0" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="#FFD847">
-					<TextBlock.Effect>
-						<DropShadowEffect BlurRadius="1" ShadowDepth="2"/>
-					</TextBlock.Effect>
-				</TextBlock>
-				<StackPanel Orientation="Horizontal">
-					<ProgressBar Name="DownloadProgressBar" Style="{StaticResource DownloadProgressBarStyle}" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0,4,0,8" Width="776" Height="24"/>
-					<Button Name="DownloadPauseButton" Style="{DynamicResource DownloadPauseButtonStyle}" Margin="10,0,0,4" Click="DownloadPauseButton_Click"/>
-					<Button Name="DownloadResumeButton" Style="{DynamicResource DownloadResumeButtonStyle}" Margin="10,0,0,4" Click="DownloadPauseButton_Click" Visibility="Collapsed"/>
-				</StackPanel>
-				<TextBlock Name="DownloadSpeedText" VerticalAlignment="Center" HorizontalAlignment="Left" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="#C8FFFFFF">
+			<StackPanel Name="DownloadProgressBarStackPanel" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="50,20" Width="820">
+				<DockPanel>
+					<TextBlock Name="DownloadProgressText" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="White">
+						<TextBlock.Effect>
+							<DropShadowEffect BlurRadius="1" ShadowDepth="2"/>
+						</TextBlock.Effect>
+					</TextBlock>
+					<TextBlock Name="DownloadETAText" HorizontalAlignment="Right" Margin="0,0,3,0" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="#FFD847">
+						<TextBlock.Effect>
+							<DropShadowEffect BlurRadius="1" ShadowDepth="2"/>
+						</TextBlock.Effect>
+					</TextBlock>
+				</DockPanel>
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*"/>
+						<ColumnDefinition Width="Auto"/>
+					</Grid.ColumnDefinitions>
+					<ProgressBar Name="DownloadProgressBar" Style="{StaticResource DownloadProgressBarStyle}" Margin="0,4,0,8" Height="24"/>
+					<Button Grid.Column="1" Name="DownloadPauseButton" Style="{DynamicResource DownloadPauseButtonStyle}" Margin="10,0,0,4" Click="DownloadPauseButton_Click"/>
+					<Button Grid.Column="1" Name="DownloadResumeButton" Style="{DynamicResource DownloadResumeButtonStyle}" Margin="10,0,0,4" Click="DownloadPauseButton_Click" Visibility="Collapsed"/>
+				</Grid>
+				<TextBlock Name="DownloadSpeedText" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="#C8FFFFFF">
 					<TextBlock.Effect>
 						<DropShadowEffect BlurRadius="1" ShadowDepth="2"/>
 					</TextBlock.Effect>