Integrating the LoadingView to the main Window

Author: StanleyGoldman

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

@@ -1,30 +1,25 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Octokit;
-using Rackspace.Threading;
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
 namespace GitHub.Unity
 {
     class LoadingView : Subview
     {
-        private static readonly Vector2 viewSize = new Vector2(300, 250);
+        private static readonly Vector2 MinViewSize = new Vector2(300, 250);
 
         private const string WindowTitle = "Loading...";
-        private const string Header = "";
-
 
         public override void InitializeView(IView parent)
         {
             base.InitializeView(parent);
             Title = WindowTitle;
-            Size = viewSize;
+            Size = MinViewSize;
         }
 
         public override void OnGUI()
-        {}
+        {
+            
+        }
 
         public override bool IsBusy
         {

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

@@ -26,6 +26,7 @@ class Window : BaseWindow
         [SerializeField] private SubTab changeTab = SubTab.History;
         [SerializeField] private SubTab activeTab = SubTab.History;
         [SerializeField] private InitProjectView initProjectView = new InitProjectView();
+        [SerializeField] private LoadingView loadingView = new LoadingView();
         [SerializeField] private BranchesView branchesView = new BranchesView();
         [SerializeField] private ChangesView changesView = new ChangesView();
         [SerializeField] private HistoryView historyView = new HistoryView();
@@ -39,6 +40,7 @@ class Window : BaseWindow
 
         [SerializeField] private CacheUpdateEvent lastCurrentBranchAndRemoteChangedEvent;
         [NonSerialized] private bool currentBranchAndRemoteHasUpdate;
+        [NonSerialized] private bool gitExecutableIsSet;
 
         [MenuItem(LaunchMenu)]
         public static void Window_GitHub()
@@ -84,9 +86,18 @@ public override void Initialize(IApplicationManager applicationManager)
         {
             base.Initialize(applicationManager);
 
-            if (!HasRepository && activeTab != SubTab.InitProject && activeTab != SubTab.Settings)
+            gitExecutableIsSet = Environment.GitExecutablePath != null;
+
+            if (!gitExecutableIsSet && activeTab != SubTab.Loading)
+            {
+                changeTab = activeTab = SubTab.Loading;
+            }
+            else if (!HasRepository && activeTab != SubTab.InitProject && activeTab != SubTab.Settings)
+            {
                 changeTab = activeTab = SubTab.InitProject;
+            }
 
+            LoadingView.InitializeView(this);
             HistoryView.InitializeView(this);
             ChangesView.InitializeView(this);
             BranchesView.InitializeView(this);
@@ -165,12 +176,15 @@ public override void OnUI()
         {
             base.OnUI();
 
-            if (HasRepository)
-            {
-                DoHeaderGUI();
-            }
+            if(gitExecutableIsSet)
+            { 
+                if (HasRepository)
+                {
+                    DoHeaderGUI();
+                }
 
-            DoToolbarGUI();
+                DoToolbarGUI();
+            }
 
             // GUI for the active tab
             if (ActiveView != null)
@@ -442,6 +456,8 @@ private Subview ToView(SubTab tab)
         {
             switch (tab)
             {
+                case SubTab.Loading:
+                    return loadingView;
                 case SubTab.InitProject:
                     return initProjectView;
                 case SubTab.History:
@@ -457,6 +473,11 @@ private Subview ToView(SubTab tab)
             }
         }
 
+        public LoadingView LoadingView
+        {
+            get { return loadingView; }
+        }
+
         public HistoryView HistoryView
         {
             get { return historyView; }
@@ -495,6 +516,7 @@ public override bool IsBusy
         private enum SubTab
         {
             None,
+            Loading,
             InitProject,
             History,
             Changes,