From 372fd2d87abdc0eeea60dae8f2c50626952a0ae3 Mon Sep 17 00:00:00 2001 From: reddyashish <43763136+reddyashish@users.noreply.github.com> Date: Wed, 27 Nov 2019 14:27:36 -0500 Subject: [PATCH] DYN-2240 (#10155) * DYN-2240 * Addressing some comments (cherry picked from commit b3ba589acc6f8be61effef9541e3657969903adc) --- src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs | 2 +- src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs | 2 +- .../Properties/Resources.Designer.cs | 6 +++--- .../Properties/Resources.en-US.resx | 4 ++-- .../Properties/Resources.resx | 4 ++-- .../WorkspaceDependencyViewExtension.cs | 2 +- .../PackageManagerExtensionLoadingTests.cs | 2 +- .../ViewExtensions/WorkspaceDependencyViewExtensionTests.cs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs b/src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs index ac93f6ec734..e470b244e53 100644 --- a/src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs +++ b/src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs @@ -12,7 +12,7 @@ public enum PackageDependencyState IncorrectVersion, // Correct package but incorrect version. Missing, // package is completely missing. Warning, // Actual package is missing but the nodes are resolved by some other package. - RequiresRestart // Restart needed in order to complete the uninstall of some package. Notice this would be only set when workspace dependency viewer is loaded. + RequiresRestart // Restart needed in order to complete the uninstall of some package. Notice this would be only set when workspace references extension is loaded. } /// diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs index 3b194987460..447a1a6e739 100644 --- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs +++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs @@ -211,7 +211,7 @@ internal TabItem AddTabItem(IViewExtension viewExtension, ContentControl content // creates a new tab item TabItem tab = new TabItem(); - tab.Header = viewExtension.GetType().Name; + tab.Header = viewExtension.Name; tab.Tag = viewExtension.GetType(); tab.HeaderTemplate = tabDynamic.FindResource("TabHeader") as DataTemplate; diff --git a/src/WorkspaceDependencyViewExtension/Properties/Resources.Designer.cs b/src/WorkspaceDependencyViewExtension/Properties/Resources.Designer.cs index 200ded80076..52351984774 100644 --- a/src/WorkspaceDependencyViewExtension/Properties/Resources.Designer.cs +++ b/src/WorkspaceDependencyViewExtension/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Dynamo.WorkspaceDependency.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -133,7 +133,7 @@ public static string KeepLocalButtonText { } /// - /// Looks up a localized string similar to Show Graph Package Dependency. + /// Looks up a localized string similar to Workspace References. /// public static string MenuItemString { get { @@ -199,7 +199,7 @@ public static string ProvideFeedbackError { } /// - /// Looks up a localized string similar to Click to recalculate workspace dependencies.. + /// Looks up a localized string similar to Click to recalculate workspace references.. /// public static string RefreshButtonTooltipText { get { diff --git a/src/WorkspaceDependencyViewExtension/Properties/Resources.en-US.resx b/src/WorkspaceDependencyViewExtension/Properties/Resources.en-US.resx index abcd9711996..2280c5cf44e 100644 --- a/src/WorkspaceDependencyViewExtension/Properties/Resources.en-US.resx +++ b/src/WorkspaceDependencyViewExtension/Properties/Resources.en-US.resx @@ -142,7 +142,7 @@ Keep Installed Version - Show Graph Package Dependency + Workspace References @@ -369,7 +369,7 @@ Could not redirect to the Dynamo forum page for feedback: - Click to recalculate workspace dependencies. + Click to recalculate workspace references. An installed package is marked for uninstall. To complete the uninstall, please restart Dynamo. diff --git a/src/WorkspaceDependencyViewExtension/Properties/Resources.resx b/src/WorkspaceDependencyViewExtension/Properties/Resources.resx index abcd9711996..2280c5cf44e 100644 --- a/src/WorkspaceDependencyViewExtension/Properties/Resources.resx +++ b/src/WorkspaceDependencyViewExtension/Properties/Resources.resx @@ -142,7 +142,7 @@ Keep Installed Version - Show Graph Package Dependency + Workspace References @@ -369,7 +369,7 @@ Could not redirect to the Dynamo forum page for feedback: - Click to recalculate workspace dependencies. + Click to recalculate workspace references. An installed package is marked for uninstall. To complete the uninstall, please restart Dynamo. diff --git a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs index b1fe91eafad..a0d357f218b 100644 --- a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs +++ b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs @@ -34,7 +34,7 @@ public string Name { get { - return "Workspace Dependency ViewExtension"; + return "Workspace References"; } } diff --git a/test/DynamoCoreWpfTests/PackageManagerExtensionLoadingTests.cs b/test/DynamoCoreWpfTests/PackageManagerExtensionLoadingTests.cs index 8f67a663e27..e12af75dd17 100644 --- a/test/DynamoCoreWpfTests/PackageManagerExtensionLoadingTests.cs +++ b/test/DynamoCoreWpfTests/PackageManagerExtensionLoadingTests.cs @@ -57,7 +57,7 @@ public void PackageManagerLoadsExtensionAndItWorks() public void PackageManagerLoadsAndAddsViewExtension() { Assert.That(this.View.viewExtensionManager.ViewExtensions.Select(x => x.Name), - Is.EquivalentTo((new List { "DynamoManipulationExtension","LibraryUI","NotificationsExtension", "Workspace Dependency ViewExtension", "Sample View Extension","PackageManagerViewExtension" }))); + Is.EquivalentTo((new List { "DynamoManipulationExtension","LibraryUI","NotificationsExtension", "Workspace References", "Sample View Extension","PackageManagerViewExtension" }))); } [Test] diff --git a/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs index 6961736a99e..939cb117c41 100644 --- a/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs +++ b/test/DynamoCoreWpfTests/ViewExtensions/WorkspaceDependencyViewExtensionTests.cs @@ -167,7 +167,7 @@ public void WillNotAddDupWorkspaceDependencyViewExtensionLoadTest() var initialNum = View.TabItems.Count; - // Adding the workspace dependency view extension will + // Adding the workspace references extension will // not add a dup tab in the extensions side bar extensionManager.Add(viewExtension); Assert.AreEqual(initialNum, View.TabItems.Count);