Merge branch 'master' into dev

* master:
  theme editor: allow writing into color text fields, escape = undo current textfield edit
  projects: if press up/down key in searchbox, selection moves in grid, if no items selected from search then select first as default, updates: clear search field on refresh, #BUILD
  Disable "Remove project from list" for now (causes sorting issues if registry not in order), Tools: add buttons for browsing CrashDumps, Unity\cache, GiCache
  add codeql badge
  Update codeql.yml
  Create codeql.yml
  Update screenshots
  test #BUILD
  Add custom ProjectName.txt support, Add rename project title (saves into ProjectSettings/ProjectName.txt file), Add setting for taking projectname from Folder or ProjectName.txt override, or from Player settings ProductName field, REMOVED: Project folder rename (it was too dangerous, rather rename folder from Explorer if needed), fixed nullref if pressed F2 (rename) when recent grid was not selected, #BUILD
  disable horizontal scroll from upgrade window datagrid (otherwise it autoscrolls when click editor path column)
  fix double click to launch, after cell edit #32
  #BUILD
  add virustotal scan link banner

Author: unitycoder

.github/workflows/codeql.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '19 2 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-2019
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

README.md

@@ -1,5 +1,6 @@
 # UnityLauncherPro 
-[![Build Status](https://ci.appveyor.com/api/projects/status/hajcaavcsg7904rx?svg=true)](https://github.com/unitycoder/UnityLauncherPro/releases/latest/download/UnityLauncherPro.zip) [![Downloads](https://img.shields.io/github/downloads/unitycoder/unitylauncherpro/total)](https://github.com/unitycoder/UnityLauncherPro/releases/latest/download/UnityLauncherPro.zip) [![GitHub license](https://img.shields.io/github/license/unitycoder/UnityLauncherPro)](https://github.com/unitycoder/UnityLauncherPro/blob/master/LICENSE) [](https://discord.gg/cXT97hU)<a href="https://discord.gg/cXT97hU"><img src="https://img.shields.io/discord/337579253866692608.svg"></a>
+[![Build Status](https://ci.appveyor.com/api/projects/status/hajcaavcsg7904rx?svg=true)](https://github.com/unitycoder/UnityLauncherPro/releases/latest/download/UnityLauncherPro.zip) [![Downloads](https://img.shields.io/github/downloads/unitycoder/unitylauncherpro/total)](https://github.com/unitycoder/UnityLauncherPro/releases/latest/download/UnityLauncherPro.zip) [![GitHub license](https://img.shields.io/github/license/unitycoder/UnityLauncherPro)](https://github.com/unitycoder/UnityLauncherPro/blob/master/LICENSE) [](https://discord.gg/cXT97hU)<a href="https://discord.gg/cXT97hU"><img src="https://img.shields.io/discord/337579253866692608.svg"></a> [![VirusTotal scan now](https://img.shields.io/static/v1?label=VirusTotal&message=Scan)](https://www.virustotal.com/gui/url/e123b616cf4cbe3d3f7ba13b0d88cf5fff4638f72d5b9461088d0b11e9a41de3?nocache=1) [![CodeQL](https://github.com/unitycoder/UnityLauncherPro/actions/workflows/codeql.yml/badge.svg)](https://github.com/unitycoder/UnityLauncherPro/actions/workflows/codeql.yml)
+
 
 Handle all your Unity versions and Projects easily!
 
@@ -42,9 +43,9 @@ See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro
 
 ![image](https://user-images.githubusercontent.com/5438317/120828338-17681d00-c565-11eb-972a-49055070427a.png)
 
-![image](https://user-images.githubusercontent.com/5438317/120828346-19ca7700-c565-11eb-9430-89420cf15caa.png)
+![image](https://user-images.githubusercontent.com/5438317/154346224-8aa8d547-8495-47cf-baca-4cb31639344b.png)
 
-![image](https://user-images.githubusercontent.com/5438317/120828355-1c2cd100-c565-11eb-9fee-bc77112b8d16.png)
+![image](https://user-images.githubusercontent.com/5438317/154346049-4426f504-a437-4119-8d1c-f3d4d3fa434c.png)
 
 ### Perform tasks on selected project
 ![image](https://user-images.githubusercontent.com/5438317/120828528-4da59c80-c565-11eb-8b11-9cf739cde306.png)
@@ -64,3 +65,4 @@ See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro
 
 <br>
 Old (winforms) version is here: https://github.com/unitycoder/UnityLauncher
+

UnityLauncherPro/MainWindow.xaml

@@ -585,8 +585,8 @@
                                 <MenuItem x:Name="menuItemKillProcess" Header="Kill Process" Click="MenuItemKillProcess_Click" />
                                 <Separator/>
                                 <MenuItem x:Name="menuStartWebGLServer" Header="Start WebGL server" Click="MenuStartWebGLServer_Click" />
-                                <Separator/>
-                                <MenuItem x:Name="menuRemoveProject" Header="Remove from recent list" Click="MenuRemoveProject_Click" />
+                                <!--<Separator/>
+                                <MenuItem x:Name="menuRemoveProject" Header="Remove from recent list" Click="MenuRemoveProject_Click" />-->
                             </ContextMenu>
                         </DataGrid.ContextMenu>
 
@@ -852,12 +852,12 @@
                         <RowDefinition Height="50*" />
                     </Grid.RowDefinitions>
                     <!-- 1st part -->
-                    <Grid Grid.Row="0" VerticalAlignment="Top" HorizontalAlignment="Left">
-                        <StackPanel Orientation="Vertical" Margin="10" VerticalAlignment="Top">
+                    <Grid Grid.Row="0" VerticalAlignment="Top">
+                        <StackPanel Orientation="Vertical" Margin="10" VerticalAlignment="Top" HorizontalAlignment="Left">
                             <!--border to avoid next row moving when button is selected-->
-                            <Border VerticalAlignment="Top" Height="40" HorizontalAlignment="Left" Margin="0,0,0,2">
+                            <Border VerticalAlignment="Top" Height="40" Margin="0,0,0,2" HorizontalAlignment="Left">
                                 <!-- folders -->
-                                <StackPanel Orientation="Horizontal" Margin="0,4,10,4" VerticalAlignment="Top" Width="560">
+                                <StackPanel Orientation="Horizontal" Margin="0,4,10,4" VerticalAlignment="Top">
                                     <Label Content="Folders" Foreground="{DynamicResource ThemeButtonForeground}" />
                                     <Button Style="{StaticResource CustomButton}" x:Name="btnOpenEditorLogsFolder"  Margin="0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" Click="BtnOpenEditorLogsFolder_Click" ToolTip="Browse Editor logs folder">
                                         <Label Content="_Editor Logs" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
@@ -871,6 +871,15 @@
                                     <Button Style="{StaticResource CustomButton}" x:Name="btnAssetPackages" Margin="10,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Browse AssetStore downloads folder" Click="BtnAssetPackages_Click">
                                         <Label Content="A_sset packages" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
                                     </Button>
+                                    <Button Style="{StaticResource CustomButton}" x:Name="btnCrashDumps" Margin="10,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Browse Crash dumps folder" Click="BtnCrashDumps_Click">
+                                        <Label Content="Crash _Dumps" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
+                                    </Button>
+                                    <Button Style="{StaticResource CustomButton}" x:Name="btnUnityCache" Margin="10,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Browse Unity Cache folder" Click="BtnUnityCache_Click">
+                                        <Label Content="_Unity Cache" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
+                                    </Button>
+                                    <Button Style="{StaticResource CustomButton}" x:Name="btnGICache" Margin="10,0,0,0" BorderBrush="{x:Null}" HorizontalAlignment="Left" VerticalAlignment="Top" ToolTip="Browse Unity GI Cache folder" Click="BtnGICache_Click">
+                                        <Label Content="_GI Cache" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Control}}}" />
+                                    </Button>
                                 </StackPanel>
                             </Border>
                             <!-- tools -->

UnityLauncherPro/MainWindow.xaml.cs

@@ -624,6 +624,9 @@ private void OnRectangleMouseDown(object sender, MouseButtonEventArgs e)
         private void OnSearchTextChanged(object sender, TextChangedEventArgs e)
         {
             FilterRecentProjects();
+            
+            // if nothing selected, select first item
+            if (gridRecent.SelectedIndex < 0) gridRecent.SelectedIndex = 0;
         }
 
         private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
@@ -687,7 +690,7 @@ private void OnGetUnityUpdatesClick(object sender, RoutedEventArgs e)
 
             // refresh installations, if already added some new ones
             UpdateUnityInstallationsList();
-
+            txtSearchBoxUpdates.Text = "";
             CallGetUnityUpdates();
 
             button.IsEnabled = true;
@@ -727,9 +730,9 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
                             txtSearchBox.Text = "";
                             break;
                         case Key.Up:
+                        case Key.Down:
                         case Key.Left:
                         case Key.Right:
-                        case Key.Down:
                             break;
                         case Key.F2: // edit arguments or project name
                             if (chkEnableProjectRename.IsChecked == false) return; //if rename not enabled
@@ -991,7 +994,11 @@ private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
                     break;
                 case Key.Tab:
                 case Key.Up:
-                    Tools.SetFocusToGrid(gridRecent);
+                    //Tools.SetFocusToGrid(gridRecent);
+                    var currentIndex = gridRecent.SelectedIndex - 1;
+                    //Console.WriteLine(currentIndex);
+                    if (currentIndex < 0) currentIndex = gridRecent.Items.Count - 1;
+                    gridRecent.SelectedIndex = currentIndex;
                     e.Handled = true;
                     break;
                 case Key.Down:
@@ -1002,8 +1009,11 @@ private void TxtSearchBox_PreviewKeyDown(object sender, KeyEventArgs e)
                     //}
                     //else
                     //{
-                    Tools.SetFocusToGrid(gridRecent);
+                    //Tools.SetFocusToGrid(gridRecent);
                     //                    }
+
+                    // if in searchbox, then move selected index up or down
+                    gridRecent.SelectedIndex = ++gridRecent.SelectedIndex % gridRecent.Items.Count;
                     e.Handled = true; // to stay in first row
                     break;
                 default:
@@ -1139,14 +1149,7 @@ private void BtnOpenEditorLogsFolder_Click(object sender, RoutedEventArgs e)
 
         private void BtnOpenPlayerLogs_Click(object sender, RoutedEventArgs e)
         {
-            var logfolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "/../LocalLow");
-            if (Directory.Exists(logfolder) == true)
-            {
-                if (Tools.LaunchExplorer(logfolder) == false)
-                {
-                    Console.WriteLine("Error> Directory not found: " + logfolder);
-                }
-            }
+            Tools.OpenAppdataSpecialFolder("../LocalLow");
         }
 
         private void BtnOpenADBLogCat_Click(object sender, RoutedEventArgs e)
@@ -1514,12 +1517,7 @@ private void ChkAllowSingleInstanceOnly_CheckedChanged(object sender, RoutedEven
 
         private void BtnAssetPackages_Click(object sender, RoutedEventArgs e)
         {
-            var folder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Unity", "Asset Store-5.x");
-            if (Directory.Exists(folder) == false) return;
-            if (Tools.LaunchExplorer(folder) == false)
-            {
-                Console.WriteLine("Cannot open folder.." + folder);
-            }
+            Tools.OpenAppdataSpecialFolder("../Roaming/Unity/Asset Store-5.x");
         }
 
         // sets selected unity version as preferred main unity version (to be preselected in case of unknown version projects, when creating new empty project, etc)
@@ -1739,14 +1737,7 @@ private void GridRecent_BeginningEdit(object sender, DataGridBeginningEditEventA
 
         private void BtnOpenCrashLogs_Click(object sender, RoutedEventArgs e)
         {
-            var logfolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Temp", "Unity", "Editor", "Crashes");
-            if (Directory.Exists(logfolder) == true)
-            {
-                if (Tools.LaunchExplorer(logfolder) == false)
-                {
-                    Console.WriteLine("Cannot open folder.." + logfolder);
-                }
-            }
+            Tools.OpenAppdataSpecialFolder("Temp/Unity/Editor/Crashes/");
         }
 
         // reorder grid item by index
@@ -2410,6 +2401,21 @@ private void ChkSearchProjectPath_Checked(object sender, RoutedEventArgs e)
             Properties.Settings.Default.Save();
         }
 
+        private void BtnCrashDumps_Click(object sender, RoutedEventArgs e)
+        {
+            Tools.OpenAppdataSpecialFolder("CrashDumps");
+        }
+
+        private void BtnGICache_Click(object sender, RoutedEventArgs e)
+        {
+            Tools.OpenAppdataSpecialFolder("../LocalLow/Unity/Caches/GiCache");
+        }
+
+        private void BtnUnityCache_Click(object sender, RoutedEventArgs e)
+        {
+            Tools.OpenAppdataSpecialFolder("Unity/cache");
+        }
+
         //private void BtnBrowseTemplateUnityPackagesFolder_Click(object sender, RoutedEventArgs e)
         //{
         //    var folder = Tools.BrowseForOutputFolder("Select unitypackage Templates folder");

UnityLauncherPro/ThemeEditor.xaml

@@ -238,22 +238,22 @@
                 <StackPanel Orientation="Horizontal">
                     <Label Foreground="#FFC1C1C1" Width="44">Red</Label>
                     <Slider x:Name="sliderRed" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderRed_ValueChanged" PreviewMouseLeftButtonDown="SliderRed_PreviewMouseLeftButtonDown" IsSnapToTickEnabled="True"/>
-                    <TextBox x:Name="txtRed" Text="{Binding ElementName=sliderRed,Path=Value}" Background="#FFAAAAAA" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" IsReadOnly="True" />
+                    <TextBox x:Name="txtRed" Text="{Binding ElementName=sliderRed,Path=Value}" Background="#FFAAAAAA" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Margin="5,0,0,8" KeyUp="TxtRed_KeyUp" PreviewKeyDown="TxtColorField_PreviewKeyDown" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <Label Foreground="#FFC1C1C1" Width="44">Green</Label>
                     <Slider x:Name="sliderGreen"  AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"  HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderGreen_ValueChanged" PreviewMouseLeftButtonDown="SliderGreen_PreviewMouseLeftButtonDown" IsSnapToTickEnabled="True"/>
-                    <TextBox x:Name="txtGreen" Text="{Binding ElementName=sliderGreen,Path=Value}" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Background="#FFAAAAAA" Margin="5,0,0,8" IsReadOnly="True" />
+                    <TextBox x:Name="txtGreen" Text="{Binding ElementName=sliderGreen,Path=Value}" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Background="#FFAAAAAA" Margin="5,0,0,8" KeyUp="TxtGreen_KeyUp" PreviewKeyDown="TxtColorField_PreviewKeyDown" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <Label Foreground="#FFC1C1C1" Width="44">Blue</Label>
                     <Slider x:Name="sliderBlue"  AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"  HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderBlue_ValueChanged" PreviewMouseLeftButtonDown="SliderBlue_PreviewMouseLeftButtonDown" IsSnapToTickEnabled="True"/>
-                    <TextBox x:Name="txtBlue" Text="{Binding ElementName=sliderBlue,Path=Value}" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Background="#FFAAAAAA" Margin="5,0,0,8" IsReadOnly="True" />
+                    <TextBox x:Name="txtBlue" Text="{Binding ElementName=sliderBlue,Path=Value}" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Background="#FFAAAAAA" Margin="5,0,0,8" KeyUp="TxtBlue_KeyUp" PreviewKeyDown="TxtColorField_PreviewKeyDown" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <Label Foreground="#FFC1C1C1" Width="44">Alpha</Label>
                     <Slider x:Name="sliderAlpha"  AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Height="28" Value="255" Maximum="255" LargeChange="0" SmallChange="1" ValueChanged="SliderAlpha_ValueChanged" PreviewMouseLeftButtonDown="SliderAlpha_PreviewMouseLeftButtonDown" IsSnapToTickEnabled="True"/>
-                    <TextBox x:Name="txtAlpha" Text="{Binding ElementName=sliderAlpha,Path=Value}" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Background="#FFAAAAAA" Margin="5,0,0,8" IsReadOnly="True" />
+                    <TextBox x:Name="txtAlpha" Text="{Binding ElementName=sliderAlpha,Path=Value}" VerticalAlignment="Center" IsUndoEnabled="True" Width="32" Background="#FFAAAAAA" Margin="5,0,0,8" KeyUp="TxtAlpha_KeyUp" PreviewKeyDown="TxtColorField_PreviewKeyDown" />
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Vertical" Margin="25,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center">