Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Changing "favour" to "favor" #276

Merged
shana merged 6 commits into from
Sep 8, 2017
Merged

Changing "favour" to "favor" #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b55ec61
Merge branch 'fixes/settings-update-on-enable' into fixes/british-fav…
StanleyGoldman Sep 5, 2017
df26f26
Replacing favour with favor
StanleyGoldman Sep 5, 2017
ba47733
Merge branch 'fixes/settings-update-on-enable' into fixes/british-fav…
StanleyGoldman Sep 5, 2017
95dfd31
Missed fix
StanleyGoldman Sep 5, 2017
c54254e
Merge master into fixes/british-favourite
shana Sep 8, 2017
4dfcb90
A wild u appears!
shana Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
20 changes: 10 additions & 10 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ class Styles
private static Texture2D branchIcon,
activeBranchIcon,
trackingBranchIcon,
favouriteIconOn,
favouriteIconOff,
favoriteIconOn,
favoriteIconOff,
smallLogoIcon,
bigLogoIcon,
defaultAssetIcon,
Expand Down Expand Up @@ -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;
}
}

Expand Down
78 changes: 39 additions & 39 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ class BranchesView : Subview
private bool showLocalBranches = true;
private bool showRemoteBranches = true;

[NonSerialized] private List<BranchTreeNode> favourites = new List<BranchTreeNode>();
[NonSerialized] private List<BranchTreeNode> favorites = new List<BranchTreeNode>();
[NonSerialized] private int listID = -1;
[NonSerialized] private List<GitBranch> 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;
Expand All @@ -52,7 +52,7 @@ class BranchesView : Subview
[SerializeField] private List<Remote> remotes = new List<Remote>();
[SerializeField] private Vector2 scroll;
[SerializeField] private BranchTreeNode selectedNode;
private List<string> favouritesList;
private List<string> favoritesList;

public override void InitializeView(IView parent)
{
Expand All @@ -64,7 +64,7 @@ public override void OnEnable()
{
base.OnEnable();
AttachHandlers(Repository);
favouritesHasChanged = true;
favoritesHasChanged = true;
}

public override void OnDisable()
Expand All @@ -81,10 +81,10 @@ public override void OnDataUpdate()

private void MaybeUpdateData()
{
if (favouritesHasChanged)
if (favoritesHasChanged)
{
favouritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
favouritesHasChanged = false;
favoritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
favoritesHasChanged = false;
}
}

Expand Down Expand Up @@ -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]);
}
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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<GitBranch> list)
Expand Down Expand Up @@ -318,8 +318,8 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
var tracking = new List<KeyValuePair<int, int>>();
var localBranchNodes = new List<BranchTreeNode>();

// 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);
Expand Down Expand Up @@ -348,10 +348,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> 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
Expand Down Expand Up @@ -392,10 +392,10 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> 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
Expand Down Expand Up @@ -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());
}
}

Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down