B2025-030 Show Cannot restore wording if restoring Annotation with a deleted annotation type.

good for testing phase

PROMS/Formats/frmFormatCopy.Designer.cs

@@ -35,6 +35,7 @@ namespace Formats
 			this.buttonX2 = new DevComponents.DotNetBar.ButtonX();
 			this.labelX2 = new DevComponents.DotNetBar.LabelX();
 			this.LstBxExcludeFiles = new DevComponents.DotNetBar.ListBoxAdv();
+			this.cbIncludeDemoFormats = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.SuspendLayout();
 			// 
 			// txbxPROMSFormatsPath
@@ -131,11 +132,26 @@ namespace Formats
 			this.LstBxExcludeFiles.TabIndex = 6;
 			this.LstBxExcludeFiles.Text = "listBoxAdv1";
 			// 
+			// cbIncludeDemoFormats
+			// 
+			// 
+			// 
+			// 
+			this.cbIncludeDemoFormats.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.cbIncludeDemoFormats.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbIncludeDemoFormats.Location = new System.Drawing.Point(43, 156);
+			this.cbIncludeDemoFormats.Name = "cbIncludeDemoFormats";
+			this.cbIncludeDemoFormats.Size = new System.Drawing.Size(160, 23);
+			this.cbIncludeDemoFormats.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2010;
+			this.cbIncludeDemoFormats.TabIndex = 7;
+			this.cbIncludeDemoFormats.Text = "Include Demo Formats";
+			// 
 			// frmFormatCopy
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.ClientSize = new System.Drawing.Size(496, 191);
+			this.Controls.Add(this.cbIncludeDemoFormats);
 			this.Controls.Add(this.LstBxExcludeFiles);
 			this.Controls.Add(this.labelX2);
 			this.Controls.Add(this.buttonX2);
@@ -158,6 +174,7 @@ namespace Formats
 		private DevComponents.DotNetBar.ButtonX buttonX2;
 		private DevComponents.DotNetBar.LabelX labelX2;
 		private DevComponents.DotNetBar.ListBoxAdv LstBxExcludeFiles;
+		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeDemoFormats;
 	}
 }
 

PROMS/Formats/frmFormatCopy.cs

@@ -96,13 +96,17 @@ namespace Formats
 			if (!txbxPROMSFormatsPath.Text.EndsWith(@"\")) txbxPROMSFormatsPath.Text += @"\";
 		}
 
-		public string[] excludeThese = { "WPS", "WPB", "VCBEPP" };
-
+		// Added a PROMSDemo to the list of excluded format files
+		public string[] excludeThese = { "WPS", "WPB", "VCBEPP", "PROMSDemo" };
+		
+		// Added logic to support in inclusion of the PROMSDemo formats if the checkbox on the
+		// dialog is check
 		private bool ExcludeFromCopy(string fn)
 		{
 			// don't copy formats whos file name starts with..
 			foreach (string excludeThis in excludeThese)
-				if (fn.ToUpper().StartsWith(excludeThis)) return true;
+				if (fn.ToUpper().StartsWith(excludeThis) 
+					&& !(cbIncludeDemoFormats.Checked && fn.ToUpper().StartsWith("PROMSDEMO"))) return true;
 			return false;
 		}
 
@@ -161,5 +165,5 @@ namespace Formats
 			Application.Exit();
 		}
 
-}
+	}
 }

PROMS/Volian.Controls.Library/DisplayHistory.cs

@@ -897,11 +897,7 @@ namespace Volian.Controls.Library
 					// B2023-072: Don't crash if annotation type was deleted for the restore annotation
 					if (ai == null)
 					{
-						AnnotationTypeInfo ati = AnnotationTypeInfo.Get(aai.TypeID);
-						if (ati == null)
-						{
-							FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-						}
+						FlexibleMessageBox.Show(this, "Annotation Type was deleted, cannot restore Annotation Type\r\nCopy text from window in Change Details and paste into new annotation to restore the text.", "Annotation Type Deleted", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 						return;
 					}
 					OnAnnotationRestored(ai, ai.MyItem);

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -2074,7 +2074,6 @@ namespace Volian.Controls.Library
 				case "Paste Procedure After":
 				case "Paste Section":
 				case "Paste Section Before":
-				case "Replace Existing Section":
 				case "Paste Section After":
 				case "Paste Step":
 				case "Paste Step Before":
@@ -2083,8 +2082,18 @@ namespace Volian.Controls.Library
 				case "Paste Subsection":
 					tv_NodePaste(mi.Text);
 					break;
+				case "Replace Existing Section":
+					//C2025-032 - Add check if user is sure want to paste replace section
+					DialogResult ovewriteExPS = FlexibleMessageBox.Show("This will overwrite the selected section with the one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the section?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+
+					if (ovewriteExPS == DialogResult.Cancel) break;
+					else
+					{
+						tv_NodePaste(mi.Text);
+						break;
+					}
 				case "Replace Existing Procedure":
-					DialogResult ovewriteEx = FlexibleMessageBox.Show("This will overwrite the selected procedure with then one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the procedure?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
+					DialogResult ovewriteEx = FlexibleMessageBox.Show("This will overwrite the selected procedure with the one you copied, would you like to overwrite it?\r\n\r\nSelecting 'Cancel' will cancel the paste action.", "Overwrite the procedure?", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);// == DialogResult.Yes;
 
 					if (ovewriteEx == DialogResult.Cancel) break;
 					else