Add message about ejecting previous installers on Mac (#515)

wpilibsuite · Jan 15, 2025 · 2e85635 · 2e85635
1 parent 7789546
commit 2e85635
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/WPILibInstaller-Avalonia/ViewModels/StartPageViewModel.cs b/WPILibInstaller-Avalonia/ViewModels/StartPageViewModel.cs
@@ -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

diff --git a/WPILibInstaller-Avalonia/Views/StartPage.xaml b/WPILibInstaller-Avalonia/Views/StartPage.xaml
@@ -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"
@@ -18,6 +18,8 @@
                HorizontalAlignment="Center"
                FontSize="25"
                VerticalAlignment="Center" />
+    <TextBlock Text="Ensure you've ejected any other WPILib Installer images and restart the installer"
+               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..."