From abd832f21dae8cf1118fd531d2f4c7187dccaf82 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Mon, 18 Sep 2017 14:37:10 -0400 Subject: [PATCH 1/5] Fix needed after merge --- .../Assets/Editor/GitHub.Unity/UI/Window.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs index 3f6fc0518..14c212e36 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs @@ -462,11 +462,11 @@ private Subview ToView(SubTab tab) default: throw new ArgumentOutOfRangeException(); } + } - public override bool IsBusy - { - get { return false; } - } + public override bool IsBusy + { + get { return false; } } private enum SubTab From 6168309dc244f9c521fb19fd5f6e1afb20b0736c Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 7 Sep 2017 10:17:20 -0400 Subject: [PATCH 2/5] Adding configurations to init project view --- .../Editor/GitHub.Unity/UI/InitProjectView.cs | 62 +++++++++++++++++-- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs index 38c186839..168b18f8d 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs @@ -1,5 +1,3 @@ -#pragma warning disable 649 - using System; using System.Collections.Generic; using System.Linq; @@ -14,7 +12,9 @@ class InitProjectView : Subview { private const string NoRepoTitle = "No Git repository found for this project"; private const string NoRepoDescription = "Initialize a Git repository to track changes and collaborate with others."; - + + [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView(); + [SerializeField] private GitPathView gitPathView = new GitPathView(); [SerializeField] private bool isBusy; [SerializeField] private bool isPublished; @@ -24,15 +24,63 @@ public override void OnDataUpdate() MaybeUpdateData(); } + public override void InitializeView(IView parent) + { + base.InitializeView(parent); + userSettingsView.InitializeView(this); + gitPathView.InitializeView(this); + } + + public override void OnEnable() + { + base.OnEnable(); + userSettingsView.OnEnable(); + gitPathView.OnEnable(); + } + + public override void OnDisable() + { + base.OnDisable(); + userSettingsView.OnDisable(); + gitPathView.OnDisable(); + } + + public override void OnDataUpdate() + { + base.OnDataUpdate(); + + if (userSettingsView != null) + { + userSettingsView.OnDataUpdate(); + } + + if (gitPathView != null) + { + gitPathView.OnDataUpdate(); + } + } + public override void OnRepositoryChanged(IRepository oldRepository) { base.OnRepositoryChanged(oldRepository); + + userSettingsView.OnRepositoryChanged(oldRepository); + gitPathView.OnRepositoryChanged(oldRepository); + Refresh(); } public override bool IsBusy { - get { return isBusy; } + get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; } + } + + public override void Refresh() + { + base.Refresh(); + + userSettingsView.Refresh(); + gitPathView.Refresh(); } public override void OnGUI() @@ -66,6 +114,10 @@ public override void OnGUI() } EditorGUILayout.EndHorizontal(); + gitPathView.OnGUI(); + + userSettingsView.OnGUI(); + GUILayout.BeginVertical(Styles.GenericBoxStyle); { GUILayout.FlexibleSpace(); @@ -75,7 +127,7 @@ public override void OnGUI() GUILayout.BeginHorizontal(); GUILayout.FlexibleSpace(); - EditorGUI.BeginDisabledGroup(isBusy); + EditorGUI.BeginDisabledGroup(IsBusy); { if (GUILayout.Button(Localization.InitializeRepositoryButtonText, "Button")) { From e344577c9e3c66acf49a31cd65cad72fa4434945 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Thu, 19 Oct 2017 15:48:57 +0200 Subject: [PATCH 3/5] Fix merge --- .../Assets/Editor/GitHub.Unity/UI/InitProjectView.cs | 7 +------ src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs index 4a4a4e961..f7924a89e 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs @@ -18,12 +18,6 @@ class InitProjectView : Subview [SerializeField] private bool isBusy; [SerializeField] private bool isPublished; - public override void OnDataUpdate() - { - base.OnDataUpdate(); - MaybeUpdateData(); - } - public override void InitializeView(IView parent) { base.InitializeView(parent); @@ -77,6 +71,7 @@ public override void Refresh() userSettingsView.Refresh(); gitPathView.Refresh(); } + public override void OnGUI() { var headerRect = EditorGUILayout.BeginHorizontal(Styles.HeaderBoxStyle); diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs index 576a2763e..a9bbaca1b 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs @@ -469,7 +469,6 @@ private Subview ActiveView get { return ToView(activeTab); } } - } public override bool IsBusy { get { return false; } From e13e4b5cef2662d397a239806ffcaa1fc27ead29 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Thu, 19 Oct 2017 15:57:31 +0200 Subject: [PATCH 4/5] Remove unused code --- .../Editor/GitHub.Unity/UI/GitPathView.cs | 1 - .../Editor/GitHub.Unity/UI/InitProjectView.cs | 49 +------------------ .../GitHub.Unity/UI/UserSettingsView.cs | 18 ++----- 3 files changed, 7 insertions(+), 61 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs index bd8e60c68..c8037d152 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs @@ -38,7 +38,6 @@ class GitPathView : Subview public override void OnEnable() { base.OnEnable(); - gitExecHasChanged = true; } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs index f7924a89e..00360f0fe 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs @@ -16,7 +16,6 @@ class InitProjectView : Subview [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView(); [SerializeField] private GitPathView gitPathView = new GitPathView(); [SerializeField] private bool isBusy; - [SerializeField] private bool isPublished; public override void InitializeView(IView parent) { @@ -25,51 +24,12 @@ public override void InitializeView(IView parent) gitPathView.InitializeView(this); } - public override void OnEnable() - { - base.OnEnable(); - userSettingsView.OnEnable(); - gitPathView.OnEnable(); - } - - public override void OnDisable() - { - base.OnDisable(); - userSettingsView.OnDisable(); - gitPathView.OnDisable(); - } - public override void OnDataUpdate() { base.OnDataUpdate(); - if (userSettingsView != null) - { - userSettingsView.OnDataUpdate(); - } - - if (gitPathView != null) - { - gitPathView.OnDataUpdate(); - } - } - - public override void OnRepositoryChanged(IRepository oldRepository) - { - base.OnRepositoryChanged(oldRepository); - - userSettingsView.OnRepositoryChanged(oldRepository); - gitPathView.OnRepositoryChanged(oldRepository); - - Refresh(); - } - - public override void Refresh() - { - base.Refresh(); - - userSettingsView.Refresh(); - gitPathView.Refresh(); + userSettingsView.OnDataUpdate(); + gitPathView.OnDataUpdate(); } public override void OnGUI() @@ -136,11 +96,6 @@ public override void OnGUI() GUILayout.EndVertical(); } - private void MaybeUpdateData() - { - isPublished = Repository != null && Repository.CurrentRemote.HasValue; - } - public override bool IsBusy { get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs index 8d50a9cdc..674231aef 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs @@ -21,7 +21,6 @@ class UserSettingsView : Subview [SerializeField] private string gitName; [SerializeField] private string gitEmail; - [SerializeField] private string newGitName; [SerializeField] private string newGitEmail; [SerializeField] private User cachedUser; @@ -32,13 +31,6 @@ public override void OnDataUpdate() MaybeUpdateData(); } - public override void OnRepositoryChanged(IRepository oldRepository) - { - base.OnRepositoryChanged(oldRepository); - - Refresh(); - } - public override void OnGUI() { GUILayout.Label(GitConfigTitle, EditorStyles.boldLabel); @@ -108,11 +100,6 @@ public override void OnGUI() EditorGUI.EndDisabledGroup(); } - public override bool IsBusy - { - get { return isBusy; } - } - private void MaybeUpdateData() { if (Repository == null) @@ -154,5 +141,10 @@ private void MaybeUpdateData() newGitName = gitName = Repository.User.Name; newGitEmail = gitEmail = Repository.User.Email; } + + public override bool IsBusy + { + get { return isBusy; } + } } } From 722363ad1db5979085e1e5fc1ad145c4e77f7f1f Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Thu, 19 Oct 2017 16:04:42 +0200 Subject: [PATCH 5/5] La de da kill the usings la la --- .../Assets/Editor/GitHub.Unity/UI/GitPathView.cs | 4 ---- .../Assets/Editor/GitHub.Unity/UI/InitProjectView.cs | 3 --- .../Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs | 4 ---- 3 files changed, 11 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs index c8037d152..37db8aa24 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using UnityEditor; using UnityEngine; diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs index 00360f0fe..ec20862dd 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/InitProjectView.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; using UnityEditor; using UnityEngine; -using Object = UnityEngine.Object; namespace GitHub.Unity { diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs index 674231aef..d754bb60d 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/UserSettingsView.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; using UnityEditor; using UnityEngine;