diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index ec377a623dc..d38fe2150a0 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -107,32 +107,12 @@
-
-
-
-
-
-
-
- %(TGZFiles.Filename)
-
-
-
-
-
-
-
-
-
-
-
-
@@ -184,7 +164,6 @@
-
@@ -193,20 +172,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -286,19 +251,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -333,20 +285,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -726,9 +664,6 @@
-
-
-
@@ -814,16 +749,6 @@
-
- PackagePathView.xaml
-
-
-
-
-
-
- TermsOfUseView.xaml
-
@@ -866,15 +791,9 @@
NoteView.xaml
-
- PackageManagerSearchView.xaml
-
PreviewControl.xaml
-
- PublishPackageView.xaml
-
TooltipWindow.xaml
@@ -887,9 +806,6 @@
WorkspaceView.xaml
-
- PackageManagerWizard.xaml
-
@@ -901,24 +817,15 @@
-
-
-
-
-
-
-
-
-
-
+
ExtensionWindow.xaml
@@ -1003,34 +910,6 @@
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
Designer
MSBuild:Compile
@@ -1039,45 +918,9 @@
MSBuild:Compile
Designer
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
-
- MSBuild:Compile
- Designer
-
Designer
MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
@@ -1118,19 +961,14 @@
- PublicResXFileCodeGenerator
- Designer
Resources.Designer.cs
- PublicResXFileCodeGenerator
Resources.en-US.Designer.cs
- Designer
- Designer
Always
@@ -1180,7 +1018,6 @@
-
@@ -1368,7 +1205,6 @@
-
@@ -1765,77 +1601,56 @@
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
- MSBuild:Compile
- Designer
Always
Always
- Designer
- MSBuild:Compile
- Designer
Always
- Designer
- MSBuild:Compile
Always
@@ -1856,14 +1671,6 @@
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
Designer
MSBuild:Compile
@@ -1907,10 +1714,6 @@
-
- MSBuild:Compile
- Designer
-
@@ -1919,10 +1722,6 @@
-
- MSBuild:Compile
- Designer
-
MSBuild:Compile
Designer
@@ -1957,10 +1756,6 @@
-
- MSBuild:Compile
- Designer
-
@@ -2050,10 +1845,6 @@
-
-
-
-
@@ -2170,34 +1961,6 @@
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
-
-
- MSBuild:Compile
@@ -2209,12 +1972,6 @@
-
-
-
-
-
-
@@ -2364,20 +2121,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
index 4bfd6b6b491..3f10152be58 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
@@ -5,6 +5,55 @@
namespace Dynamo.ViewModels
{
+ ///
+ /// EventArgs for opening PackageManagerView with a specific tab.
+ ///
+ public class OpenPackageManagerEventArgs : EventArgs
+ {
+ private string tab;
+
+ ///
+ /// The tab to open in the PackageManagerView
+ ///
+ public string Tab { get { return tab; } }
+
+ ///
+ /// Constructor
+ ///
+ /// Tab name to open
+ public OpenPackageManagerEventArgs(string _Tab)
+ {
+ tab = _Tab;
+ }
+ }
+
+ ///
+ /// EventArgs for opening PackageManagerView with specific dimensions.
+ ///
+ public class PackageManagerSizeEventArgs : EventArgs
+ {
+ ///
+ /// Width of the PackageManagerView
+ ///
+ public double Width;
+
+ ///
+ /// Height of the PackageManagerView
+ ///
+ public double Height;
+
+ ///
+ /// Constructor
+ ///
+ /// Width of the window
+ /// Height of the window
+ public PackageManagerSizeEventArgs(double width, double height)
+ {
+ Width = width;
+ Height = height;
+ }
+ }
+
partial class DynamoViewModel
{
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 2180fa7ae7a..ec92252603f 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -24,7 +24,6 @@
using Dynamo.Models;
using Dynamo.Nodes;
using Dynamo.PackageManager;
-using Dynamo.PackageManager.UI;
using Dynamo.PythonServices;
using Dynamo.Search.SearchElements;
using Dynamo.Selection;
@@ -81,7 +80,6 @@ public partial class DynamoView : Window, IDisposable
private readonly LoginService loginService;
private ShortcutToolbar shortcutBar;
private PreferencesView preferencesWindow;
- private PackageManagerView packageManagerWindow;
private bool loaded = false;
private bool graphMetadataHooked;
private MenuItem graphPropsGeneralMenuItem;
@@ -1458,12 +1456,6 @@ private void DynamoView_Loaded(object sender, EventArgs e)
LoadSamplesMenu();
#endif
- #region Package manager
-
- dynamoViewModel.RequestPackagePublishDialog += DynamoViewModelRequestPackageManager;
- dynamoViewModel.RequestPackageManagerSearchDialog += DynamoViewModelRequestShowPackageManagerSearch;
- dynamoViewModel.RequestPackageManagerDialog += DynamoViewModelRequestShowPackageManager;
-
#endregion
#region Node view injection
@@ -1623,17 +1615,6 @@ private void TrackStartupAnalytics()
/// is accepted by the user, or false otherwise. If this method returns
/// false, then download of package should be terminated.
///
- private bool DisplayTermsOfUseForAcceptance()
- {
- var prefSettings = dynamoViewModel.Model.PreferenceSettings;
- if (prefSettings.PackageDownloadTouAccepted)
- return true; // User accepted the terms of use.
-
- prefSettings.PackageDownloadTouAccepted = TermsOfUseHelper.ShowTermsOfUseDialog(false, null, _this);
-
- // User may or may not accept the terms.
- return prefSettings.PackageDownloadTouAccepted;
- }
private void DynamoView_Unloaded(object sender, RoutedEventArgs e)
{
@@ -1648,84 +1629,7 @@ private void DynamoViewModelRequestAboutWindow(DynamoViewModel model)
aboutWindow.ShowDialog();
}
- private PublishPackageView _pubPkgView;
-
- private void DynamoViewModelRequestPackageManager(PublishPackageViewModel model)
- {
- if (packageManagerWindow == null)
- {
- if (_pkgSearchVM == null)
- {
- _pkgSearchVM = new PackageManagerSearchViewModel(dynamoViewModel.PackageManagerClientViewModel);
- }
-
- if (_pkgVM == null)
- {
- _pkgVM = new PackageManagerViewModel(dynamoViewModel, _pkgSearchVM);
- }
-
- packageManagerWindow = new PackageManagerView(this, _pkgVM)
- {
- Owner = this,
- WindowStartupLocation = WindowStartupLocation.CenterOwner
- };
-
- // setting the owner to the packageManagerWindow will centralize promts originating from the Package Manager
- dynamoViewModel.Owner = packageManagerWindow;
-
- packageManagerWindow.Closed += HandlePackageManagerWindowClosed;
- packageManagerWindow.Show();
-
- if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;
- }
- if (_pkgVM != null)
- {
- _pkgVM.PublishPackageViewModel = model;
- }
-
- packageManagerWindow.Focus();
- packageManagerWindow.Navigate(Wpf.Properties.Resources.PackageManagerPublishTab);
- }
-
- private PackageManagerSearchView _searchPkgsView;
- private PackageManagerSearchViewModel _pkgSearchVM;
- private PackageManagerViewModel _pkgVM;
-
- private void DynamoViewModelRequestShowPackageManagerSearch(object s, EventArgs e)
- {
- if (!DisplayTermsOfUseForAcceptance())
- return; // Terms of use not accepted.
-
- var cmd = Analytics.TrackTaskCommandEvent("SearchPackage");
-
- // The package search view model is shared and can be shared by resources at the moment
- // If it hasn't been initialized yet, we do that here
- if (_pkgSearchVM == null)
- {
- _pkgSearchVM = new PackageManagerSearchViewModel(dynamoViewModel.PackageManagerClientViewModel);
- }
- else
- {
- _pkgSearchVM.InitializeLuceneForPackageManager();
- }
-
- if (_searchPkgsView == null)
- {
- _searchPkgsView = new PackageManagerSearchView(_pkgSearchVM)
- {
- Owner = this,
- WindowStartupLocation = WindowStartupLocation.CenterOwner
- };
-
- _searchPkgsView.Closed += (sender, args) => { _searchPkgsView = null; Analytics.EndTaskCommandEvent(cmd); };
- _searchPkgsView.Show();
- if (_searchPkgsView.IsLoaded && IsLoaded) _searchPkgsView.Owner = this;
- }
-
- _searchPkgsView.Focus();
- _pkgSearchVM.RefreshAndSearchAsync();
- }
private void ClipBoard_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
@@ -2206,16 +2110,6 @@ private void WindowClosed(object sender, EventArgs e)
dynamoViewModel.Model.RequestLayoutUpdate -= vm_RequestLayoutUpdate;
dynamoViewModel.RequestViewOperation -= DynamoViewModelRequestViewOperation;
- //PACKAGE MANAGER
- dynamoViewModel.RequestPackagePublishDialog -= DynamoViewModelRequestPackageManager;
- dynamoViewModel.RequestPackageManagerSearchDialog -= DynamoViewModelRequestShowPackageManagerSearch;
-
- //FUNCTION NAME PROMPT
- dynamoViewModel.Model.RequestsFunctionNamePrompt -= DynamoViewModelRequestsFunctionNamePrompt;
-
- //Preset Name Prompt
- dynamoViewModel.Model.RequestPresetsNamePrompt -= DynamoViewModelRequestPresetNamePrompt;
- dynamoViewModel.RequestPresetsWarningPrompt -= DynamoViewModelRequestPresetWarningPrompt;
dynamoViewModel.RequestClose -= DynamoViewModelRequestClose;
dynamoViewModel.RequestSaveImage -= DynamoViewModelRequestSaveImage;
@@ -2296,8 +2190,6 @@ private void WindowClosed(object sender, EventArgs e)
this.Dispose();
sharedViewExtensionLoadedParams?.Dispose();
- this._pkgSearchVM?.Dispose();
- this._pkgVM?.Dispose();
}
// Remove the HomePage from the visual tree and dispose of its resources
@@ -2529,69 +2421,6 @@ private void OnPreferencesWindowClick(object sender, RoutedEventArgs e)
preferencesWindow.Show();
}
- private void DynamoViewModelRequestShowPackageManager(object s, EventArgs e)
- {
- if (!DisplayTermsOfUseForAcceptance())
- return; // Terms of use not accepted.
-
- if (_pkgSearchVM == null)
- {
- _pkgSearchVM = new PackageManagerSearchViewModel(dynamoViewModel.PackageManagerClientViewModel);
- }
-
- if (_pkgVM == null)
- {
- _pkgVM = new PackageManagerViewModel(dynamoViewModel, _pkgSearchVM);
- }
-
- if (packageManagerWindow == null)
- {
- if (e is PackageManagerSizeEventArgs)
- {
- var packageManagerSizeEventArgs = e as PackageManagerSizeEventArgs;
- //Set a fixed size for the PackageManagerView
- _pkgVM.Width = packageManagerSizeEventArgs.Width;
- _pkgVM.Height = packageManagerSizeEventArgs.Height;
- }
-
- packageManagerWindow = new PackageManagerView(this, _pkgVM)
- {
- Owner = this,
- WindowStartupLocation = WindowStartupLocation.CenterOwner
- };
-
- // setting the owner to the packageManagerWindow will centralize promts originating from the Package Manager
- dynamoViewModel.Owner = packageManagerWindow;
-
- packageManagerWindow.Closed += HandlePackageManagerWindowClosed;
- packageManagerWindow.Show();
-
- if (packageManagerWindow.IsLoaded && IsLoaded) packageManagerWindow.Owner = this;
- }
-
- packageManagerWindow.Focus();
- if (e is OpenPackageManagerEventArgs)
- {
- packageManagerWindow.Navigate((e as OpenPackageManagerEventArgs).Tab);
- }
-
- _pkgSearchVM.RefreshAndSearchAsync();
- }
-
- private void HandlePackageManagerWindowClosed(object sender, EventArgs e)
- {
- packageManagerWindow.Closed -= HandlePackageManagerWindowClosed;
- packageManagerWindow = null;
- // Reset owner back to the main Dynamo window so that dialogs opened after
- // the Package Manager closes do not attempt to use the now-closed window as owner.
- dynamoViewModel.Owner = this;
-
- var cmd = Analytics.TrackCommandEvent("PackageManager");
- cmd.Dispose();
-
- this.Activate();
- }
-
///
/// Adds/Removes an overlay so the user won't be able to interact with the background (this behavior was implemented for Dynamo and for Library)
///
diff --git a/src/DynamoPackagesWPF/DynamoPackagesWPF.csproj b/src/DynamoPackagesWPF/DynamoPackagesWPF.csproj
index f07f32b33aa..dd9d0d57aff 100644
--- a/src/DynamoPackagesWPF/DynamoPackagesWPF.csproj
+++ b/src/DynamoPackagesWPF/DynamoPackagesWPF.csproj
@@ -29,6 +29,224 @@
+
+
+
+
+ 0.0.24
+ PackageManagerWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %(TGZFiles.Filename)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs
index 015bbc7950b..e74d38c108d 100644
--- a/src/DynamoPackagesWPF/PackageManagerViewExtension.cs
+++ b/src/DynamoPackagesWPF/PackageManagerViewExtension.cs
@@ -2,7 +2,11 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
+using System.Windows;
using Dynamo.Logging;
+using Dynamo.PackageManager.ViewModels;
+using Dynamo.Utilities;
+using Dynamo.ViewModels;
using Dynamo.Wpf.Extensions;
using Dynamo.Wpf.Interfaces;
using Dynamo.Wpf.Properties;
@@ -12,13 +16,20 @@ namespace Dynamo.PackageManager.UI
{
///
/// The View layer of the packageManagerExtension.
- /// Currently its only responsibility is to request the loading of ViewExtensions which it finds in packages.
- /// In the future packageManager functionality should be moved from DynamoCoreWPF to this ViewExtension.
+ /// Manages PackageManager UI including PackageManagerView and PackageManagerSearchView windows.
///
public class PackageManagerViewExtension : IViewExtension, IViewExtensionSource, ILayoutSpecSource, INotificationSource
{
private readonly List requestedExtensions = new List();
private PackageManagerExtension packageManager;
+ private ViewLoadedParams viewLoadedParams;
+ private DynamoViewModel dynamoViewModel;
+
+ // Package Manager UI state
+ private PackageManagerView packageManagerWindow;
+ private PackageManagerSearchView searchPackagesView;
+ private PackageManagerSearchViewModel pkgSearchVM;
+ private PackageManagerViewModel pkgVM;
public string Name
{
get
@@ -83,10 +94,37 @@ public void Dispose()
{
packageManager.PackageLoader.PackgeLoaded -= packageLoadedHandler;
}
+
+ // Unsubscribe from DynamoViewModel events
+ if (dynamoViewModel != null)
+ {
+ dynamoViewModel.RequestPackageManagerDialog -= OnRequestPackageManagerDialog;
+ dynamoViewModel.RequestPackageManagerSearchDialog -= OnRequestPackageManagerSearchDialog;
+ dynamoViewModel.RequestPackagePublishDialog -= OnRequestPackagePublishDialog;
+ }
+
+ // Clean up view models
+ pkgSearchVM?.Dispose();
+ pkgVM?.Dispose();
+
+ // Close windows if open
+ packageManagerWindow?.Close();
+ searchPackagesView?.Close();
}
- public void Loaded(ViewLoadedParams viewLoadedParams)
+ public void Loaded(ViewLoadedParams p)
{
+ viewLoadedParams = p;
+ dynamoViewModel = p.DynamoWindow.DataContext as DynamoViewModel;
+
+ // Subscribe to PackageManager dialog events from DynamoViewModel
+ if (dynamoViewModel != null)
+ {
+ dynamoViewModel.RequestPackageManagerDialog += OnRequestPackageManagerDialog;
+ dynamoViewModel.RequestPackageManagerSearchDialog += OnRequestPackageManagerSearchDialog;
+ dynamoViewModel.RequestPackagePublishDialog += OnRequestPackagePublishDialog;
+ }
+
RequestLoadLayoutSpecs(packageManager?.PackageLoader.LocalPackages);
var packagesToCheck = packageManager?.PackageLoader.LocalPackages;
if(packagesToCheck != null)
@@ -193,6 +231,149 @@ private void packageLoadedHandler(Package package)
}
+ #region PackageManager UI Event Handlers
+
+ private void OnRequestPackageManagerDialog(object sender, EventArgs e)
+ {
+ if (!DisplayTermsOfUseForAcceptance())
+ return; // Terms of use not accepted.
+
+ InitializePackageManagerViewModels();
+
+ if (packageManagerWindow == null)
+ {
+ if (e is PackageManagerSizeEventArgs sizeArgs)
+ {
+ pkgVM.Width = sizeArgs.Width;
+ pkgVM.Height = sizeArgs.Height;
+ }
+
+ packageManagerWindow = new PackageManagerView(viewLoadedParams.DynamoWindow, pkgVM)
+ {
+ Owner = viewLoadedParams.DynamoWindow,
+ WindowStartupLocation = WindowStartupLocation.CenterOwner
+ };
+
+ dynamoViewModel.Owner = packageManagerWindow;
+ packageManagerWindow.Closed += HandlePackageManagerWindowClosed;
+ packageManagerWindow.Show();
+
+ if (packageManagerWindow.IsLoaded && viewLoadedParams.DynamoWindow.IsLoaded)
+ packageManagerWindow.Owner = viewLoadedParams.DynamoWindow;
+ }
+
+ packageManagerWindow.Focus();
+ if (e is OpenPackageManagerEventArgs openArgs)
+ {
+ packageManagerWindow.Navigate(openArgs.Tab);
+ }
+
+ pkgSearchVM.RefreshAndSearchAsync();
+ }
+
+ private void OnRequestPackageManagerSearchDialog(object sender, EventArgs e)
+ {
+ if (!DisplayTermsOfUseForAcceptance())
+ return; // Terms of use not accepted.
+
+ var cmd = Analytics.TrackTaskCommandEvent("SearchPackage");
+
+ if (pkgSearchVM == null)
+ {
+ pkgSearchVM = new PackageManagerSearchViewModel(dynamoViewModel.PackageManagerClientViewModel);
+ }
+ else
+ {
+ pkgSearchVM.InitializeLuceneForPackageManager();
+ }
+
+ if (searchPackagesView == null)
+ {
+ searchPackagesView = new PackageManagerSearchView(pkgSearchVM)
+ {
+ Owner = viewLoadedParams.DynamoWindow,
+ WindowStartupLocation = WindowStartupLocation.CenterOwner
+ };
+
+ searchPackagesView.Closed += (s, args) =>
+ {
+ searchPackagesView = null;
+ Analytics.EndTaskCommandEvent(cmd);
+ };
+ searchPackagesView.Show();
+
+ if (searchPackagesView.IsLoaded && viewLoadedParams.DynamoWindow.IsLoaded)
+ searchPackagesView.Owner = viewLoadedParams.DynamoWindow;
+ }
+
+ searchPackagesView.Focus();
+ pkgSearchVM.RefreshAndSearchAsync();
+ }
+
+ private void OnRequestPackagePublishDialog(PublishPackageViewModel model)
+ {
+ InitializePackageManagerViewModels();
+
+ if (packageManagerWindow == null)
+ {
+ packageManagerWindow = new PackageManagerView(viewLoadedParams.DynamoWindow, pkgVM)
+ {
+ Owner = viewLoadedParams.DynamoWindow,
+ WindowStartupLocation = WindowStartupLocation.CenterOwner
+ };
+
+ dynamoViewModel.Owner = packageManagerWindow;
+ packageManagerWindow.Closed += HandlePackageManagerWindowClosed;
+ packageManagerWindow.Show();
+
+ if (packageManagerWindow.IsLoaded && viewLoadedParams.DynamoWindow.IsLoaded)
+ packageManagerWindow.Owner = viewLoadedParams.DynamoWindow;
+ }
+
+ if (pkgVM != null)
+ {
+ pkgVM.PublishPackageViewModel = model;
+ }
+
+ packageManagerWindow.Focus();
+ packageManagerWindow.Navigate(Resources.PackageManagerPublishTab);
+ }
+
+ private void HandlePackageManagerWindowClosed(object sender, EventArgs e)
+ {
+ packageManagerWindow.Closed -= HandlePackageManagerWindowClosed;
+ packageManagerWindow = null;
+
+ var cmd = Analytics.TrackCommandEvent("PackageManager");
+ cmd.Dispose();
+
+ viewLoadedParams?.DynamoWindow?.Activate();
+ }
+
+ private void InitializePackageManagerViewModels()
+ {
+ if (pkgSearchVM == null)
+ {
+ pkgSearchVM = new PackageManagerSearchViewModel(dynamoViewModel.PackageManagerClientViewModel);
+ }
+
+ if (pkgVM == null)
+ {
+ pkgVM = new PackageManagerViewModel(dynamoViewModel, pkgSearchVM);
+ }
+ }
+
+ private bool DisplayTermsOfUseForAcceptance()
+ {
+ var prefSettings = dynamoViewModel.Model.PreferenceSettings;
+ if (prefSettings.PackageDownloadTouAccepted)
+ return true;
+
+ prefSettings.PackageDownloadTouAccepted = TermsOfUseHelper.ShowTermsOfUseDialog(false, null, viewLoadedParams.DynamoWindow);
+ return prefSettings.PackageDownloadTouAccepted;
+ }
+
+ #endregion
}
}
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/cs-CZ/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/cs-CZ/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/cs-CZ/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/cs-CZ/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/de-DE/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/de-DE/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/de-DE/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/de-DE/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/en-GB/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/en-GB/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/en-GB/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/en-GB/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/en-US/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/en-US/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/en-US/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/en-US/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/es-ES/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/es-ES/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/es-ES/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/es-ES/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/fr-FR/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/fr-FR/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/fr-FR/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/fr-FR/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/it-IT/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/it-IT/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/it-IT/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/it-IT/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/ja-JP/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/ja-JP/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/ja-JP/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/ja-JP/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/ko-KR/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/ko-KR/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/ko-KR/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/ko-KR/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/pl-PL/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/pl-PL/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/pl-PL/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/pl-PL/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/pt-BR/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/pt-BR/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/pt-BR/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/pt-BR/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/ru-RU/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/ru-RU/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/ru-RU/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/ru-RU/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/zh-CN/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/zh-CN/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/zh-CN/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/zh-CN/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/Docs/zh-TW/PublishPackageDocumentation.html b/src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/zh-TW/PublishPackageDocumentation.html
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/Docs/zh-TW/PublishPackageDocumentation.html
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/Docs/zh-TW/PublishPackageDocumentation.html
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/IPackageInstaller.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/IPackageInstaller.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/IPackageInstaller.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/IPackageInstaller.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/InstalledPackagesViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/InstalledPackagesViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/InstalledPackagesViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/InstalledPackagesViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemInternalViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemInternalViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemInternalViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemInternalViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemLeafViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemLeafViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemLeafViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemLeafViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemRootViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemRootViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemRootViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemRootViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageItemViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageItemViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerClientViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerClientViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerSearchElementViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageManagerViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackagePathViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackagePathViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackagePathViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackagePathViewModel.cs
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs b/src/DynamoPackagesWPF/ViewModels/PackageManager/PackageViewModel.cs
similarity index 100%
rename from src/DynamoCoreWpf/ViewModels/PackageManager/PackageViewModel.cs
rename to src/DynamoPackagesWPF/ViewModels/PackageManager/PackageViewModel.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Components/PackageManagerWizard/PackageManagerWizard.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/ControlColorsAndBrushes.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/ControlColorsAndBrushes.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/ControlColorsAndBrushes.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/ControlColorsAndBrushes.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/CustomBrowserControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/CustomBrowserControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/CustomBrowserControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/FilterTagControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/FilterTagControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/FilterTagControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/FilterTagControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/FilterTagControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/FilterTagControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/FilterTagControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/FilterTagControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/LoadingAnimationStripeControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/NumericUpDownControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/NumericUpDownControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/NumericUpDownControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/NumericUpDownControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/NumericUpDownControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/NumericUpDownControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/NumericUpDownControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/NumericUpDownControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagePackageAnimationControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPackagesControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishHost.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishHost.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishHost.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishHost.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishHost.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishHost.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishHost.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerPublishHost.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerSearchControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerSearchControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerSearchControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerSearchControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerSearchControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerSearchControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerSearchControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerSearchControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerTabControl.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerTabControl.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerTabControl.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/PackageManagerTabControl.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/SearchBoxControl.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Controls/SearchBoxControl.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/SearchBoxControl.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/SearchBoxControl.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/SearchBoxControl.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Controls/SearchBoxControl.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Controls/SearchBoxControl.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Controls/SearchBoxControl.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoPackagesWPF/Views/PackageManager/PackageManagerSearchView.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/PackageManagerSearchView.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/PackageManagerSearchView.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/PackageManagerSearchView.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml b/src/DynamoPackagesWPF/Views/PackageManager/PackageManagerView.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/PackageManagerView.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/PackageManagerView.xaml.cs
similarity index 93%
rename from src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/PackageManagerView.xaml.cs
index e04fde79bf8..f3e162fb8cf 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs
+++ b/src/DynamoPackagesWPF/Views/PackageManager/PackageManagerView.xaml.cs
@@ -14,31 +14,6 @@
namespace Dynamo.PackageManager.UI
{
- internal class OpenPackageManagerEventArgs : EventArgs
- {
- private string tab;
-
- internal string Tab { get { return tab; } }
-
- internal OpenPackageManagerEventArgs(string _Tab)
- {
- tab = _Tab;
- }
- }
-
- ///
- /// The PackageManagerSizeEventArgs will be used only when we want to show the PackageManagerView using a specific Width and Height
- ///
- internal class PackageManagerSizeEventArgs : EventArgs
- {
- internal double Width;
- internal double Height;
- internal PackageManagerSizeEventArgs(double width, double height)
- {
- Width = width;
- Height = height;
- }
- }
///
/// Interaction logic for PackageManagerView.xaml
///
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml b/src/DynamoPackagesWPF/Views/PackageManager/PackagePathView.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/PackagePathView.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/PackagePathView.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/PackagePathView.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageFinishPage.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageFinishPage.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageFinishPage.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageFinishPage.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageFinishPage.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageFinishPage.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageFinishPage.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageFinishPage.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePreviewPage.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePublishPage.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackagePublishPage.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageSelectPage.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageSelectPage.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageSelectPage.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/Pages/PublishPackageSelectPage.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/Pages/PublishPackageSelectPage.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml b/src/DynamoPackagesWPF/Views/PackageManager/PublishPackageView.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/PublishPackageView.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/PublishPackageView.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/PublishPackageView.xaml.cs
diff --git a/src/DynamoCoreWpf/Views/PackageManager/TermsOfUseView.xaml b/src/DynamoPackagesWPF/Views/PackageManager/TermsOfUseView.xaml
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/TermsOfUseView.xaml
rename to src/DynamoPackagesWPF/Views/PackageManager/TermsOfUseView.xaml
diff --git a/src/DynamoCoreWpf/Views/PackageManager/TermsOfUseView.xaml.cs b/src/DynamoPackagesWPF/Views/PackageManager/TermsOfUseView.xaml.cs
similarity index 100%
rename from src/DynamoCoreWpf/Views/PackageManager/TermsOfUseView.xaml.cs
rename to src/DynamoPackagesWPF/Views/PackageManager/TermsOfUseView.xaml.cs