Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
This repository was archived by the owner on May 19, 2021. It is now read-only.

Commit 718d0bc

Browse files
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
1 parent 9b08737 commit 718d0bc

File tree

4 files changed

+72
-23
lines changed

4 files changed

+72
-23
lines changed

‎UnityLauncher/Form1.Designer.cs‎

Lines changed: 17 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityLauncher/Form1.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ void Start()
6161
return;
6262
}
6363

64+
65+
6466
// check if received -projectPath argument (that means opening from explorer / cmdline)
6567
string[] args = Environment.GetCommandLineArgs();
6668
if (args != null && args.Length > 2)
@@ -89,8 +91,17 @@ void Start()
8991
commandLineArguments += " " + args[i];
9092
}
9193

92-
// try launching it
93-
LaunchProject(projectPathArgument, version, openProject: true, commandLineArguments: commandLineArguments);
94+
// check if force-update button is down
95+
if ((Control.ModifierKeys & Keys.Shift) != 0)
96+
{
97+
DisplayUpgradeDialog(version, projectPathArgument, launchProject: true, commandLineArguments: commandLineArguments);
98+
}
99+
else
100+
{
101+
// try launching it
102+
LaunchProject(projectPathArgument, version, openProject: true, commandLineArguments: commandLineArguments);
103+
}
104+
94105

95106
// quit after launch if enabled in settings
96107
if (Properties.Settings.Default.closeAfterExplorer == true)
@@ -1125,7 +1136,7 @@ void UpgradeProject()
11251136
}
11261137
}
11271138

1128-
void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launchProject = true)
1139+
void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launchProject = true,stringcommandLineArguments="")
11291140
{
11301141
// display upgrade dialog (version selector)
11311142
Form2 upgradeDialog = new Form2();
@@ -1138,7 +1149,7 @@ void DisplayUpgradeDialog(string currentVersion, string projectPath, bool launch
11381149
case DialogResult.Ignore: // view release notes page
11391150
Tools.OpenReleaseNotes(currentVersion);
11401151
// display window again for now..
1141-
DisplayUpgradeDialog(currentVersion, projectPath, launchProject);
1152+
DisplayUpgradeDialog(currentVersion, projectPath, launchProject,commandLineArguments);
11421153
break;
11431154
case DialogResult.Cancel: // cancelled
11441155
SetStatus("Cancelled project upgrade");

‎UnityLauncher/Form1.resx‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,36 @@
138138
<metadata name="_gitBranch.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139139
<value>True</value>
140140
</metadata>
141+
<metadata name="_project.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142+
<value>True</value>
143+
</metadata>
144+
<metadata name="_version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
145+
<value>True</value>
146+
</metadata>
147+
<metadata name="_path.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
148+
<value>True</value>
149+
</metadata>
150+
<metadata name="_dateModified.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
151+
<value>True</value>
152+
</metadata>
153+
<metadata name="_launchArguments.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
154+
<value>True</value>
155+
</metadata>
156+
<metadata name="_gitBranch.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
157+
<value>True</value>
158+
</metadata>
159+
<metadata name="_unityVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
160+
<value>True</value>
161+
</metadata>
162+
<metadata name="_unityPath.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
163+
<value>True</value>
164+
</metadata>
165+
<metadata name="_unityInstallDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
166+
<value>True</value>
167+
</metadata>
168+
<metadata name="_Platforms.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
169+
<value>True</value>
170+
</metadata>
141171
<metadata name="_unityVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142172
<value>True</value>
143173
</metadata>
@@ -156,6 +186,15 @@
156186
<metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
157187
<value>True</value>
158188
</metadata>
189+
<metadata name="_Date.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
190+
<value>True</value>
191+
</metadata>
192+
<metadata name="_UnityUpdateVersion.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
193+
<value>True</value>
194+
</metadata>
195+
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
196+
<value>14, 20</value>
197+
</metadata>
159198
<metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
160199
<value>111, 20</value>
161200
</metadata>

‎UnityLauncher/Form2.Designer.cs‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /