Merge branch 'master' into enhancements/user-settings-view

StanleyGoldman · StanleyGoldman · commit f37d5f948537 · 2017-09-11T09:27:02.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs
@@ -29,34 +29,8 @@ class AuthenticationView : Subview
         [NonSerialized] private string errorMessage;
         [NonSerialized] private bool enterPressed;
         [NonSerialized] private string password = "";
-
         [NonSerialized] private AuthenticationService authenticationService;
-        private AuthenticationService AuthenticationService
-        {
-            get
-            {
-                if (authenticationService == null)
-                {
-                    UriString host;
-                    if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
-                    {
-                        host = new UriString(Repository.CloneUrl.ToRepositoryUri()
-                            .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
-                    }
-                    else
-                    {
-                        host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
-                    }
 
-                    AuthenticationService = new AuthenticationService(host, Platform.Keychain);
-                }
-                return authenticationService;
-            }
-            set
-            {
-                authenticationService = value;
-            }
-        }
 
         public override void InitializeView(IView parent)
         {
@@ -124,11 +98,6 @@ public override void OnGUI()
             GUILayout.EndScrollView();
         }
 
-        public override bool IsBusy
-        {
-            get { return isBusy; }
-        }
-
         private void HandleEnterPressed()
         {
             if (Event.current.type != EventType.KeyDown)
@@ -255,5 +224,37 @@ private void ShowErrorMessage()
                 GUILayout.Label(errorMessage, Styles.ErrorLabel);
             }
         }
+
+        private AuthenticationService AuthenticationService
+        {
+            get
+            {
+                if (authenticationService == null)
+                {
+                    UriString host;
+                    if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
+                    {
+                        host = new UriString(Repository.CloneUrl.ToRepositoryUri()
+                            .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+                    }
+                    else
+                    {
+                        host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+                    }
+
+                    AuthenticationService = new AuthenticationService(host, Platform.Keychain);
+                }
+                return authenticationService;
+            }
+            set
+            {
+                authenticationService = value;
+            }
+        }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -146,11 +146,6 @@ public override void OnGUI()
             OnEmbeddedGUI();
         }
 
-        public override bool IsBusy
-        {
-            get { return false; }
-        }
-
         public void OnEmbeddedGUI()
         {
             scroll = GUILayout.BeginScrollView(scroll);
@@ -756,6 +751,11 @@ private void OnTreeNodeChildrenGUI(BranchTreeNode node)
             }
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         private enum NodeType
         {
             Folder,
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -52,11 +52,6 @@ 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))
@@ -217,5 +212,10 @@ private void Commit()
                         isBusy = false;
                     }).Start();
         }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesetTreeView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesetTreeView.cs
@@ -86,17 +86,6 @@ public override void OnGUI()
             GUILayout.EndVertical();
         }
 
-        public override bool IsBusy
-        {
-            get { return false; }
-        }
-
-        private void OnCommitTreeChange()
-        {
-            Height = 0f;
-            Redraw();
-        }
-
         public void UpdateEntries(IList<GitStatusEntry> newEntries)
         {
             // Handle the empty list scenario
@@ -117,6 +106,12 @@ public void UpdateEntries(IList<GitStatusEntry> newEntries)
             OnCommitTreeChange();
         }
 
+        private void OnCommitTreeChange()
+        {
+            Height = 0f;
+            Redraw();
+        }
+
         private void TreeNode(FileTreeNode node)
         {
             GUILayout.Space(Styles.TreeVerticalSpacing);
@@ -280,6 +275,11 @@ private void TreeNode(FileTreeNode node)
             GUILayout.EndHorizontal();
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         public float Height { get; protected set; }
 
         public bool Readonly { get; set; }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -125,10 +125,6 @@ public override void OnGUI()
             OnEmbeddedGUI();
         }
 
-        public override bool IsBusy
-        {
-            get { return isBusy; }
-        }
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
@@ -750,6 +746,11 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)
             EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor);
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         private float EntryHeight
         {
             get { return Styles.HistoryEntryHeight + Styles.HistoryEntryPadding; }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PopupWindow.cs
@@ -113,6 +113,11 @@ public override void OnDestroy()
             OnClose = null;
         }
 
+        public override bool IsBusy
+        {
+            get { return ActiveView.IsBusy; }
+        }
+
         private Subview ActiveView
         {
             get
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -464,5 +464,10 @@ private void OnLoggingSettingsGui()
             }
             EditorGUI.EndDisabledGroup();
         }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs
@@ -139,11 +139,6 @@ public override void OnSelectionChange()
                 ActiveView.OnSelectionChange();
         }
 
-        public override bool IsBusy
-        {
-            get { return false; }
-        }
-
         public override void Refresh()
         {
             base.Refresh();
@@ -405,6 +400,11 @@ public SettingsView SettingsView
             get { return settingsView; }
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         private Subview ActiveView
         {
             get

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,6 @@ public override void OnGUI()`
`146`	`146`	`OnEmbeddedGUI();`
`147`	`147`	`}`
`148`	`148`
`149`		`- public override bool IsBusy`
`150`		`- {`
`151`		`- get { return false; }`
`152`		`- }`
`153`		`-`
`154`	`149`	`public void OnEmbeddedGUI()`
`155`	`150`	`{`
`156`	`151`	`scroll = GUILayout.BeginScrollView(scroll);`
`@@ -756,6 +751,11 @@ private void OnTreeNodeChildrenGUI(BranchTreeNode node)`
`756`	`751`	`}`
`757`	`752`	`}`
`758`	`753`
	`754`	`+ public override bool IsBusy`
	`755`	`+ {`
	`756`	`+ get { return false; }`
	`757`	`+ }`
	`758`	`+`
`759`	`759`	`private enum NodeType`
`760`	`760`	`{`
`761`	`761`	`Folder,`
Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,6 @@ public override void OnDisable()`
`52`	`52`	`Repository.OnStatusUpdated -= RunStatusUpdateOnMainThread;`
`53`	`53`	`}`
`54`	`54`
`55`		`- public override bool IsBusy`
`56`		`- {`
`57`		`- get { return isBusy; }`
`58`		`- }`
`59`		`-`
`60`	`55`	`private void RunStatusUpdateOnMainThread(GitStatus status)`
`61`	`56`	`{`
`62`	`57`	`new ActionTask(TaskManager.Token, _ => OnStatusUpdate(status))`
`@@ -217,5 +212,10 @@ private void Commit()`
`217`	`212`	`isBusy = false;`
`218`	`213`	`}).Start();`
`219`	`214`	`}`
	`215`	`+`
	`216`	`+ public override bool IsBusy`
	`217`	`+ {`
	`218`	`+ get { return isBusy; }`
	`219`	`+ }`
`220`	`220`	`}`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,6 @@ public override void OnGUI()`
`125`	`125`	`OnEmbeddedGUI();`
`126`	`126`	`}`
`127`	`127`
`128`		`- public override bool IsBusy`
`129`		`- {`
`130`		`- get { return isBusy; }`
`131`		`- }`
`132`	`128`	`private void AttachHandlers(IRepository repository)`
`133`	`129`	`{`
`134`	`130`	`if (repository == null)`
`@@ -750,6 +746,11 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)`
`750`	`746`	`EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor);`
`751`	`747`	`}`
`752`	`748`
	`749`	`+ public override bool IsBusy`
	`750`	`+ {`
	`751`	`+ get { return isBusy; }`
	`752`	`+ }`
	`753`	`+`
`753`	`754`	`private float EntryHeight`
`754`	`755`	`{`
`755`	`756`	`get { return Styles.HistoryEntryHeight + Styles.HistoryEntryPadding; }`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,11 @@ public override void OnDestroy()`
`113`	`113`	`OnClose = null;`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ public override bool IsBusy`
	`117`	`+ {`
	`118`	`+ get { return ActiveView.IsBusy; }`
	`119`	`+ }`
	`120`	`+`
`116`	`121`	`private Subview ActiveView`
`117`	`122`	`{`
`118`	`123`	`get`
Original file line number	Diff line number	Diff line change
`@@ -464,5 +464,10 @@ private void OnLoggingSettingsGui()`
`464`	`464`	`}`
`465`	`465`	`EditorGUI.EndDisabledGroup();`
`466`	`466`	`}`
	`467`	`+`
	`468`	`+ public override bool IsBusy`
	`469`	`+ {`
	`470`	`+ get { return isBusy; }`
	`471`	`+ }`
`467`	`472`	`}`
`468`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,6 @@ public override void OnSelectionChange()`
`139`	`139`	`ActiveView.OnSelectionChange();`
`140`	`140`	`}`
`141`	`141`
`142`		`- public override bool IsBusy`
`143`		`- {`
`144`		`- get { return false; }`
`145`		`- }`
`146`		`-`
`147`	`142`	`public override void Refresh()`
`148`	`143`	`{`
`149`	`144`	`base.Refresh();`
`@@ -405,6 +400,11 @@ public SettingsView SettingsView`
`405`	`400`	`get { return settingsView; }`
`406`	`401`	`}`
`407`	`402`
	`403`	`+ public override bool IsBusy`
	`404`	`+ {`
	`405`	`+ get { return false; }`
	`406`	`+ }`
	`407`	`+`
`408`	`408`	`private Subview ActiveView`
`409`	`409`	`{`
`410`	`410`	`get`