Use checkboxes to select node libraries (#11462)

mmisol · web-flow · commit a5e250a3a4b5 · 2021-02-08T13:07:28.000-05:00
Changes the publish package dialog to use checkboxes rather than a
context menu to select which dlls are node libraries. Also adds an
instructive text on top to further guide users.
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
@@ -2281,4 +2281,7 @@ Uninstall the following packages: {0}?</value>
     <value>An error occurred when loading the application icon: {0}</value>
     <comment>{0} = detailed error message</comment>
   </data>
+  <data name="PublishPackageSelectNodeLibraries" xml:space="preserve">
+    <value>Select Node Libraries</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2283,4 +2283,7 @@ Uninstall the following packages: {0}?</value>
     <value>An error occurred when loading the application icon: {0}</value>
     <comment>{0} = detailed error message</comment>
   </data>
+  <data name="PublishPackageSelectNodeLibraries" xml:space="preserve">
+    <value>Select Node Libraries</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
@@ -237,6 +237,7 @@
 
                 <Grid.RowDefinitions>
                     <RowDefinition Height="40"></RowDefinition>
+                    <RowDefinition Height="20"></RowDefinition>
                     <RowDefinition Height="*" ></RowDefinition>
                 </Grid.RowDefinitions>
 
@@ -251,7 +252,11 @@
                             Content="{x:Static p:Resources.PublishPackageViewAddFileButton}"/>
                 </DockPanel>
 
-                <ScrollViewer Grid.Row="1" Margin="0" VerticalScrollBarVisibility="Visible" Name="BrowserScrollView" Background="#222" BorderThickness="0">
+                <DockPanel Background="#222" Grid.Row="1">
+                    <TextBlock Text="{x:Static p:Resources.PublishPackageSelectNodeLibraries}" FontSize="10" Margin="15,0,0,0" Foreground="DarkGray" HorizontalAlignment="Left"  VerticalAlignment="Top"/>
+                </DockPanel>
+
+                <ScrollViewer Grid.Row="2" Margin="0" VerticalScrollBarVisibility="Visible" Name="BrowserScrollView" Background="#222" BorderThickness="0">
 
                     <ScrollViewer.Resources>
 
@@ -385,17 +390,9 @@
 
                             <DataTemplate x:Key="sharedTemplate">
                                 <StackPanel Orientation="Horizontal">
+                                    <CheckBox Name="IsNodeLibrary" IsEnabled="False" Visibility="Hidden" IsChecked="{Binding IsNodeLibrary, Mode=TwoWay}"/>
                                     <Image Name="Icon" Width="32" Height="32" />
                                     <TextBlock Name="DepName" Padding="7" FontSize="13" Foreground="WhiteSmoke" Text="{Binding Path=Name}"/>
-
-                                    <StackPanel.ContextMenu>
-
-                                        <ContextMenu Name="DepContextMenu">
-                                            <MenuItem Name="IsNodeLibraryButton" Header="{x:Static p:Resources.PublishPackageViewContextMenuIsNodeLibrary}" IsCheckable="True" IsChecked="{Binding IsNodeLibrary}"></MenuItem>
-                                        </ContextMenu>
-
-                                    </StackPanel.ContextMenu>
-
                                 </StackPanel>
 
                                 <DataTemplate.Triggers>
@@ -411,6 +408,8 @@
                                             <packagemanager:DependencyType>Assembly</packagemanager:DependencyType>
                                         </DataTrigger.Value>
                                         <Setter Property="Source" TargetName="Icon" Value="/DynamoCoreWpf;component/UI/Images/assemblies.png"/>
+                                        <Setter TargetName="IsNodeLibrary" Property="IsEnabled" Value="True"/>
+                                        <Setter TargetName="IsNodeLibrary" Property="Visibility" Value="Visible"/>
                                     </DataTrigger>
 
                                     <DataTrigger Binding="{Binding DependencyType}">
@@ -420,13 +419,6 @@
                                         <Setter Property="Source" TargetName="Icon" Value="/DynamoCoreWpf;component/UI/Images/nodes.png"/>
                                     </DataTrigger>
 
-                                    <DataTrigger Binding="{Binding DependencyType}">
-                                        <DataTrigger.Value>
-                                            <packagemanager:DependencyType>Assembly</packagemanager:DependencyType>
-                                        </DataTrigger.Value>
-                                        <Setter Property="Visibility" TargetName="IsNodeLibraryButton" Value="Visible"/>
-                                    </DataTrigger>
-
                                     <DataTrigger Binding="{Binding IsNodeLibrary}" Value="true">
                                         <Setter Property="FontWeight" TargetName="DepName" Value="Bold"/>
                                     </DataTrigger>
@@ -439,11 +431,11 @@
 
                             </DataTemplate>
 
-                            <HierarchicalDataTemplate DataType = "{x:Type packagemanager:PackageItemRootViewModel}" ItemsSource="{Binding Path=Items}">
+                            <HierarchicalDataTemplate DataType="{x:Type packagemanager:PackageItemRootViewModel}" ItemsSource="{Binding Path=Items}">
                                 <ContentControl Content="{Binding}" ContentTemplate="{StaticResource sharedTemplate}" />
                             </HierarchicalDataTemplate>
 
-                            <HierarchicalDataTemplate DataType = "{x:Type packagemanager:PackageItemInternalViewModel}" ItemsSource="{Binding Path=Items}">
+                            <HierarchicalDataTemplate DataType="{x:Type packagemanager:PackageItemInternalViewModel}" ItemsSource="{Binding Path=Items}">
                                 <ContentControl Content="{Binding}" ContentTemplate="{StaticResource sharedTemplate}" />
                             </HierarchicalDataTemplate>
 
@@ -454,7 +446,6 @@
                         </TreeView.Resources>
 
                     </TreeView>
-
                 </ScrollViewer>
             </Grid>
 
