Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DYN-2240 #10155

Merged
merged 2 commits into from
Nov 27, 2019
Merged

DYN-2240 #10155

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/DynamoCore/Graph/Workspaces/PackageDependencyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<value>Keep Installed Version</value>
</data>
<data name="MenuItemString" xml:space="preserve">
<value>Show Graph Package Dependency</value>
<value>Workspace References</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="NodeLibraryDependency_Loaded" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
Expand Down Expand Up @@ -369,7 +369,7 @@
<value>Could not redirect to the Dynamo forum page for feedback:</value>
</data>
<data name="RefreshButtonTooltipText" xml:space="preserve">
<value>Click to recalculate workspace dependencies.</value>
<value>Click to recalculate workspace references.</value>
</data>
<data name="RestartBannerMessage" xml:space="preserve">
<value>An installed package is marked for uninstall. To complete the uninstall, please restart Dynamo.</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<value>Keep Installed Version</value>
</data>
<data name="MenuItemString" xml:space="preserve">
<value>Show Graph Package Dependency</value>
<value>Workspace References</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="NodeLibraryDependency_Loaded" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
Expand Down Expand Up @@ -369,7 +369,7 @@
<value>Could not redirect to the Dynamo forum page for feedback:</value>
</data>
<data name="RefreshButtonTooltipText" xml:space="preserve">
<value>Click to recalculate workspace dependencies.</value>
<value>Click to recalculate workspace references.</value>
</data>
<data name="RestartBannerMessage" xml:space="preserve">
<value>An installed package is marked for uninstall. To complete the uninstall, please restart Dynamo.</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public string Name
{
get
{
return "Workspace Dependency ViewExtension";
return "Workspace References";
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void PackageManagerLoadsExtensionAndItWorks()
public void PackageManagerLoadsAndAddsViewExtension()
{
Assert.That(this.View.viewExtensionManager.ViewExtensions.Select(x => x.Name),
Is.EquivalentTo((new List<string> { "DynamoManipulationExtension","LibraryUI","NotificationsExtension", "Workspace Dependency ViewExtension", "Sample View Extension","PackageManagerViewExtension" })));
Is.EquivalentTo((new List<string> { "DynamoManipulationExtension","LibraryUI","NotificationsExtension", "Workspace References", "Sample View Extension","PackageManagerViewExtension" })));
}

[Test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down