From 2fbc0dab730a03a0e1c52e3cbe3b5811defbd5d5 Mon Sep 17 00:00:00 2001
From: pinzart90 <46732933+pinzart90@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:43:35 -0400
Subject: [PATCH] Add installed package UI in Preferences TAB (#11750)

* update

* update

* update

* update

* Update InstalledPackagesControl.xaml

* Update icons and icon sizes.

* More tweaking..

* More tweaking.
Remove delete button.
Restore delete button in context menu.

* More tweaking

* MergeFixes

* Some more tweaks

* Add contest menu style

* update colors

* More context menu tweaking.

* One small tweak.

* add mark for uninstall label

* simplify control

* Update DynamoModern.xaml

* Change ListBox to ItemsControl

* More tweaks

* More tweaks

* Restore Scollbar

* Remove unused icon

* align content with header and remove border

* update

* update menu icon

* Update InstalledPackagesControl.xaml.cs

* Fix Colors

* Move style

* Use FlatIconButtonStyle

* Update comment and use nameof()

* Update comment.

Co-authored-by: pinzart <tiberiu.pinzariu@autodesk.com>
Co-authored-by: Jorgen Dahl <jorgen.dahl@autodesk.com>
---
 .../Controls/InstalledPackagesControl.xaml    | 262 ++++++++++++++++++
 .../Controls/InstalledPackagesControl.xaml.cs |  45 +++
 src/DynamoCoreWpf/DynamoCoreWpf.csproj        |  12 +-
 src/DynamoCoreWpf/UI/Images/caret_down.png    | Bin 0 -> 223 bytes
 src/DynamoCoreWpf/UI/Images/caret_up.png      | Bin 0 -> 204 bytes
 src/DynamoCoreWpf/UI/Images/menu.png          | Bin 0 -> 291 bytes
 src/DynamoCoreWpf/UI/Images/menu_16_16.png    | Bin 0 -> 236 bytes
 .../UI/Themes/Modern/DynamoModern.xaml        | 117 +++++++-
 .../ViewModels/Menu/PreferencesViewModel.cs   |   9 +
 .../Views/Menu/PreferencesView.xaml           |  12 +-
 src/DynamoPackages/Package.cs                 |   8 +
 11 files changed, 455 insertions(+), 10 deletions(-)
 create mode 100644 src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
 create mode 100644 src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml.cs
 create mode 100644 src/DynamoCoreWpf/UI/Images/caret_down.png
 create mode 100644 src/DynamoCoreWpf/UI/Images/caret_up.png
 create mode 100644 src/DynamoCoreWpf/UI/Images/menu.png
 create mode 100644 src/DynamoCoreWpf/UI/Images/menu_16_16.png

diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
new file mode 100644
index 00000000000..47b2ae7f7fe
--- /dev/null
+++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml
@@ -0,0 +1,262 @@
+<UserControl x:Class="Dynamo.Wpf.Controls.InstalledPackagesControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:ui="clr-namespace:Dynamo.UI"
+             xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
+             xmlns:viewmodels="clr-namespace:Dynamo.ViewModels" 
+             d:DataContext="{d:DesignInstance Type=viewmodels:InstalledPackagesViewModel}"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}" />
+                <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoColorsAndBrushesDictionaryUri}" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <ScrollViewer  
+            VerticalScrollBarVisibility="Auto" 
+            Background="{StaticResource PreferencesWindowBackgroundColor}" 
+            MaxHeight="290">
+            <ItemsControl Name="SearchResultsListBox"
+                              ItemsSource="{Binding Path=LocalPackages}"
+                              HorizontalContentAlignment="Stretch"
+                              VirtualizingPanel.ScrollUnit="Pixel"
+                              BorderThickness="0"
+                              Padding="0">
+
+                <ItemsControl.ItemTemplate>
+
+                    <DataTemplate>
+                        <!--This border shouldn't be wider then installed packages window.
+                        That's why bind its' width to ItemsPresenter's width. 
+                        ItemsPresenter is UI container for ListBox items.
+                        ItemsPresenter can't be wider then visible part of the window.-->
+                        <Border BorderBrush="{StaticResource PreferencesWindowBackgroundColor}"
+                                BorderThickness="0,0,0,1"
+                                Background="{StaticResource PreferencesWindowBackgroundColor}"
+                                Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource FindAncestor, 
+                                                                            AncestorType={x:Type ItemsPresenter}}}">
+                            <Expander Name="PackageHeader"
+                                              IsExpanded="{Binding Path=Model.TypesVisibleInManager}"
+                                              Style="{StaticResource InstalledPackagesExpanderStyle}">
+                                <Expander.Header>
+                                    <Grid x:Name="PackageGrid"  >
+                                        <DockPanel HorizontalAlignment="Stretch"
+                                                       >
+                                            <StackPanel HorizontalAlignment="Left"
+                                                            Orientation="Horizontal"
+                                                            Margin="10,5,5,7">
+                                                <TextBlock Text="{Binding Path=Model.Name}"
+                                                               ToolTip="{Binding Path=Model.Name}"
+                                                               FontSize="11"
+                                                               Width="150"
+                                                               TextTrimming="CharacterEllipsis"
+                                                               Margin="15,0,10,0"
+                                                               Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>
+                                                <TextBlock Text="{Binding Path=Model.VersionName}"
+                                                               MinWidth="50"
+                                                               FontSize="11"
+                                                               Foreground="{StaticResource PreferencesWindowFontColor}"></TextBlock>
+                                                <TextBlock Text="{x:Static p:Resources.InstalledPackageViewPendingInstallButton}"
+                                                               Visibility="{Binding Path=Model.EnableOldMarkedForUnistallState, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                                                               FontSize="11"
+                                                               FontStyle="Italic"
+                                                               MinWidth="160"
+                                                               TextAlignment="Center"
+                                                               Foreground="Red"></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Width="Auto">
+                                                <Button Name="MoreButton"
+                                                                Click="MoreButton_OnClick"
+                                                                Width="16"
+                                                                Height="16"
+                                                                Margin="0,0,10,0"
+                                                                Style="{StaticResource FlatIconButtonStyle}">
+                                                    <Image Source="/DynamoCoreWpf;component/UI/Images/menu_16_16.png"/>
+                                                    <Button.ContextMenu>
+                                                        <ContextMenu Style="{StaticResource ContextMenuNoLeftColumnStyle}">
+                                                            <MenuItem Name="GoToRoot"
+                                                                      Command="{Binding Path=GoToRootDirectoryCommand}"
+                                                                      ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuShowRootDirTooltip}"
+                                                                      Header="{x:Static p:Resources.InstalledPackageViewContextMenuShowRootDir}">
+                                                            </MenuItem>
+                                                            <MenuItem Name="UninstallButton"
+                                                                              Command="{Binding Path=UninstallCommand}"
+                                                                              ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuUninstallTooltip}"
+                                                                              Header="{x:Static p:Resources.InstalledPackageViewContextMenuUninstall}">
+                                                            </MenuItem>
+                                                            <MenuItem Name="UnmarkUninstallButton"
+                                                                              Command="{Binding Path=UnmarkForUninstallationCommand}"
+                                                                              ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuCancelUninstallTooltip}"
+                                                                              Header="{x:Static p:Resources.InstalledPackageViewContextMenuCancelUninstall}">
+                                                            </MenuItem>
+                                                            <MenuItem Name="MakePackageButton"
+                                                                              Command="{Binding Path=PublishNewPackageCommand}"
+                                                                              ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuPublishTooltip}"
+                                                                              Header="{x:Static p:Resources.InstalledPackageViewContextMenuPublish}">
+                                                            </MenuItem>
+                                                            <MenuItem Name="MakeNewVersionButton"
+                                                                              Command="{Binding Path=PublishNewPackageVersionCommand}"
+                                                                              ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuPublishVersionTooltip}"
+                                                                              Header="{x:Static p:Resources.InstalledPackageViewContextMenuPublishVersion}">
+                                                            </MenuItem>
+                                                            <MenuItem Name="DeprecateButton"
+                                                                              Command="{Binding Path=DeprecateCommand}"
+                                                                              ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuDeprecateTooltip}"
+                                                                              Header="{x:Static p:Resources.InstalledPackageViewContextMenuDeprecate}">
+                                                            </MenuItem>
+                                                            <MenuItem Name="UndeprecateButton"
+                                                                              Command="{Binding Path=UndeprecateCommand}"
+                                                                              ToolTip="{x:Static p:Resources.InstalledPackageViewContextMenuRemoveDeprecationTooltip}"
+                                                                              Header="{x:Static p:Resources.InstalledPackageViewContextMenuRemoveDeprecation}">
+                                                            </MenuItem>
+                                                        </ContextMenu>
+
+                                                    </Button.ContextMenu>
+                                                </Button>
+                                            </StackPanel>
+                                        </DockPanel>
+                                    </Grid>
+                                </Expander.Header>
+                                <Grid>
+                                    <Border BorderThickness="0,0,0,0"
+                                                BorderBrush="{StaticResource ExpanderCaretToggleButtonSelectedBackground}"
+                                                Background="{StaticResource ExpanderCaretToggleButtonSelectedBackground}"
+                                                >
+
+                                        <StackPanel Margin="25,5,5,10">
+
+                                            <StackPanel Visibility="{Binding Path=HasCustomNodes, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+
+                                                <Label Content="{x:Static p:Resources.InstalledPackageViewCustomNodesLabel}"
+                                                           FontSize="10"
+                                                       Padding="0,5,5,5"
+                                                           Foreground="{StaticResource PreferencesWindowFontColor}"/>
+                                                <ItemsControl Name="LoadedCustomNodes"
+                                                                  ItemsSource="{Binding Path=Model.LoadedCustomNodes}"
+                                                                  Background="Transparent">
+
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Text="{Binding Path=Name}"
+                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                           FontSize="9"
+                                                                           TextTrimming="CharacterEllipsis" />
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+
+                                                </ItemsControl>
+
+                                            </StackPanel>
+
+                                            <StackPanel Visibility="{Binding Path=HasNodeLibraries, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+
+                                                <Label Padding="0,5,5,5" Content="{x:Static p:Resources.InstalledPackageViewNodeLibrariesLabel}"
+                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                           FontSize="10"></Label>
+                                                <ItemsControl Name="NodeLibraries"
+                                                                      ItemsSource="{Binding Path=Model.LoadedAssemblies}"
+                                                                      Background="Transparent">
+
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Name="Label"
+                                                                           Text="{Binding Path=Name}"
+                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                           FontSize="9"
+                                                                           TextTrimming="CharacterEllipsis" />
+
+                                                            <DataTemplate.Triggers>
+                                                                <DataTrigger Binding="{Binding Path=IsNodeLibrary}"
+                                                                                 Value="false">
+                                                                    <Setter TargetName="Label"
+                                                                                Property="Visibility"
+                                                                                Value="Collapsed"></Setter>
+                                                                </DataTrigger>
+                                                            </DataTemplate.Triggers>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+
+                                                </ItemsControl>
+                                            </StackPanel>
+
+                                            <StackPanel Visibility="{Binding Path=HasAdditionalAssemblies, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+
+                                                <Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalLabel}"
+                                                           FontSize="10"
+                                                           Padding="0,5,5,5"
+                                                           Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
+                                                <ItemsControl Name="AddAssemblies"
+                                                                  ItemsSource="{Binding Path=Model.LoadedAssemblies}"
+                                                                  Background="Transparent">
+
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Name="Label"
+                                                                           Text="{Binding Path=Name}"
+                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                           FontSize="9"
+                                                                           TextTrimming="CharacterEllipsis" />
+
+                                                            <DataTemplate.Triggers>
+                                                                <DataTrigger Binding="{Binding Path=IsNodeLibrary}"
+                                                                                 Value="true">
+                                                                    <Setter TargetName="Label"
+                                                                                Property="Visibility"
+                                                                                Value="Collapsed"></Setter>
+                                                                </DataTrigger>
+                                                            </DataTemplate.Triggers>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+
+                                                </ItemsControl>
+
+                                            </StackPanel>
+
+                                            <StackPanel Visibility="{Binding Path=HasAdditionalFiles, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+
+                                                <Label Content="{x:Static p:Resources.InstalledPackageViewAdditionalFileLabel}"
+                                                           FontSize="10"
+                                                       Padding="0,5,5,5"
+                                                           Foreground="{StaticResource PreferencesWindowFontColor}"></Label>
+                                                <ItemsControl Name="AdditionalFiles"
+                                                                  ItemsSource="{Binding Path=Model.AdditionalFiles}"
+                                                                  Background="Transparent">
+
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Text="{Binding Path=RelativePath}"
+                                                                           Foreground="{StaticResource PreferencesWindowFontColor}"
+                                                                           FontSize="9"
+                                                                           TextTrimming="CharacterEllipsis" />
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+
+                                                </ItemsControl>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </Border>
+                                </Grid>
+                            </Expander>
+                        </Border>
+                    </DataTemplate>
+
+                </ItemsControl.ItemTemplate>
+
+            </ItemsControl>
+        </ScrollViewer>
+    </Grid>
+
+</UserControl>
diff --git a/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml.cs b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml.cs
new file mode 100644
index 00000000000..c30ec6ec2ed
--- /dev/null
+++ b/src/DynamoCoreWpf/Controls/InstalledPackagesControl.xaml.cs
@@ -0,0 +1,45 @@
+using Dynamo.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Dynamo.Wpf.Controls
+{
+    /// <summary>
+    /// Interaction logic for InstalledPackagesControl.xaml
+    /// </summary>
+    public partial class InstalledPackagesControl : UserControl
+    {
+        public InstalledPackagesControl()
+        {
+            InitializeComponent();
+        }
+
+        private void MoreButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            var button = (Button)sender;
+            button.ContextMenu.DataContext = button.DataContext;
+            button.ContextMenu.IsOpen = true;
+        }
+
+        private void Expander_Expanded(object sender, RoutedEventArgs e)
+        {
+            Expander exp = (Expander)sender;
+            if (exp.DataContext is PackageViewModel pm)
+            {
+                pm.ToggleTypesVisibleInManagerCommand.Execute();
+            }
+        }
+    }
+}
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 407826716d7..94f229a5528 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -121,6 +121,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\InstalledPackagesControl.xaml.cs">
+      <DependentUpon>InstalledPackagesControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\NodeAutoCompleteSearchControl.xaml.cs">
       <DependentUpon>NodeAutoCompleteSearchControl.xaml</DependentUpon>
     </Compile>
@@ -427,6 +430,10 @@
     <Compile Include="Windows\ModelessChildWindow.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Controls\InstalledPackagesControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\NodeAutoCompleteSearchControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1258,7 +1265,7 @@
     <ProjectReference Include="..\Libraries\PythonNodeModels\PythonNodeModels.csproj">
       <Project>{8872CA17-C10D-43B9-8393-5C5A57065EB0}</Project>
       <Name>PythonNodeModels</Name>
-	  <Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Libraries\VMDataBridge\VMDataBridge.csproj">
       <Project>{ccb6e56b-2da1-4eba-a1f9-e8510e129d12}</Project>
@@ -1304,6 +1311,9 @@
     <Resource Include="UI\Images\profile_normal.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="UI\Images\menu_16_16.png" />
+    <Resource Include="UI\Images\caret_down.png" />
+    <Resource Include="UI\Images\caret_up.png" />
     <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" />
diff --git a/src/DynamoCoreWpf/UI/Images/caret_down.png b/src/DynamoCoreWpf/UI/Images/caret_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..007f55c7ea92386bc859de21c69b6026ab5b008a
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBeu<}xV@L(#+rERm4GKK2-R^$t4o*CKr@@M8
zav_Uf-vZ%)+eex+dkod89;w<-ng5B&;dy+J*W!0<dnXjfWv_MA_ex(Io5y<ZcW=Lk
zOU1MkI<eWhS&fa{Kg2V7IAx~nwt05uoMp@MjwMr^gl0bEZBJ=BxBZRPeMk4>%gsW8
P_A_|8`njxgN@xNAa)eB8

literal 0
HcmV?d00001

diff --git a/src/DynamoCoreWpf/UI/Images/caret_up.png b/src/DynamoCoreWpf/UI/Images/caret_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d37b12dcb6d667d6a5247b271fddf2bc46f13bb
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBexj#~V@L(#+rERm4F(*pmKF`sB{uF8{7wkY
zI3y?_<h$dBRC0bTC+E)(_6$D9l$2(#diSB#psK-jtJ5^~%`+E<?^P+`_0kl*7nhc{
vXX}gV`3_Nbn=IRp^mJTHb0|;zWUt=+(#`F4-=|MN%NRUe{an^LB{Ts5Hi|-h

literal 0
HcmV?d00001

diff --git a/src/DynamoCoreWpf/UI/Images/menu.png b/src/DynamoCoreWpf/UI/Images/menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..8468208285776d1c7c94bc30d73903c917485460
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{tizU$B+ufvq1-W4=eDra8)Qy5wv2OZK7P#
zT-MTef%g{gB+*@t=8F6dHUd|s%~GFsLiv;@$Aq_!d-^vXK4h8h%n{sE_~~BsHExZn
z|D9|KRa-x~Xa{)B+_>S|sfSjZbsHWricc-hVhyPBdda4>uHv1VfRjzpIr)GOp<Z`)
zb26N+T5#*ZT82~8g8Bk#u0`2fKIeYTIw|1qWUdFF-EQbvxXG+ET$Vp2W69UjQywCX
juF{L=nnzZe|6x$LTd<JfFUMn`9~eAc{an^LB{Ts5{ETT_

literal 0
HcmV?d00001

diff --git a/src/DynamoCoreWpf/UI/Images/menu_16_16.png b/src/DynamoCoreWpf/UI/Images/menu_16_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1767bf517b0b6f43f08320cd7225c0d4efeb7fac
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBexs+0V@L(#+eyA$4GIFS?mSmQE1L5{%ugtn
zELnG<cTb~Ym!8O_Yn-ZobABZ}I4C{idji8gwy8WzL)<xDCimF17!;pVjX5Y`Ec@~@
z=bYl$T{;HGxD>Y-98=lTcdg39(`|*~SFxRLa@lVKZe@G9z1my#zT8(cccGc<I!6Cb
c_Lq2bHm(Y)d3^nn1<)}Jp00i_>zopr05|1Pga7~l

literal 0
HcmV?d00001

diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index 07a566642bb..02ac675106f 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -2293,7 +2293,6 @@
     <SolidColorBrush x:Key="SemiTransparent" 
                              Color="#80000000" />
 
-
     <!--Usual button color for the Preferences Window-->
     <Color x:Key="PreferencesToogleCheckedColor" R="6" G="150" B="215" A="255"/>
     
@@ -2421,7 +2420,55 @@
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+    <SolidColorBrush x:Key="ExpanderCaretToggleButtonBackground" Color="#4d4d4d"/>
+    <SolidColorBrush x:Key="ExpanderCaretToggleButtonSelectedBackground" Color="#3c3c3c"/>
+
+    <ControlTemplate x:Key="ExpanderCaretToggleButton" TargetType="{x:Type ToggleButton}">
+        <Border Name="Border" 
+                Grid.Row="0" 
+                Background="{StaticResource ExpanderCaretToggleButtonBackground}"
+                BorderThickness="1" 
+                CornerRadius="1" >
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Image x:Name="Caret"
+                      Grid.Column="0"
+                      Source="pack://application:,,,/DynamoCoreWpf;component/UI/Images/Caret_Down.png"
+                      Width="16"
+                      Height="16"
+                      Margin="5,10,0,10"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      >
+                </Image>
+                <ContentPresenter x:Name="HeaderContent" 
+                                    Grid.Column="0" 
+                                    Margin="0,0,0,0" 
+                                    RecognizesAccessKey="True" 
+                                    VerticalAlignment="Center"
+                                    Width="{Binding
+                                        RelativeSource={RelativeSource
+                                        Mode=FindAncestor,
+                                        AncestorType={x:Type Expander}},
+                                        Path=ActualWidth}"/>
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+                <!--Sets the icon on the expander to caret up (-)-->
+                <Setter Property="Background" TargetName="Border" Value="{StaticResource ExpanderCaretToggleButtonSelectedBackground}"/>
+                <Setter TargetName="Caret" Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/Caret_Up.png" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="false">
+                <Setter Property="Background" TargetName="Border" Value="{StaticResource ExpanderCaretToggleButtonBackground}"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ExpanderPlusToggleButton" TargetType="{x:Type ToggleButton}">
         <Border Name="Border" 
                 Grid.Row="0" 
                 Background="{StaticResource SecondaryGray}" 
@@ -2477,6 +2524,68 @@
         </TextBlock>
     </DataTemplate>
     
+
+    <Style TargetType="Expander" x:Key="InstalledPackagesExpanderStyle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <!-- Control template for expander -->
+                <ControlTemplate TargetType="Expander" x:Name="exp">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Name="ContentRow" Height="0"/>
+                        </Grid.RowDefinitions>
+                        <Border Name="Border" Grid.Row="0" Background="{x:Null}" BorderBrush="{x:Null}" BorderThickness="1" CornerRadius="0,0,0,0">
+                            <ToggleButton IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ExpanderCaretToggleButton}">
+                                <ToggleButton.Content>
+                                    <ContentPresenter ContentSource="Header" OverridesDefaultStyle="True" RecognizesAccessKey="True" />
+                                </ToggleButton.Content>
+                            </ToggleButton>
+                        </Border>
+                        <Border x:Name="Content" 
+                                Grid.Row="1"
+                                BorderThickness="1,0,1,1"
+                                CornerRadius="0,0,4,4" >
+                            <!--The Margin is necesary so that the Content is perfectly aligned with the Header-->
+                            <ContentPresenter Margin="1,-3,1,0" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter TargetName="ContentRow" Property="Height" Value="{Binding ElementName=Content,Path=Height}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type ContextMenu}" x:Key="ContextMenuNoLeftColumnStyle">
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="true" />
+        <Setter Property="HasDropShadow" Value="True" />
+        <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}"/>
+        <Setter Property="Background" Value="{StaticResource PreferencesWindowItemDarkerBackgroundColor}"/>
+        <Setter Property="FontSize" Value="10"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ContextMenu}">
+                    <Border x:Name="Border" Background="{StaticResource PreferencesWindowItemDarkerBackgroundColor}" BorderThickness="1">
+                        <ItemsPresenter />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <StackPanel Margin="-25,0,0,0"/>
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style TargetType="Expander" x:Key="MenuExpanderStyle">
         <Setter Property="Background" Value="{StaticResource SecondaryGray}"/>
         <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}"/>
@@ -2491,7 +2600,7 @@
                             <RowDefinition Name="ContentRow" Height="0"/>
                         </Grid.RowDefinitions>
                         <Border Name="Border" Grid.Row="0" Background="{x:Null}" BorderBrush="{x:Null}" BorderThickness="1" CornerRadius="0,0,0,0">
-                            <ToggleButton IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" Template="{StaticResource ExpanderToggleButton}" Background="#FF4682B4">
+                            <ToggleButton IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" Template="{StaticResource ExpanderPlusToggleButton}" Background="#FF4682B4">
                                 <ToggleButton.Content>
                                     <ContentPresenter ContentSource="Header" RecognizesAccessKey="True" />
                                 </ToggleButton.Content>
@@ -2532,7 +2641,7 @@
                             <RowDefinition Name="ContentRow" Height="0"/>
                         </Grid.RowDefinitions>
                         <Border Name="Border" Grid.Row="0" Background="{x:Null}" BorderBrush="{x:Null}" BorderThickness="1" CornerRadius="0,0,0,0">
-                            <ToggleButton IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" Template="{StaticResource ExpanderToggleButton}" Background="#FF4682B4">
+                            <ToggleButton IsChecked="{Binding Path=IsExpanded,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" Template="{StaticResource ExpanderPlusToggleButton}" Background="#FF4682B4">
                                 <ToggleButton.Content>
                                     <ContentPresenter ContentSource="Header" RecognizesAccessKey="True" />
                                 </ToggleButton.Content>
diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
index 5ba0cdd59b8..0f3e28b9ac3 100644
--- a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
@@ -62,6 +62,8 @@ public class PreferencesViewModel : ViewModelBase, INotifyPropertyChanged
         private DynamoViewModel dynamoViewModel;
         private bool isWarningEnabled;
         private GeometryScalingOptions optionsGeometryScale = null;
+
+        private InstalledPackagesViewModel installedPackagesViewModel;
         #endregion Private Properties
 
         public GeometryScaleSize ScaleSize { get; set; }
@@ -142,6 +144,11 @@ public bool PreferencesDebugMode
             }
         }
 
+        /// <summary>
+        /// Returns all installed packages
+        /// </summary>
+        public ObservableCollection<PackageViewModel> LocalPackages => installedPackagesViewModel.LocalPackages;
+
         //This includes all the properties that can be set on the General tab
         #region General Properties
         /// <summary>
@@ -697,6 +704,8 @@ public PreferencesViewModel(DynamoViewModel dynamoViewModel)
             this.runPreviewEnabled = dynamoViewModel.HomeSpaceViewModel.RunSettingsViewModel.RunButtonEnabled;
             this.homeSpace = dynamoViewModel.HomeSpace;
             this.dynamoViewModel = dynamoViewModel;
+            this.installedPackagesViewModel = new InstalledPackagesViewModel(dynamoViewModel, 
+                dynamoViewModel.PackageManagerClientViewModel.PackageManagerExtension.PackageLoader);
 
             PythonEnginesList = new ObservableCollection<string>();
             PythonEnginesList.Add(Wpf.Properties.Resources.DefaultPythonEngineNone);
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
index f957481fe39..c371aaefa92 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -13,12 +13,13 @@
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         xmlns:fa="http://schemas.fontawesome.io/icons/" 
         xmlns:packagemanager="clr-namespace:Dynamo.Wpf.Views.PackageManager"
+        xmlns:wpfControls="clr-namespace:Dynamo.Wpf.Controls"
         WindowStartupLocation="CenterOwner"
         WindowStyle="None"
-        ResizeMode="NoResize"
         mc:Ignorable="d" 
         Height="474" 
-        Width="530" >
+        Width="650"
+        ResizeMode="NoResize">
 
     <!--Using the Styles from the SharedResourcesDictionary located in DynamoCoreWpf/UI/Themes/DynamoModern.xaml-->
     <Window.Resources>
@@ -745,11 +746,12 @@
                             <!--This Grid row contains the Installed Packages section-->
                             <Expander x:Name="InstalledPackagesExpander" 
                                           Style="{StaticResource MenuExpanderStyle}" 
-                                       IsExpanded="{Binding PreferencesTabs[Features].ExpanderActive, Converter={StaticResource ExpandersBindingConverter}, ConverterParameter=InstalledPackagesExpander}"
+                                          IsExpanded="{Binding PreferencesTabs[Features].ExpanderActive, Converter={StaticResource ExpandersBindingConverter}, ConverterParameter=InstalledPackagesExpander}"
                                           Grid.Row="1"
                                           Header="{x:Static p:Resources.InstalledPackageViewTitle}">
-                                <StackPanel Orientation="Vertical" Margin="0,6,0,0">
-                                    <Label>SOME CONTENT</Label>
+                                <StackPanel
+                                    Orientation="Vertical" Margin="0,6,0,0">
+                                    <wpfControls:InstalledPackagesControl Height="Auto"/>
                                 </StackPanel>
                             </Expander>
                         </Grid>
diff --git a/src/DynamoPackages/Package.cs b/src/DynamoPackages/Package.cs
index 7c5c08c23f2..93bb61187ca 100644
--- a/src/DynamoPackages/Package.cs
+++ b/src/DynamoPackages/Package.cs
@@ -489,6 +489,10 @@ internal void MarkForUninstall(IPreferences prefs)
             {
                 PackageState = PackageStates.PendingUnload;
             }
+            else
+            {
+                RaisePropertyChanged(nameof(EnableOldMarkedForUnistallState));
+            }
 
             if (!prefs.PackageDirectoriesToUninstall.Contains(RootDirectory))
             {
@@ -505,6 +509,10 @@ internal void UnmarkForUninstall(IPreferences prefs)
                 // Or maybe state should only be set when trying to Load the package...not here.
                 PackageState = PackageStates.Loaded;
             }
+            else
+            {
+                RaisePropertyChanged(nameof(EnableOldMarkedForUnistallState));
+            }
             prefs.PackageDirectoriesToUninstall.RemoveAll(x => x.Equals(RootDirectory));
         }