adding Platform selection dropdown (disable for now), rename ParseTargetPlatform to GetTargetPlatform

Author: unitycoder

UnityLauncherPro/Data/Platform.cs

@@ -0,0 +1,12 @@
+namespace UnityLauncherPro
+{
+    // TODO should display only valid platforms for projects Unity version
+    public enum Platform
+    {
+        Unknown,
+        Win32, Win64, OSX, Linux, Linux64, iOS, Android, Web, WebStreamed, WebGL, Xboxone, OS4, PSP2, WSAPlayer, Tizen, SamsungTV,
+        Standalone, Win, OSXuniversal, LinuxUniversal, WindowsStoreApps, @Switch, Wiiu, N3DS, tVoS, PSM,
+        // manually added
+        StandaloneWindows, StandaloneWindows64
+    }
+}

UnityLauncherPro/Data/Project.cs

@@ -12,7 +12,8 @@ public class Project : IValueConverter
         public DateTime? Modified { set; get; }
         public string Arguments { set; get; }
         public string GITBranch { set; get; }
-        public string TargetPlatform { set; get; }
+        //public string TargetPlatform { set; get; }
+        public Platform TargetPlatform { set; get; }
         public bool folderExists { set; get; }
         public Process Process; // launched unity exe
 

UnityLauncherPro/GetProjects.cs

@@ -116,10 +116,12 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
                         }
 
                         // TODO add option to disable check
-                        string targetPlatform = "";
+                        //string targetPlatform = "";
+                        Platform targetPlatform = Platform.Unknown;
                         if (showTargetPlatform == true)
                         {
-                            targetPlatform = folderExists ? Tools.ParseTargetPlatform(projectPath) : null;
+                            //targetPlatform = folderExists ? Tools.GetTargetPlatform(projectPath) : null;
+                            targetPlatform = folderExists ? Tools.GetTargetPlatform(projectPath) : Platform.Unknown;
                         }
 
                         var p = new Project();
@@ -129,6 +131,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
                         p.Modified = lastUpdated;
                         p.Arguments = customArgs;
                         p.GITBranch = gitBranch;
+                        //p.TargetPlatform = targetPlatform;
                         p.TargetPlatform = targetPlatform;
                         p.folderExists = folderExists;
 

UnityLauncherPro/MainWindow.xaml

@@ -9,6 +9,13 @@
         Title="UnityLauncherPro" Height="650" Width="600" WindowStartupLocation="CenterScreen" Background="{DynamicResource ThemeDarkestBackground}" MinWidth="600" MinHeight="650" AllowsTransparency="True" WindowStyle="None" Margin="0" KeyDown="OnWindowKeyDown" Closing="Window_Closing" SizeChanged="Window_SizeChanged" Icon="Images/icon.ico" Activated="Window_Activated">
     <Window.Resources>
 
+        <!-- platform dropdown menu -->
+        <ObjectDataProvider x:Key="platformEnum" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type Type="local:Platform"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+
         <!-- colors for unity missing installatios -->
         <local:UnityInstallation x:Key="VersionInstalledConverter"/>
         <local:Project x:Key="ProjectExistsConverter"/>
@@ -337,9 +344,10 @@
                             <DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Arguments}" ClipboardContentBinding="{x:Null}" Header="Arguments" IsReadOnly="False" Width="100"/>
                             <DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding GITBranch}" ClipboardContentBinding="{x:Null}" Header="Branch" IsReadOnly="True" Width="100"/>
                             <!--TODO platform as dropdown?-->
-                            <DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding TargetPlatform}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>
+                            <!--<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding TargetPlatform}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
                             <!--<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" SelectedItemBinding="{Binding TargetPlatform, NotifyOnSourceUpdated=True, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
-                            <DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>
+                            <!--<DataGridComboBoxColumn x:Name="cmbPlatform" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>-->
+                            <DataGridComboBoxColumn Header="Platform" IsReadOnly="True"  SelectedItemBinding="{Binding TargetPlatform}" ItemsSource="{Binding Source={StaticResource platformEnum}}" />
                         </DataGrid.Columns>
 
                         <!-- right click context menu -->
@@ -357,7 +365,7 @@
                         </DataGrid.ContextMenu>
 
                         <!-- sample data for testing -->
-                        <local:Project TargetPlatform="C64" GITBranch="Best" Modified="" Title="M dfgh dfghMO" Path="A:/temp" Version="2099.1.2.3" />
+                        <local:Project TargetPlatform="win64" GITBranch="Best" Modified="" Title="M dfgh dfghMO" Path="A:/temp" Version="2099.1.2.3" />
                         <local:Project GITBranch="" Modified="" Title="asdgdfg" Path="A:/temp" Version="5.6.7f1"/>
                         <local:Project GITBranch="" Modified="" Title="Mghdfghdf dfghdfgMO" Path="A:/temp" Version="2018.3.13f1"/>
                         <local:Project GITBranch="" Modified="" Title="MMO" Path="A:/temp" Version="2099.1.2.3"/>

UnityLauncherPro/MainWindow.xaml.cs

@@ -476,7 +476,7 @@ private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
                 p.Title = Path.GetFileName(folder);
                 p.Version = Tools.GetProjectVersion(folder);
                 p.Arguments = Tools.ReadCustomLaunchArguments(folder, MainWindow.launcherArgumentsFile);
-                if ((bool)chkShowPlatform.IsChecked == true) p.TargetPlatform = Tools.ParseTargetPlatform(folder);
+                if ((bool)chkShowPlatform.IsChecked == true) p.TargetPlatform = Tools.GetTargetPlatform(folder);
                 if ((bool)chkShowGitBranchColumn.IsChecked == true) p.GITBranch = Tools.ReadGitBranchInfo(folder);
 
                 // add to list
@@ -1112,7 +1112,7 @@ private void BtnOpenGithub_Click(object sender, RoutedEventArgs e)
             Process.Start(githubURL);
         }
 
-        // finished editing project name cell or launcher argument cell
+        // finished editing project name cell or launcher argument cell or platform cells
         private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
         {
             // avoid ending event running twice
@@ -1124,16 +1124,22 @@ private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEven
 
             // check that folder exists
             string path = proj.Path;
-            if (string.IsNullOrEmpty(path)) return;
-
-            // get current arguments, after editing
-            TextBox t = e.EditingElement as TextBox;
-            string newcellValue = t.Text.ToString();
+            Console.WriteLine(e.Column.DisplayIndex);
+            Console.WriteLine(path);
+            Console.WriteLine(string.IsNullOrEmpty(path));
+            if (string.IsNullOrEmpty(path))
+            {
 
+                //return;
+            }
 
             // check if we edited project name, or launcher arguments
             if (e.Column.DisplayIndex == 0)
             {
+                // get current arguments, after editing
+                TextBox t = e.EditingElement as TextBox;
+                string newcellValue = t.Text.ToString();
+
                 // restore read only
                 e.Column.IsReadOnly = true;
 
@@ -1191,8 +1197,11 @@ private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEven
                 }
 
             }
-            else // edit launcher arguments
+            else if (e.Column.DisplayIndex == 4) // edit launcher arguments
             {
+                // get current arguments, after editing
+                TextBox t = e.EditingElement as TextBox;
+                string newcellValue = t.Text.ToString();
 
                 string projSettingsFolder = "ProjectSettings";
 
@@ -1217,6 +1226,14 @@ private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEven
                     Console.WriteLine("Error saving launcher arguments: " + ex);
                 }
             }
+            else if (e.Column.DisplayIndex == 6) // platform dropdown
+            {
+                // get current arguments, after editing
+                var t = e.EditingElement as ComboBox;
+                string newcellValue = t.SelectedItem.ToString();
+
+                Console.WriteLine("Modified platform target: " + newcellValue);
+            }
 
             // TODO select the same row again
         }
@@ -1233,12 +1250,12 @@ private void TxtSearchBoxUnity_TextChanged(object sender, TextChangedEventArgs e
 
         private void GridRecent_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            // cancel if editing cell, because often try to double click to edit
+            // cancel if editing cell, because often try to double click to edit instead
             if (IsEditingCell(gridRecent)) return;
 
-            // cancel run if double click arguments editable field
+            // cancel run if double clicked Arguments or Platform editable field
             var currentColumnCell = gridRecent.CurrentCell.Column.DisplayIndex;
-            if (currentColumnCell == 4) return;
+            if (currentColumnCell == 4 || currentColumnCell == 6) return;
 
             var proj = GetSelectedProject();
             var proc = Tools.LaunchProject(proj);

UnityLauncherPro/Tools.cs

@@ -734,9 +734,11 @@ public static string ReadGitBranchInfo(string projectPath)
             return results;
         }
 
-        public static string ParseTargetPlatform(string projectPath)
+        public static Platform GetTargetPlatform(string projectPath)
+        //public static string GetTargetPlatform(string projectPath)
         {
-            string results = null;
+            //string results = null;
+            Platform results = Platform.Unknown;
 
             // get buildtarget from .csproj
             // <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
@@ -759,11 +761,11 @@ public static string ParseTargetPlatform(string projectPath)
                         // 2018: standalone, Win, Win64, OSXUniversal, Linux, Linux64, LinuxUniversal, iOS, Android, Web, WebStreamed, WebGL, XboxOne, PS4, WindowsStoreApps, Switch, N3DS, tvOS
                         // 2019: Standalone, Win, Win64, OSXUniversal, Linux64, iOS, Android, WebGL, XboxOne, PS4, WindowsStoreApps, Switch, tvOS
                         // 2020: Standalone, Win, Win64, OSXUniversal, Linux64, iOS, Android, WebGL, XboxOne, PS4, WindowsStoreApps, Switch, tvOS
-                        results = csprojsplit[1].Substring(0, endrow);
+                        //results = csprojsplit[1].Substring(0, endrow);
+                        results = (Platform)Enum.Parse(typeof(Platform), csprojsplit[1].Substring(0, endrow));
                     }
                 }
             }
-
             return results;
         }
 

UnityLauncherPro/UnityLauncherPro.csproj

@@ -76,6 +76,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Data\BuildReport.cs" />
+    <Compile Include="Data\Platform.cs" />
     <Compile Include="Data\Tabs.cs" />
     <Compile Include="GetProjects.cs" />
     <Compile Include="GetUnityInstallations.cs" />