Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add message about ejecting previous installers #515

Merged
merged 2 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions WPILibInstaller-Avalonia/ViewModels/StartPageViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ public bool MissingHash

public bool MissingEitherFile => MissingSupportFiles || MissingResourceFiles;

public bool MacOSEject => MissingEitherFile && RuntimeInformation.IsOSPlatform(OSPlatform.OSX);

private bool missingSupportFiles = true;

public bool MissingResourceFiles
Expand Down
4 changes: 3 additions & 1 deletion WPILibInstaller-Avalonia/Views/StartPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
VerticalAlignment="Center">
<Image Source="resm:WPILibInstaller.Assets.wpilib-generic-75.png?assembly=WPILibInstaller"
Stretch="None"
Margin="75"/>
Margin="40"/>
<TextBlock Text="Welcome to the WPILib Installer!"
HorizontalAlignment="Center"
FontWeight="Bold"
Expand All @@ -18,6 +18,8 @@
HorizontalAlignment="Center"
FontSize="25"
VerticalAlignment="Center" />
<TextBlock Text="Ensure you've ejected any other WPILib Installer images"
IsVisible="{Binding MacOSEject}" Foreground="Red"/>
<TextBlock Text="The artifacts and/or resource files were not found. Please click the buttons below to select them."
IsVisible="{Binding MissingEitherFile}"/>
<TextBlock Text="Verifying Artifacts File..."
Expand Down
Loading