DynamoDS
diff --git a/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Copy file name to clipboard
+15-2Lines changed: 15 additions & 2 deletions b/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
Copy file name to clipboard
+15-2Lines changed: 15 additions & 2 deletions
diff --git a/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Converters.cs
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+54Lines changed: 54 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+54Lines changed: 54 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
@@ -5,6 +5,8 @@
              xmlns:d="https://schemas.microsoft.com/expression/blend/2008" 
              xmlns:ui="clr-namespace:Dynamo.UI"
              xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
+             xmlns:controls="clr-namespace:Dynamo.Controls"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 
@@ -15,6 +17,7 @@
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
             </ResourceDictionary.MergedDictionaries>
+            <controls:SumConverter x:Key="SumConverter"/>
             <Style TargetType="{x:Type MenuItem}" x:Key="MenuItemCollapseStyle">
                 <Style.Triggers>
                     <Trigger Property="IsEnabled" Value="False">
@@ -67,8 +70,18 @@
         </ItemsControl>
         <ScrollViewer Grid.Row="1"  
             VerticalScrollBarVisibility="Auto" 
-            Background="{StaticResource PreferencesWindowBackgroundColor}" 
-            MaxHeight="246">
+            Background="{StaticResource PreferencesWindowBackgroundColor}">
+            <ScrollViewer.Height>
+                <MultiBinding Converter="{StaticResource SumConverter}">
+                    <Binding Path="ActualHeight"
+                             RelativeSource="{RelativeSource  Mode=FindAncestor, AncestorType=UserControl}" />
+                    <Binding>
+                        <Binding.Source>
+                            <sys:Double>-40.0</sys:Double>
+                        </Binding.Source>
+                    </Binding>
+                </MultiBinding>
+            </ScrollViewer.Height>
             <ItemsControl Name="SearchResultsListBox"
                               ItemsSource="{Binding Path=LocalPackages}"
                               HorizontalContentAlignment="Stretch"
 
@@ -1,4 +1,4 @@
-using Dynamo.ViewModels;
+using Dynamo.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -59,6 +59,10 @@
     <None Remove="Views\Core\CustomColorPicker.xaml" />
     <None Remove="Views\Core\GeometryScalingPopup.xaml" />
     <None Remove="UI\Images\question-hover-blue-16px.png" />
+    <None Remove="Views\PackageManager\Controls\ControlColorsAndBrushes.xaml" />
+    <None Remove="Views\PackageManager\Controls\PackageManagerPublishControl.xaml" />
+    <None Remove="Views\PackageManager\Controls\PackageManagerSearchControl.xaml" />
+    <None Remove="Views\PackageManager\Controls\SearchBoxControl.xaml" />
     <None Remove="Views\SplashScreen\WebApp\splashScreenBackground.png" />
   </ItemGroup>
   <ItemGroup>
@@ -372,6 +376,7 @@
     <Compile Include="ViewModels\Menu\TrustedPathViewModel.cs" />
     <Compile Include="ViewModels\Menu\PreferencesViewModel.cs" />
     <Compile Include="ViewModels\PackageManager\IPackageInstaller.cs" />
+    <Compile Include="ViewModels\PackageManager\PackageManagerViewModel.cs" />
     <Compile Include="ViewModels\PackageManager\PackagePathViewModel.cs" />
     <Compile Include="ViewModels\Preview\CompactBubbleViewModel.cs" />
     <Compile Include="ViewModels\Preview\ConnectorAnchorViewModel.cs" />
@@ -440,6 +445,10 @@
       <DependentUpon>SurveyPopupWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Input\ParameterEditor.cs" />
+    <Compile Include="Views\PackageManager\Controls\PackageManagerPublishControl.xaml.cs" />
+    <Compile Include="Views\PackageManager\Controls\PackageManagerSearchControl.xaml.cs" />
+    <Compile Include="Views\PackageManager\Controls\SearchBoxControl.xaml.cs" />
+    <Compile Include="Views\PackageManager\PackageManagerView.xaml.cs" />
     <Compile Include="Views\Menu\TrustedPathView.xaml.cs" />
     <Compile Include="Views\Output\OutputEditor.cs" />
     <Compile Include="Views\PackageManager\PackagePathView.xaml.cs">
@@ -623,6 +632,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\PackageManager\Controls\ControlColorsAndBrushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\PackageManager\Controls\SearchBoxControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Menu\TrustedPathView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -631,6 +648,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\PackageManager\PackageManagerView.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\PackageManager\Controls\PackageManagerSearchControl.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\PackageManager\Controls\PackageManagerPublishControl.xaml">
+        <Generator>MSBuild:Compile</Generator>
+        <SubType>Designer</SubType>
+    </Page>
     <Page Include="Windows\ExtensionWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
 
@@ -3745,4 +3745,21 @@ public object ConvertBack(object value, Type targetType, object parameter, Syste
             return value;
         }
     }
+
+
+    public class SumConverter : IMultiValueConverter
+    {
+        /// <summary>
+        /// Calculates and returns the sum of the values provided
+        /// </summary>
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            return values.Cast<double>().Sum();
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
 }
@@ -2934,6 +2934,7 @@
     <SolidColorBrush x:Key="TabItemUnSelected" Color="DarkGray" />
     <SolidColorBrush x:Key="SecondaryGray" Color="#707070" />
     <SolidColorBrush x:Key="SemiTransparent" Color="#80000000" />
+    <SolidColorBrush x:Key="PackageManagerTabBackgroundColor" Color="#2A2A2A" />
 
     <!--  Usual button color for the Preferences Window  -->
     <Color x:Key="PreferencesToogleCheckedColor"
@@ -4063,6 +4064,59 @@
         </Setter>
     </Style>
 
+    <Style x:Key="PackageManagerTab" TargetType="{x:Type TabItem}">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="FontSize" Value="15" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabItem}">
+                    <Border Name="TabBorder"
+                            Margin="0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="Transparent"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            CornerRadius="6">
+                        <StackPanel HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    Orientation="Horizontal"
+                                    Margin="0 5 0 0">
+                            <Grid Name="TabPanel"
+                                  Width="165"
+                                  Height="30"
+                                  Margin="5">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="5" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Label x:Name="SelectedItem" Grid.Column="0" />
+                                <ContentPresenter x:Name="ContentSection"
+                                                  Grid.Column="1"
+                                                  Margin="5,0,0,0"
+                                                  HorizontalAlignment="Stretch"
+                                                  VerticalAlignment="Center"
+                                                  ContentSource="Header" />
+                            </Grid>
+                        </StackPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="SelectedItem" Property="Background" Value="{StaticResource PreferencesWindowTabSelectedColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}" />
+                            <Setter Property="FontWeight" Value="Bold" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="False">
+                            <Setter TargetName="SelectedItem" Property="Background" Value="{StaticResource PreferencesWindowBackgroundColor}" />
+                            <Setter Property="Foreground" Value="{StaticResource TabItemUnSelected}" />
+                            <Setter Property="FontWeight" Value="Regular" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <!--  This is a Toogle button shown in the Preferences Window for the General tab, when is checked shows a Blue button  -->
     <Style x:Key="EllipseToggleButton1" TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
 
@@ -2214,11 +2214,21 @@ internal void ShowPackageManagerSearch(object parameters)
             OnRequestPackageManagerSearchDialog(this, EventArgs.Empty);
         }
 
+        internal void ShowPackageManager(object parameters)
+        {
+            OnRequestPackageManagerDialog(this, EventArgs.Empty);
+        }
+
         internal bool CanShowPackageManagerSearch(object parameters)
         {
             return !model.IsServiceMode;
         }
 
+        internal bool CanShowPackageManager(object parameters)
+        {
+            return !model.IsServiceMode;
+        }
+
         /// <summary>
         ///     Change the currently visible workspace to a custom node's workspace
         /// </summary>
 
@@ -66,6 +66,7 @@ private void InitializeDelegateCommands()
             DisplayInteractiveGuideCommand = new DelegateCommand(DisplayStartPage, CanDisplayInteractiveGuide);
             GettingStartedGuideCommand = new DelegateCommand(StartGettingStartedGuide, CanStartGettingStartedGuide);
             ShowPackageManagerSearchCommand = new DelegateCommand(ShowPackageManagerSearch, CanShowPackageManagerSearch);
+            ShowPackageManagerCommand = new DelegateCommand(ShowPackageManager, CanShowPackageManager);
             ShowInstalledPackagesCommand = new DelegateCommand(o => { }, o => true);
             ManagePackagePathsCommand = new DelegateCommand(o => { }, o => true);
 
 
@@ -32,6 +32,18 @@ public virtual void OnRequestPackageManagerSearchDialog(Object sender, EventArgs
                 RequestPackageManagerSearchDialog(this, e);
             }
         }
+
+
+        public event EventHandler RequestPackageManagerDialog;
+        public virtual void OnRequestPackageManagerDialog(Object sender, EventArgs e)
+        {
+            if (RequestPackageManagerDialog != null)
+            {
+                RequestPackageManagerDialog(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.")]
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Dynamo.ViewModels;`
	`1`	`+using Dynamo.ViewModels;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`