diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs index 10091c857..c18c19d51 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs @@ -126,52 +126,52 @@ public List RemoteBranches } [Location("views/branches.yaml", LocationAttribute.Location.LibraryFolder)] - sealed class Favourites : ScriptObjectSingleton + sealed class Favorites : ScriptObjectSingleton { - [SerializeField] private List favouriteBranches; - public List FavouriteBranches + [SerializeField] private List favoriteBranches; + public List FavoriteBranches { get { - if (favouriteBranches == null) - FavouriteBranches = new List(); - return favouriteBranches; + if (favoriteBranches == null) + FavoriteBranches = new List(); + 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); } } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs index 10f918e66..f2ec9bf92 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs +++ b/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; } } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index 75fa59421..9210c6528 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs @@ -38,12 +38,12 @@ class BranchesView : Subview private bool showLocalBranches = true; private bool showRemoteBranches = true; - [NonSerialized] private List favourites = new List(); + [NonSerialized] private List favorites = new List(); [NonSerialized] private int listID = -1; [NonSerialized] private List newLocalBranches; [NonSerialized] private BranchTreeNode newNodeSelection; [NonSerialized] private BranchesMode targetMode; - [NonSerialized] private bool favouritesHasChanged; + [NonSerialized] private bool favoritesHasChanged; [SerializeField] private BranchTreeNode activeBranchNode; [SerializeField] private BranchTreeNode localRoot; @@ -52,7 +52,7 @@ class BranchesView : Subview [SerializeField] private List remotes = new List(); [SerializeField] private Vector2 scroll; [SerializeField] private BranchTreeNode selectedNode; - private List favouritesList; + private List favoritesList; public override void InitializeView(IView parent) { @@ -64,7 +64,7 @@ public override void OnEnable() { base.OnEnable(); AttachHandlers(Repository); - favouritesHasChanged = true; + favoritesHasChanged = true; } public override void OnDisable() @@ -81,10 +81,10 @@ public override void OnDataUpdate() private void MaybeUpdateData() { - if (favouritesHasChanged) + if (favoritesHasChanged) { - favouritesList = Manager.LocalSettings.Get(FavoritesSetting, new List()); - favouritesHasChanged = false; + favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List()); + favoritesHasChanged = false; } } @@ -160,17 +160,17 @@ public void OnEmbeddedGUI() GUILayout.BeginVertical(Styles.CommitFileAreaStyle); { - // Favourites list - if (favourites.Count > 0) + // Favorites list + if (favorites.Count > 0) { GUILayout.Label(FavoritesTitle); GUILayout.BeginHorizontal(); { GUILayout.BeginVertical(); { - for (var index = 0; index < favourites.Count; ++index) + for (var index = 0; index < favorites.Count; ++index) { - OnTreeNodeGUI(favourites[index]); + OnTreeNodeGUI(favorites[index]); } } @@ -264,12 +264,12 @@ public void OnEmbeddedGUI() private int CompareBranches(GitBranch a, GitBranch b) { - if (IsFavourite(a.Name)) + if (IsFavorite(a.Name)) { return -1; } - if (IsFavourite(b.Name)) + if (IsFavorite(b.Name)) { return 1; } @@ -287,9 +287,9 @@ private int CompareBranches(GitBranch a, GitBranch b) return 0; } - private bool IsFavourite(string branchName) + private bool IsFavorite(string branchName) { - return !String.IsNullOrEmpty(branchName) && favouritesList.Contains(branchName); + return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName); } private void OnLocalBranchesUpdate(IEnumerable list) @@ -318,8 +318,8 @@ private void BuildTree(IEnumerable local, IEnumerable remo var tracking = new List>(); var localBranchNodes = new List(); - // Prepare for updated favourites listing - favourites.Clear(); + // Prepare for updated favorites listing + favorites.Clear(); // Just build directly on the local root, keep track of active branch localRoot = new BranchTreeNode("", NodeType.Folder, false); @@ -348,10 +348,10 @@ private void BuildTree(IEnumerable local, IEnumerable remo } } - // Add to favourites - if (favouritesList.Contains(branch.Name)) + // Add to favorites + if (favoritesList.Contains(branch.Name)) { - favourites.Add(node); + favorites.Add(node); } // Build into tree @@ -392,10 +392,10 @@ private void BuildTree(IEnumerable local, IEnumerable remo } } - // Add to favourites - if (favouritesList.Contains(branch.Name)) + // Add to favorites + if (favoritesList.Contains(branch.Name)) { - favourites.Add(node); + favorites.Add(node); } // Build on the root of the remote, just like with locals @@ -430,23 +430,23 @@ private void BuildTree(BranchTreeNode parent, BranchTreeNode child) BuildTree(folder, child); } - private void SetFavourite(BranchTreeNode branch, bool favourite) + private void SetFavorite(BranchTreeNode branch, bool favorite) { if (string.IsNullOrEmpty(branch.Name)) { return; } - if (!favourite) + if (!favorite) { - favourites.Remove(branch); - Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList()); + favorites.Remove(branch); + Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList()); } else { - favourites.Remove(branch); - favourites.Add(branch); - Manager.LocalSettings.Set(FavoritesSetting, favourites.Select(x => x.Name).ToList()); + favorites.Remove(branch); + favorites.Add(branch); + Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList()); } } @@ -589,12 +589,12 @@ private void OnTreeNodeGUI(BranchTreeNode node) var style = node.Active ? Styles.BoldLabel : Styles.Label; var rect = GUILayoutUtility.GetRect(content, style, GUILayout.MaxHeight(EditorGUIUtility.singleLineHeight)); var clickRect = new Rect(0f, rect.y, Position.width, rect.height); - var favouriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height); + var favoriteRect = new Rect(clickRect.xMax - clickRect.height * 2f, clickRect.y, clickRect.height, clickRect.height); var selected = selectedNode == node; var keyboardFocus = GUIUtility.keyboardControl == listID; - // Selection highlight and favourite toggle + // Selection highlight and favorite toggle if (selected) { if (Event.current.type == EventType.Repaint) @@ -604,22 +604,22 @@ private void OnTreeNodeGUI(BranchTreeNode node) if (node.Type != NodeType.Folder) { - var favourite = IsFavourite(node.Name); + var favorite = IsFavorite(node.Name); if (Event.current.type == EventType.Repaint) { - GUI.DrawTexture(favouriteRect, favourite ? Styles.FavouriteIconOn : Styles.FavouriteIconOff); + GUI.DrawTexture(favoriteRect, favorite ? Styles.FavoriteIconOn : Styles.FavoriteIconOff); } - else if (Event.current.type == EventType.MouseDown && favouriteRect.Contains(Event.current.mousePosition)) + else if (Event.current.type == EventType.MouseDown && favoriteRect.Contains(Event.current.mousePosition)) { - SetFavourite(node, !favourite); + SetFavorite(node, !favorite); Event.current.Use(); } } } - // Favourite status - else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavourite(node.Name)) + // Favorite status + else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavorite(node.Name)) { - GUI.DrawTexture(favouriteRect, Styles.FavouriteIconOn); + GUI.DrawTexture(favoriteRect, Styles.FavoriteIconOn); } // The actual icon and label