From b168b7403aa2adfacac8490f5115c7656fd7ba0a Mon Sep 17 00:00:00 2001
From: strongleong <nikita_chul@mail.ru>
Date: Sun, 6 Feb 2022 20:38:13 +1100
Subject: [PATCH] Implemented choosing Scrapland version

---
 ScrapModLoader/MainWindow.xaml        |  6 +++++-
 ScrapModLoader/MainWindow.xaml.cs     | 19 ++++++++++++++-----
 ScrapModLoader/SettingsWindow.xaml.cs |  4 ++--
 ScrapModLoader/Utils.cs               | 12 ------------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ScrapModLoader/MainWindow.xaml b/ScrapModLoader/MainWindow.xaml
index cec4a92..6816164 100644
--- a/ScrapModLoader/MainWindow.xaml
+++ b/ScrapModLoader/MainWindow.xaml
@@ -66,9 +66,13 @@
                 <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">                
-                <Button Content=" Settings " Click="Button_Click" />
+                <Button Name="ButtonSettings" Content=" Settings " Click="ButtonSettings_Click" />
             </StackPanel>
             <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Left">
+                <ComboBox Name="ScraplandVersion" Margin="0,0,10,0">
+                    <ComboBoxItem Content="Original" IsEnabled="False" />
+                    <ComboBoxItem Content="Remastered" />
+                </ComboBox>
                 <CheckBox Content=" Windowed " Margin="0,0,10,0" HorizontalAlignment="Center" VerticalAlignment="Center" />
                 <CheckBox Content=" Close launcher " Margin="0,0,10,0" HorizontalAlignment="Center" VerticalAlignment="Center" />
                 <Button Content=" Run Scrapland " Name="ButtonRunScrapland" />
diff --git a/ScrapModLoader/MainWindow.xaml.cs b/ScrapModLoader/MainWindow.xaml.cs
index 8e055df..a6d158a 100644
--- a/ScrapModLoader/MainWindow.xaml.cs
+++ b/ScrapModLoader/MainWindow.xaml.cs
@@ -34,12 +34,21 @@ namespace ScrapModLoader
             }
 
             // TODO: Refactor it to separate window with pretty loading animation
-            if (!modsLauncher.SearchForScrapland())
+            if (modsLauncher.ScraplandPath == String.Empty && modsLauncher.ScraplandRemasteredPath == String.Empty)
             {
-                ButtonRunScrapland.IsEnabled = false;
-                MessageBox.Show("Error: unable to find Scrapland instalation. Please, specify yours game installation folder in settings.");
+                Boolean isFoundScrapland = modsLauncher.SearchForScrapland();
+                if (!isFoundScrapland)
+                {
+                    ButtonRunScrapland.IsEnabled = false;
+                    MessageBox.Show("Error: unable to find Scrapland instalation. Please, specify yours game installation folder in settings.");
+                }
             }
 
+            ((ComboBoxItem)ScraplandVersion.Items[0]).IsEnabled = modsLauncher.ScraplandPath != String.Empty;
+            ((ComboBoxItem)ScraplandVersion.Items[1]).IsEnabled = modsLauncher.ScraplandRemasteredPath != String.Empty;
+
+            ScraplandVersion.SelectedIndex = modsLauncher.ScraplandRemasteredPath != String.Empty ? 1 : 0;
+
             modsLauncher.ScanMods();
         }
 
@@ -136,9 +145,9 @@ namespace ScrapModLoader
             mod.Checked = (Boolean)isChecked;
         }
 
-        private void Button_Click(Object sender, RoutedEventArgs e)
+        private void ButtonSettings_Click(Object sender, RoutedEventArgs e)
         {
-            SettingsWindow settingsWindow = new SettingsWindow(modsLauncher);
+            SettingsWindow settingsWindow = new SettingsWindow();
             settingsWindow.ShowDialog();
             if (settingsWindow.Save)
                 modsLauncher.ScanMods();
diff --git a/ScrapModLoader/SettingsWindow.xaml.cs b/ScrapModLoader/SettingsWindow.xaml.cs
index 5e74cf4..bf0260b 100644
--- a/ScrapModLoader/SettingsWindow.xaml.cs
+++ b/ScrapModLoader/SettingsWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace ScrapModLoader
         public String ScraplandRemasteredPath { get; set; }
         public Boolean Save { get; set; }
 
-        public SettingsWindow(ModsLauncher modsLauncher)
+        public SettingsWindow()
         {
             InitializeComponent();
 
@@ -118,7 +118,7 @@ namespace ScrapModLoader
         }
         private void ButtonBrowseScrapRemaster_Click(Object sender, RoutedEventArgs e)
         {
-            String scraplandRemasteredPath = Utils.GetFilePath();
+            String scraplandRemasteredPath = Utils.GetFolderDialog();
             if (scraplandRemasteredPath != String.Empty)
             {
                 ScraplandRemasteredPathTextBox.Text = scraplandRemasteredPath;
diff --git a/ScrapModLoader/Utils.cs b/ScrapModLoader/Utils.cs
index 918e25b..7eee65b 100644
--- a/ScrapModLoader/Utils.cs
+++ b/ScrapModLoader/Utils.cs
@@ -9,18 +9,6 @@ namespace ScrapModLoader
 {
     internal static class Utils
     {
-        public static String GetFilePath()
-        {
-            Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog
-            {
-                DefaultExt = ".exe",
-                Filter = "Scrapland Executable File (*.exe)|*.exe"
-            };
-
-            Nullable<Boolean> result = dlg.ShowDialog();
-            return dlg.FileName;
-        }
-        
         public static String GetFolderDialog()
         {
             using System.Windows.Forms.FolderBrowserDialog? dialog = new System.Windows.Forms.FolderBrowserDialog();