Compare commits

..

No commits in common. "8b94eadac08eaf99ef5b2f35d6bf9905366e23a0" and "b4ce64456e111e2be0d4984e724655623d0fcb5e" have entirely different histories.

2 changed files with 7 additions and 17 deletions

View file

@ -45,19 +45,12 @@
HorizontalAlignment="Stretch" /> HorizontalAlignment="Stretch" />
</StackPanel> </StackPanel>
<StackPanel Grid.Column="0" Margin="20" Spacing="15" VerticalAlignment="Bottom"> <Image Grid.Column="0"
<Image Margin="20"
Margin="20" VerticalAlignment="Bottom"
VerticalAlignment="Bottom" Source="{DynamicResource Logo}"
Source="{DynamicResource Logo}" HorizontalAlignment="Center">
HorizontalAlignment="Center"> </Image>
</Image>
<TextBlock
Name="VersionTextBlock"
FontFamily="Consolas,Courier New,monospace"
FontSize="14"
HorizontalAlignment="Center" />
</StackPanel>
<!-- Right Panel - Logs --> <!-- Right Panel - Logs -->
<TextBox Grid.Column="1" Name="LogsTextBox" <TextBox Grid.Column="1" Name="LogsTextBox"

View file

@ -1,6 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Threading.Tasks;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Platform.Storage; using Avalonia.Platform.Storage;
@ -28,9 +28,6 @@ public partial class MainWindow : Window
InitializeComponent(); InitializeComponent();
LogMessage("MetaforceInstaller by slavagm"); LogMessage("MetaforceInstaller by slavagm");
VersionTextBlock.Text = Assembly.GetExecutingAssembly()
.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version;
_adbService = new AdbService(); _adbService = new AdbService();
_adbService.ProgressChanged += OnAdbProgressChanged; _adbService.ProgressChanged += OnAdbProgressChanged;