Enable install only on valid HCE & clean up XAML

MirisWisdom · Nov 21, 2018 · 799afc9 · 799afc9
1 parent c07a340
commit 799afc9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/AmaiSosu/Main.cs b/AmaiSosu/Main.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Windows;
 using AmaiSosu.IO;
 using AmaiSosu.Properties;
 using Atarashii.API;
@@ -14,24 +15,27 @@ namespace AmaiSosu
     /// <summary>
     ///     Main AmaiSosu model.
     /// </summary>
-    public class Main : INotifyPropertyChanged
+    public sealed class Main : INotifyPropertyChanged
     {
         /// <summary>
         ///     Installation is possible given the current state.
         /// </summary>
-        private bool _canInstall = true;
+        private bool _canInstall;
 
         /// <summary>
         ///     Current state of the OpenSauce installation.
         /// </summary>
-        private string _installState = "Currently awaiting the end-user to invoke OpenSauce installation.";
+        private string _installState = "Click Browse and select the HCE installation path.";
 
         /// <summary>
         ///     Installation path.
         ///     Path is expected to contain the HCE executable.
         /// </summary>
         private string _path;
 
+        /// <summary>
+        ///     Git version.
+        /// </summary>
         public string Version
         {
             get
@@ -176,12 +180,14 @@ private void FinishInstall(string backupDir)
         /// </summary>
         private void OnPathChanged()
         {
-            if (Directory.Exists(Path))
-                InstallText = "Ready to install OpenSauce to the HCE folder!";
+            CanInstall = Directory.Exists(Path) && File.Exists(System.IO.Path.Combine(Path, "haloce.exe"));
+            InstallText = CanInstall
+                ? "Ready to install OpenSauce to the HCE folder!"
+                : "Click Browse and select the HCE installation path.";
         }
 
         [NotifyPropertyChangedInvocator]
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        private void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }

diff --git a/AmaiSosu/MainWindow.xaml b/AmaiSosu/MainWindow.xaml
@@ -68,22 +68,19 @@
             <!-- Header -->
             <StackPanel Orientation="Horizontal"
                         HorizontalAlignment="Center">
-                <Label Content="HCE."
-                       FontFamily="Segoe UI Light"
-                       FontSize="48"
-                       Padding="0"
-                       HorizontalContentAlignment="Center" />
+                <StackPanel.Resources>
+                    <Style TargetType="Label">
+                        <Setter Property="FontFamily" Value="Segoe UI Light" />
+                        <Setter Property="FontSize" Value="48" />
+                        <Setter Property="Padding" Value="0" />
+                        <Setter Property="HorizontalContentAlignment" Value="Center" />
+                    </Style>
+                </StackPanel.Resources>
+
+                <Label Content="HCE." />
                 <Label Content="Amai"
-                       FontFamily="Segoe UI Light"
-                       FontSize="48"
-                       Foreground="Crimson"
-                       Padding="0"
-                       HorizontalContentAlignment="Center" />
-                <Label Content="Sosu"
-                       FontFamily="Segoe UI Light"
-                       FontSize="48"
-                       Padding="0"
-                       HorizontalContentAlignment="Center" />
+                       Foreground="Crimson" />
+                <Label Content="Sosu" />
             </StackPanel>
 
             <Label Content="⸻ An OpenSauce Installer ⸻"
@@ -101,7 +98,8 @@
                          Padding="2.5,0,0,0" />
             </DockPanel>
 
-            <Border Margin="0,10,0,0">
+            <Border Margin="0,10,0,0"
+                    IsEnabled="{Binding CanInstall}">
                 <Button Content="⬛ Install OpenSauce"
                         FontSize="16"
                         IsEnabled="{Binding CanInstall}"

diff --git a/AmaiSosu/Resources/Version.txt b/AmaiSosu/Resources/Version.txt
@@ -1 +1 @@
-
+v0.3.1-7-gd4cfe3a