move package search paths to preferences settings

src/DynamoCoreWpf/DynamoCoreWpf.csproj

@@ -79,7 +79,7 @@
 	</Reference>
     <Reference Include="ProtoGeometry, Version=2.12.0.5264, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\DynamoVisualProgramming.LibG_227_0_0.2.12.0.5264\lib\net48\ProtoGeometry.dll</HintPath>
-        <Private>False</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
@@ -1308,6 +1308,10 @@
     <Resource Include="UI\Images\profile_normal.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="UI\Images\PackageManager\close_16_16.png" />
+    <Resource Include="UI\Images\PackageManager\down_16_16.png" />
+    <Resource Include="UI\Images\PackageManager\folder_16_16.png" />
+    <Resource Include="UI\Images\PackageManager\up_16_16.png" />
     <EmbeddedResource Include="Controls\Docs\NodeAutocompleteDocumentation.html" />
     <Content Include="sharpdx_direct3d11_effects_x64.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

src/DynamoCoreWpf/Properties/Resources.en-US.resx

@@ -2405,6 +2405,12 @@ Uninstall the following packages: {0}?</value>
   <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
     <value>Package Manager</value>
   </data>
+  <data name="PackagePathAddPathButtonName" xml:space="preserve">
+    <value>Add Paths</value>
+  </data>
+  <data name="PackagePathPreferencesTitle" xml:space="preserve">
+    <value>Package/Library Search Paths</value>
+  </data>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
     <value>Switchable only when the current workspace is in Manual run mode.</value>
   </data>

src/DynamoCoreWpf/Properties/Resources.resx

@@ -2405,6 +2405,12 @@ Uninstall the following packages: {0}?</value>
   <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
     <value>Package Manager</value>
   </data>
+  <data name="PackagePathAddPathButtonName" xml:space="preserve">
+    <value>Add Paths</value>
+  </data>
+  <data name="PackagePathPreferencesTitle" xml:space="preserve">
+    <value>Package/Library Search Paths</value>
+  </data>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
     <value>Switchable only when the current workspace is in Manual run mode.</value>
   </data>

src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml

@@ -547,6 +547,8 @@
         </Setter>
     </Style>
 
+
+
     <Style x:Key="SDarkTextBox"
            BasedOn="{StaticResource {x:Type TextBox}}"
            TargetType="{x:Type TextBox}">
@@ -2266,6 +2268,8 @@
 
     <SolidColorBrush x:Key="PreferencesWindowBackgroundColor" 
                              Color="#535353" />
+    <SolidColorBrush x:Key="PreferencesWindowItemDarkerBackgroundColor"
+                     Color="#353535"/>
     <SolidColorBrush x:Key="PreferencesWindowFontColor" 
                              Color="#E5E5E5" />
     <SolidColorBrush x:Key="PreferencesWindowButtonColor" 
@@ -2299,6 +2303,25 @@
     <!--White Window Color for borders-->
     <Color x:Key="PreferencesToogleBorderColor" R="255" G="255" B="255" A="255"/>
 
+    <Style x:Key="DarkTextBlock"
+           TargetType="TextBlock">
+        <Setter Property="FontSize"
+                Value="12">
+        </Setter>
+        <Setter Property="TextTrimming"
+            Value="CharacterEllipsis">
+        </Setter>
+    </Style>
+
+    <Style x:Key="PreferenceTitleLabelStyle"
+            TargetType="{x:Type Label}">
+        <Setter Property="Foreground"
+                Value="{StaticResource PreferencesWindowFontColor}">
+        </Setter>
+        <Setter Property="FontSize"
+                Value="14">
+        </Setter>
+    </Style>
 
     <Style x:Key="CaptionButtonStyleClose" 
                    TargetType="Button">
@@ -2445,10 +2468,19 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-
+
+    <DataTemplate x:Key="expanderHeader">
+        <TextBlock
+            Text="{Binding}" 
+            FontSize="14"
+            FontWeight="Medium">
+        </TextBlock>
+    </DataTemplate>
+
     <Style TargetType="Expander" x:Key="MenuExpanderStyle">
         <Setter Property="Background" Value="{StaticResource SecondaryGray}"/>
         <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}"/>
+        <Setter Property="HeaderTemplate" Value="{StaticResource expanderHeader}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <!-- Control template for expander -->
@@ -2482,10 +2514,14 @@
         </Setter>
     </Style>
 
+
+
+
     <!-- This expander style is similar to the MenuExpanderStyle and the only difference is the left-margin spacing -->
     <Style TargetType="Expander" x:Key="WorkspaceReferencesExpanderStyle">
         <Setter Property="Background" Value="{StaticResource SecondaryGray}"/>
         <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}"/>
+        <Setter Property="HeaderTemplate" Value="{StaticResource expanderHeader}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <!-- Control template for expander -->
@@ -3223,10 +3259,17 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
+
 
     <!--This Style will be used for the small trash icon button that appears when a new Style is created in the Visual Settings tab-->
-    <Style x:Key="RemoveStyleButtonStyle" 
+    <Style x:Key="FlatIconButtonStyle" 
            TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value=".5" />
+            </Trigger>
+        </Style.Triggers>
         <Setter Property="Background" 
                 Value="Transparent"/>
         <Setter Property="Template">

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs

@@ -102,11 +102,6 @@ internal PreferencesViewModel PreferencesViewModel
             {
                 return preferencesViewModel;
             }
-            set
-            {
-                preferencesViewModel = value;
-                RaisePropertyChanged(nameof(PreferencesViewModel));
-            }
         }
 
         public Point TransformOrigin
@@ -1695,21 +1690,6 @@ internal bool CanShowPackageManagerSearch(object parameters)
             return true;
         }
 
-        private void ShowInstalledPackages(object parameters)
-        {
-            OnRequestManagePackagesDialog(this, EventArgs.Empty);
-        }
-
-        private bool CanShowInstalledPackages(object parameters)
-        {
-            return true;
-        }
-
-        private void ManagePackagePaths(object parameters)
-        {
-            OnRequestPackagePathsDialog(this, EventArgs.Empty);
-        }
-
         /// <summary>
         ///     Change the currently visible workspace to a custom node's workspace
         /// </summary>

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs

@@ -59,8 +59,8 @@ private void InitializeDelegateCommands()
             DisplayStartPageCommand = new DelegateCommand(DisplayStartPage, CanDisplayStartPage);
             ShowPackageManagerSearchCommand = new DelegateCommand(ShowPackageManagerSearch, CanShowPackageManagerSearch);
             PublishNewPackageCommand = new DelegateCommand(PackageManagerClientViewModel.PublishNewPackage, PackageManagerClientViewModel.CanPublishNewPackage);
-            ShowInstalledPackagesCommand = new DelegateCommand(ShowInstalledPackages, CanShowInstalledPackages);
-            ManagePackagePathsCommand = new DelegateCommand(ManagePackagePaths, o => true);
+            ShowInstalledPackagesCommand = new DelegateCommand(o => { }, o => true);
+            ManagePackagePathsCommand = new DelegateCommand(o => { }, o => true);
             PublishCurrentWorkspaceCommand = new DelegateCommand(PackageManagerClientViewModel.PublishCurrentWorkspace, PackageManagerClientViewModel.CanPublishCurrentWorkspace);
             PublishSelectedNodesCommand = new DelegateCommand(PackageManagerClientViewModel.PublishSelectedNodes, PackageManagerClientViewModel.CanPublishSelectedNodes);
             PublishCustomNodeCommand = new DelegateCommand<Function>(PackageManagerClientViewModel.PublishCustomNode, PackageManagerClientViewModel.CanPublishCustomNode);
@@ -104,7 +104,9 @@ private void InitializeDelegateCommands()
         public DelegateCommand GraphAutoLayoutCommand { get; set; }
         public DelegateCommand GoHomeCommand { get; set; }
         public DelegateCommand ShowPackageManagerSearchCommand { get; set; }
+        [Obsolete("Do not use. This command will be removed. It does nothing.")]
         public DelegateCommand ShowInstalledPackagesCommand { get; set; }
+        [Obsolete("Do not use. This command will be removed. It does nothing.")]
         public DelegateCommand ManagePackagePathsCommand { get; set; }
         public DelegateCommand HomeCommand { get; set; }
         public DelegateCommand ExitCommand { get; set; }

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs

@@ -6,7 +6,9 @@ namespace Dynamo.ViewModels
 {
     partial class DynamoViewModel
     {
+        [Obsolete("This event will be removed, do not use. It does nothing.")]
         public event EventHandler RequestManagePackagesDialog;
+        [Obsolete("This method will be removed do not use. It does nothing.")]
         public virtual void OnRequestManagePackagesDialog(Object sender, EventArgs e)
         {
             if (RequestManagePackagesDialog != null)
@@ -30,8 +32,9 @@ public virtual void OnRequestPackageManagerSearchDialog(Object sender, EventArgs
                 RequestPackageManagerSearchDialog(this, e);
             }
         }
-
+        [Obsolete("This event will be removed, do not use. It does nothing.")]
         public event EventHandler RequestPackagePathsDialog;
+        [Obsolete("This method will be removed do not use. It does nothing.")]
         public virtual void OnRequestPackagePathsDialog(object sender, EventArgs e)
         {
             var handler = RequestPackagePathsDialog;

src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs

@@ -10,6 +10,7 @@
 using Dynamo.Graph.Workspaces;
 using Dynamo.Logging;
 using Dynamo.Models;
+using Dynamo.PackageManager;
 using Dynamo.Wpf.ViewModels.Core.Converters;
 using Res = Dynamo.Wpf.Properties.Resources;
 
@@ -622,6 +623,11 @@ private void AddPythonEnginesOptions()
         }
         #endregion
 
+        /// <summary>
+        /// Package Search Paths view model.
+        /// </summary>
+        public PackagePathViewModel PackagePathsViewModel { get; set; }
+
         /// <summary>
         /// The PreferencesViewModel constructor basically initialize all the ItemsSource for the corresponding ComboBox in the View (PreferencesView.xaml)
         /// </summary>
@@ -696,6 +702,18 @@ public PreferencesViewModel(DynamoViewModel dynamoViewModel)
             preferencesTabs.Add("General", new TabSettings() { Name = "General", ExpanderActive = string.Empty });
             preferencesTabs.Add("Features",new TabSettings() { Name = "Features", ExpanderActive = string.Empty });
             preferencesTabs.Add("VisualSettings",new TabSettings() { Name = "VisualSettings", ExpanderActive = string.Empty });
+            preferencesTabs.Add("Package Manager", new TabSettings() { Name = "Package Manager", ExpanderActive = string.Empty });
+
+            //create a packagePathsViewModel we'll use to interact with the package search paths list.
+            var loadPackagesParams = new LoadPackageParams
+            {
+                Preferences = preferenceSettings,
+                PathManager = dynamoViewModel.Model.PathManager,
+            };
+            var customNodeManager = dynamoViewModel.Model.CustomNodeManager;
+            var packageLoader = dynamoViewModel.Model.GetPackageManagerExtension()?.PackageLoader;            
+            PackagePathsViewModel = new PackagePathViewModel(packageLoader, loadPackagesParams, customNodeManager);
+
             this.PropertyChanged += Model_PropertyChanged;
         }