updates: add download & install button, add null version checks

Author: unitycoder

UnityLauncherPro/MainWindow.xaml

@@ -411,15 +411,19 @@
                     <Grid VerticalAlignment="Bottom" Margin="4,0,8,5">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="20*" />
-                            <ColumnDefinition Width="45*" />
+                            <ColumnDefinition Width="33*" />
+                            <ColumnDefinition Width="33*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="32" />
                         </Grid.RowDefinitions>
-                        <Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnDonwloadInBrowser"  Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnDonwloadInBrowser_Click">
+                        <Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnDownloadInBrowser"  Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnDownloadInBrowser_Click">
                             <Label Content="_Download in browser" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
                         </Button>
-                        <Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnOpenWebsite"  Margin="8,0,0,0" BorderBrush="{x:Null}" Click="BtnOpenWebsite_Click" >
+                        <Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnDownloadInstallUpdate"  Margin="5,0,0,0" BorderBrush="{x:Null}" Click="btnDownloadInstallUpdate_Click">
+                            <Label Content="Download &amp; Install" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
+                        </Button>
+                        <Button Grid.Column="2" Style="{StaticResource CustomButton}" x:Name="btnOpenWebsite"  Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnOpenWebsite_Click" >
                             <Label Content="Release _Notes" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
                         </Button>
                     </Grid>

UnityLauncherPro/MainWindow.xaml.cs

@@ -1385,7 +1385,7 @@ private void BtnRefreshUnityList_Click(object sender, RoutedEventArgs e)
             UpdateUnityInstallationsList();
         }
 
-        private void BtnDonwloadInBrowser_Click(object sender, RoutedEventArgs e)
+        private void BtnDownloadInBrowser_Click(object sender, RoutedEventArgs e)
         {
             var unity = GetSelectedUpdate();
             string url = Tools.GetUnityReleaseURL(unity?.Version);
@@ -1400,6 +1400,20 @@ private void BtnDonwloadInBrowser_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void btnDownloadInstallUpdate_Click(object sender, RoutedEventArgs e)
+        {
+            var unity = GetSelectedUpdate();
+            string url = Tools.GetUnityReleaseURL(unity?.Version);
+            if (string.IsNullOrEmpty(url) == false)
+            {
+                Tools.DownloadAndInstall(url, unity?.Version);
+            }
+            else
+            {
+                Console.WriteLine("Failed getting Unity Installer URL for " + unity?.Version);
+            }
+        }
+
         private void BtnOpenWebsite_Click(object sender, RoutedEventArgs e)
         {
             var unity = GetSelectedUpdate();
@@ -2694,7 +2708,7 @@ private void MenuItemDownloadInBrowser_Click(object sender, RoutedEventArgs e)
         {
             var unity = GetSelectedUpdate();
             string exeURL = Tools.ParseDownloadURLFromWebpage(unity?.Version);
-            Tools.DownloadInBrowser(exeURL, unity?.Version);
+            if (exeURL != null) Tools.DownloadInBrowser(exeURL, unity?.Version);
         }
 
         private void MenuItemDownloadLinuxModule_Click(object sender, RoutedEventArgs e)
@@ -3322,6 +3336,8 @@ private void tabControl_PreviewKeyDown(object sender, KeyEventArgs e)
             }
         }
 
+
+
         //private void BtnBrowseTemplateUnityPackagesFolder_Click(object sender, RoutedEventArgs e)
         //{
         //    var folder = Tools.BrowseForOutputFolder("Select unitypackage Templates folder");

UnityLauncherPro/Tools.cs

@@ -649,6 +649,8 @@ public static string ParseDownloadURLFromWebpage(string version)
         {
             string url = "";
 
+            if (string.IsNullOrEmpty(version)) return null;
+
             using (WebClient client = new WebClient())
             {
                 // get correct page url

UnityLauncherPro/UpgradeWindow.xaml

@@ -21,7 +21,7 @@
             <Button Style="{StaticResource CustomButton}" x:Name="btnDownload" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" Margin="9,0,9,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="35" Click="BtnDownload_Click" Width="125" >
                 <Label Foreground="{DynamicResource ThemeButtonForeground}" Content="Download in _Browser"/>
             </Button>
-            <Button Style="{StaticResource CustomButton}" x:Name="btnInstall" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" BorderBrush="{x:Null}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="35" Width="125" Click="btnInstall_Click" >
+            <Button Style="{StaticResource CustomButton}" x:Name="btnInstall" Background="{DynamicResource ThemeButtonBackground}" Foreground="#FFC1C1C1" BorderBrush="{x:Null}" HorizontalAlignment="Right" VerticalAlignment="Top" Height="35" Width="125" Click="btnInstall_Click" ToolTip="Downloads Unity web installer into Temp folder and runs it (Root folder path is copied to clipboard)" >
                 <Label Foreground="{DynamicResource ThemeButtonForeground}" Content="_Download &amp; Install"/>
             </Button>
         </StackPanel>