add option to disable project folder rename, fix nullref if try to rename after added project, disable grid navigation keys during cell edit, validate project rename better and restore old value if failed, #build

Author: unitycoder

Diff for: UnityLauncherPro/App.config

@@ -57,6 +57,9 @@
             <setting name="askNameForQuickProject" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="enableProjectRename" serializeAs="String">
+                <value>False</value>
+            </setting>
         </UnityLauncherPro.Properties.Settings>
     </userSettings>
 </configuration>

Diff for: UnityLauncherPro/MainWindow.xaml

@@ -657,6 +657,7 @@
 						<CheckBox x:Name="chkShowGitBranchColumn" Content="Show git branch column" Foreground="{DynamicResource ButtonForeground}" Checked="ChkShowGitBranchColumn_CheckedChanged" Unchecked="ChkShowGitBranchColumn_CheckedChanged" Margin="0,0,0,3" ToolTip="Shows column for project git branch info"/>
 						<CheckBox x:Name="chkShowMissingFolderProjects" Content="Show projects that don't exist on disk" Foreground="{DynamicResource ButtonForeground}" Checked="ChkShowMissingFolderProjects_CheckedChanged" Unchecked="ChkShowMissingFolderProjects_CheckedChanged" Margin="0,0,0,3" ToolTip="List in recent projects, even if the project folder is missing"/>
 						<CheckBox x:Name="chkAllowSingleInstanceOnly" Content="Allow single instance only" Foreground="{DynamicResource ButtonForeground}" Checked="ChkAllowSingleInstanceOnly_CheckedChanged" Unchecked="ChkAllowSingleInstanceOnly_CheckedChanged" Margin="0,0,0,3" ToolTip="Activates already running instance, instead of starting new exe (not working if app is minized to taskbar)"/>
+						<CheckBox x:Name="chkEnableProjectRename" Content="Enable Project Renaming (Not recommended for beginners)" Foreground="{DynamicResource ButtonForeground}" Margin="0,0,0,3" ToolTip="Can use F2 to rename project folders, Note that project will disappears from list on refresh, unless you open it (since its new path, not in unity recent projects registry)" Checked="ChkEnableProjectRename_Checked" Unchecked="ChkEnableProjectRename_Checked"/>
 						<CheckBox x:Name="chkAskNameForQuickProject" Content="Ask name for New Project" Foreground="{DynamicResource ButtonForeground}" Checked="ChkAskNameForQuickProject_Checked" Unchecked="ChkAskNameForQuickProject_Checked" Margin="0,0,0,3" ToolTip="If disabled, uses automatic quick project naming"/>
 
 						<StackPanel Grid.Row="3" Orientation="Horizontal">

Diff for: UnityLauncherPro/MainWindow.xaml.cs

@@ -179,10 +179,10 @@ void FilterRecentProjects()
             ICollectionView collection = CollectionViewSource.GetDefaultView(projectsSource);
             collection.Filter = ProjectFilter;
             // set first row selected, if only 1 row
-            //if (gridRecent.Items.Count == 1)
-            //{
-            //    gridRecent.SelectedIndex = 0;
-            //}
+            if (gridRecent.Items.Count == 1)
+            {
+                gridRecent.SelectedIndex = 0;
+            }
         }
 
         void FilterUpdates()
@@ -243,6 +243,7 @@ void LoadSettings()
             chkAllowSingleInstanceOnly.IsChecked = Properties.Settings.Default.AllowSingleInstanceOnly;
             txtRootFolderForNewProjects.Text = Properties.Settings.Default.newProjectsRoot;
             chkAskNameForQuickProject.IsChecked = Properties.Settings.Default.askNameForQuickProject;
+            chkEnableProjectRename.IsChecked = Properties.Settings.Default.enableProjectRename;
 
             // update optional grid columns, hidden or visible
             gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
@@ -450,7 +451,9 @@ private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
                 // add to list
                 projectsSource.Insert(0, p);
                 gridRecent.Items.Refresh();
+                Tools.SetFocusToGrid(gridRecent); // force focus
                 gridRecent.SelectedIndex = 0;
+
             }
         }
 
@@ -523,6 +526,7 @@ private void OnWindowKeyDown(object sender, KeyEventArgs e)
                         case Key.Down:
                             break;
                         case Key.F2: // edit arguments or project name
+                            if (chkEnableProjectRename.IsChecked == false) return; //if rename not enabled
                             // if in first cell (or no cell)
                             var cell = gridRecent.CurrentCell;
                             if (cell.Column.DisplayIndex == 0)
@@ -796,29 +800,36 @@ private void GridRecent_PreviewKeyDown(object sender, KeyEventArgs e)
             switch (e.Key)
             {
                 case Key.Home: // override home
+                    // if edit mode, dont override keys
+                    if (IsEditingCell(gridRecent) == true) return;
                     gridRecent.SelectedIndex = 0;
                     gridRecent.ScrollIntoView(gridRecent.SelectedItem);
                     e.Handled = true;
                     break;
                 case Key.End: // override end
+                    // if edit mode, dont override keys
+                    if (IsEditingCell(gridRecent) == true) return;
                     gridRecent.SelectedIndex = gridRecent.Items.Count - 1;
                     gridRecent.ScrollIntoView(gridRecent.SelectedItem);
                     e.Handled = true;
                     break;
                 case Key.F5: // refresh projects
+                    // if edit mode, dont override keys
+                    if (IsEditingCell(gridRecent) == true) return;
                     UpdateUnityInstallationsList();
                     RefreshRecentProjects();
                     break;
                 case Key.Tab:
+                    // if edit mode, dont override keys
+                    if (IsEditingCell(gridRecent) == true) return;
                     if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
                     {
                         e.Handled = true;
                     }
                     break;
                 case Key.Return:
-                    // cancel if editing cell
-                    IEditableCollectionView itemsView = gridRecent.Items;
-                    if (itemsView.IsAddingNew || itemsView.IsEditingItem) return;
+                    // if edit mode, dont override keys
+                    if (IsEditingCell(gridRecent) == true) return;
                     e.Handled = true;
                     var proj = GetSelectedProject();
                     Tools.LaunchProject(proj);
@@ -828,12 +839,19 @@ private void GridRecent_PreviewKeyDown(object sender, KeyEventArgs e)
             }
         }
 
+        bool IsEditingCell(DataGrid targetGrid)
+        {
+            IEditableCollectionView itemsView = targetGrid.Items;
+            var res = itemsView.IsAddingNew || itemsView.IsEditingItem;
+            return res;
+        }
+
         private void DataGridUnitys_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
             {
                 e.Handled = true;
-                // TODO launchunity
+                // TODO launch unity?
             }
         }
 
@@ -1077,17 +1095,29 @@ private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEven
             {
                 // restore read only
                 e.Column.IsReadOnly = true;
-                // TODO validate filename
+
                 if (string.IsNullOrEmpty(newcellValue))
                 {
-                    Console.WriteLine("Invalid new project name: " + newcellValue);
+                    Console.WriteLine("Project name is null: " + newcellValue);
+                    return;
+                }
+
+                // cannot allow / or \ or . as last character (otherwise might have issues going parent folder?)
+                if (newcellValue.EndsWith("\\") || newcellValue.EndsWith("/") || newcellValue.EndsWith("."))
+                {
+                    Console.WriteLine("Project name cannot end with / or \\ or . ");
                     return;
                 }
 
+                // get new path
                 var newPath = Path.Combine(Directory.GetParent(path).ToString(), newcellValue);
 
-                //Console.WriteLine("Old folder: " + path);
-                //Console.WriteLine("New folder: " + newPath);
+                // check if has invalid characters for full path
+                if (newPath.IndexOfAny(Path.GetInvalidPathChars()) >= 0)
+                {
+                    Console.WriteLine("Invalid project path: " + newPath);
+                    return;
+                }
 
                 // check if same as before (need to replace mismatch slashes)
                 if (path.Replace('/', '\\') == newPath.Replace('/', '\\'))
@@ -1103,13 +1133,15 @@ private void GridRecent_CellEditEnding(object sender, DataGridCellEditEndingEven
                     return;
                 }
 
-                // try rename project folder
+                // try rename project folder by moving directory to new name
                 Directory.Move(path, newPath);
 
-                // check if success
+                // check if move was success
                 if (Directory.Exists(newPath))
                 {
-                    proj.Path = newPath;
+                    // force ending edit (otherwise only ends on enter or esc)
+                    gridRecent.CommitEdit(DataGridEditingUnit.Row, true);
+
                     // TODO save to registry (otherwise not listed in recent projects, unless opened)
                 }
                 else
@@ -1160,6 +1192,13 @@ 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
+            if (IsEditingCell(gridRecent)) return;
+
+            // cancel run if double click arguments editable field
+            var currentColumnCell = gridRecent.CurrentCell.Column.DisplayIndex;
+            if (currentColumnCell == 4) return;
+
             Tools.LaunchProject(GetSelectedProject());
         }
 
@@ -1371,6 +1410,22 @@ private void BtnOpenCrashLogs_Click(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        // reorder grid item by index
+        public void MoveRecentGridItem(int to)
+        {
+            var source = (Project)gridRecent.Items[gridRecent.SelectedIndex];
+            projectsSource.RemoveAt(gridRecent.SelectedIndex);
+            projectsSource.Insert(to, source);
+            gridRecent.Items.Refresh();
+            gridRecent.SelectedIndex = to;
+        }
+
+        private void ChkEnableProjectRename_Checked(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.enableProjectRename = (bool)chkEnableProjectRename.IsChecked;
+            Properties.Settings.Default.Save();
+        }
     } // class
 } //namespace
 

Diff for: UnityLauncherPro/Properties/Settings.Designer.cs

@@ -50,5 +50,8 @@
     <Setting Name="askNameForQuickProject" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="enableProjectRename" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

Diff for: UnityLauncherPro/Properties/Settings.settings

@@ -192,6 +192,10 @@ public static void LaunchProject(Project proj)
             {
                 Console.WriteLine(e);
             }
+
+            // move as first, since its opened, disabled for now, more used to it staying in place..
+            // MainWindow wnd = (MainWindow)Application.Current.MainWindow;
+            // wnd.MoveRecentGridItem(0);
         }
 
         static bool CheckCrashBackupScene(string projectPath)
@@ -806,8 +810,7 @@ public static void FastCreateProject(string version, string baseFolder, string p
             var p = new Project();
             p.Path = Path.Combine(baseFolder, newPath);
             p.Version = version;
-            Tools.LaunchProject(p);
-
+            LaunchProject(p);
         } // FastCreateProject