add star icon for preferred unity, fix update list downloading, add preferredversion string to compare with, improve focus on search results and after clearning search (keeps previous item if didnt change it, on keydown move to first item (not 2nd)

Author: unitycoder

Diff for: UnityLauncherPro/Data/UnityInstallation.cs

@@ -9,6 +9,7 @@ public class UnityInstallation : IValueConverter
         public string Path { set; get; }
         public DateTime? Installed { set; get; }
         public string Platforms { set; get; }
+        public bool IsPreferred { set; get; }
 
         // color project unity version cells, depending if have that version installed
         // https://stackoverflow.com/a/5551986/5452781

Diff for: UnityLauncherPro/GetUnityInstallations.cs

@@ -48,6 +48,7 @@ public static UnityInstallation[] Scan()
                     unity.Version = version;
                     unity.Path = exePath;
                     unity.Installed = installDate;
+                    unity.IsPreferred = (version == MainWindow.preferredVersion);
 
                     // TEST get platforms, NOTE if this is slow, do it later, or skip for commandline
                     var platforms = GetPlatforms(dataFolder);

Diff for: UnityLauncherPro/GetUnityUpdates.cs

@@ -15,7 +15,7 @@ public static async Task<string> Scan()
         {
             if (isDownloadingUnityList == true)
             {
-                //SetStatus("We are already downloading ...");
+                Console.WriteLine("We are already downloading ...");
                 return null;
             }
 
@@ -28,8 +28,8 @@ public static async Task<string> Scan()
 
                 Task<string> downloadStringTask = webClient.DownloadStringTaskAsync(new Uri(unityVersionsURL));
                 result = await downloadStringTask;
+                isDownloadingUnityList = false;
             }
-
             return result;
         }
 

Diff for: UnityLauncherPro/MainWindow.xaml

@@ -426,6 +426,19 @@
 					<DataGrid x:Name="dataGridUnitys"  SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="#FFD8D8D8" HorizontalGridLinesBrush="#4C000000" VerticalGridLinesBrush="#19000000" AutoGenerateColumns="False" PreviewKeyDown="DataGridUnitys_PreviewKeyDown" PreviewMouseDoubleClick="DataGridUnitys_PreviewMouseDoubleClick">
 
 						<DataGrid.Columns>
+							<DataGridTextColumn ClipboardContentBinding="{x:Null}" IsReadOnly="True" MinWidth="16">
+								<DataGridTextColumn.ElementStyle>
+									<Style TargetType="{x:Type TextBlock}">
+										<Style.Triggers>
+											<DataTrigger Binding="{Binding IsPreferred}" Value="true">
+												<Setter Property="Text" Value="★" />
+												<Setter Property="TextAlignment" Value="Center" />
+											</DataTrigger>
+										</Style.Triggers>
+									</Style>
+								</DataGridTextColumn.ElementStyle>
+							</DataGridTextColumn>
+
 							<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="123"/>
 							<DataGridTextColumn Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" Header="Path" IsReadOnly="True"/>
 							<DataGridTextColumn Binding="{Binding Installed, StringFormat=\{0:dd/MM/yyyy HH:mm:ss\}}" ClipboardContentBinding="{x:Null}" Header="Installed" IsReadOnly="True"/>
@@ -503,7 +516,6 @@
 					<Button Style="{StaticResource CustomButton}" ToolTip="Fetch released versions" x:Name="btnRefreshUpdatesList" Content="⟳" Height="22" Width="22" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="16" Background="#FF3F3F46" Foreground="#FFC1C1C1" Margin="0,4,3,0" Padding="1,-2,1,1" BorderBrush="{x:Null}" Click="OnGetUnityUpdatesClick"/>
 
 					<DataGrid x:Name="dataGridUpdates"  SelectionMode="Single" Margin="4,30,2,42" Background="{x:Null}" BorderBrush="{x:Null}" ColumnHeaderStyle="{StaticResource HeaderStyle}" Padding="0" HorizontalScrollBarVisibility="Disabled" HeadersVisibility="Column" Foreground="#FFD8D8D8" HorizontalGridLinesBrush="#4C000000" VerticalGridLinesBrush="#19000000" AutoGenerateColumns="False" PreviewKeyDown="DataGridUpdates_PreviewKeyDown" PreviewMouseDoubleClick="DataGridUpdates_PreviewMouseDoubleClick">
-
 						<DataGrid.Columns>
 							<DataGridTextColumn Binding="{Binding ReleaseDate, StringFormat=\{0:dd/MM/yyyy\}}" ClipboardContentBinding="{x:Null}"  MinWidth="100" Header="ReleaseDate" IsReadOnly="True"/>
 							<DataGridTextColumn Binding="{Binding Version}" ClipboardContentBinding="{x:Null}" Header="Version" IsReadOnly="True" MinWidth="123">

Diff for: UnityLauncherPro/MainWindow.xaml.cs

@@ -40,6 +40,7 @@ public partial class MainWindow : Window
         string _filterString = null;
         const string githubURL = "https://github.com/unitycoder/UnityLauncherPro";
         int lastSelectedProjectIndex = 0;
+        public static string preferredVersion = "none";
         Mutex myMutex;
 
         public MainWindow()
@@ -174,11 +175,11 @@ void FilterRecentProjects()
             _filterString = txtSearchBox.Text;
             ICollectionView collection = CollectionViewSource.GetDefaultView(projectsSource);
             collection.Filter = ProjectFilter;
-            // set first row selected
-            if (gridRecent.Items.Count > 0)
-            {
-                gridRecent.SelectedIndex = 0;
-            }
+            // set first row selected, if only 1 row
+            //if (gridRecent.Items.Count == 1)
+            //{
+            //    gridRecent.SelectedIndex = 0;
+            //}
         }
 
         void FilterUpdates()
@@ -242,7 +243,6 @@ void LoadSettings()
             gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
             gridRecent.Columns[5].Visibility = (bool)chkShowGitBranchColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
 
-
             // update installations folder listbox
             lstRootFolders.Items.Clear();
             lstRootFolders.ItemsSource = Properties.Settings.Default.rootFolders;
@@ -256,6 +256,10 @@ void LoadSettings()
                     gridRecent.Columns[i].Width = gridColumnWidths[i];
                 }
             }
+
+            // other setting vars
+            preferredVersion = Properties.Settings.Default.preferredVersion;
+
         } // LoadSettings()
 
         private void SaveSettingsOnExit()
@@ -292,6 +296,9 @@ private void SaveSettingsOnExit()
 
         void UpdateUnityInstallationsList()
         {
+            // reset preferred string, if user changed it
+            //preferredVersion = "none";
+
             unityInstallationsSource = GetUnityInstallations.Scan();
             dataGridUnitys.ItemsSource = unityInstallationsSource;
 
@@ -300,7 +307,7 @@ void UpdateUnityInstallationsList()
             for (int i = 0, len = unityInstallationsSource.Length; i < len; i++)
             {
                 var version = unityInstallationsSource[i].Version;
-                if (string.IsNullOrEmpty(version)==false && unityInstalledVersions.ContainsKey(version) == false)
+                if (string.IsNullOrEmpty(version) == false && unityInstalledVersions.ContainsKey(version) == false)
                 {
                     unityInstalledVersions.Add(version, unityInstallationsSource[i].Path);
                 }
@@ -339,13 +346,13 @@ void AddUnityInstallationRootFolder()
             }
         }
 
-
-
+        // waits for unity update results and assigns to datagrid
         async void CallGetUnityUpdates()
         {
             dataGridUpdates.ItemsSource = null;
             var task = GetUnityUpdates.Scan();
             var items = await task;
+            Console.WriteLine(items == null);
             if (items == null) return;
             updatesSource = GetUnityUpdates.Parse(items);
             if (updatesSource == null) return;
@@ -485,7 +492,7 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
                         case Key.Escape: // clear project search
                             if (txtSearchBox.Text == "")
                             {
-                                Tools.SetFocusToGrid(gridRecent);
+                                if (txtSearchBox.IsFocused) Tools.SetFocusToGrid(gridRecent);
                             }
                             txtSearchBox.Text = "";
                             break;
@@ -555,11 +562,12 @@ private async void OnTabSelectionChanged(object sender, SelectionChangedEventArg
             // if going into updates tab, fetch list (first time only)
             if (((TabControl)sender).SelectedIndex == (int)Tabs.Updates)
             {
+                // if we dont have previous results yet, TODO scan again if previous was 24hrs ago
                 if (updatesSource == null)
                 {
                     var task = GetUnityUpdates.Scan();
-                    if (task.IsCompleted == false) return;
                     var items = await task;
+                    if (task.IsCompleted == false || task.IsFaulted == true) return;
                     if (items == null) return;
                     updatesSource = GetUnityUpdates.Parse(items);
                     if (updatesSource == null) return;
@@ -601,12 +609,14 @@ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
         private void BtnLaunchProject_Click(object sender, RoutedEventArgs e)
         {
             Tools.LaunchProject(GetSelectedProject());
+            Tools.SetFocusToGrid(gridRecent);
         }
 
         private void BtnExplore_Click(object sender, RoutedEventArgs e)
         {
             var proj = GetSelectedProject();
             Tools.ExploreProjectFolder(proj);
+            Tools.SetFocusToGrid(gridRecent);
         }
 
         // copy selected row unity version to clipboard
@@ -719,6 +729,7 @@ private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
                 case Key.Up:
                 case Key.Down:
                     Tools.SetFocusToGrid(gridRecent);
+                    e.Handled = true; // to stay in first row
                     break;
                 default:
                     break;
@@ -814,6 +825,7 @@ private void TxtSearchBoxUpdates_PreviewKeyDown(object sender, KeyEventArgs e)
                 case Key.Up:
                 case Key.Down:
                     Tools.SetFocusToGrid(dataGridUpdates);
+                    e.Handled = true;
                     break;
                 default:
                     break;
@@ -935,7 +947,7 @@ private void BtnDonwloadInBrowser_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                Console.WriteLine("Failed getting Unity Installer URL for " + unity.Version);
+                Console.WriteLine("Failed getting Unity Installer URL for " + unity?.Version);
             }
         }
 
@@ -1106,10 +1118,13 @@ private void BtnAssetPackages_Click(object sender, RoutedEventArgs e)
         // sets selected unity version as preferred main unity version (to be preselected in case of unknown version projects, when creating new empty project, etc)
         private void MenuItemSetPreferredUnityVersion_Click(object sender, RoutedEventArgs e)
         {
-            Properties.Settings.Default.preferredVersion = GetSelectedUnity().Version;
+            var ver = GetSelectedUnity().Version;
+            Properties.Settings.Default.preferredVersion = ver;
             Properties.Settings.Default.Save();
-            
-            // TODO set star icon
+
+            preferredVersion = ver;
+            // TODO update unity list or just set value?
+            UpdateUnityInstallationsList();
 
         }
     } // class