add new package manager prefs section (#11734)

mjkkirschner · web-flow · commit 116b3f23fba9 · 2021-06-07T17:32:23.000-04:00
* add new expanders
add new tab
increase tab width
increase window width

* revert width change
use existing resource string for installed packages

Co-authored-by: michael kirschner &lt;michael.kirschner@autodesk.com&gt;
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2399,4 +2399,10 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
+  <data name="PackagePathsExpanderName" xml:space="preserve">
+    <value>Node and Package Paths</value>
+  </data>
+  <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
+    <value>Package Manager</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2399,4 +2399,10 @@ Uninstall the following packages: {0}?</value>
   <data name="ResetCPythonButtonToolTip" xml:space="preserve">
     <value>Resets CPython environment by reloading modules.</value>
   </data>
+  <data name="PackagePathsExpanderName" xml:space="preserve">
+    <value>Node and Package Paths</value>
+  </data>
+  <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
+    <value>Package Manager</value>
+  </data>
 </root>
diff --git 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
@@ -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.InstalledPackageViewTitle}">
+                                <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
@@ -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;
 
@@ -62,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>
@@ -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();
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ namespace Dynamo.Wpf.Views`
`18`	`18`	`/// </summary>`
`19`	`19`	`public partial class PreferencesView : Window`
`20`	`20`	`{`
`21`		`- private List<Expander> allExpandersList;`
`22`	`21`	`private readonly PreferencesViewModel viewModel;`
`23`	`22`	`private readonly DynamoViewModel dynViewModel;`
`24`	`23`
`@@ -62,9 +61,9 @@ private void InitRadioButtonsDescription()`
`62`	`61`	`RadioMediumDesc.Inlines.Add(new Run(Res.ChangeScaleFactorPromptDescriptionDefaultSetting) { FontWeight = FontWeights.Bold });`
`63`	`62`	`RadioMediumDesc.Inlines.Add(" " + viewModel.OptionsGeometryScale.DescriptionScaleRange[1]);`
`64`	`63`
`65`		`- RadioLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[1]);`
	`64`	`+ RadioLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[2]);`
`66`	`65`
`67`		`- RadioExtraLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[2]);`
	`66`	`+ RadioExtraLargeDesc.Inlines.Add(viewModel.OptionsGeometryScale.DescriptionScaleRange[3]);`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`/// <summary>`
`@@ -142,7 +141,7 @@ private void AddStyle_CancelButton_Click(object sender, RoutedEventArgs e)`
`142`	`141`	`viewModel.ResetAddStyleControl();`
`143`	`142`	`}`
`144`	`143`
`145`		`- private void removeStyle_Click(object sender, RoutedEventArgs e)`
	`144`	`+ private void RemoveStyle_Click(object sender, RoutedEventArgs e)`
`146`	`145`	`{`
`147`	`146`	`var removeButton = sender as Button;`
`148`	`147`
`@@ -156,7 +155,7 @@ private void removeStyle_Click(object sender, RoutedEventArgs e)`
`156`	`155`	`viewModel.RemoveStyleEntry(groupNameLabel.Content.ToString());`
`157`	`156`	`}`
`158`	`157`
`159`		`- private void buttonColorPicker_Click(object sender, RoutedEventArgs e)`
	`158`	`+ private void ButtonColorPicker_Click(object sender, RoutedEventArgs e)`
`160`	`159`	`{`
`161`	`160`	`System.Windows.Forms.ColorDialog colorDialog = new System.Windows.Forms.ColorDialog();`
`162`	`161`