Insert Changes (#13705)

dnenov · web-flow · commit ce7388971cad · 2023-01-31T13:06:53.000-05:00
- added Insert dialog box title to resources, changed the text
- added insert run mode change notification to resources
- change the Toast type (now disappears on the next mouseclick)
- change the order in which Insert is done and the mode is changed, i.e. mode would change only if a graph has been inserted
diff --git a/src/DynamoCore/Properties/Resources.Designer.cs b/src/DynamoCore/Properties/Resources.Designer.cs
diff --git a/src/DynamoCore/Properties/Resources.en-US.resx b/src/DynamoCore/Properties/Resources.en-US.resx
@@ -893,4 +893,10 @@ This package likely contains an assembly that is blocked. You will need to load
   <data name="FailedInsertFileNodeExistNotification" xml:space="preserve">
     <value>Failed to insert the file as some of the nodes already exist in the current worspace.</value>
   </data>
-</root>
+  <data name="InsertDialogBoxText" xml:space="preserve">
+    <value>Insert Dynamo Definition...</value>
+  </data>
+  <data name="InsertGraphRunModeNotificationText" xml:space="preserve">
+    <value>Example file added to workspace. Run mode changed to Manual.</value>
+  </data>
+</root>
diff --git a/src/DynamoCore/Properties/Resources.resx b/src/DynamoCore/Properties/Resources.resx
@@ -896,4 +896,10 @@ This package likely contains an assembly that is blocked. You will need to load
   <data name="FailedInsertFileNodeExistNotification" xml:space="preserve">
     <value>Failed to insert the file as some of the nodes already exist in the current worspace.</value>
   </data>
-</root>
+  <data name="InsertDialogBoxText" xml:space="preserve">
+    <value>Insert Dynamo Definition...</value>
+  </data>
+  <data name="InsertGraphRunModeNotificationText" xml:space="preserve">
+    <value>Example file added to workspace. Run mode changed to Manual.</value>
+  </data>
+</root>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -1819,7 +1819,7 @@ private void model_ComputeModelDeserialized()
         /// <param name="notification"></param>
         private void model_RequestNotification(string notification)
         {
-            this.MainGuideManager.CreateRealTimeInfoWindow(notification, true);
+            this.MainGuideManager.CreateRealTimeInfoWindow(notification);
         }
 
         /// <summary>
@@ -1893,7 +1893,7 @@ private void ShowInsertDialogAndInsertResult(object parameter)
                 Filter = string.Format(Resources.FileDialogDynamoDefinitions,
                          BrandingResourceProvider.ProductName, fileExtensions) + "|" +
                          string.Format(Resources.FileDialogAllFiles, "*.*"),
-                Title = string.Format("Insert Title (Replace)", BrandingResourceProvider.ProductName)
+                Title = string.Format(Properties.Resources.InsertDialogBoxText, BrandingResourceProvider.ProductName)
             };
 
             // if you've got the current space path, use it as the inital dir
@@ -1921,17 +1921,17 @@ private void ShowInsertDialogAndInsertResult(object parameter)
                     _fileDialog.InitialDirectory = path;
             }
 
-            if (HomeSpace.RunSettings.RunType != RunType.Manual)
-            {
-                MainGuideManager.CreateRealTimeInfoWindow("Example file added to workspace. Run mode changed to Manual.", true);
-                HomeSpace.RunSettings.RunType = RunType.Manual;
-            }
-
             if (_fileDialog.ShowDialog() == DialogResult.OK)
             {
                 if (CanOpen(_fileDialog.FileName))
                 {
                     Insert(new Tuple<string, bool>(_fileDialog.FileName, _fileDialog.RunManualMode));
+
+                    if (HomeSpace.RunSettings.RunType != RunType.Manual)
+                    {
+                        MainGuideManager.CreateRealTimeInfoWindow(Properties.Resources.InsertGraphRunModeNotificationText);
+                        HomeSpace.RunSettings.RunType = RunType.Manual;
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1819,7 +1819,7 @@ private void model_ComputeModelDeserialized()`
`1819`	`1819`	`/// <param name="notification"></param>`
`1820`	`1820`	`private void model_RequestNotification(string notification)`
`1821`	`1821`	`{`
`1822`		`- this.MainGuideManager.CreateRealTimeInfoWindow(notification, true);`
	`1822`	`+ this.MainGuideManager.CreateRealTimeInfoWindow(notification);`
`1823`	`1823`	`}`
`1824`	`1824`
`1825`	`1825`	`/// <summary>`
`@@ -1893,7 +1893,7 @@ private void ShowInsertDialogAndInsertResult(object parameter)`
`1893`	`1893`	`Filter = string.Format(Resources.FileDialogDynamoDefinitions,`
`1894`	`1894`	`BrandingResourceProvider.ProductName, fileExtensions) + "\|" +`
`1895`	`1895`	`string.Format(Resources.FileDialogAllFiles, "."),`
`1896`		`- Title = string.Format("Insert Title (Replace)", BrandingResourceProvider.ProductName)`
	`1896`	`+ Title = string.Format(Properties.Resources.InsertDialogBoxText, BrandingResourceProvider.ProductName)`
`1897`	`1897`	`};`
`1898`	`1898`
`1899`	`1899`	`// if you've got the current space path, use it as the inital dir`
`@@ -1921,17 +1921,17 @@ private void ShowInsertDialogAndInsertResult(object parameter)`
`1921`	`1921`	`_fileDialog.InitialDirectory = path;`
`1922`	`1922`	`}`
`1923`	`1923`
`1924`		`- if (HomeSpace.RunSettings.RunType != RunType.Manual)`
`1925`		`- {`
`1926`		`- MainGuideManager.CreateRealTimeInfoWindow("Example file added to workspace. Run mode changed to Manual.", true);`
`1927`		`- HomeSpace.RunSettings.RunType = RunType.Manual;`
`1928`		`- }`
`1929`		`-`
`1930`	`1924`	`if (_fileDialog.ShowDialog() == DialogResult.OK)`
`1931`	`1925`	`{`
`1932`	`1926`	`if (CanOpen(_fileDialog.FileName))`
`1933`	`1927`	`{`
`1934`	`1928`	`Insert(new Tuple<string, bool>(_fileDialog.FileName, _fileDialog.RunManualMode));`
	`1929`	`+`
	`1930`	`+ if (HomeSpace.RunSettings.RunType != RunType.Manual)`
	`1931`	`+ {`
	`1932`	`+ MainGuideManager.CreateRealTimeInfoWindow(Properties.Resources.InsertGraphRunModeNotificationText);`
	`1933`	`+ HomeSpace.RunSettings.RunType = RunType.Manual;`
	`1934`	`+ }`
`1935`	`1935`	`}`
`1936`	`1936`	`}`
`1937`	`1937`	`}`