diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs index 3a95dc15747..bc8da91ffbb 100644 --- a/src/DynamoCore/Configuration/PreferenceSettings.cs +++ b/src/DynamoCore/Configuration/PreferenceSettings.cs @@ -1148,9 +1148,11 @@ internal void InitializeNamespacesToExcludeFromLibrary() { if (!NamespacesToExcludeFromLibrarySpecified) { - NamespacesToExcludeFromLibrary.Add( - "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline" - ); + NamespacesToExcludeFromLibrary = new List() + { + "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.TSpline", + "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel" + }; NamespacesToExcludeFromLibrarySpecified = true; } } diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj index 2fce1a97d76..76da85c31ba 100644 --- a/src/DynamoCore/DynamoCore.csproj +++ b/src/DynamoCore/DynamoCore.csproj @@ -33,7 +33,7 @@ - + @@ -113,15 +113,15 @@ - $(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\libg_locale + $(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\libg_locale - - - + + + - + diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj index 143f75b2c17..18579a1efdb 100644 --- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj +++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj @@ -138,7 +138,7 @@ - + diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs index 15b60581bd2..f4a75bc41b3 100644 --- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs +++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs @@ -7484,6 +7484,15 @@ public static string PreferencesViewEnableNotificationCenter { } } + /// + /// Looks up a localized string similar to Enable Paneling nodes. + /// + public static string PreferencesViewEnablePanelingNodes { + get { + return ResourceManager.GetString("PreferencesViewEnablePanelingNodes", resourceCulture); + } + } + /// /// Looks up a localized string similar to On launch, remember open extensions panels from last session. /// diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx index 2a245b84835..7f050f082b5 100644 --- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx +++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx @@ -3915,4 +3915,8 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Retain folder structure - \ No newline at end of file + + Enable Paneling nodes + Preferences | Features | Experimental | Enable Paneling nodes + + diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx index 1ab2a3e9b14..23237c8e163 100644 --- a/src/DynamoCoreWpf/Properties/Resources.resx +++ b/src/DynamoCoreWpf/Properties/Resources.resx @@ -3902,4 +3902,8 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in Retain folder structure - \ No newline at end of file + + Enable Paneling nodes + Preferences | Features | Experimental | Enable Paneling nodes + + diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs index 7dcf38a58f5..a5db5991ddc 100644 --- a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs @@ -1222,6 +1222,23 @@ public bool EnableTSplineIsChecked } } + /// + /// Controls the IsChecked property in the "Enable Paneling nodes" toogle button + /// + public bool EnablePanelingIsChecked + { + get + { + return !preferenceSettings.NamespacesToExcludeFromLibrary.Contains( + "ProtoGeometry.dll:Autodesk.DesignScript.Geometry.Panel"); + } + set + { + HideUnhideNamespace(!value, "ProtoGeometry.dll", "Autodesk.DesignScript.Geometry.Panel"); + RaisePropertyChanged(nameof(EnablePanelingIsChecked)); + } + } + /// /// This method updates the node search library to either hide or unhide nodes that belong /// to a specified assembly name and namespace. These nodes will be hidden from the node @@ -1770,6 +1787,9 @@ private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e) case nameof(EnableTSplineIsChecked): description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewEnableTSplineNodes), System.Globalization.CultureInfo.InvariantCulture); goto default; + case nameof(EnablePanelingIsChecked): + description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewEnablePanelingNodes), System.Globalization.CultureInfo.InvariantCulture); + goto default; case nameof(ShowPreviewBubbles): description = Res.ResourceManager.GetString(nameof(Res.PreferencesViewShowPreviewBubbles), System.Globalization.CultureInfo.InvariantCulture); goto default; diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml index 2a30adf8421..c6fc7bb42fd 100644 --- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml +++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml @@ -1021,6 +1021,7 @@ + + + + + + diff --git a/src/DynamoManipulation/DynamoManipulation.csproj b/src/DynamoManipulation/DynamoManipulation.csproj index 62c2a4632fb..8abbecd33d5 100644 --- a/src/DynamoManipulation/DynamoManipulation.csproj +++ b/src/DynamoManipulation/DynamoManipulation.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/Libraries/Analysis/Analysis.csproj b/src/Libraries/Analysis/Analysis.csproj index b57de44d593..214261b734a 100644 --- a/src/Libraries/Analysis/Analysis.csproj +++ b/src/Libraries/Analysis/Analysis.csproj @@ -18,7 +18,7 @@ - + {7858fa8c-475f-4b8e-b468-1f8200778cf8} DynamoCore diff --git a/src/Libraries/CoreNodes/CoreNodes.csproj b/src/Libraries/CoreNodes/CoreNodes.csproj index ce053387a3a..f870bbc29df 100644 --- a/src/Libraries/CoreNodes/CoreNodes.csproj +++ b/src/Libraries/CoreNodes/CoreNodes.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Libraries/GeometryColor/GeometryColor.csproj b/src/Libraries/GeometryColor/GeometryColor.csproj index c845531f5b6..306f0350f9d 100644 --- a/src/Libraries/GeometryColor/GeometryColor.csproj +++ b/src/Libraries/GeometryColor/GeometryColor.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + diff --git a/src/Libraries/GeometryUI/GeometryUI.csproj b/src/Libraries/GeometryUI/GeometryUI.csproj index 68bbd965fd5..9ac6892378c 100644 --- a/src/Libraries/GeometryUI/GeometryUI.csproj +++ b/src/Libraries/GeometryUI/GeometryUI.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj index a977f276b58..09d8943b41e 100644 --- a/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj +++ b/src/Libraries/GeometryUIWpf/GeometryUIWpf.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Libraries/Tesellation/Tessellation.csproj b/src/Libraries/Tesellation/Tessellation.csproj index cb3d722be08..6fc3a8b41d2 100644 --- a/src/Libraries/Tesellation/Tessellation.csproj +++ b/src/Libraries/Tesellation/Tessellation.csproj @@ -14,7 +14,7 @@ MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672 - + diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj index 84d99cbe169..476a6aed9ea 100644 --- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj +++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/Libraries/AnalysisTests/AnalysisTests.csproj b/test/Libraries/AnalysisTests/AnalysisTests.csproj index 67e76007984..951c8fd4ed5 100644 --- a/test/Libraries/AnalysisTests/AnalysisTests.csproj +++ b/test/Libraries/AnalysisTests/AnalysisTests.csproj @@ -10,7 +10,7 @@ AnalysisTests - + diff --git a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj index 6f5cc5f14de..e6d99951b04 100644 --- a/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj +++ b/test/Libraries/DynamoPythonTests/DynamoPythonTests.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj index de8529f75cf..3852675d0d7 100644 --- a/test/Libraries/GeometryColorTests/GeometryColorTests.csproj +++ b/test/Libraries/GeometryColorTests/GeometryColorTests.csproj @@ -10,7 +10,7 @@ DisplayTests - + diff --git a/test/Libraries/TestServices/TestServices.csproj b/test/Libraries/TestServices/TestServices.csproj index 2ef00d63904..e4ecacb180d 100644 --- a/test/Libraries/TestServices/TestServices.csproj +++ b/test/Libraries/TestServices/TestServices.csproj @@ -10,7 +10,7 @@ TestServices - + diff --git a/test/Libraries/WorkflowTests/WorkflowTests.csproj b/test/Libraries/WorkflowTests/WorkflowTests.csproj index 3b4d358f060..b1c337c3251 100644 --- a/test/Libraries/WorkflowTests/WorkflowTests.csproj +++ b/test/Libraries/WorkflowTests/WorkflowTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/System/IntegrationTests/DynamoApplicationTests.cs b/test/System/IntegrationTests/DynamoApplicationTests.cs index 7d6976ecc5d..413183c9bd4 100644 --- a/test/System/IntegrationTests/DynamoApplicationTests.cs +++ b/test/System/IntegrationTests/DynamoApplicationTests.cs @@ -14,8 +14,8 @@ public class DynamoApplicationTests public void DynamoSandboxLoadsASMFromValidPath() { var versions = new List(){ - new Version(229,0,0), - new Version(228, 6, 0) + new Version(230, 0, 0), + new Version(229,0,0) }; diff --git a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs index 371a0afcce3..a5ddc5caa3e 100644 --- a/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs +++ b/test/Tools/NodeDocumentationMarkdownGeneratorTests/MarkdownGeneratorCommandTests.cs @@ -164,7 +164,7 @@ public void ProducesCorrectOutputFromCoreDirectory_preloadedbinaries() FromDirectoryCommand.HandleDocumentationFromDirectory(opts); var generatedFileNames = tempDirectory.GetFiles().Select(x => x.Name); - Assert.AreEqual(685, generatedFileNames.Count()); + Assert.AreEqual(700, generatedFileNames.Count()); } [Test]