new project: added platform selection, load/save last used platform selection,

Author: unitycoder

UnityLauncherPro/App.config

@@ -102,6 +102,9 @@
             <setting name="templatePackagesFolder" serializeAs="String">
                 <value />
             </setting>
+            <setting name="newProjectPlatform" serializeAs="String">
+                <value />
+            </setting>
         </UnityLauncherPro.Properties.Settings>
     </userSettings>
 </configuration>

UnityLauncherPro/MainWindow.xaml.cs

@@ -559,7 +559,7 @@ async Task CallGetUnityUpdates()
             dataGridUpdates.ItemsSource = null;
             var task = GetUnityUpdates.Scan();
             var items = await task;
-            Console.WriteLine(items == null);
+            Console.WriteLine("CallGetUnityUpdates=" + items == null);
             if (items == null) return;
             updatesSource = GetUnityUpdates.Parse(items);
             if (updatesSource == null) return;
@@ -1642,7 +1642,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);
+                    var p = Tools.FastCreateProject(NewProject.newVersion, projectPath, NewProject.newProjectName, NewProject.templateZipPath, NewProject.selectedPlatform);
 
                     // add to list (just in case new project fails to start, then folder is already generated..)
                     if (p != null) AddNewProjectToList(p);
@@ -1732,7 +1732,7 @@ public void CopyRowFolderToClipBoard(object sender, ExecutedRoutedEventArgs e)
             {
                 path = GetSelectedUpdate()?.Version; // TODO copy url instead
             }
-            Console.WriteLine(path);
+            Console.WriteLine("CopyRowFolderToClipBoard=" + path);
 
             if (string.IsNullOrEmpty(path) == false) Clipboard.SetText(path);
         }

UnityLauncherPro/NewProject.xaml.cs

@@ -12,6 +12,7 @@ public partial class NewProject : Window
         public static string newVersion = null;
         public static string newName = null;
         public static string templateZipPath = null;
+        public static string selectedPlatform = null;
 
         bool isInitializing = true; // to keep OnChangeEvent from firing too early
         int previousSelectedTemplateIndex = -1;
@@ -77,11 +78,22 @@ void UpdateTemplatesDropDown(string unityPath)
         void UpdateModulesDropdown(string version)
         {
             // get modules and stick into combobox
-            cmbNewProjectPlatform.ItemsSource = Tools.GetPlatformsForUnityVersion(version);
-            System.Console.WriteLine(Tools.GetPlatformsForUnityVersion(version).Length);
+            var 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)
+                {
+                    cmbNewProjectPlatform.SelectedIndex = i;
+                    break;
+                }
+            }
 
-            // TODO remember this selection next time
-            cmbNewProjectPlatform.SelectedIndex = 0;
             //lblTemplateTitleAndCount.Content = "Templates: (" + (cmbNewProjectTemplate.Items.Count - 1) + ")";
         }
 
@@ -90,7 +102,13 @@ void UpdateModulesDropdown(string version)
         private void BtnCreateNewProject_Click(object sender, RoutedEventArgs e)
         {
             templateZipPath = ((KeyValuePair<string, string>)cmbNewProjectTemplate.SelectedValue).Value;
+            selectedPlatform = cmbNewProjectPlatform.SelectedValue.ToString();
             UpdateSelectedVersion();
+
+            // save last used value for platform
+            Properties.Settings.Default.newProjectPlatform = cmbNewProjectPlatform.SelectedValue.ToString();
+            Properties.Settings.Default.Save();
+
             DialogResult = true;
         }
 
@@ -123,7 +141,7 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
                     e.Handled = true;
                     break;
                 case Key.Escape: // esc cancel
-                    // if pressed esc while combobox is open, close that one instead of closing window
+                                 // if pressed esc while combobox is open, close that one instead of closing window
                     if (cmbNewProjectTemplate.IsDropDownOpen)
                     {
                         cmbNewProjectTemplate.IsDropDownOpen = false;

UnityLauncherPro/Properties/Settings.Designer.cs

@@ -101,5 +101,8 @@
     <Setting Name="templatePackagesFolder" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="newProjectPlatform" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>

UnityLauncherPro/Properties/Settings.settings

@@ -383,7 +383,7 @@ public static bool LaunchExe(string path, string param = null)
             {
                 if (string.IsNullOrEmpty(param) == true)
                 {
-                    Console.WriteLine(path);
+                    Console.WriteLine("LaunchExe=" + path);
                     Process.Start(path);
                 }
                 else
@@ -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)
+        public static Project FastCreateProject(string version, string baseFolder, string projectName = null, string templateZipPath = null, string platform = null)
         {
             // check for base folders in settings tab
             if (string.IsNullOrEmpty(baseFolder) == true)
@@ -1035,16 +1035,16 @@ public static Project FastCreateProject(string version, string baseFolder, strin
             // check selected unity version
             if (string.IsNullOrEmpty(version) == true)
             {
-                Console.WriteLine("Missing unity version");
+                Console.WriteLine("Missing unity version string");
                 return null;
             }
 
             string newPath = null;
             // if we didnt have name yet
             if (string.IsNullOrEmpty(projectName) == true)
             {
-                Console.WriteLine(version);
-                Console.WriteLine(baseFolder);
+                //Console.WriteLine("version=" + version);
+                //Console.WriteLine("baseFolder=" + baseFolder);
                 projectName = GetSuggestedProjectName(version, baseFolder);
                 // failed getting new path a-z
                 if (projectName == null) return null;
@@ -1065,6 +1065,7 @@ public static Project FastCreateProject(string version, string baseFolder, strin
             proj.Title = projectName;
             proj.Path = Path.Combine(baseFolder, newPath);
             proj.Version = version;
+            proj.TargetPlatform = platform;
             var proc = LaunchProject(proj);
             ProcessHandler.Add(proj, proc);
             return proj;