Merge branch 'master' into dev

* master: (33 commits) try to handle version splitting better for uninstaller, fix #140 fix browse Script and Theme folder buttons testing focusing modification for #133, add comment about nographics for batch build Tools: add "Hub logs" button Update README.md Update README.md fix release type (fixes #132), update assembly info string fix alpha/beta for download full installer fix vs warning "The property 'IsEmpty' was not found in type 'String'", Add button: Download full editor in browser (instead of installer) #131 fix start minimized (titlebar was not hidden from taskbar), fix check updates: did not filter results, if checked updates twice on same unity version Tools, BuildReport: Get Plugins/ folder size from build (if not found, then count all Plugins/ folder sizes from project) Projects: disable ctrl key from focusing search field (to allow ctrl+home/end) Projects: Add support for multiple search strings (separated with space), Updates: clear filters on refresh list (since they are not applied to new list now) Upgrade project: Fix null ref for selected row, Updates: Download & Run, Set installation path using commandline argument to installer (using editor root path + unity base version) upgrade project: display platform, display unity release type & platforms in available unitys list Build report: filter out timestamps, if they are used (fixes #107) fix commandline start Projects: Fix adding existing project and creating new project (select correct just added row, fix red path color, fix null ref if refresh) fixes #125 Projects: Refresh list if toggle Branch or Launcher Arguments column (fixes #117) Projects: Fix Sorting on Refresh and Load (fixes #123) ...
unitycoder · Dec 15, 2023 · 1325a1e · 1325a1e
2 parents 771e8ae + 4a1226e
commit 1325a1e
Show file tree

Hide file tree

Showing 15 changed files with 683 additions and 278 deletions.
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ Handle all your Unity versions and Projects easily!
 ## Features
 - Automagically Open Projects with Correct Unity Version
 - Display Recent Projects list with last modified date and project version info
+- List more than 40 recent projects!
 - Quickly Explore Project Folders
 - List installed Unity versions, can easily Run, Explore installation folder, View release notes
 - Download Missing Unity Versions in Browser
@@ -33,35 +34,38 @@ https://forum.unity.com/threads/unity-launcher-launch-correct-unity-versions-for
 https://github.com/unitycoder/UnityLauncherPro/wiki
 
 ### Development
-See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro/tree/dev
+See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro/tree/dev <br>
+Pre-releases are sometimes available from dev branch: https://github.com/unitycoder/UnityLauncherPro/releases
 
 ### Screenshots
 
 ![image](https://user-images.githubusercontent.com/5438317/71485879-184b3a00-281c-11ea-97db-73c5dfa9bb4e.png)
 
-![image](https://user-images.githubusercontent.com/5438317/120828332-146d2c80-c565-11eb-8a84-c3737c17025f.png)
+![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/21eb1fcd-3cb1-4dea-8133-9ce440de77d8)
 
-![image](https://user-images.githubusercontent.com/5438317/120828338-17681d00-c565-11eb-972a-49055070427a.png)
+![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/2942c1d7-2006-4dee-8b68-e1f6f2e0fbf4)
 
-![image](https://user-images.githubusercontent.com/5438317/154346224-8aa8d547-8495-47cf-baca-4cb31639344b.png)
+![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/6f8dce07-c640-42db-a1ef-d8bcc7a80cc2)
 
-![image](https://user-images.githubusercontent.com/5438317/154346049-4426f504-a437-4119-8d1c-f3d4d3fa434c.png)
+![image](https://user-images.githubusercontent.com/5438317/206923022-4b4bb8ed-0351-408f-b1d3-82bd6eefbc45.png)
 
 ### Perform tasks on selected project
-![image](https://user-images.githubusercontent.com/5438317/120828528-4da59c80-c565-11eb-8b11-9cf739cde306.png)
+![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/a0b468ba-e3a6-420b-8155-78bc32814752)
 
 ### Quick New Project Creation (with Unity version and Templates selection)
-![image](https://user-images.githubusercontent.com/5438317/120828565-58603180-c565-11eb-9cf3-0e3738a7dc95.png)
+![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/9b34f9ba-2c91-462c-be85-9c8aeefa63a0)
 
 ### Upgrade Project Version (automatically suggests next higher version)
-![image](https://user-images.githubusercontent.com/5438317/120828587-5e561280-c565-11eb-876d-54b72aed88c9.png)
+![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/3cc8f8d0-861b-406a-be10-716d92b7f379)
 
 ### Explorer integration (1-click opening projects with correct unity version)
 ![image](https://user-images.githubusercontent.com/5438317/120883135-34900080-c5e4-11eb-80a5-ae78fe89260a.png)
 
 ### View and Select current platform
 ![unitylauncherpro_platform](https://user-images.githubusercontent.com/5438317/132997691-5ed50f1d-e285-4c83-b356-46c1e3f431e4.gif)
 
+### Rename Project title
+![pro-rename](https://user-images.githubusercontent.com/5438317/193453048-aa5527c6-a345-4f93-b934-f68ac2524cac.gif)
 
 <br>
 Old (winforms) version is here: https://github.com/unitycoder/UnityLauncher

diff --git a/UnityLauncherPro/App.xaml b/UnityLauncherPro/App.xaml
@@ -47,10 +47,10 @@
                 <Setter Property="MinHeight" Value="20" />
 
                 <!--test fix for System.Windows.Data Error: 4-->
-                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Center" />
+                <!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />-->
+                <!--<Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Center" />-->
 
                 <Setter Property="Template">
                     <Setter.Value>
@@ -121,10 +121,10 @@
                 <Setter Property="SnapsToDevicePixels" Value="true" />
                 <!--<Setter Property="OverridesDefaultStyle" Value="true" />-->
                 <!-- test fix for error 4 https://gist.github.com/TobiasSekan/73a93c2dfea4a051ff72abb5218d6f8f-->
-                <!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Center" />-->
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="VerticalAlignment" Value="Center" />
 
                 <Setter Property="Template">
                     <Setter.Value>

diff --git a/UnityLauncherPro/GetProjects.cs b/UnityLauncherPro/GetProjects.cs
@@ -101,7 +101,6 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
             }
 
             // sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)
-            // thats why need to sort projects list by modified date
             // sort by modified date, projects without modified date are put to last, NOTE: this would remove projects without modified date (if they become last items, before trimming list on next step)
             projectsFound.Sort((x, y) =>
             {
@@ -112,7 +111,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
                 //return x.Modified.Value.CompareTo(y.Modified.Value); // BUG this breaks something, so that last item platform is wrong (for project that is missing from disk) ?
             });
 
-            // trim list to max amount
+            // trim list to max amount (older ones are dropped)
             if (projectsFound.Count > MainWindow.maxProjectCount)
             {
                 //Console.WriteLine("Trimming projects list to " + MainWindow.maxProjectCount + " projects");
@@ -146,8 +145,12 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
 
             //Console.WriteLine("valueName="+ valueName+"  , projectName =" + projectName);
 
-            // get last modified date from folder
-            DateTime? lastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
+            // get last modified date from most recent date of solution or folder
+            string solutionPath = Path.Combine(projectPath, $"{projectName}.sln");
+            bool solutionExists = File.Exists(solutionPath);
+            DateTime? solutionLastUpdated = solutionExists ? Tools.GetLastModifiedTime(solutionPath) : null;
+            DateTime? folderLastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
+            DateTime? lastUpdated = solutionLastUpdated > folderLastUpdated ? solutionLastUpdated : folderLastUpdated;
 
             // get project version
             string projectVersion = folderExists ? Tools.GetProjectVersion(projectPath) : null;

diff --git a/UnityLauncherPro/GetUnityInstallations.cs b/UnityLauncherPro/GetUnityInstallations.cs
@@ -65,6 +65,25 @@ public static List<UnityInstallation> Scan()
                     unity.IsPreferred = (version == MainWindow.preferredVersion);
                     unity.ProjectCount = GetProjectCountForUnityVersion(version);
 
+                    if (Tools.IsAlpha(version))
+                    {
+                        unity.ReleaseType = "Alpha";
+                    }
+                    else if (Tools.IsBeta(version))
+                    {
+                        unity.ReleaseType = "Beta";
+                    }
+                    else
+                        if (Tools.IsLTS(version))
+
+                    {
+                        unity.ReleaseType = "LTS";
+                    }
+                    else
+                    {
+                        unity.ReleaseType = ""; // cannot be null for UnitysFilter to work properly
+                    }
+
                     // get platforms, NOTE if this is slow, do it later, or skip for commandline
                     var platforms = GetPlatforms(dataFolder);
                     // this is for editor tab, show list of all platforms in cell