add force update key when launching project from explorer (hold shift key down) fixes #89, fix download button size in updates tab fixes #95, open update project form topmost

Author: unitycoder

UnityLauncher/Form1.Designer.cs

@@ -61,6 +61,8 @@ void Start()
                 return;
             }
 
+
+
             // check if received -projectPath argument (that means opening from explorer / cmdline)
             string[] args = Environment.GetCommandLineArgs();
             if (args != null && args.Length > 2)
@@ -89,8 +91,17 @@ void Start()
                         commandLineArguments += " " + args[i];
                     }
 
-                    // try launching it
-                    LaunchProject(projectPathArgument, version, openProject: true, commandLineArguments: commandLineArguments);
+                    // check if force-update button is down
+                    if ((Control.ModifierKeys & Keys.Shift) != 0)
+                    {
+                        DisplayUpgradeDialog(version, projectPathArgument, launchProject: true, commandLineArguments: commandLineArguments);
+                    }
+                    else
+                    {
+                        // try launching it
+                        LaunchProject(projectPathArgument, version, openProject: true, commandLineArguments: commandLineArguments);
+                    }
+
 
                     // quit after launch if enabled in settings
                     if (Properties.Settings.Default.closeAfterExplorer == true)
@@ -1125,7 +1136,7 @@ void UpgradeProject()
             }
         }
 
-        void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launchProject = true)
+        void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launchProject = true, string commandLineArguments = "")
         {
             // display upgrade dialog (version selector)
             Form2 upgradeDialog = new Form2();
@@ -1138,7 +1149,7 @@ void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launch
                 case DialogResult.Ignore: // view release notes page
                     Tools.OpenReleaseNotes(currentVersion);
                     // display window again for now..
-                    DisplayUpgradeDialog(currentVersion, projectPath, launchProject);
+                    DisplayUpgradeDialog(currentVersion, projectPath, launchProject, commandLineArguments);
                     break;
                 case DialogResult.Cancel: // cancelled
                     SetStatus("Cancelled project upgrade");

UnityLauncher/Form1.cs

@@ -138,6 +138,36 @@
   <metadata name="_gitBranch.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="_project.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_path.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_dateModified.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_launchArguments.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_gitBranch.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_unityVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_unityPath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_unityInstallDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_Platforms.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="_unityVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -156,6 +186,15 @@
   <metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="_Date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</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="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>111, 20</value>
   </metadata>