From ee1f1ea980df98c9d8a1af7714cc0ff5455d4583 Mon Sep 17 00:00:00 2001
From: michael kirschner <michael.kirschner@autodesk.com>
Date: Fri, 4 Jun 2021 18:35:51 -0400
Subject: [PATCH 1/2] add new expanders add new tab increase tab width increase
 window width

---
 .../Properties/Resources.Designer.cs          | 27 ++++++++++++
 .../Properties/Resources.en-US.resx           |  9 ++++
 src/DynamoCoreWpf/Properties/Resources.resx   |  9 ++++
 .../UI/Themes/Modern/DynamoModern.xaml        |  2 +-
 .../Views/Menu/PreferencesView.xaml           | 42 +++++++++++++++++--
 .../Views/Menu/PreferencesView.xaml.cs        |  5 +--
 6 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 0b2483e2cc1..76b4b4ee124 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -2612,6 +2612,15 @@ public static string InfoBubbleWarning {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Installed Packages.
+        /// </summary>
+        public static string InstalledPackagesExpanderName {
+            get {
+                return ResourceManager.GetString("InstalledPackagesExpanderName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Additional Files.
         /// </summary>
@@ -3890,6 +3899,15 @@ public static string PackagePathAutoAddNotificationTitle {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Package Paths.
+        /// </summary>
+        public static string PackagePathsExpanderName {
+            get {
+                return ResourceManager.GetString("PackagePathsExpanderName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Accept Changes.
         /// </summary>
@@ -4376,6 +4394,15 @@ public static string PortViewContextMenuUserDefaultValue {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Package Manager.
+        /// </summary>
+        public static string PreferencesPackageManagerSettingsTab {
+            get {
+                return ResourceManager.GetString("PreferencesPackageManagerSettingsTab", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Default Python Engine.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index f0682ff664e..aa1d75dd576 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2399,4 +2399,13 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
+  <data name="InstalledPackagesExpanderName" xml:space="preserve">
+    <value>Installed Packages</value>
+  </data>
+  <data name="PackagePathsExpanderName" xml:space="preserve">
+    <value>Package Paths</value>
+  </data>
+  <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
+    <value>Package Manager</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index abfb63c1323..6208d999ed7 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2399,4 +2399,13 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
+  <data name="InstalledPackagesExpanderName" xml:space="preserve">
+    <value>Installed Packages</value>
+  </data>
+  <data name="PackagePathsExpanderName" xml:space="preserve">
+    <value>Package Paths</value>
+  </data>
+  <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
+    <value>Package Manager</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index 322423eee87..6e4e6c71100 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -2501,7 +2501,7 @@
                                             HorizontalAlignment="Stretch" 
                                             VerticalAlignment="Stretch">
                             <Grid Name="TabPanel" 
-                                          Width="100"
+                                          Width="150"
                                           Height="30">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="5" />
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
index 4b7473f5530..bd512c58313 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -18,7 +18,7 @@
         ResizeMode="NoResize"
         mc:Ignorable="d" 
         Height="474" 
-        Width="530" >
+        Width="580" >
 
     <!--Using the Styles from the SharedResourcesDictionary located in DynamoCoreWpf/UI/Themes/DynamoModern.xaml-->
     <Window.Resources>
@@ -75,7 +75,7 @@
                                     Margin="0,0,8,0"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Top"
-                                    Click="removeStyle_Click"
+                                    Click="RemoveStyle_Click"
                                     Style="{StaticResource RemoveStyleButtonStyle}"
                                     Width="20"
                                     Height="30">
@@ -574,7 +574,7 @@
                                                         <Button x:Name="buttonColorPicker"
                                                                 Style="{StaticResource ButtonColorPickerStyle}"
                                                                 Background="{Binding AddStyleControl.HexColorString}" 
-                                                                Click="buttonColorPicker_Click"
+                                                                Click="ButtonColorPicker_Click"
                                                                 Width="25" 
                                                                 Height="15"/>
                                                         <Label x:Name="colorHexVal" 
@@ -698,6 +698,42 @@
                             </Expander>
                         </Grid>
                     </TabItem>
+
+                    <!--Package Manager Settings Tab-->
+                    <TabItem Header="{x:Static p:Resources.PreferencesPackageManagerSettingsTab}"
+                             Style="{StaticResource LeftTab}">
+                        <!--This Grid contains the package mangager settings tab-->
+                        <Grid x:Name="PackageManagerTab" 
+                              Margin="1"
+                              HorizontalAlignment="Stretch">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <!--This Grid row contains the Package Paths section-->
+                            <Expander x:Name="PackagePathsExpander"
+                                        Grid.Row="0"
+                                        Style="{StaticResource MenuExpanderStyle}" 
+                                        IsExpanded="{Binding PreferencesTabs[Features].ExpanderActive, Converter={StaticResource ExpandersBindingConverter}, ConverterParameter=PackagePathsExpander}"
+                                        Header="{x:Static p:Resources.PackagePathsExpanderName}">
+                                <StackPanel Orientation="Vertical" Margin="0,6,0,0">
+                                    <Label>SOME CONTENT</Label>
+                                </StackPanel>
+                            </Expander>
+
+                            <!--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}"
+                                          Grid.Row="1"
+                                          Header="{x:Static p:Resources.InstalledPackagesExpanderName}">
+                                <StackPanel Orientation="Vertical" Margin="0,6,0,0">
+                                    <Label>SOME CONTENT</Label>
+                                </StackPanel>
+                            </Expander>
+                        </Grid>
+                    </TabItem>
                 </TabControl>
             </Grid>
         </Grid>
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
index b4ab3875d1f..31117d04dea 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
@@ -18,7 +18,6 @@ namespace Dynamo.Wpf.Views
     /// </summary>
     public partial class PreferencesView : Window
     {
-        private List<Expander> allExpandersList;
         private readonly PreferencesViewModel viewModel;
         private readonly DynamoViewModel dynViewModel;
 
@@ -142,7 +141,7 @@ private void AddStyle_CancelButton_Click(object sender, RoutedEventArgs e)
             viewModel.ResetAddStyleControl();
         }
 
-        private void removeStyle_Click(object sender, RoutedEventArgs e)
+        private void RemoveStyle_Click(object sender, RoutedEventArgs e)
         {
            var removeButton = sender as Button;
 
@@ -156,7 +155,7 @@ private void removeStyle_Click(object sender, RoutedEventArgs e)
             viewModel.RemoveStyleEntry(groupNameLabel.Content.ToString());
         }
 
-        private void buttonColorPicker_Click(object sender, RoutedEventArgs e)
+        private void ButtonColorPicker_Click(object sender, RoutedEventArgs e)
         {
             System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();
 

From e66e846724ae34e37f6cda0ddc0c1c6eeda0331c Mon Sep 17 00:00:00 2001
From: michael kirschner <michael.kirschner@autodesk.com>
Date: Mon, 7 Jun 2021 13:38:44 -0400
Subject: [PATCH 2/2] revert width change use existing resource string for
 installed packages

---
 src/DynamoCoreWpf/Properties/Resources.Designer.cs   | 11 +----------
 src/DynamoCoreWpf/Properties/Resources.en-US.resx    |  5 +----
 src/DynamoCoreWpf/Properties/Resources.resx          |  5 +----
 src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml    |  4 ++--
 src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs |  4 ++--
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 76b4b4ee124..37b846b1b31 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -2612,15 +2612,6 @@ public static string InfoBubbleWarning {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Installed Packages.
-        /// </summary>
-        public static string InstalledPackagesExpanderName {
-            get {
-                return ResourceManager.GetString("InstalledPackagesExpanderName", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Additional Files.
         /// </summary>
@@ -3900,7 +3891,7 @@ public static string PackagePathAutoAddNotificationTitle {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Package Paths.
+        ///   Looks up a localized string similar to Node and Package Paths.
         /// </summary>
         public static string PackagePathsExpanderName {
             get {
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index aa1d75dd576..ef38f93f912 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2399,11 +2399,8 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
-  <data name="InstalledPackagesExpanderName" xml:space="preserve">
-    <value>Installed Packages</value>
-  </data>
   <data name="PackagePathsExpanderName" xml:space="preserve">
-    <value>Package Paths</value>
+    <value>Node and Package Paths</value>
   </data>
   <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
     <value>Package Manager</value>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 6208d999ed7..88de57b999a 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2399,11 +2399,8 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
-  <data name="InstalledPackagesExpanderName" xml:space="preserve">
-    <value>Installed Packages</value>
-  </data>
   <data name="PackagePathsExpanderName" xml:space="preserve">
-    <value>Package Paths</value>
+    <value>Node and Package Paths</value>
   </data>
   <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
     <value>Package Manager</value>
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
index bd512c58313..0c147263cc3 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -18,7 +18,7 @@
         ResizeMode="NoResize"
         mc:Ignorable="d" 
         Height="474" 
-        Width="580" >
+        Width="530" >
 
     <!--Using the Styles from the SharedResourcesDictionary located in DynamoCoreWpf/UI/Themes/DynamoModern.xaml-->
     <Window.Resources>
@@ -727,7 +727,7 @@
                                           Style="{StaticResource MenuExpanderStyle}" 
                                        IsExpanded="{Binding PreferencesTabs[Features].ExpanderActive, Converter={StaticResource ExpandersBindingConverter}, ConverterParameter=InstalledPackagesExpander}"
                                           Grid.Row="1"
-                                          Header="{x:Static p:Resources.InstalledPackagesExpanderName}">
+                                          Header="{x:Static p:Resources.InstalledPackageViewTitle}">
                                 <StackPanel Orientation="Vertical" Margin="0,6,0,0">
                                     <Label>SOME CONTENT</Label>
                                 </StackPanel>
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
index 31117d04dea..e7a724c1805 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs
@@ -61,9 +61,9 @@ private void InitRadioButtonsDescription()
             RadioMediumDesc.Inlines.Add(new Run(Res.ChangeScaleFactorPromptDescriptionDefaultSetting) { FontWeight = FontWeights.Bold });
             RadioMediumDesc.Inlines.Add(" " + viewModel.OptionsGeometryScale.DescriptionScaleRange[1]);
 
-            RadioLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[1]);
+            RadioLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[2]);
 
-            RadioExtraLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[2]);
+            RadioExtraLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[3]);
         }
 
         /// <summary>