Merge pull request #1060 from DinCahill/master

Move KSP Install selection to File menu
KSP-CKAN · Jun 4, 2015 · b9eeb33 · b9eeb33
2 parents b518094 + c893a86
commit b9eeb33
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 78 deletions.
diff --git a/GUI/Main.Designer.cs b/GUI/Main.Designer.cs
diff --git a/GUI/Main.cs b/GUI/Main.cs
@@ -920,6 +920,15 @@ private void exportModListToolStripMenuItem_Click(object sender, EventArgs e)
                 File.Copy(Path.Combine(CurrentInstance.CkanDir(), "installed-default.ckan"), dlg.FileName);
             }
         }
+
+        private void selectKSPInstallMenuItem_Click(object sender, EventArgs e)
+        {
+            Main.Instance.Manager.ClearAutoStart();
+            var old_instance = Main.Instance.CurrentInstance;
+            var result = new ChooseKSPInstance().ShowDialog();
+            if (!Equals(old_instance, Main.Instance.CurrentInstance))
+                Main.Instance.CurrentInstanceUpdated();
+        }
     }
 
     public class GUIUser : NullUser

diff --git a/GUI/SettingsDialog.Designer.cs b/GUI/SettingsDialog.Designer.cs
diff --git a/GUI/SettingsDialog.cs b/GUI/SettingsDialog.cs
@@ -24,8 +24,6 @@ public void UpdateDialog()
         {
             RefreshReposListBox();
 
-            KSPInstallPathLabel.Text = Main.Instance.CurrentInstance.GameDir();
-
             LocalVersionLabel.Text = Meta.Version();
 
             CheckUpdateOnLaunchCheckbox.Checked = Main.Instance.m_Configuration.CheckForUpdatesOnLaunch;
@@ -90,15 +88,6 @@ private void ClearCKANCacheButton_Click(object sender, EventArgs e)
             UpdateCacheInfo();
         }
 
-        private void ResetAutoStartChoice_Click(object sender, EventArgs e)
-        {
-            Main.Instance.Manager.ClearAutoStart();
-            var old_instance = Main.Instance.CurrentInstance;
-            var result = new ChooseKSPInstance().ShowDialog();
-            if(!Equals(old_instance, Main.Instance.CurrentInstance))
-                Main.Instance.CurrentInstanceUpdated();            
-        }
-
         private void ReposListBox_SelectedIndexChanged(object sender, EventArgs e)
         {
             DeleteRepoButton.Enabled = ReposListBox.SelectedItem != null;