Merge branch 'master' into enhancements/git-install-validation

Author: StanleyGoldman

README.md

@@ -2,7 +2,7 @@
 
 ## Notices
 
-From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running.
+From version 0.19 onwards, the location of the plugin has moved to `Assets/Plugins/GitHub`. If you have version 0.18 or lower, you need to delete the `Assets/Editor/GitHub` folder before you install newer versions. You should exit Unity and delete the folder from Explorer/Finder, as Unity will not unload native libraries while it's running. Also, remember to update your `.gitignore` file.
 
 ![Build Status](https://ci.appveyor.com/api/projects/status/github/github-for-unity/Unity?branch=master&svg=true)
 
@@ -81,7 +81,11 @@ Once the extension is installed, you can open a command line with the same Git a
 
 ### Installation
 
-To install the extension, download the latest package from [the releases page](https://github.com/github-for-unity/Unity/releases) and double click on it.
+This extensions needs to be installed (and updated) for each Unity project that you want to version control. 
+First step is to download the latest package from [the releases page](https://github.com/github-for-unity/Unity/releases);
+it will be saved as a file with the extension `.unitypackage`.
+To install it, open Unity, then open the project you want to version control, and then double click on the downloaded package.
+Alternatively, import the package by clicking Assets, Import Package, Custom Package, then select the downloaded package.
 
 #### Log files
 

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -126,52 +126,52 @@ public List<GitBranch> RemoteBranches
     }
 
     [Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)]
-    sealed class Favourites : ScriptObjectSingleton<Favourites>
+    sealed class Favorites : ScriptObjectSingleton<Favorites>
     {
-        [SerializeField] private List<string> favouriteBranches;
-        public List<string> FavouriteBranches
+        [SerializeField] private List<string> favoriteBranches;
+        public List<string> FavoriteBranches
         {
             get
             {
-                if (favouriteBranches == null)
-                    FavouriteBranches = new List<string>();
-                return favouriteBranches;
+                if (favoriteBranches == null)
+                    FavoriteBranches = new List<string>();
+                return favoriteBranches;
             }
             set
             {
-                favouriteBranches = value;
+                favoriteBranches = value;
                 Save(true);
             }
         }
 
-        public void SetFavourite(string branchName)
+        public void SetFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
+            if (FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Add(branchName);
+            FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public void UnsetFavourite(string branchName)
+        public void UnsetFavorite(string branchName)
         {
-            if (!FavouriteBranches.Contains(branchName))
+            if (!FavoriteBranches.Contains(branchName))
                 return;
-            FavouriteBranches.Remove(branchName);
+            FavoriteBranches.Remove(branchName);
             Save(true);
         }
 
-        public void ToggleFavourite(string branchName)
+        public void ToggleFavorite(string branchName)
         {
-            if (FavouriteBranches.Contains(branchName))
-                FavouriteBranches.Remove(branchName);
+            if (FavoriteBranches.Contains(branchName))
+                FavoriteBranches.Remove(branchName);
             else
-                FavouriteBranches.Add(branchName);
+                FavoriteBranches.Add(branchName);
             Save(true);
         }
 
-        public bool IsFavourite(string branchName)
+        public bool IsFavorite(string branchName)
         {
-            return FavouriteBranches.Contains(branchName);
+            return FavoriteBranches.Contains(branchName);
         }
     }
 

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

@@ -84,8 +84,8 @@ class Styles
         private static Texture2D branchIcon,
                                  activeBranchIcon,
                                  trackingBranchIcon,
-                                 favouriteIconOn,
-                                 favouriteIconOff,
+                                 favoriteIconOn,
+                                 favoriteIconOff,
                                  smallLogoIcon,
                                  bigLogoIcon,
                                  defaultAssetIcon,
@@ -663,29 +663,29 @@ public static Texture2D TrackingBranchIcon
             }
         }
 
-        public static Texture2D FavouriteIconOn
+        public static Texture2D FavoriteIconOn
         {
             get
             {
-                if (favouriteIconOn == null)
+                if (favoriteIconOn == null)
                 {
-                    favouriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");
+                    favoriteIconOn = Utility.GetIcon("favorite-branch-indicator.png");
                 }
 
-                return favouriteIconOn;
+                return favoriteIconOn;
             }
         }
 
-        public static Texture2D FavouriteIconOff
+        public static Texture2D FavoriteIconOff
         {
             get
             {
-                if (favouriteIconOff == null)
+                if (favoriteIconOff == null)
                 {
-                    favouriteIconOff = FolderIcon;
+                    favoriteIconOff = FolderIcon;
                 }
 
-                return favouriteIconOff;
+                return favoriteIconOff;
             }
         }
 

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)
         {
@@ -250,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; }
+        }
     }
 }

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

@@ -111,6 +111,7 @@ public virtual void OnSelectionChange()
 
         public 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; } }