Unity tab: add explore install folder, add open release notes, add run unity only. UpgradeWindow: add esc key to cancel, fix keyboard scrolling in list

Author: unitycoder

UnityLauncherPro/MainWindow.xaml

@@ -72,7 +72,7 @@
 		</Style>
 
 		<!-- datagrid hide selected cell borders -->
-		<!--<Style TargetType="{x:Type DataGridCell}">
+		<Style TargetType="{x:Type DataGridCell}">
 			<Setter Property="BorderBrush" Value="Transparent" />
 			<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 			<Setter Property="Margin" Value="0,0.5,0,0.5" />
@@ -84,10 +84,10 @@
 					<Setter Property="Background" Value="Transparent" />
 				</Trigger>
 			</Style.Triggers>
-		</Style>-->
+		</Style>
 
 		<Style x:Key="NoFocusCellStyle" TargetType="DataGridCell">
-			<Setter Property="Focusable" Value="False"/>
+			<!--<Setter Property="Focusable" Value="False"/>-->
 		</Style>
 
 		<!-- custom buttons -->
@@ -225,8 +225,8 @@
 
 	</Window.Resources>
 
-	
-	
+
+
 
 	<!-- UI -->
 
@@ -387,7 +387,6 @@
 						<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExplore" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="8,0,0,0" BorderBrush="{x:Null}" Click="BtnExplore_Click" >
 							<Label Foreground="{DynamicResource ButtonForeground}">_Explore</Label>
 						</Button>
-
 					</Grid>
 				</Grid>
 			</TabItem>
@@ -441,20 +440,25 @@
 					<!-- bottom buttoms row -->
 					<Grid VerticalAlignment="Bottom" Margin="4,0,8,5">
 						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="20*" />
 							<ColumnDefinition Width="20*" />
 							<ColumnDefinition Width="45*" />
 							<ColumnDefinition Width="15*" />
+
 						</Grid.ColumnDefinitions>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="32" />
 						</Grid.RowDefinitions>
-						<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnRunUnity" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}">
-							<Label Foreground="{DynamicResource ButtonForeground}">_Upgrade</Label>
+						<Button Grid.Column="0" Style="{StaticResource CustomButton}" x:Name="btnReleaseNotes" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="5,0,0,0" BorderBrush="{x:Null}" Click="BtnReleaseNotes_Click">
+							<Label Foreground="{DynamicResource ButtonForeground}" Content="Release Notes"/>
+						</Button>
+						<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnUpdateUnity" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="8,0,0,0" BorderBrush="{x:Null}" Click="BtnUpdateUnity_Click">
+							<Label Foreground="{DynamicResource ButtonForeground}" Content="Update"/>
 						</Button>
-						<Button Grid.Column="1" Style="{StaticResource CustomButton}" x:Name="btnReleaseNotes" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="8,0,0,0" BorderBrush="{x:Null}" >
+						<Button Grid.Column="2" Style="{StaticResource CustomButton}" x:Name="btnRunUnity" Background="{DynamicResource ButtonBackground}" Foreground="{DynamicResource ButtonForeground}" Margin="8,0,0,0" BorderBrush="{x:Null}" Click="BtnRunUnity_Click" >
 							<Label Foreground="{DynamicResource ButtonForeground}">_Run Unity</Label>
 						</Button>
-						<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExploreUnity" Background="{DynamicResource ButtonBackground}" Margin="8,0,0,0" BorderBrush="{x:Null}" Foreground="{DynamicResource ButtonForeground}" >
+						<Button Grid.Column="3" Style="{StaticResource CustomButton}" x:Name="btnExploreUnity" Background="{DynamicResource ButtonBackground}" Margin="8,0,0,0" BorderBrush="{x:Null}" Foreground="{DynamicResource ButtonForeground}" Click="BtnExploreUnity_Click" >
 							<Label Foreground="{DynamicResource ButtonForeground}">_Explore</Label>
 						</Button>
 

UnityLauncherPro/MainWindow.xaml.cs

@@ -456,6 +456,11 @@ Project GetSelectedProject()
             return (Project)gridRecent.SelectedItem;
         }
 
+        UnityInstallation GetSelectedUnity()
+        {
+            return (UnityInstallation)dataGridUnitys.SelectedItem;
+        }
+
         private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             // override Enter for datagrid
@@ -543,6 +548,33 @@ private void GridRecent_Loaded(object sender, RoutedEventArgs e)
             DataGridRow row = (DataGridRow)gridRecent.ItemContainerGenerator.ContainerFromIndex(0);
             row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
         }
+
+        private void BtnExploreUnity_Click(object sender, RoutedEventArgs e)
+        {
+            var unity = GetSelectedUnity();
+            if (unity == null) return;
+            var path = Path.GetDirectoryName(unity.Path);
+            Tools.LaunchExplorer(path);
+        }
+
+        private void BtnRunUnity_Click(object sender, RoutedEventArgs e)
+        {
+            var unity = GetSelectedUnity();
+            if (unity == null) return;
+            Tools.LaunchExe(unity.Path);
+        }
+
+        private void BtnReleaseNotes_Click(object sender, RoutedEventArgs e)
+        {
+            var unity = GetSelectedUnity();
+            if (unity == null) return;
+            Tools.OpenReleaseNotes(unity.Version);
+        }
+
+        private void BtnUpdateUnity_Click(object sender, RoutedEventArgs e)
+        {
+            // TODO check for newer available version in Updates tab, select that row and jump to tab
+        }
     } // class
 } //namespace
 

UnityLauncherPro/UpgradeWindow.xaml

@@ -189,7 +189,7 @@
 		<Button Style="{StaticResource CustomButton}" x:Name="btnUpgradeProject" Background="{DynamicResource ButtonBackground}" Foreground="#FFC1C1C1" Margin="0,434,8,0" BorderBrush="{x:Null}" HorizontalAlignment="Right" Width="159" VerticalAlignment="Top" Height="51" Click="BtnUpgradeProject_Click" >
 			<Label Foreground="{DynamicResource ButtonForeground}" Content="_Upgrade Project"/>
 		</Button>
-		<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" HorizontalAlignment="Left" Height="304" Margin="10,121,0,0" VerticalAlignment="Top" Width="393" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ButtonForeground}" Background="{DynamicResource MainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown">
+		<DataGrid x:Name="gridAvailableVersions" SelectionMode="Single" HorizontalAlignment="Left" Height="304" Margin="10,121,0,0" VerticalAlignment="Top" Width="393" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ButtonForeground}" Background="{DynamicResource MainBackgroundColor}" PreviewKeyDown="GridAvailableVersions_PreviewKeyDown" Loaded="GridAvailableVersions_Loaded">
 			<DataGrid.Columns>
 				<DataGridTextColumn Header="Key" Binding="{Binding Key}" IsReadOnly="True" />
 				<DataGridTextColumn Header="Value" Binding="{Binding Value}" IsReadOnly="True" />

UnityLauncherPro/UpgradeWindow.xaml.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace UnityLauncherPro
@@ -101,6 +102,17 @@ private void Window_PreviewKeyDown(object sender, System.Windows.Input.KeyEventA
                 DialogResult = true;
                 return;
             }
+            else // other keys
+            {
+                switch (e.Key)
+                {
+                    case Key.Escape:
+                        DialogResult = false;
+                        break;
+                    default:
+                        break;
+                }
+            }
 
             base.OnKeyDown(e);
         }
@@ -109,5 +121,12 @@ private void GridAvailableVersions_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             Tools.HandleDataGridScrollKeys(sender, e);
         }
+
+        private void GridAvailableVersions_Loaded(object sender, RoutedEventArgs e)
+        {
+            gridAvailableVersions.Focus();
+            DataGridRow row = (DataGridRow)gridAvailableVersions.ItemContainerGenerator.ContainerFromIndex(gridAvailableVersions.SelectedIndex);
+            row.MoveFocus(new TraversalRequest(FocusNavigationDirection.Next));
+        }
     }
 }