new project: Fix create new project platform argument if pressed enter to create., When new project is added as first item add modified date and platform also.,

Author: unitycoder

UnityLauncherPro/MainWindow.xaml

@@ -555,9 +555,9 @@
                                 </DataGridTextColumn.CellStyle>
                             </DataGridTextColumn>
                             <!--<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Modified, StringFormat=\{0:dd/MM/yyyy HH:mm:ss\}}" ClipboardContentBinding="{x:Null}" Header="Modified" IsReadOnly="True" Width="120"/>-->
-                            <DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Modified, Converter={StaticResource lastModifiedConverter}}" ClipboardContentBinding="{x:Null}" Header="Modified" IsReadOnly="True" Width="120"/>
-                            <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="60"/>
+                            <DataGridTextColumn Binding="{Binding Modified, Converter={StaticResource lastModifiedConverter}}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Modified" IsReadOnly="True" Width="120"/>
+                            <DataGridTextColumn Binding="{Binding Arguments}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Arguments" IsReadOnly="False" Width="100"/>
+                            <DataGridTextColumn Binding="{Binding GITBranch}" CellStyle="{StaticResource NoFocusCellStyle}" ClipboardContentBinding="{x:Null}" Header="Branch" IsReadOnly="True" Width="60"/>
                             <!--TODO platform as dropdown?-->
                             <!--<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"/>-->
@@ -567,7 +567,7 @@
                             <DataGridTemplateColumn Header="Platform" Width="90">
                                 <DataGridTemplateColumn.CellTemplate >
                                     <DataTemplate >
-                                        <ComboBox x:Name="cmbPlatformSelection" OverridesDefaultStyle="True" VerticalAlignment="Center" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch" IsEnabled="{Binding ElementName=chkEnablePlatformSelection, Path=IsChecked}" ItemsSource="{Binding TargetPlatforms}" SelectedValue="{Binding TargetPlatform}" Height="18"  Foreground="{DynamicResource ThemeButtonForeground}" DropDownClosed="CmbPlatformSelection_DropDownClosed" MinWidth="80"/>
+                                        <ComboBox ItemsSource="{Binding TargetPlatforms}" SelectedValue="{Binding TargetPlatform}" x:Name="cmbPlatformSelection" OverridesDefaultStyle="True" VerticalAlignment="Center" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Stretch" IsEnabled="{Binding ElementName=chkEnablePlatformSelection, Path=IsChecked}"   Height="18"  Foreground="{DynamicResource ThemeButtonForeground}" DropDownClosed="CmbPlatformSelection_DropDownClosed" MinWidth="80"/>
                                     </DataTemplate>
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>

UnityLauncherPro/MainWindow.xaml.cs

@@ -1630,7 +1630,7 @@ void CreateNewEmptyProject()
                     Console.WriteLine("Create project " + NewProject.newVersion + " : " + projectPath);
                     if (string.IsNullOrEmpty(projectPath)) return;
 
-                    var p = Tools.FastCreateProject(NewProject.newVersion, projectPath, NewProject.newProjectName, NewProject.templateZipPath, NewProject.selectedPlatform);
+                    var p = Tools.FastCreateProject(NewProject.newVersion, projectPath, NewProject.newProjectName, NewProject.templateZipPath, NewProject.platformsForThisUnity, NewProject.selectedPlatform);
 
                     // add to list (just in case new project fails to start, then folder is already generated..)
                     if (p != null) AddNewProjectToList(p);

UnityLauncherPro/NewProject.xaml.cs

@@ -13,6 +13,7 @@ public partial class NewProject : Window
         public static string newName = null;
         public static string templateZipPath = null;
         public static string selectedPlatform = null;
+        public static string[] platformsForThisUnity = null;
 
         bool isInitializing = true; // to keep OnChangeEvent from firing too early
         int previousSelectedTemplateIndex = -1;
@@ -77,17 +78,17 @@ void UpdateTemplatesDropDown(string unityPath)
 
         void UpdateModulesDropdown(string version)
         {
-            // get modules and stick into combobox
-            var platformsForThisUnity = Tools.GetPlatformsForUnityVersion(version);
+            // get modules and stick into combobox, NOTE we already have this info from GetProjects.Scan, so could access it
+            platformsForThisUnity = Tools.GetPlatformsForUnityVersion(version);
             cmbNewProjectPlatform.ItemsSource = platformsForThisUnity;
             //System.Console.WriteLine(Tools.GetPlatformsForUnityVersion(version).Length);
 
             var lastUsedPlatform = Properties.Settings.Default.newProjectPlatform;
 
             for (int i = 0; i < platformsForThisUnity.Length; i++)
             {
-                // set default platform (now win64) if never used this before
-                if (platformsForThisUnity[i].ToLower() == "win64" || platformsForThisUnity[i] == lastUsedPlatform)
+                // set default platform (win64) if never used this setting before
+                if ((lastUsedPlatform == null && platformsForThisUnity[i].ToLower() == "win64") || platformsForThisUnity[i] == lastUsedPlatform)
                 {
                     cmbNewProjectPlatform.SelectedIndex = i;
                     break;
@@ -143,9 +144,8 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
                     cmbNewProjectTemplate.SelectedIndex = ++cmbNewProjectTemplate.SelectedIndex % cmbNewProjectTemplate.Items.Count;
                     e.Handled = true; // override writing to textbox
                     break;
-                case Key.Enter: // enter accept
-                    UpdateSelectedVersion();
-                    DialogResult = true;
+                case Key.Enter: // enter, create proj
+                    BtnCreateNewProject_Click(null, null);
                     e.Handled = true;
                     break;
                 case Key.Escape: // esc cancel

UnityLauncherPro/Tools.cs

@@ -1016,7 +1016,7 @@ public static string BrowseForOutputFolder(string title)
             return null;
         }
 
-        public static Project FastCreateProject(string version, string baseFolder, string projectName = null, string templateZipPath = null, string platform = null)
+        public static Project FastCreateProject(string version, string baseFolder, string projectName = null, string templateZipPath = null, string[] platformsForThisUnity = null, string platform = null)
         {
             // check for base folders in settings tab
             if (string.IsNullOrEmpty(baseFolder) == true)
@@ -1065,7 +1065,9 @@ public static Project FastCreateProject(string version, string baseFolder, strin
             proj.Title = projectName;
             proj.Path = Path.Combine(baseFolder, newPath);
             proj.Version = version;
+            proj.TargetPlatforms = platformsForThisUnity;
             proj.TargetPlatform = platform;
+            proj.Modified = DateTime.Now;
             var proc = LaunchProject(proj);
             ProcessHandler.Add(proj, proc);
             return proj;