From cd71f2b777cd24c346e4a5287ee024f85b688603 Mon Sep 17 00:00:00 2001 From: john pierson Date: Mon, 9 Jun 2025 15:55:25 -0600 Subject: [PATCH 1/9] Add preferences view toggle for DNA menu --- .../Configuration/PreferenceSettings.cs | 6 ++++ src/DynamoCore/PublicAPI.Unshipped.txt | 2 ++ src/DynamoCoreWpf/Commands/PortCommands.cs | 2 +- .../Properties/Resources.Designer.cs | 9 ++++++ src/DynamoCoreWpf/Properties/Resources.resx | 6 +++- src/DynamoCoreWpf/PublicAPI.Unshipped.txt | 2 ++ .../ViewModels/Core/DynamoViewModel.cs | 11 +++++++ .../ViewModels/Core/PortViewModel.cs | 30 ++++++++----------- .../ViewModels/Menu/PreferencesViewModel.cs | 16 ++++++++++ .../Views/Menu/PreferencesView.xaml | 17 +++++++++-- 10 files changed, 79 insertions(+), 22 deletions(-) diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs index 7b4ee0243f1..d7401592c47 100644 --- a/src/DynamoCore/Configuration/PreferenceSettings.cs +++ b/src/DynamoCore/Configuration/PreferenceSettings.cs @@ -663,6 +663,11 @@ public string PythonTemplateFilePath /// public bool EnableNodeAutoComplete { get; set; } + /// + /// This allows the user to enable or disable the new node auto complete menu. + /// + public bool EnableNewNodeAutoCompleteFlyout { get; set; } + /// /// PolyCurve normal and direction behavior has been made predictable in Dynamo 3.0 and has therefore changed. /// This defines whether legacy (pre-3.0) PolyCurve behavior is selected by default. @@ -1008,6 +1013,7 @@ public PreferenceSettings() IsIronPythonDialogDisabled = false; ShowTabsAndSpacesInScriptEditor = false; EnableNodeAutoComplete = true; + EnableNewNodeAutoCompleteFlyout = true; DefaultEnableLegacyPolyCurveBehavior = true; HideNodesBelowSpecificConfidenceLevel = false; MLRecommendationConfidenceLevel = 10; diff --git a/src/DynamoCore/PublicAPI.Unshipped.txt b/src/DynamoCore/PublicAPI.Unshipped.txt index 0c73a674235..d81071b5d29 100644 --- a/src/DynamoCore/PublicAPI.Unshipped.txt +++ b/src/DynamoCore/PublicAPI.Unshipped.txt @@ -154,6 +154,8 @@ Dynamo.Configuration.PreferenceSettings.EnableDynamoPlayerRenamedWatchAsOutput.g Dynamo.Configuration.PreferenceSettings.EnableDynamoPlayerRenamedWatchAsOutput.set -> void Dynamo.Configuration.PreferenceSettings.EnableNodeAutoComplete.get -> bool Dynamo.Configuration.PreferenceSettings.EnableNodeAutoComplete.set -> void +Dynamo.Configuration.PreferenceSettings.EnableNewNodeAutoCompleteFlyout.get -> bool +Dynamo.Configuration.PreferenceSettings.EnableNewNodeAutoCompleteFlyout.set -> void Dynamo.Configuration.PreferenceSettings.EnableNotificationCenter.get -> bool Dynamo.Configuration.PreferenceSettings.EnableNotificationCenter.set -> void Dynamo.Configuration.PreferenceSettings.EnablePersistExtensions.get -> bool diff --git a/src/DynamoCoreWpf/Commands/PortCommands.cs b/src/DynamoCoreWpf/Commands/PortCommands.cs index 16b6d7f44dc..5e1290f8355 100644 --- a/src/DynamoCoreWpf/Commands/PortCommands.cs +++ b/src/DynamoCoreWpf/Commands/PortCommands.cs @@ -32,7 +32,7 @@ public DelegateCommand NodeAutoCompleteCommand get { if (autoCompleteCommand == null) - autoCompleteCommand ??= new DelegateCommand(NodeViewModel.WorkspaceViewModel.DynamoViewModel.IsDNAClusterPlacementEnabled ? AutoCompleteCluster : AutoComplete, CanAutoComplete); + autoCompleteCommand ??= new DelegateCommand(AutoComplete, CanAutoComplete); return autoCompleteCommand; } diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 96f2274006d..443e8aa31a1 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -8027,6 +8027,15 @@ public static string PreferencesViewEnableNodeAutoComplete { } } + /// + /// Looks up a localized string similar to Enable New Node Autocomplete Flyout. + /// + public static string PreferencesViewEnableNodeAutoCompleteNewFlyout { + get { + return ResourceManager.GetString("PreferencesViewEnableNodeAutoCompleteNewFlyout", resourceCulture); + } + } + /// /// Looks up a localized string similar to Learn more about Node Autocomplete feature.. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index 386846318a4..6b127b6d371 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -2689,6 +2689,10 @@ Uninstall the following packages: {0}? Enable Node Autocomplete Preferences | Features | Experimental | Enable Node Auto Complete + + + Enable New Node Autocomplete Flyout + Preferences | Features | Experimental | Enable Node Auto Complete New Flyout An error occurred when loading the application icon: {0} @@ -4139,4 +4143,4 @@ To make this file into a new template, save it to a different folder, then move This group is frozen. Click to unfreeze. - \ No newline at end of file + diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt index 00efa9c6c8b..8b300c1840e 100644 --- a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt +++ b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt @@ -2867,6 +2867,8 @@ Dynamo.ViewModels.PreferencesViewModel.MLRecommendationNumberOfResults.get -> in Dynamo.ViewModels.PreferencesViewModel.MLRecommendationNumberOfResults.set -> void Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteIsChecked.get -> bool Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteIsChecked.set -> void +Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteNewFlyoutIsChecked.get -> bool +Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteNewFlyoutIsChecked.set -> void Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteMachineLearningIsBeta.get -> bool Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteMachineLearningIsChecked.get -> bool Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteMachineLearningIsChecked.set -> void diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs index bc6cc6d4e5f..b1e92510c73 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs @@ -230,6 +230,17 @@ internal bool IsDNAClusterPlacementEnabled } } + /// + /// Controls if the new DNA Flyout is enabled from preference settings. + /// + internal bool IsNewDNAFlyoutEnabled + { + get + { + return model.PreferenceSettings.EnableNewNodeAutoCompleteFlyout; + } + } + /// /// Count of unresolved issues on the linter manager. /// This is used for binding in the NotificationsControl diff --git a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs index d5dc7d73e1c..5e24b8166bd 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs @@ -560,29 +560,23 @@ private void AutoComplete(object parameter) return; } - var existingPort = wsViewModel.NodeAutoCompleteSearchViewModel.PortViewModel; - if (existingPort != null) + if (wsViewModel.DynamoViewModel.IsNewDNAFlyoutEnabled) { - existingPort.Highlight = Visibility.Collapsed; + wsViewModel?.OnRequestNodeAutocompleteBar(this); } + else + { + var existingPort = wsViewModel.NodeAutoCompleteSearchViewModel.PortViewModel; + if (existingPort != null) + { + existingPort.Highlight = Visibility.Collapsed; + } - wsViewModel.NodeAutoCompleteSearchViewModel.PortViewModel = this; - - wsViewModel.OnRequestNodeAutoCompleteSearch(); - } + wsViewModel.NodeAutoCompleteSearchViewModel.PortViewModel = this; - // Handler to invoke Node autocomplete cluster - private void AutoCompleteCluster(object parameter) - { - //handle the mouse event to prevent connection from starting - MouseButtonEventArgs evArgs = parameter as MouseButtonEventArgs; - if (evArgs != null) - { - evArgs.Handled = true; + wsViewModel.OnRequestNodeAutoCompleteSearch(); } - - var wsViewModel = node.WorkspaceViewModel; - wsViewModel?.OnRequestNodeAutocompleteBar(this); + } private void NodePortContextMenu(object obj) diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs index 8d68c5ad5c0..c5b325b9d09 100644 --- a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs @@ -1128,6 +1128,22 @@ public bool NodeAutocompleteIsChecked } } + /// + /// Controls the IsChecked property in the "Node autocomplete new menu" toggle button + /// + public bool NodeAutocompleteNewFlyoutIsChecked + { + get + { + return preferenceSettings.EnableNewNodeAutoCompleteFlyout; + } + set + { + preferenceSettings.EnableNewNodeAutoCompleteFlyout = value; + RaisePropertyChanged(nameof(NodeAutocompleteNewFlyoutIsChecked)); + } + } + /// /// If MLAutocompleteTOU is approved /// diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml index a98e422cb6f..1a714dd3aab 100644 --- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -912,6 +912,7 @@ + @@ -941,8 +942,20 @@ - - + + + From 4ae4340b59acf82c2bf900d4a8b91dfd60e9f8e5 Mon Sep 17 00:00:00 2001 From: john pierson Date: Tue, 10 Jun 2025 08:30:52 -0600 Subject: [PATCH 2/9] Add Flyout Preferences Text to Resources --- src/DynamoCoreWpf/Properties/Resources.en-US.resx | 4 ++++ src/DynamoCoreWpf/Properties/Resources.resx | 2 +- src/DynamoCoreWpf/PublicAPI.Unshipped.txt | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index d7885855e2a..67d501629ed 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -4155,4 +4155,8 @@ To make this file into a new template, save it to a different folder, then move This group is frozen. Click to unfreeze. + + Enable New Node Autocomplete Flyout + Preferences | Features | Experimental | Enable Node Auto Complete New Flyout + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index 6b127b6d371..a3895f1a991 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -2690,7 +2690,7 @@ Uninstall the following packages: {0}? Enable Node Autocomplete Preferences | Features | Experimental | Enable Node Auto Complete - + Enable New Node Autocomplete Flyout Preferences | Features | Experimental | Enable Node Auto Complete New Flyout diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt index 8b300c1840e..c6a2038381d 100644 --- a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt +++ b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt @@ -5067,6 +5067,7 @@ static Dynamo.Wpf.Properties.Resources.NodeAutocomplete.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutocompleteDocumentationUriString.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteNotAvailableForCollapsedGroups.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteToolTip.get -> string +static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewFlyout.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuEnablePeriodicUpdate.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuHelp.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuIsInput.get -> string From 9a823688762f55ef4368e66899e1c62fb8df5e08 Mon Sep 17 00:00:00 2001 From: john pierson Date: Tue, 10 Jun 2025 08:40:15 -0600 Subject: [PATCH 3/9] Revise from Flyout to "New UI" --- src/DynamoCore/Configuration/PreferenceSettings.cs | 4 ++-- src/DynamoCore/PublicAPI.Unshipped.txt | 4 ++-- src/DynamoCoreWpf/Properties/Resources.Designer.cs | 6 +++--- src/DynamoCoreWpf/Properties/Resources.en-US.resx | 2 +- src/DynamoCoreWpf/Properties/Resources.resx | 6 +++--- src/DynamoCoreWpf/PublicAPI.Unshipped.txt | 6 +++--- src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs | 4 ++-- src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs | 2 +- src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs | 8 ++++---- src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs index d7401592c47..8a993aa8991 100644 --- a/src/DynamoCore/Configuration/PreferenceSettings.cs +++ b/src/DynamoCore/Configuration/PreferenceSettings.cs @@ -666,7 +666,7 @@ public string PythonTemplateFilePath /// /// This allows the user to enable or disable the new node auto complete menu. /// - public bool EnableNewNodeAutoCompleteFlyout { get; set; } + public bool EnableNewNodeAutoCompleteUI { get; set; } /// /// PolyCurve normal and direction behavior has been made predictable in Dynamo 3.0 and has therefore changed. @@ -1013,7 +1013,7 @@ public PreferenceSettings() IsIronPythonDialogDisabled = false; ShowTabsAndSpacesInScriptEditor = false; EnableNodeAutoComplete = true; - EnableNewNodeAutoCompleteFlyout = true; + EnableNewNodeAutoCompleteUI = true; DefaultEnableLegacyPolyCurveBehavior = true; HideNodesBelowSpecificConfidenceLevel = false; MLRecommendationConfidenceLevel = 10; diff --git a/src/DynamoCore/PublicAPI.Unshipped.txt b/src/DynamoCore/PublicAPI.Unshipped.txt index d81071b5d29..28278f36814 100644 --- a/src/DynamoCore/PublicAPI.Unshipped.txt +++ b/src/DynamoCore/PublicAPI.Unshipped.txt @@ -154,8 +154,8 @@ Dynamo.Configuration.PreferenceSettings.EnableDynamoPlayerRenamedWatchAsOutput.g Dynamo.Configuration.PreferenceSettings.EnableDynamoPlayerRenamedWatchAsOutput.set -> void Dynamo.Configuration.PreferenceSettings.EnableNodeAutoComplete.get -> bool Dynamo.Configuration.PreferenceSettings.EnableNodeAutoComplete.set -> void -Dynamo.Configuration.PreferenceSettings.EnableNewNodeAutoCompleteFlyout.get -> bool -Dynamo.Configuration.PreferenceSettings.EnableNewNodeAutoCompleteFlyout.set -> void +Dynamo.Configuration.PreferenceSettings.EnableNewNodeAutoCompleteUI.get -> bool +Dynamo.Configuration.PreferenceSettings.EnableNewNodeAutoCompleteUI.set -> void Dynamo.Configuration.PreferenceSettings.EnableNotificationCenter.get -> bool Dynamo.Configuration.PreferenceSettings.EnableNotificationCenter.set -> void Dynamo.Configuration.PreferenceSettings.EnablePersistExtensions.get -> bool diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 443e8aa31a1..27c57d6ca7c 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -8028,11 +8028,11 @@ public static string PreferencesViewEnableNodeAutoComplete { } /// - /// Looks up a localized string similar to Enable New Node Autocomplete Flyout. + /// Looks up a localized string similar to Enable New Node Autocomplete UI. /// - public static string PreferencesViewEnableNodeAutoCompleteNewFlyout { + public static string PreferencesViewEnableNodeAutoCompleteNewUI { get { - return ResourceManager.GetString("PreferencesViewEnableNodeAutoCompleteNewFlyout", resourceCulture); + return ResourceManager.GetString("PreferencesViewEnableNodeAutoCompleteNewUI", resourceCulture); } } diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 67d501629ed..f3ac768bbd7 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -4155,7 +4155,7 @@ To make this file into a new template, save it to a different folder, then move This group is frozen. Click to unfreeze. - + Enable New Node Autocomplete Flyout Preferences | Features | Experimental | Enable Node Auto Complete New Flyout diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index a3895f1a991..c1d0b7f1569 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -2690,9 +2690,9 @@ Uninstall the following packages: {0}? Enable Node Autocomplete Preferences | Features | Experimental | Enable Node Auto Complete - - Enable New Node Autocomplete Flyout - Preferences | Features | Experimental | Enable Node Auto Complete New Flyout + + Enable New UI + Preferences | Features | Experimental | Enable Node Auto Complete New UI An error occurred when loading the application icon: {0} diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt index c6a2038381d..8c0c02963d0 100644 --- a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt +++ b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt @@ -2867,8 +2867,8 @@ Dynamo.ViewModels.PreferencesViewModel.MLRecommendationNumberOfResults.get -> in Dynamo.ViewModels.PreferencesViewModel.MLRecommendationNumberOfResults.set -> void Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteIsChecked.get -> bool Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteIsChecked.set -> void -Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteNewFlyoutIsChecked.get -> bool -Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteNewFlyoutIsChecked.set -> void +Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteNewUIIsChecked.get -> bool +Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteNewUIIsChecked.set -> void Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteMachineLearningIsBeta.get -> bool Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteMachineLearningIsChecked.get -> bool Dynamo.ViewModels.PreferencesViewModel.NodeAutocompleteMachineLearningIsChecked.set -> void @@ -5067,7 +5067,7 @@ static Dynamo.Wpf.Properties.Resources.NodeAutocomplete.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutocompleteDocumentationUriString.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteNotAvailableForCollapsedGroups.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteToolTip.get -> string -static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewFlyout.get -> string +static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewUI.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuEnablePeriodicUpdate.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuHelp.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuIsInput.get -> string diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs index b1e92510c73..edebded999d 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs @@ -233,11 +233,11 @@ internal bool IsDNAClusterPlacementEnabled /// /// Controls if the new DNA Flyout is enabled from preference settings. /// - internal bool IsNewDNAFlyoutEnabled + internal bool IsNewDNAUIEnabled { get { - return model.PreferenceSettings.EnableNewNodeAutoCompleteFlyout; + return model.PreferenceSettings.EnableNewNodeAutoCompleteUI; } } diff --git a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs index 5e24b8166bd..a8b6d3e7651 100644 --- a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs @@ -560,7 +560,7 @@ private void AutoComplete(object parameter) return; } - if (wsViewModel.DynamoViewModel.IsNewDNAFlyoutEnabled) + if (wsViewModel.DynamoViewModel.IsNewDNAUIEnabled) { wsViewModel?.OnRequestNodeAutocompleteBar(this); } diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs index c5b325b9d09..5f96ce82fc3 100644 --- a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs @@ -1131,16 +1131,16 @@ public bool NodeAutocompleteIsChecked /// /// Controls the IsChecked property in the "Node autocomplete new menu" toggle button /// - public bool NodeAutocompleteNewFlyoutIsChecked + public bool NodeAutocompleteNewUIIsChecked { get { - return preferenceSettings.EnableNewNodeAutoCompleteFlyout; + return preferenceSettings.EnableNewNodeAutoCompleteUI; } set { - preferenceSettings.EnableNewNodeAutoCompleteFlyout = value; - RaisePropertyChanged(nameof(NodeAutocompleteNewFlyoutIsChecked)); + preferenceSettings.EnableNewNodeAutoCompleteUI = value; + RaisePropertyChanged(nameof(NodeAutocompleteNewUIIsChecked)); } } diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml index 1a714dd3aab..103a8d9ce99 100644 --- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -947,9 +947,9 @@ Width="{StaticResource ToggleButtonWidth}" Height="{StaticResource ToggleButtonHeight}" VerticalAlignment="Center" - IsChecked="{Binding Path=NodeAutocompleteNewFlyoutIsChecked}" + IsChecked="{Binding Path=NodeAutocompleteNewUIIsChecked}" Style="{StaticResource EllipseToggleButton1}"/> - - Enable New Node Autocomplete Flyout - Preferences | Features | Experimental | Enable Node Auto Complete New Flyout + Enable New Node Autocomplete UI + Preferences | Features | Experimental | Enable New Node AutoComplete UI \ No newline at end of file From 8325ba4cedf0d83a6b073d3196ec84911f5876f9 Mon Sep 17 00:00:00 2001 From: john pierson Date: Tue, 10 Jun 2025 08:51:36 -0600 Subject: [PATCH 5/9] Update Resources.en-US.resx --- src/DynamoCoreWpf/Properties/Resources.en-US.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index fdf3f98ad12..7e015f5908f 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -4156,7 +4156,7 @@ To make this file into a new template, save it to a different folder, then move This group is frozen. Click to unfreeze. - Enable New Node Autocomplete UI - Preferences | Features | Experimental | Enable New Node AutoComplete UI + Enable New UI + Preferences | Features | Experimental | Enable Node AutoComplete New UI \ No newline at end of file From eaf464797037a08e73ed4a386e46ab16170196c4 Mon Sep 17 00:00:00 2001 From: john pierson Date: Tue, 10 Jun 2025 10:48:53 -0600 Subject: [PATCH 6/9] Update PortCommands.cs --- src/DynamoCoreWpf/Commands/PortCommands.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DynamoCoreWpf/Commands/PortCommands.cs b/src/DynamoCoreWpf/Commands/PortCommands.cs index 5e1290f8355..9fc75e99a38 100644 --- a/src/DynamoCoreWpf/Commands/PortCommands.cs +++ b/src/DynamoCoreWpf/Commands/PortCommands.cs @@ -33,7 +33,6 @@ public DelegateCommand NodeAutoCompleteCommand { if (autoCompleteCommand == null) autoCompleteCommand ??= new DelegateCommand(AutoComplete, CanAutoComplete); - return autoCompleteCommand; } } From f2a469f9f5b7c20ccb76b5774a99994f9a2d4a4d Mon Sep 17 00:00:00 2001 From: john pierson Date: Tue, 10 Jun 2025 11:36:38 -0600 Subject: [PATCH 7/9] Add ? tooltip to preferences view for new ui --- .../Properties/Resources.Designer.cs | 11 ++++++++++- .../Properties/Resources.en-US.resx | 3 +++ src/DynamoCoreWpf/Properties/Resources.resx | 3 +++ .../Views/Menu/PreferencesView.xaml | 19 +++++++++++++++++-- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 27c57d6ca7c..0aca110c3d5 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -8028,7 +8028,7 @@ public static string PreferencesViewEnableNodeAutoComplete { } /// - /// Looks up a localized string similar to Enable New Node Autocomplete UI. + /// Looks up a localized string similar to Enable New UI. /// public static string PreferencesViewEnableNodeAutoCompleteNewUI { get { @@ -8036,6 +8036,15 @@ public static string PreferencesViewEnableNodeAutoCompleteNewUI { } } + /// + /// Looks up a localized string similar to Enable the new floating menu for node suggestions for a more streamlined workflow. Turn off to return to the traditional pop-up dialog.. + /// + public static string PreferencesViewEnableNodeAutoCompleteNewUITooltipText { + get { + return ResourceManager.GetString("PreferencesViewEnableNodeAutoCompleteNewUITooltipText", resourceCulture); + } + } + /// /// Looks up a localized string similar to Learn more about Node Autocomplete feature.. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 7e015f5908f..ad8cce97447 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -4159,4 +4159,7 @@ To make this file into a new template, save it to a different folder, then move Enable New UI Preferences | Features | Experimental | Enable Node AutoComplete New UI + + Enable the new floating menu for node suggestions for a more streamlined workflow. Turn off to return to the traditional pop-up dialog. + \ No newline at end of file diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index c1d0b7f1569..dd537f95850 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -2867,6 +2867,9 @@ Do you wish to uninstall {1}? Restart {2} to complete the uninstall and try down Learn more about Node Autocomplete feature. + + Enable the new floating menu for node suggestions for a more streamlined workflow. Turn off to return to the traditional pop-up dialog. + Add Style diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml index 103a8d9ce99..a3c49549ad6 100644 --- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -943,7 +943,7 @@ - + Foreground="{StaticResource PreferencesWindowFontColor}"> + + From 0ddd80643bed83748dba5913ccb4cd3c51f5809a Mon Sep 17 00:00:00 2001 From: john pierson Date: Tue, 10 Jun 2025 11:38:47 -0600 Subject: [PATCH 8/9] Update PublicAPI.Unshipped.txt --- src/DynamoCoreWpf/PublicAPI.Unshipped.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt index 8c0c02963d0..c8f47d11ec8 100644 --- a/src/DynamoCoreWpf/PublicAPI.Unshipped.txt +++ b/src/DynamoCoreWpf/PublicAPI.Unshipped.txt @@ -5068,6 +5068,7 @@ static Dynamo.Wpf.Properties.Resources.NodeAutocompleteDocumentationUriString.ge static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteNotAvailableForCollapsedGroups.get -> string static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteToolTip.get -> string static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewUI.get -> string +static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewUITooltipText.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuEnablePeriodicUpdate.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuHelp.get -> string static Dynamo.Wpf.Properties.Resources.NodeContextMenuIsInput.get -> string From 8dff6f960a6a6fb256452c409a025b0ab6bc9b12 Mon Sep 17 00:00:00 2001 From: john pierson Date: Wed, 11 Jun 2025 08:06:02 -0600 Subject: [PATCH 9/9] Update DynamoSettings-NewSettings.xml Update test settings file. --- test/settings/DynamoSettings-NewSettings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/settings/DynamoSettings-NewSettings.xml b/test/settings/DynamoSettings-NewSettings.xml index f5c225a1ab1..47362c295a9 100644 --- a/test/settings/DynamoSettings-NewSettings.xml +++ b/test/settings/DynamoSettings-NewSettings.xml @@ -74,6 +74,7 @@ true true false + false false true 99