Assign F1 as the hotkey to display node help docs (#12894)

zeusongit · web-flow · commit c8a7dbd7fc4b · 2022-05-18T16:48:00.000-04:00
* f1
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
@@ -2482,7 +2482,7 @@ Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try down
     <comment>Dynamo Guided Tours</comment>
   </data>
   <data name="GetStartedGuideLibraryText" xml:space="preserve">
-    <value>The library contains all default functions #(nodes)=https://www.dynamoprimer.com/03_Anatomy-of-a-Dynamo-Definition/3-1_dynamo_nodes.html of Dynamo, as well as custom nodes you may have loaded. \n\nTo find a node, search the library or browse its categories.</value>
+    <value>The library contains all default functions #(nodes)=https://primer2.dynamobim.org/4_nodes_and_wires of Dynamo, as well as custom nodes you may have loaded. \n\nTo find a node, search the library or browse its categories.</value>
   </data>
   <data name="GetStartedGuideLibraryTitle" xml:space="preserve">
     <value>Library</value>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2724,7 +2724,7 @@ Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try down
     <comment>Dynamo Guided Tours</comment>
   </data>
   <data name="GetStartedGuideLibraryText" xml:space="preserve">
-    <value>The library contains all default functions #(nodes)=https://www.dynamoprimer.com/03_Anatomy-of-a-Dynamo-Definition/3-1_dynamo_nodes.html of Dynamo, as well as custom nodes you may have loaded. \n\nTo find a node, search the library or browse its categories.</value>
+    <value>The library contains all default functions #(nodes)=https://primer2.dynamobim.org/4_nodes_and_wires of Dynamo, as well as custom nodes you may have loaded. \n\nTo find a node, search the library or browse its categories.</value>
   </data>
   <data name="GetStartedGuideLibraryTitle" xml:space="preserve">
     <value>Library</value>
diff --git a/src/DynamoCoreWpf/Utilities/NodeContextMenuBuilder.cs b/src/DynamoCoreWpf/Utilities/NodeContextMenuBuilder.cs
@@ -85,6 +85,7 @@ internal static void Build(ContextMenu contextMenu, NodeViewModel nodeViewModel,
         /// <param name="visibility"></param>
         /// <param name="isEnabled"></param>
         /// <param name="itemsSource"></param>
+        /// <param name="hotkey"></param>
         /// <returns></returns>
         internal static MenuItem CreateMenuItem
         (
@@ -96,7 +97,8 @@ internal static MenuItem CreateMenuItem
             Binding isChecked = null,
             Binding visibility = null,
             Binding isEnabled = null,
-            Binding itemsSource = null
+            Binding itemsSource = null,
+            string hotkey = null
         )
         {
             MenuItem menuItem = new MenuItem { Header = header, IsCheckable = isCheckable };
@@ -108,6 +110,7 @@ internal static MenuItem CreateMenuItem
             if (visibility != null) menuItem.SetBinding(UIElement.VisibilityProperty, visibility);
             if (isEnabled != null) menuItem.SetBinding(UIElement.IsEnabledProperty, isEnabled);
             if (itemsSource != null) menuItem.SetBinding(ItemsControl.ItemsSourceProperty, itemsSource);
+            if (!string.IsNullOrWhiteSpace(hotkey)) menuItem.InputGestureText = hotkey;
 
             return menuItem;
         }
@@ -433,7 +436,8 @@ internal static MenuItem BuildHelpMenuItem()
                 {
                     Source = NodeViewModel,
                     Path = new PropertyPath(nameof(NodeViewModel.ShowHelpCommand))
-                }
+                },
+                hotkey: "F1"
             );
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -2676,6 +2676,24 @@ internal void OpenDocumentationLink(object parameter)
             OnRequestOpenDocumentationLink((OpenDocumentationLinkEventArgs)parameter);
         }
 
+        internal void ShowNodeDocumentation(object parameter)
+        {
+            var node = DynamoSelection.Instance.Selection.OfType<NodeModel>().LastOrDefault();
+
+            var nodeAnnotationEventArgs = new OpenNodeAnnotationEventArgs(node, this);
+            OpenDocumentationLink(nodeAnnotationEventArgs);
+        }
+        internal bool CanShowNodeDocumentation(object parameter)
+        {
+            var node = DynamoSelection.Instance.Selection.OfType<NodeModel>().LastOrDefault();
+
+            if (node == null || !(node is NodeModel))
+            {
+                return false;
+            }
+            return true;
+        }
+
         private bool CanZoomIn(object parameter)
         {
             return CurrentSpaceViewModel.CanZoomIn;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelDelegateCommands.cs
@@ -85,6 +85,7 @@ private void InitializeDelegateCommands()
             ShowNewPresetsDialogCommand = new DelegateCommand(ShowNewPresetStateDialogAndMakePreset, CanShowNewPresetStateDialog);
             NodeFromSelectionCommand = new DelegateCommand(CreateNodeFromSelection, CanCreateNodeFromSelection);
             OpenDocumentationLinkCommand = new DelegateCommand(OpenDocumentationLink);
+            ShowNodeDocumentationCommand = new DelegateCommand(ShowNodeDocumentation, CanShowNodeDocumentation);
         }
         public DelegateCommand OpenFromJsonIfSavedCommand { get; set; }
         public DelegateCommand OpenFromJsonCommand { get; set; }
@@ -167,5 +168,7 @@ private void InitializeDelegateCommands()
         public DelegateCommand ShowNewPresetsDialogCommand { get; set; }
         public DelegateCommand NodeFromSelectionCommand { get; set; }
         public DelegateCommand OpenDocumentationLinkCommand { get; set; }
+        public DelegateCommand ShowNodeDocumentationCommand { get; set; }
+        
     }
 }
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -175,6 +175,8 @@
         <KeyBinding Key="T"
                     Modifiers="Control"
                     Command="{Binding Path=DataContext.ShowNewPresetsDialogCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}" />
+        <KeyBinding Key="F1"
+                    Command="{Binding Path=DataContext.ShowNodeDocumentationCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}" />
     </Window.InputBindings>
 
     <Grid Name="mainGrid"
diff --git a/src/DynamoCoreWpf/Views/Core/NodeView.xaml b/src/DynamoCoreWpf/Views/Core/NodeView.xaml
@@ -130,6 +130,14 @@
                                                     </Style>
                                                 </Label.Style>
                                             </Label>
+                                            <TextBlock x:Name="InputGestureText"
+                                               Margin="0,2,2,2"
+                                               DockPanel.Dock="Right"
+                                               HorizontalAlignment="Right"
+                                               VerticalAlignment="Center"
+                                               Text="{TemplateBinding InputGestureText}"
+                                               TextBlock.FontFamily="{StaticResource ArtifaktElementRegular}"
+                                               TextBlock.FontSize="13px" />
                                             <Popup x:Name="PART_Popup"
                                                    AllowsTransparency="true"
                                                    Focusable="false"

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ internal static void Build(ContextMenu contextMenu, NodeViewModel nodeViewModel,`
`85`	`85`	`/// <param name="visibility"></param>`
`86`	`86`	`/// <param name="isEnabled"></param>`
`87`	`87`	`/// <param name="itemsSource"></param>`
	`88`	`+ /// <param name="hotkey"></param>`
`88`	`89`	`/// <returns></returns>`
`89`	`90`	`internal static MenuItem CreateMenuItem`
`90`	`91`	`(`
`@@ -96,7 +97,8 @@ internal static MenuItem CreateMenuItem`
`96`	`97`	`Binding isChecked = null,`
`97`	`98`	`Binding visibility = null,`
`98`	`99`	`Binding isEnabled = null,`
`99`		`- Binding itemsSource = null`
	`100`	`+ Binding itemsSource = null,`
	`101`	`+ string hotkey = null`
`100`	`102`	`)`
`101`	`103`	`{`
`102`	`104`	`MenuItem menuItem = new MenuItem { Header = header, IsCheckable = isCheckable };`
`@@ -108,6 +110,7 @@ internal static MenuItem CreateMenuItem`
`108`	`110`	`if (visibility != null) menuItem.SetBinding(UIElement.VisibilityProperty, visibility);`
`109`	`111`	`if (isEnabled != null) menuItem.SetBinding(UIElement.IsEnabledProperty, isEnabled);`
`110`	`112`	`if (itemsSource != null) menuItem.SetBinding(ItemsControl.ItemsSourceProperty, itemsSource);`
	`113`	`+ if (!string.IsNullOrWhiteSpace(hotkey)) menuItem.InputGestureText = hotkey;`
`111`	`114`
`112`	`115`	`return menuItem;`
`113`	`116`	`}`
`@@ -433,7 +436,8 @@ internal static MenuItem BuildHelpMenuItem()`
`433`	`436`	`{`
`434`	`437`	`Source = NodeViewModel,`
`435`	`438`	`Path = new PropertyPath(nameof(NodeViewModel.ShowHelpCommand))`
`436`		`- }`
	`439`	`+ },`
	`440`	`+ hotkey: "F1"`
`437`	`441`	`);`
`438`	`442`	`}`
`439`	`443`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ private void InitializeDelegateCommands()`
`85`	`85`	`ShowNewPresetsDialogCommand = new DelegateCommand(ShowNewPresetStateDialogAndMakePreset, CanShowNewPresetStateDialog);`
`86`	`86`	`NodeFromSelectionCommand = new DelegateCommand(CreateNodeFromSelection, CanCreateNodeFromSelection);`
`87`	`87`	`OpenDocumentationLinkCommand = new DelegateCommand(OpenDocumentationLink);`
	`88`	`+ ShowNodeDocumentationCommand = new DelegateCommand(ShowNodeDocumentation, CanShowNodeDocumentation);`
`88`	`89`	`}`
`89`	`90`	`public DelegateCommand OpenFromJsonIfSavedCommand { get; set; }`
`90`	`91`	`public DelegateCommand OpenFromJsonCommand { get; set; }`
`@@ -167,5 +168,7 @@ private void InitializeDelegateCommands()`
`167`	`168`	`public DelegateCommand ShowNewPresetsDialogCommand { get; set; }`
`168`	`169`	`public DelegateCommand NodeFromSelectionCommand { get; set; }`
`169`	`170`	`public DelegateCommand OpenDocumentationLinkCommand { get; set; }`
	`171`	`+ public DelegateCommand ShowNodeDocumentationCommand { get; set; }`
	`172`	`+`
`170`	`173`	`}`
`171`	`174`	`}`