Merge branch 'enhancements/subview-is-busy' into enhancements/git-path-view

Author: StanleyGoldman

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

@@ -119,6 +119,11 @@ public override void OnGUI()
             GUILayout.EndScrollView();
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         private void HandleEnterPressed()
         {
             if (Event.current.type != EventType.KeyDown)

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

@@ -73,5 +73,10 @@ public override void Finish(bool result)
             Close();
             base.Finish(result);
         }
+
+        public override bool IsBusy
+        {
+            get { return authView.IsBusy; }
+        }
     }
 }

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

@@ -126,6 +126,7 @@ public virtual void OnSelectionChange()
 
         public virtual Rect Position { get { return position; } }
         public IApplicationManager Manager { get; private set; }
+        public abstract bool IsBusy { get; }
         public IRepository Repository { get { return inLayout ? cachedRepository : Environment.Repository; } }
         public bool HasRepository { get { return Environment.RepositoryPath != null; } }
 

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

@@ -150,6 +150,11 @@ public override void OnGUI()
             }
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         public void OnEmbeddedGUI()
         {
             scroll = GUILayout.BeginScrollView(scroll);

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

@@ -19,9 +19,9 @@ class ChangesView : Subview
         private const string OneChangedFileLabel = "1 changed file";
         private const string NoChangedFilesLabel = "No changed files";
 
-        [NonSerialized] private bool busy = true;
-        [SerializeField] private string commitBody = "";
+        [NonSerialized] private bool isBusy = true;
 
+        [SerializeField] private string commitBody = "";
         [SerializeField] private string commitMessage = "";
         [SerializeField] private string currentBranch = "[unknown]";
         [SerializeField] private Vector2 horizontalScroll;
@@ -52,6 +52,11 @@ public override void OnDisable()
             Repository.OnStatusUpdated -= RunStatusUpdateOnMainThread;
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         private void RunStatusUpdateOnMainThread(GitStatus status)
         {
             new ActionTask(TaskManager.Token, _ => OnStatusUpdate(status))
@@ -72,10 +77,9 @@ private void OnStatusUpdate(GitStatus update)
             // (Re)build tree
             tree.UpdateEntries(update.Entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
 
-            busy = false;
+            isBusy = false;
         }
 
-
         public override void OnGUI()
         {
             GUILayout.BeginHorizontal();
@@ -144,7 +148,7 @@ private void OnCommitDetailsAreaGUI()
                     GUILayout.Space(Styles.CommitAreaPadding);
 
                     // Disable committing when already committing or if we don't have all the data needed
-                    EditorGUI.BeginDisabledGroup(busy || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
+                    EditorGUI.BeginDisabledGroup(isBusy || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
                     {
                         GUILayout.BeginHorizontal();
                         {
@@ -187,7 +191,7 @@ private void SelectNone()
         private void Commit()
         {
             // Do not allow new commits before we have received one successful update
-            busy = true;
+            isBusy = true;
 
             var files = Enumerable.Range(0, tree.Entries.Count)
                 .Where(i => tree.CommitTargets[i].All)
@@ -212,7 +216,7 @@ private void Commit()
                     {
                         commitMessage = "";
                         commitBody = "";
-                        busy = false;
+                        isBusy = false;
                     }).Start();
         }
     }

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

@@ -86,6 +86,11 @@ public override void OnGUI()
             GUILayout.EndVertical();
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         private void OnCommitTreeChange()
         {
             Height = 0f;
@@ -276,6 +281,7 @@ private void TreeNode(FileTreeNode node)
         }
 
         public float Height { get; protected set; }
+
         public bool Readonly { get; set; }
 
         public IList<GitStatusEntry> Entries

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

@@ -47,6 +47,7 @@ class HistoryView : Subview
         [NonSerialized] private int selectionIndex;
         [NonSerialized] private bool updated = true;
         [NonSerialized] private bool useScrollTime;
+        [NonSerialized] private bool isBusy;
 
 #if ENABLE_BROADMODE
         [SerializeField] private bool broadMode;
@@ -60,7 +61,6 @@ class HistoryView : Subview
 
         [SerializeField] private ChangesetTreeView changesetTree = new ChangesetTreeView();
         [SerializeField] private List<GitLogEntry> history = new List<GitLogEntry>();
-        [SerializeField] private bool isBusy;
         [SerializeField] private string currentRemote;
         [SerializeField] private bool isPublished;
 
@@ -146,6 +146,11 @@ public override void OnGUI()
 #endif
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
 #if ENABLE_BROADMODE
         public void OnBroadGUI()
         {

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

@@ -16,5 +16,6 @@ interface IView
         IRepository Repository { get; }
         bool HasRepository { get; }
         IApplicationManager Manager { get; }
+        bool IsBusy { get; }
     }
 }

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

@@ -232,6 +232,11 @@ public override void OnGUI()
             EditorGUI.EndDisabledGroup();
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         private bool IsFormValid
         {
             get { return !string.IsNullOrEmpty(repoName) && !isBusy && selectedOwner != 0; }

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

@@ -64,5 +64,10 @@ public override void Finish(bool result)
             Close();
             base.Finish(result);
         }
+
+        public override bool IsBusy
+        {
+            get { return publishView.IsBusy; }
+        }
     }
 }