added option for changing open-in-terminal command

Author: somedeveloper00

UnityHubNative.Net/ControlsExtensions.cs

@@ -230,9 +230,9 @@ public static T OnSelectionChanged<T>(this T control, Action action) where T : S
         return control;
     }
 
-    public static T OnTextChanged<T>(this T control, Action action) where T : Control
+    public static T OnTextChanged<T>(this T control, Action action) where T : TextBox
     {
-        control.SizeChanged += (_, e) => action();
+        control.TextChanged += (_, e) => action();
         return control;
     }
 

UnityHubNative.Net/MainWindow.cs

@@ -8,6 +8,7 @@
 using Avalonia.Platform.Storage;
 using FluentAvalonia.UI.Controls;
 using MsBox.Avalonia;
+using SkiaSharp;
 
 namespace UnityHubNative.Net;
 
@@ -27,7 +28,9 @@ class MainWindow : Window
 
     static DockPanel s_transparentPanel;
     static Slider s_backgroundBlurIntensitySlider;
-    static private Key s_lastKey;
+    static TextBox s_openInTerminalFormatText;
+    static Key s_lastKey;
+    private static TabControl s_tabControl;
 
     public MainWindow(object data)
     {
@@ -55,29 +58,32 @@ protected override void OnKeyDown(KeyEventArgs e)
 
         s_lastKey = e.Key;
 
-        // focus on searchbar if typed a character
-        if (e.KeyModifiers is KeyModifiers.None or KeyModifiers.Shift && (int)e.Key >= (int)Key.A && (int)e.Key <= (int)Key.Z)
+        if (s_tabControl.SelectedIndex == 0)
         {
-            if (!s_projectSearchBoxAutoComplete.IsKeyboardFocusWithin)
+            // focus on searchbar if typed a character
+            if (e.KeyModifiers is KeyModifiers.None or KeyModifiers.Shift && (int)e.Key >= (int)Key.A && (int)e.Key <= (int)Key.Z)
             {
-                s_projectSearchBoxAutoComplete.Focus();
-                s_projectSearchBoxAutoComplete.Text += e.KeyModifiers == KeyModifiers.Shift ? e.Key.ToString() : e.Key.ToString().ToLower();
-                s_projectSearchBoxAutoComplete.CaretIndex = s_projectSearchBoxAutoComplete.Text.Length;
-                e.Handled = true;
+                if (!s_projectSearchBoxAutoComplete.IsKeyboardFocusWithin)
+                {
+                    s_projectSearchBoxAutoComplete.Focus();
+                    s_projectSearchBoxAutoComplete.Text += e.KeyModifiers == KeyModifiers.Shift ? e.Key.ToString() : e.Key.ToString().ToLower();
+                    s_projectSearchBoxAutoComplete.CaretIndex = s_projectSearchBoxAutoComplete.Text.Length;
+                    e.Handled = true;
+                }
+                return;
             }
-            return;
-        }
 
-        // focus on the list of escaped
-        if (e.Key == Key.Escape)
-        {
-            if (s_unityProjectsParent.SelectedItem != null)
+            // focus on the list of escaped
+            if (e.Key == Key.Escape)
             {
-                s_unityProjectsParent.ContainerFromIndex(GetUnityProjectSelectedIndex())!.Focus();
-                s_projectSearchBoxAutoComplete.Text = string.Empty;
-            }
+                if (s_unityProjectsParent.SelectedItem != null)
+                {
+                    s_unityProjectsParent.ContainerFromIndex(GetUnityProjectSelectedIndex())!.Focus();
+                    s_projectSearchBoxAutoComplete.Text = string.Empty;
+                }
 
-            return;
+                return;
+            }
         }
     }
 
@@ -247,7 +253,7 @@ public static void MoveSelectedProjectDown()
         {
         }.AddChildren
         ([
-            new TabControl
+            s_tabControl = new TabControl
             {
                 TabStripPlacement = Dock.Top,
             }.AddItems
@@ -526,14 +532,39 @@ public static void MoveSelectedProjectDown()
                                         VerticalAlignment = VerticalAlignment.Center,
                                     }.OnCheckChanged(OnCloseAfterOpenProjectCheckboxChanged).SetDock(Dock.Right)
                                 ])
-                            }.SetTooltip("If checked, the app will close after opening a project")
+                            }.SetTooltip("If checked, the app will close after opening a project"),
+                            new SettingsExpanderItem
+                            {
+                                Content = new DockPanel
+                                {
+                                }.AddChildren
+                                ([
+                                    new TextBlock
+                                    {
+                                        Text = "Format to open project in Terminal",
+                                        VerticalAlignment = VerticalAlignment.Center,
+                                        Margin = new(0, 0, 10, 0),
+                                    }.SetDock(Dock.Left),
+                                    s_openInTerminalFormatText = new TextBox
+                                    {
+                                        Text = UnityHubNativeNetApp.Config.openInTerminalFormat,
+                                        VerticalAlignment = VerticalAlignment.Center,
+                                    }.OnTextChanged(OnOpenInTerminalFormatChanged).SetDock(Dock.Right)
+                                ])
+                            }.SetTooltip("Defines the process format of when opening a project in terminal. {path} will be replaced by the project path"),
                         ])
                     ])
                 }
             ])
         ])
     ]);
 
+    static void OnOpenInTerminalFormatChanged()
+    {
+        UnityHubNativeNetApp.Config.openInTerminalFormat = s_openInTerminalFormatText.Text;
+        UnityHubNativeNetApp.SaveConfig(UnityHubNativeNetApp.Config);
+    }
+
     static void OnExtendToTitlebarCheckChanged()
     {
         UnityHubNativeNetApp.Config.extendToTitlebar = !UnityHubNativeNetApp.Config.extendToTitlebar;

UnityHubNative.Net/OsUtils.cs

@@ -13,14 +13,29 @@ public static void OpenExplorer(string dir)
         });
     }
 
-    public static void OpenInTerminal(string path)
+    public static void OpenInTerminal(string command)
     {
 #if Windows
+        var (filename, args) = ExtractCommand(UnityHubNativeNetApp.Config.openInTerminalFormat.Replace("{path}", command, StringComparison.InvariantCultureIgnoreCase));
         Process.Start(new ProcessStartInfo
         {
-            FileName = "cmd.exe",
-            Arguments = $"/K cd /d \"{path}\""
+            FileName = filename,
+            Arguments = args,
+            UseShellExecute = true
         });
 #endif
     }
+
+    static (string fileName, string args) ExtractCommand(string command)
+    {
+        bool insideQuote = false;
+        for (int i = 0; i < command.Length; i++)
+        {
+            if (command[i] == '\"' && command.Length > 0 && command[i - 1] != '\\')
+                insideQuote = !insideQuote;
+            else if (command[i] == ' ')
+                return (command[..i], command.Length > i ? command[(i + 1)..] : string.Empty);
+        }
+        return (command, string.Empty);
+    }
 }

UnityHubNative.Net/UnityHubNativeNetApp.cs

@@ -54,6 +54,7 @@ public static AppConfig LoadConfig()
                 blurIntensity = txt.Length >= 3 && float.TryParse(txt[2], out var acrylicAmount) ? acrylicAmount : 0.2f,
                 closeAfterProjectOpen = txt.Length >= 4 && txt[3] == "true",
                 extendToTitlebar = txt.Length >= 5 && txt[4] == "true",
+                openInTerminalFormat = txt.Length >= 6 ? txt[5] : "cmd.exe /K cd /d \"{path}\"",
             };
         }
         catch (Exception ex)
@@ -72,6 +73,7 @@ public static void SaveConfig(AppConfig config)
             config.blurIntensity.ToString(),
             config.closeAfterProjectOpen ? "true" : "false",
             config.extendToTitlebar ? "true" : "false",
+            config.openInTerminalFormat
         ]);
     }
 
@@ -82,5 +84,6 @@ public struct AppConfig
         public float blurIntensity;
         public bool extendToTitlebar;
         public bool closeAfterProjectOpen;
+        public string openInTerminalFormat;
     }
 }