DynamoDS
diff --git a/‎LICENSE.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎LICENSE.txt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎doc/distrib/License.rtf
Copy file name to clipboard
+645-657Lines changed: 645 additions & 657 deletions b/‎doc/distrib/License.rtf
Copy file name to clipboard
+645-657Lines changed: 645 additions & 657 deletions
diff --git a/‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/AssemblySharedInfoGenerator/AssemblySharedInfo.tt
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Config/upiconfig.xml
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Config/upiconfig.xml
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCore/Core/CustomNodeManager.cs
Copy file name to clipboard
+8-1Lines changed: 8 additions & 1 deletion b/‎src/DynamoCore/Core/CustomNodeManager.cs
Copy file name to clipboard
+8-1Lines changed: 8 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
Copy file name to clipboard
+18-10Lines changed: 18 additions & 10 deletions b/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
Copy file name to clipboard
+18-10Lines changed: 18 additions & 10 deletions
diff --git a/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Images/TitleBarButtons/close-darktheme-disabled-16px.png
Copy file name to clipboard
4.35 KB b/‎src/DynamoCoreWpf/UI/Images/TitleBarButtons/close-darktheme-disabled-16px.png
Copy file name to clipboard
4.35 KB
@@ -1,4 +1,4 @@
-DYNAMO v.2.16.3 © 2022 Autodesk, Inc.  All rights reserved.
+DYNAMO v.2.16.4 © 2022 Autodesk, Inc.  All rights reserved.
 Dynamo License
 
 Those portions created by Ian are provided with the following copyright:
 
@@ -45,7 +45,7 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("2.16.3.8080")]
+[assembly: AssemblyVersion("2.16.4.10050")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("2.16.3.8080")]
+[assembly: AssemblyFileVersion("2.16.4.10050")]
@@ -69,7 +69,7 @@ using System.Runtime.InteropServices;
 <#+
 int MajorVersion = 2;
 int MinorVersion = 16;
-int BuildNumber = 3;
+int BuildNumber = 4;
 // The datetime baseline we choose using this algorithm will affect build number and all nuget packages uploaded
 // Please only change when major or minor version got incremented
 int RevisionNumber = ((int)(DateTime.UtcNow - new DateTime(2022,1,1)).TotalDays)*10+((int)DateTime.UtcNow.Hour)/3;
 
@@ -14,7 +14,7 @@
             <upi_attribute name='id' value='Win64'/>
             <upi_element name='level'>
               <upi_attribute name='name' value='build'/>
-              <upi_attribute name='id' value='2.16.3' />
+              <upi_attribute name='id' value='2.16.4' />
             </upi_element>
           </upi_element>
         </upi_element>
 
@@ -1112,7 +1112,14 @@ internal CustomNodeWorkspaceModel Collapse(
                     currentWorkspace.RemoveGroup(group);
 
                     group.GUID = Guid.NewGuid();
-                    group.Nodes = group.DeletedModelBases;
+                    group.Nodes = group.Nodes.Concat(group.DeletedModelBases);
+                    //for nested groups
+                    //if any of the previously added annotations has a DeletedModelBases with the same group as the current one, then add it to the Nodes
+                    var nestedGroup = newAnnotations.FirstOrDefault(x => x.DeletedModelBases.OfType<AnnotationModel>().Any(y => y.GUID == group.GUID));
+                    if (nestedGroup != null)
+                    {
+                        nestedGroup.Nodes = nestedGroup.Nodes.Append(group);
+                    }
                     newAnnotations.Add(group);
                 }
 
 
@@ -12,6 +12,10 @@
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="UI\Images\TitleBarButtons\close-darktheme-disabled-16px.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="UI\Images\AboutWindow\logo_about_dark.png" />
     <None Remove="UI\Images\Alignment\align_bottom.png" />
@@ -818,6 +822,7 @@
     <Resource Include="UI\Images\NodeStates\hidden-64px.png" />
     <Resource Include="UI\Images\NodeStates\info-64px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-darktheme-default-16px.png" />
+    <Resource Include="UI\Images\TitleBarButtons\close-darktheme-disabled-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-lighttheme-default-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-lighttheme-hover-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\max-darktheme-default-16px.png" />
 
@@ -118,7 +118,7 @@ internal void Initialize()
             guideBackgroundElement.ClearCutOffSection();
             guideBackgroundElement.ClearHighlightSection();
             stopwatch = Stopwatch.StartNew();
-    }
+        }
 
         /// <summary>
         /// Creates the background for the GuidedTour
@@ -239,10 +239,10 @@ internal void ExitTour()
                 {
                     Logging.Analytics.TrackEvent(Logging.Actions.Completed, Logging.Categories.GuidedTourOperations, guidName, currentGuide.CurrentStep.Sequence);
                 }
-                else 
+                else
                 {
                     Logging.Analytics.TrackEvent(Logging.Actions.End, Logging.Categories.GuidedTourOperations, guidName, currentGuide.CurrentStep.Sequence);
-                }                
+                }
                 Logging.Analytics.TrackTimedEvent(Logging.Categories.GuidedTourOperations, Logging.Actions.TimeElapsed.ToString(), stopwatch.Elapsed, guidName);
 
                 currentGuide.ClearGuide();
@@ -332,7 +332,7 @@ private void CreateGuideSteps(string jsonFile)
                 totalTooltips = (from step in guide.GuideSteps
                                  where step.StepType == Step.StepTypes.TOOLTIP ||
                                        step.StepType == Step.StepTypes.SURVEY
-                                 select step).GroupBy(x=>x.Sequence).Count();
+                                 select step).GroupBy(x => x.Sequence).Count();
 
                 foreach (Step step in guide.GuideSteps)
                 {
@@ -458,7 +458,7 @@ private Step CreateStep(Step jsonStepInfo, HostControlInfo hostControlInfo, int
                         }
                     };
                     var popupWindow = newStep.stepUIPopup as PopupWindow;
-                    if(popupWindow != null && hostControlInfo.HtmlPage != null && !string.IsNullOrEmpty(hostControlInfo.HtmlPage.FileName))
+                    if (popupWindow != null && hostControlInfo.HtmlPage != null && !string.IsNullOrEmpty(hostControlInfo.HtmlPage.FileName))
                     {
                         popupWindow.WebBrowserUserDataFolder = userDataFolder != null ? userDataFolder.FullName : string.Empty;
                     }
@@ -523,7 +523,7 @@ private void Popup_StepClosed(string name, Step.StepTypes stepType)
             GuideFlowEvents.OnGuidedTourFinish(currentGuide.Name);
 
             //The exit tour popup will be shown only when a popup (doesn't apply for survey) is closed or when the tour is closed. 
-            if(stepType != Step.StepTypes.SURVEY)
+            if (stepType != Step.StepTypes.SURVEY)
                 CreateRealTimeInfoWindow(Res.ExitTourWindowContent);
         }
 
@@ -540,10 +540,7 @@ internal void CreateRealTimeInfoWindow(string content, bool stayOpen = false)
             UIElement hostUIElement = GuideUtilities.FindChild(mainRootElement, "statusBarPanel");
 
             // When popup already exist, replace it
-            if ( exitTourPopup != null && exitTourPopup.IsOpen)
-            {
-                exitTourPopup.IsOpen = false;
-            }
+            CloseRealTimeInfoWindow();
             // Otherwise creates the RealTimeInfoWindow popup and set up all the needed values
             // to show the popup over the Dynamo workspace
             exitTourPopup = new RealTimeInfoWindow()
@@ -559,5 +556,16 @@ internal void CreateRealTimeInfoWindow(string content, bool stayOpen = false)
                 exitTourPopup.PlacementTarget = hostUIElement;
             exitTourPopup.IsOpen = true;
         }
+
+        /// <summary>
+        /// Closes the exitTourPopup if exist and it's open
+        /// </summary>
+        internal void CloseRealTimeInfoWindow()
+        {
+            if (exitTourPopup != null && exitTourPopup.IsOpen)
+            {
+                exitTourPopup.IsOpen = false;
+            }
+        }
     }
 }
@@ -156,13 +156,18 @@ internal static void ExecuteClosePackagesSearch(Step stepInfo, StepUIAutomation
                     {
                         CloseButtonSearchPackages = GuideUtilities.FindChild(ownedWindow, handler.HandlerElement) as Button;
                         CloseButtonSearchPackages.Click += CloseButton_Click;
+                        CloseButtonSearchPackages.IsEnabled = false;
                     }
                 }
             }
             else
             {
                 if (CloseButtonSearchPackages != null)
+                {
+                    CloseButtonSearchPackages.IsEnabled = true;
                     CloseButtonSearchPackages.Click -= CloseButton_Click;
+                    CloseButtonSearchPackages = null;
+                }
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-DYNAMO v.2.16.3 © 2022 Autodesk, Inc. All rights reserved.`
	`1`	`+DYNAMO v.2.16.4 © 2022 Autodesk, Inc. All rights reserved.`
`2`	`2`	`Dynamo License`
`3`	`3`
`4`	`4`	`Those portions created by Ian are provided with the following copyright:`
Original file line number	Diff line number	Diff line change
`@@ -156,13 +156,18 @@ internal static void ExecuteClosePackagesSearch(Step stepInfo, StepUIAutomation`
`156`	`156`	`{`
`157`	`157`	`CloseButtonSearchPackages = GuideUtilities.FindChild(ownedWindow, handler.HandlerElement) as Button;`
`158`	`158`	`CloseButtonSearchPackages.Click += CloseButton_Click;`
	`159`	`+ CloseButtonSearchPackages.IsEnabled = false;`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`	`}`
`162`	`163`	`else`
`163`	`164`	`{`
`164`	`165`	`if (CloseButtonSearchPackages != null)`
	`166`	`+ {`
	`167`	`+ CloseButtonSearchPackages.IsEnabled = true;`
`165`	`168`	`CloseButtonSearchPackages.Click -= CloseButton_Click;`
	`169`	`+ CloseButtonSearchPackages = null;`
	`170`	`+ }`
`166`	`171`	`}`
`167`	`172`	`}`
`168`	`173`