add run unity button, fix: open correct tab at start if missing root folder, fixed uninstall registry key error if no key

Author: unitycoder

UnityLauncher/Form1.Designer.cs

@@ -17,6 +17,9 @@ public partial class Form1 : Form
         // version,exe path (example: 5.6.1f1,c:\prog\unity561\editor\unity.exe)
         Dictionary<string, string> unityList = new Dictionary<string, string>();
 
+        const int settingsTabIndex = 3;
+        const string contextRegRoot = "Software\\Classes\\Directory\\Background\\shell";
+
         public Form1()
         {
             InitializeComponent();
@@ -48,7 +51,7 @@ void Start()
             {
                 SetStatus("Error> Did not found any Unity installations, try setting correct root folder..");
                 UpdateRecentProjectsList();
-                tabControl1.SelectedIndex = 2; // settings tab
+                tabControl1.SelectedIndex = settingsTabIndex;
                 return;
             }
 
@@ -62,7 +65,7 @@ void Start()
                     SetStatus("Launching from commandline..");
 
                     var pathArg = args[2];
-                    LaunchProject(pathArg);
+                    LaunchProject(pathArg, true);
                     SetStatus("Ready");
 
                     // quit after launch if enabled in settings
@@ -75,7 +78,6 @@ void Start()
                 {
                     SetStatus("Error> Invalid arguments:" + args[1]);
                 }
-
             }
 
             UpdateRecentProjectsList();
@@ -285,30 +287,31 @@ void UpdateRecentProjectsList()
             }
         }
 
-        void LaunchProject(string pathArg = null)
+        void LaunchProject(string pathArg = null, bool openProject = true)
         {
-            // check if path is unity project folder
             if (Directory.Exists(pathArg) == true)
             {
-                // validate folder
                 if (Directory.Exists(Path.Combine(pathArg, "Assets")))
                 {
                     var version = GetProjectVersion(pathArg);
-                    Console.WriteLine("Detected project version: " + version);
+                    //Console.WriteLine("Detected project version: " + version);
 
                     bool installed = HaveExactVersionInstalled(version);
                     if (installed == true)
                     {
-                        // TODO: open?
-                        Console.WriteLine("Opening unity version " + version);
+                        //Console.WriteLine("Opening unity version " + version);
+                        SetStatus("Launching project in unity " + version);
 
                         try
                         {
                             Process myProcess = new Process();
                             var cmd = "\"" + unityList[version] + "\"";
-                            var pars = " -projectPath " + "\"" + pathArg + "\"";
                             myProcess.StartInfo.FileName = cmd;
-                            myProcess.StartInfo.Arguments = pars;
+                            if (openProject == true)
+                            {
+                                var pars = " -projectPath " + "\"" + pathArg + "\"";
+                                myProcess.StartInfo.Arguments = pars;
+                            }
                             myProcess.Start();
                         }
                         catch (Exception ex)
@@ -317,8 +320,10 @@ void LaunchProject(string pathArg = null)
                         }
 
                     }
-                    else
+                    else // we dont have this version installed
                     {
+                        SetStatus("Missing unity version: " + version);
+
                         var yesno = MessageBox.Show("Unity version " + version + " is not installed! Yes = Download, No = Open Webpage", "UnityLauncher", MessageBoxButtons.YesNoCancel);
 
                         string url = GetUnityReleaseURL(version);
@@ -480,13 +485,13 @@ private void ShowForm()
             notifyIcon.Visible = false;
         }
 
-        void LaunchSelectedProject()
+        void LaunchSelectedProject(bool openProject = true)
         {
             var selected = gridRecent.CurrentCell.RowIndex;
             if (selected > -1)
             {
                 SetStatus("Launching project..");
-                LaunchProject(gridRecent.Rows[selected].Cells["_path"].Value.ToString());
+                LaunchProject(gridRecent.Rows[selected].Cells["_path"].Value.ToString(), openProject);
                 SetStatus("Ready");
             }
         }
@@ -549,7 +554,7 @@ void AddPackageFolder()
 
         void AddContextMenuRegistry()
         {
-            RegistryKey key = Registry.CurrentUser.OpenSubKey("Software\\Classes\\Directory\\Background\\shell", true);
+            RegistryKey key = Registry.CurrentUser.OpenSubKey(contextRegRoot, true);
             if (key != null)
             {
                 var appName = "UnityLauncher";
@@ -568,22 +573,30 @@ void AddContextMenuRegistry()
             }
             else
             {
-                SetStatus("Error> Cannot find registry key: Software\\Classes\\Directory\\Background\\shell");
+                SetStatus("Error> Cannot find registry key: " + contextRegRoot);
             }
         }
 
         void RemoveContextMenuRegistry()
         {
-            RegistryKey key = Registry.CurrentUser.OpenSubKey("Software\\Classes\\Directory\\Background\\shell", true);
+            RegistryKey key = Registry.CurrentUser.OpenSubKey(contextRegRoot, true);
             if (key != null)
             {
                 var appName = "UnityLauncher";
-                key.DeleteSubKeyTree(appName);
-                SetStatus("Removed context menu registry items");
+                RegistryKey appKey = Registry.CurrentUser.OpenSubKey(contextRegRoot + "\\" + appName, false);
+                if (appKey != null)
+                {
+                    key.DeleteSubKeyTree(appName);
+                    SetStatus("Removed context menu registry items");
+                }
+                else
+                {
+                    SetStatus("Nothing to uninstall..");
+                }
             }
             else
             {
-                SetStatus("Error> Cannot find registry key: Software\\Classes\\Directory\\Background\\shell");
+                SetStatus("Error> Cannot find registry key: " + contextRegRoot);
             }
         }
 
@@ -800,12 +813,18 @@ private void btnAddRegister_Click(object sender, EventArgs e)
         {
             AddContextMenuRegistry();
         }
-        #endregion
 
         private void chkQuitAfterCommandline_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.closeAfterExplorer = chkQuitAfterCommandline.Checked;
             Properties.Settings.Default.Save();
         }
+
+        private void btnRunUnityOnly_Click(object sender, EventArgs e)
+        {
+            LaunchSelectedProject(openProject: false);
+        }
+
+        #endregion
     }
 }

UnityLauncher/Form1.cs

@@ -120,9 +120,6 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>376, 18</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>14, 20</value>
-  </metadata>
   <metadata name="_project.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1054,6 +1051,9 @@
         AAA=
 </value>
   </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>14, 20</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>43</value>
   </metadata>