Properly adding IsBusy support; Inlining GitPathView functionality

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -46,7 +46,6 @@ class Styles
 
         public const int HalfSpacing = (int)(BaseSpacing / 2);
 
-        private const string BrowseButton = "...";
         private const string WarningLabel = "<b>Warning:</b> {0}";
 
         private static Color headerGreyColor = new Color(0.878f, 0.878f, 0.878f, 1.0f);
@@ -170,23 +169,6 @@ public static void Warning(string message)
             GUILayout.EndHorizontal();
         }
 
-        public static void PathField(ref string path, Func<string> browseFunction, Func<string, bool> validationFunction)
-        {
-            GUILayout.BeginHorizontal();
-            path = EditorGUILayout.TextField("Path to Git", path);
-            if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
-            {
-                var newValue = browseFunction();
-                if (!string.IsNullOrEmpty(newValue) && validationFunction(newValue))
-                {
-                    path = newValue;
-                    GUIUtility.keyboardControl = GUIUtility.hotControl = 0;
-                    GUI.changed = true;
-                }
-            }
-            GUILayout.EndHorizontal();
-        }
-
         public static GUIStyle HistoryFileTreeBoxStyle
         {
             get

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs

@@ -11,13 +11,21 @@ namespace GitHub.Unity
     [Serializable]
     class GitPathView : Subview
     {
+        private const string BrowseButton = "...";
         private const string GitInstallTitle = "Git installation";
         private const string GitInstallBrowseTitle = "Select git binary";
         private const string GitInstallPickInvalidTitle = "Invalid Git install";
         private const string GitInstallPickInvalidMessage = "The selected file is not a valid Git install. {0}";
         private const string GitInstallFindButton = "Find install";
         private const string GitInstallPickInvalidOK = "OK";
 
+        [NonSerialized] private bool isBusy;
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         public override void OnGUI()
         {
             string gitExecPath = null;
@@ -40,23 +48,51 @@ public override void OnGUI()
             // Install path
             GUILayout.Label(GitInstallTitle, EditorStyles.boldLabel);
 
-            EditorGUI.BeginDisabledGroup(gitExecPath == null);
+            EditorGUI.BeginDisabledGroup(IsBusy || Parent.IsBusy || gitExecPath == null);
             {
                 // Install path field
                 EditorGUI.BeginChangeCheck();
                 {
-                    //TODO: Verify necessary value for a non Windows OS
-                    Styles.PathField(ref gitExecPath,
-                        () => EditorUtility.OpenFilePanel(GitInstallBrowseTitle,
-                            gitInstallPath,
-                            extension), ValidateGitInstall);
+                    GUILayout.BeginHorizontal();
+                    gitExecPath = EditorGUILayout.TextField("Path to Git", gitExecPath);
+                    if (GUILayout.Button(BrowseButton, EditorStyles.miniButton, GUILayout.Width(25)))
+                    {
+                        var newValue = EditorUtility.OpenFilePanel(GitInstallBrowseTitle, gitInstallPath, extension);
+
+                        if (!string.IsNullOrEmpty(newValue))
+                        {
+                            isBusy = true;
+
+                            var validateGitInstall = !string.IsNullOrEmpty(newValue);
+
+                            if (validateGitInstall && !GitClient.ValidateGitInstall(newValue.ToNPath()))
+                            {
+                                EditorUtility.DisplayDialog(GitInstallPickInvalidTitle, 
+                                    String.Format(GitInstallPickInvalidMessage, newValue),
+                                    GitInstallPickInvalidOK);
+
+                                validateGitInstall = false;
+                            }
+
+                            if (validateGitInstall)
+                            {
+                                gitExecPath = newValue;
+                                GUIUtility.keyboardControl = GUIUtility.hotControl = 0;
+                                GUI.changed = true;
+                            }
+                        }
+                    }
+                    GUILayout.EndHorizontal();
                 }
+
                 if (EditorGUI.EndChangeCheck())
                 {
                     Logger.Trace("Setting GitExecPath: " + gitExecPath);
 
                     Manager.SystemSettings.Set(Constants.GitInstallPathKey, gitExecPath);
                     Environment.GitExecutablePath = gitExecPath.ToNPath();
+
+                    isBusy = false;
                 }
 
                 GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
@@ -66,6 +102,8 @@ public override void OnGUI()
                     // Find button - for attempting to locate a new install
                     if (GUILayout.Button(GitInstallFindButton, GUILayout.ExpandWidth(false)))
                     {
+                        isBusy = true;
+
                         var task = new ProcessTask<NPath>(Manager.CancellationToken, new FirstLineIsPathOutputProcessor())
                             .Configure(Manager.ProcessManager, Environment.IsWindows ? "where" : "which", "git")
                             .FinallyInUI((success, ex, path) =>
@@ -75,26 +113,14 @@ public override void OnGUI()
                                     Environment.GitExecutablePath = path;
                                     GUIUtility.keyboardControl = GUIUtility.hotControl = 0;
                                 }
+
+                                isBusy = false;
                             });
                     }
                 }
                 GUILayout.EndHorizontal();
             }
             EditorGUI.EndDisabledGroup();
         }
-
-        private bool ValidateGitInstall(string path)
-        {
-            if (String.IsNullOrEmpty(path))
-                return false;
-            if (!GitClient.ValidateGitInstall(path.ToNPath()))
-            {
-                EditorUtility.DisplayDialog(GitInstallPickInvalidTitle, String.Format(GitInstallPickInvalidMessage, path),
-                    GitInstallPickInvalidOK);
-                return false;
-            }
-
-            return true;
-        }
     }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

@@ -133,12 +133,13 @@ public override void OnRepositoryChanged(IRepository oldRepository)
 
         public override bool IsBusy
         {
-            get { return isBusy; }
+            get { return isBusy || gitPathView.IsBusy; }
         }
 
         public override void Refresh()
         {
             base.Refresh();
+            gitPathView.Refresh();
             if (Repository != null && Repository.CurrentRemote.HasValue)
             {
                 Repository.ListLocks().Start();
@@ -356,7 +357,7 @@ private void OnRepositorySettingsGUI()
         {
             GUILayout.Label(GitRepositoryTitle, EditorStyles.boldLabel);
 
-            EditorGUI.BeginDisabledGroup(isBusy);
+            EditorGUI.BeginDisabledGroup(IsBusy);
             {
                 newRepositoryRemoteUrl = EditorGUILayout.TextField(GitRepositoryRemoteLabel + ": " + repositoryRemoteName, newRepositoryRemoteUrl);
                 var needsSaving = newRepositoryRemoteUrl != repositoryRemoteUrl && !String.IsNullOrEmpty(newRepositoryRemoteUrl);
@@ -593,7 +594,7 @@ private void OnGitIgnoreRulesGUI()
 
         private void OnGitLfsLocksGUI()
         {
-            EditorGUI.BeginDisabledGroup(isBusy || Repository == null);
+            EditorGUI.BeginDisabledGroup(IsBusy || Repository == null);
             {
                 GUILayout.BeginVertical();
                 {
@@ -666,7 +667,7 @@ private void OnPrivacyGui()
 
             GUILayout.Label(PrivacyTitle, EditorStyles.boldLabel);
 
-            EditorGUI.BeginDisabledGroup(isBusy || service == null);
+            EditorGUI.BeginDisabledGroup(IsBusy || service == null);
             {
                 var metricsEnabled = service != null ? service.Enabled : false;
                 EditorGUI.BeginChangeCheck();
@@ -686,7 +687,7 @@ private void OnLoggingSettingsGui()
         {
             GUILayout.Label(DebugSettingsTitle, EditorStyles.boldLabel);
 
-            EditorGUI.BeginDisabledGroup(isBusy);
+            EditorGUI.BeginDisabledGroup(IsBusy);
             {
                 var traceLogging = Logging.TracingEnabled;