diff --git a/src/GitHub.Exports/Settings/generated/IPackageSettings.cs b/src/GitHub.Exports/Settings/generated/IPackageSettings.cs index aec212bed9..258896c409 100644 --- a/src/GitHub.Exports/Settings/generated/IPackageSettings.cs +++ b/src/GitHub.Exports/Settings/generated/IPackageSettings.cs @@ -12,11 +12,6 @@ "type": "bool", "default": "false" }, - { - "name": "ForkButton", - "type": "bool", - "default": "false" - }, { "name": "UIState", "type": "object", @@ -46,7 +41,6 @@ public interface IPackageSettings : INotifyPropertyChanged void Save(); bool CollectMetrics { get; set; } bool EditorComments { get; set; } - bool ForkButton { get; set; } UIState UIState { get; set; } bool HideTeamExplorerWelcomeMessage { get; set; } bool EnableTraceLogging { get; set; } diff --git a/src/GitHub.Resources/Resources.Designer.cs b/src/GitHub.Resources/Resources.Designer.cs index f67682e422..5d54d56f10 100644 --- a/src/GitHub.Resources/Resources.Designer.cs +++ b/src/GitHub.Resources/Resources.Designer.cs @@ -1323,15 +1323,6 @@ public static string Options_ExperimentalTitle { } } - /// - /// Looks up a localized string similar to Show Fork button in Team Explorer. - /// - public static string Options_ForkButtonLabel { - get { - return ResourceManager.GetString("Options_ForkButtonLabel", resourceCulture); - } - } - /// /// Looks up a localized string similar to Help us improve by sending anonymous usage data. /// diff --git a/src/GitHub.Resources/Resources.resx b/src/GitHub.Resources/Resources.resx index 6458eb80fb..42d50a315d 100644 --- a/src/GitHub.Resources/Resources.resx +++ b/src/GitHub.Resources/Resources.resx @@ -674,9 +674,6 @@ https://git-scm.com/download/win The GitHub extension is not available inside Blend - - Show Fork button in Team Explorer - Update comment diff --git a/src/GitHub.Resources/Resources.zh-CN.resx b/src/GitHub.Resources/Resources.zh-CN.resx index f1a1758f8d..cfb3ef77c0 100644 --- a/src/GitHub.Resources/Resources.zh-CN.resx +++ b/src/GitHub.Resources/Resources.zh-CN.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -673,9 +673,6 @@ GitHub括在在Blend内部无效 - - 在团队资源管理器中显示分叉按钮 - 更新注释 @@ -835,4 +832,4 @@ 您已经克隆到此位置。单击 "打开" 打开本地存储库。 - + \ No newline at end of file diff --git a/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs b/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs index 12e8424b40..4d96864c8f 100644 --- a/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs +++ b/src/GitHub.TeamFoundation.14/Home/ForkNavigationItem.cs @@ -27,7 +27,6 @@ public class ForkNavigationItem : TeamExplorerNavigationItemBase public const string ForkNavigationItemId = "5245767A-B657-4F8E-BFEE-F04159F1DDA6"; readonly IDialogService dialogService; - readonly IPackageSettings packageSettings; readonly IUsageTracker usageTracker; IConnectionManager connectionManager; @@ -37,25 +36,15 @@ public ForkNavigationItem(IGitHubServiceProvider serviceProvider, ISimpleApiClientFactory apiFactory, ITeamExplorerServiceHolder holder, IDialogService dialogService, - IPackageSettings packageSettings, IUsageTracker usageTracker) : base(serviceProvider, apiFactory, holder, Octicon.repo_forked) { this.dialogService = dialogService; - this.packageSettings = packageSettings; this.usageTracker = usageTracker; Text = Resources.ForkNavigationItemText; ArgbColor = Colors.PurpleNavigationItem.ToInt32(); ConnectionManager.Connections.CollectionChanged += ConnectionsChanged; - - packageSettings.PropertyChanged += (sender, args) => - { - if (args.PropertyName == nameof(packageSettings.ForkButton)) - { - IsVisible = packageSettings.ForkButton; - } - }; } IConnectionManager ConnectionManager @@ -97,7 +86,7 @@ public override async void Invalidate() { IsVisible = false; - if ((packageSettings?.ForkButton ?? false) && await IsAGitHubDotComRepo()) + if (await IsAGitHubDotComRepo()) { var connection = await ConnectionManager.GetConnection(ActiveRepo); IsVisible = connection?.IsLoggedIn ?? false; diff --git a/src/GitHub.VisualStudio/Settings/OptionsPage.cs b/src/GitHub.VisualStudio/Settings/OptionsPage.cs index 3bd032ebde..7d94d1856e 100644 --- a/src/GitHub.VisualStudio/Settings/OptionsPage.cs +++ b/src/GitHub.VisualStudio/Settings/OptionsPage.cs @@ -52,7 +52,6 @@ void LoadSettings() { child.CollectMetrics = packageSettings.CollectMetrics; child.EditorComments = packageSettings.EditorComments; - child.ForkButton = packageSettings.ForkButton; child.EnableTraceLogging = packageSettings.EnableTraceLogging; } @@ -60,7 +59,6 @@ void SaveSettings() { packageSettings.CollectMetrics = child.CollectMetrics; packageSettings.EditorComments = child.EditorComments; - packageSettings.ForkButton = child.ForkButton; packageSettings.EnableTraceLogging = child.EnableTraceLogging; packageSettings.Save(); } diff --git a/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs b/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs index f8f6d30236..6969198bb2 100644 --- a/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs +++ b/src/GitHub.VisualStudio/Settings/generated/PackageSettingsGen.cs @@ -12,11 +12,6 @@ "type": "bool", "default": "false" }, - { - "name": "ForkButton", - "type": "bool", - "default": "false" - }, { "name": "UIState", "type": "object", @@ -93,7 +88,6 @@ void LoadSettings() { CollectMetrics = (bool)settingsStore.Read("CollectMetrics", true); EditorComments = (bool)settingsStore.Read("EditorComments", false); - ForkButton = (bool)settingsStore.Read("ForkButton", false); UIState = SimpleJson.DeserializeObject((string)settingsStore.Read("UIState", "{}")); HideTeamExplorerWelcomeMessage = (bool)settingsStore.Read("HideTeamExplorerWelcomeMessage", false); EnableTraceLogging = (bool)settingsStore.Read("EnableTraceLogging", false); @@ -103,7 +97,6 @@ void SaveSettings() { settingsStore.Write("CollectMetrics", CollectMetrics); settingsStore.Write("EditorComments", EditorComments); - settingsStore.Write("ForkButton", ForkButton); settingsStore.Write("UIState", SimpleJson.SerializeObject(UIState)); settingsStore.Write("HideTeamExplorerWelcomeMessage", HideTeamExplorerWelcomeMessage); settingsStore.Write("EnableTraceLogging", EnableTraceLogging); diff --git a/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml b/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml index 88c8a5e4c1..222df83aa3 100644 --- a/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml +++ b/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml @@ -109,9 +109,6 @@ - - - diff --git a/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml.cs b/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml.cs index 98d58bb649..48e8313c08 100644 --- a/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml.cs +++ b/src/GitHub.VisualStudio/UI/Settings/OptionsControl.xaml.cs @@ -31,12 +31,6 @@ public bool EditorComments set { chkEditorComments.IsChecked = value; } } - public bool ForkButton - { - get { return chkForkButton.IsChecked ?? false; } - set { chkForkButton.IsChecked = value; } - } - private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e) { var browser = VisualStudio.Services.DefaultExportProvider.GetExportedValue(); diff --git a/src/common/settings.json b/src/common/settings.json index 3bab5c422f..d0ca9a282a 100644 --- a/src/common/settings.json +++ b/src/common/settings.json @@ -10,11 +10,6 @@ "type": "bool", "default": "false" }, - { - "name": "ForkButton", - "type": "bool", - "default": "false" - }, { "name": "UIState", "type": "object",