B2025-004 Remove dependency on stored procedure (GetDisplayTabdata).

ready for testing phase

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/AssemblyInfo.cs

@@ -23,8 +23,8 @@ using System.Runtime.CompilerServices;
 //      Build YYMM (two digit year, two digit month)
 //      Revision DHH (day - no leading zero, two digit hour - military time
 //
-[assembly: AssemblyVersion("2.3.2404.1611")]
-[assembly: AssemblyFileVersion("2.3.2404.1611")]
+[assembly: AssemblyVersion("2.3.2410.907")]
+[assembly: AssemblyFileVersion("2.3.2410.907")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -91,6 +91,8 @@ using System.Runtime.CompilerServices;
 
 
 
+
+
 
 
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldCombFrm.cs

@@ -377,6 +377,7 @@ namespace ROEditor
 			this.btnOK.TabIndex = 3;
 			this.btnOK.Text = "OK";
 			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
 			// 
 			// btnCancel
 			// 
@@ -553,6 +554,7 @@ namespace ROEditor
 			// update the local/internal copy of the schema.
 			if (success != true)
 			{
+				this.DialogResult = DialogResult.Cancel;
 				return; // DO YET process an error.
 			}
 			else		 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTextFrm.cs

@@ -266,6 +266,7 @@ namespace ROEditor
 
 			if (success != true)
 			{
+				this.DialogResult = DialogResult.Cancel;
 				return; // DO YET process an error.
 			}
 			else		 
@@ -367,6 +368,7 @@ namespace ROEditor
 			// 
 			// btnOK
 			// 
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
 			this.btnOK.Location = new System.Drawing.Point(216, 72);
 			this.btnOK.Name = "btnOK";
 			this.btnOK.Size = new System.Drawing.Size(88, 24);

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/FieldTypeDefFrm.cs

@@ -220,6 +220,7 @@ namespace ROEditor
 				return;
 			}
 
+			string origFieldName = myrof.GetFieldname;
 			myrof.SetFieldname(this.tbFieldName.Text);
 			uint ftype=0;
 			if (this.rbSingleLine.Checked == true) 
@@ -247,6 +248,7 @@ namespace ROEditor
 			
 				if (success != true)
 				{
+					this.DialogResult = DialogResult.Cancel;
 					return; // DO YET process an error.
 				}
 				return;
@@ -270,7 +272,9 @@ namespace ROEditor
 			}
 			myrof.SetFieldType(ftype);
 			FieldTextFrm ftxt = new FieldTextFrm(myrof, myrodb, myelem, original_type, editlevel, origname, avlist, iulist);
-			ftxt.ShowDialog();
+			if (ftxt.ShowDialog() == DialogResult.Cancel)
+				myrof.SetFieldname(origFieldName);
+
 			this.Close();
 		}
 		#region Windows Form Designer generated code

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/GroupDefFrm.cs

@@ -100,6 +100,7 @@ using System.Text;
 using RODBInterface;
 using ROFields;
 using VlnStatus;
+using System.Linq;
 
 namespace ROEditor
 {
@@ -245,6 +246,37 @@ namespace ROEditor
 				return CvtFldToUserFld(origGroup);
 			}
 		}
+
+		//CSM C2024-023
+		//Part of 2024 PROMS Upgrades
+		//When the Overall Form is activated
+		//if there are any items that are Fields that are in use
+		//add them as auto-complete options to the
+		//Accessory Page Access - Value Textbox
+		//Typing < will bring up the auto-complete options
+		protected void tbValue_AddAutoComplete(object sender, EventArgs e)
+		{
+            string dummy = "";  // need for RODB_GetFIeldsInUse call, won't be used.
+            ArrayList AvailList, InUseList;
+            //first see if it is a valid 'InUse' Field.
+            AvailList = myrodb.RODB_GetFields(elem, (uint)RecordType.Schema);
+            InUseList = myrodb.RODB_GetFieldsInUse(elem, AvailList, "FieldsInUse", ref dummy, false);
+
+			//if any ROField items are in use, 
+			//use LINQ to get a string array of the FieldNames
+			if (InUseList.Count > 0)
+			{
+				string[] InUseListFieldNames = InUseList.OfType<ROField>().Select(x => $"<{x.GetFieldname}>").ToArray();
+				AutoCompleteStringCollection allowedTypes = new AutoCompleteStringCollection();
+				allowedTypes.AddRange(InUseListFieldNames);
+				tbValue.AutoCompleteCustomSource = allowedTypes;
+				tbValue.AutoCompleteMode = AutoCompleteMode.Suggest;
+				tbValue.AutoCompleteSource = AutoCompleteSource.CustomSource;
+
+			}
+
+        }
+
 		private void FillInData()
 		{
 			this.tbGroup.Text = DetermineGroupName();
@@ -401,6 +433,7 @@ namespace ROEditor
 			// 
 			// btnOK
 			// 
+			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
 			this.btnOK.Location = new System.Drawing.Point(24, 248);
 			this.btnOK.Name = "btnOK";
 			this.btnOK.Size = new System.Drawing.Size(144, 24);
@@ -432,6 +465,7 @@ namespace ROEditor
 			this.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
 			this.Name = "GroupDefFrm";
 			this.Text = "Group Definition";
+			this.Activated += new EventHandler(tbValue_AddAutoComplete);
 			this.groupBox1.ResumeLayout(false);
 			this.ResumeLayout(false);
 

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/RODefFrm.cs

@@ -188,23 +188,23 @@ namespace ROEditor
 				lboxInUse.Visible = true;
 				lb_chkApplc.Visible = false;
 			}
-			if (editlevel==(uint)RecordType.GroupSchema)this.Text = "Subgroup Definition";
+			if (editlevel == (uint)RecordType.GroupSchema) this.Text = "Subgroup Definition";
 			FillInData(grptxt);
 		}
 
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
-		protected override void Dispose( bool disposing )
+		protected override void Dispose(bool disposing)
 		{
-			if( disposing )
+			if (disposing)
 			{
-				if(components != null)
+				if (components != null)
 				{
 					components.Dispose();
 				}
 			}
-			base.Dispose( disposing );
+			base.Dispose(disposing);
 		}
 
 		private void FillInAvailable()
@@ -212,9 +212,9 @@ namespace ROEditor
 			ROField rof;
 
 			// put the items in the AvailList box.
-			for (int i=0; i< AvailList.Count; i++)
+			for (int i = 0; i < AvailList.Count; i++)
 			{
-				rof = (ROField) AvailList[i];
+				rof = (ROField)AvailList[i];
 				if (rof.GetFieldname != null)   // DO YET: Why null?
 					this.lboxAvail.Items.Add(rof.GetFieldname);
 			}
@@ -297,7 +297,7 @@ namespace ROEditor
 					else
 						parent = null;
 				}
-				if (menuitm !="")
+				if (menuitm != "")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
@@ -310,21 +310,21 @@ namespace ROEditor
 				this.lblRetVal.Visible = true;
 				VlnXmlElement parent;
 				parent = (VlnXmlElement) elem.ParentNode;
-				while (parent != null && (menuitm == "" || retval==""))
+				while (parent != null && (menuitm == "" || retval == ""))
 				{
 					// walk up tree to get parent and check for data there
 					if (menuitm == "") menuitm = parent.GetAttribute("MenuItem");
 					if (retval == "") retval = parent.GetAttribute("RetVal");
 					if (parent.Name != "RO_Root")
-						parent = (VlnXmlElement) parent.ParentNode;
+						parent = (VlnXmlElement)parent.ParentNode;
 					else
 						parent = null;
 				}
-				if (menuitm!="")
+				if (menuitm != "")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
-				if (retval!="")
+				if (retval != "")
 					this.tbRetVal.Text = CvtFldToUserFld(retval);
 				else
 					this.tbRetVal.Text = "";
@@ -344,24 +344,27 @@ namespace ROEditor
 
 			lboxAvail.GotFocus += new EventHandler(this.lboxAvail_GotFocus);
 
+			lboxInUse.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUse_MouseUp);
+			lboxInUseCB.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUseCB_MouseUp);
+
 			// save copies of local data, so if there is a change, we know we must save them.
-			origRetVal=this.tbRetVal.Text;
-			origMenuItem=this.tbMenuVal.Text;
+			origRetVal = this.tbRetVal.Text;
+			origMenuItem = this.tbMenuVal.Text;
 
 			// if this is a database level definition & it's a user defined database,
 			// the okay button is disabled until a field is used.
-			if (elem.ParentNode.Name == "RO_Root" && dbtype==3)
+			if (elem.ParentNode.Name == "RO_Root" && dbtype == 3)
 			{
 				string attr;
-				if (editlevel==(uint)RecordType.Schema)
+				if (editlevel == (uint)RecordType.Schema)
 					attr = elem.GetAttribute("FieldsInUse");
 				else
 					attr = elem.GetAttribute("GroupFieldsInUse");
-				if (attr==null || attr=="") btnOK.Enabled=false;
+				if (attr == null || attr == "") btnOK.Enabled = false;
 			}
 		}
 
-		protected void lboxInUse_GotFocus (object sender, EventArgs e)
+		protected void lboxInUse_GotFocus(object sender, EventArgs e)
 		{
 			lboxAvail.ClearSelected();
 			this.btnRemove.Enabled = true;
@@ -375,7 +378,7 @@ namespace ROEditor
 			this.btnAdd.Enabled = false;
 			this.btnEdit.Enabled = true;
 		}
-		protected void lboxAvail_GotFocus (object sender, EventArgs e)
+		protected void lboxAvail_GotFocus(object sender, EventArgs e)
 		{
 			if (PCApplicabilityEnabled)
 				lboxInUseCB.ClearSelected();
@@ -385,6 +388,103 @@ namespace ROEditor
 			this.btnRemove.Enabled = false;
 			this.btnEdit.Enabled = true;
 		}
+
+		//CSM C2024-024
+		//Simple Selection of Fields to add to Return Values and Menu Values.
+		//Part of 2024 PROMS Upgrades
+		//Add Context Menu for In Use Listbox
+		//Will allow user to right click Selected Items
+		//and add then to the Return Value / Menu Value Text Boxes
+		//without re-typing them
+		protected void lboxInUse_MouseUp(object sender, MouseEventArgs e)
+		{
+			if (e.Button == MouseButtons.Right && lboxInUse.SelectedItems.Count > 0)
+			{
+				ContextMenuStrip cn = new ContextMenuStrip();
+				if (tbRetVal.Visible)
+				{
+					var AddToReturnItem = new ToolStripMenuItem("Add to Return Value");
+					AddToReturnItem.Click += new EventHandler(lboxInUse_Click);
+					AddToReturnItem.Name = "Add to Return Value";
+					cn.Items.Add(AddToReturnItem);
+				}
+				var AddToMenuItem = new ToolStripMenuItem("Add to Menu Value");
+				AddToMenuItem.Click += new EventHandler(lboxInUse_Click);
+				AddToMenuItem.Name = "Add to Menu Value";
+				cn.Items.Add(AddToMenuItem);
+				this.lboxInUse.ContextMenuStrip = cn;
+				cn.Show(Control.MousePosition.X, Control.MousePosition.Y);
+			}
+		}
+		private void lboxInUse_Click(object sender, EventArgs e)
+		{
+			switch (((ToolStripMenuItem)sender).Name)
+			{
+				case "Add to Return Value":
+					if (tbRetVal.Text == "")
+						tbRetVal.Text += $"<{lboxInUse.SelectedItem}>";
+					else
+						tbRetVal.Text += $" - <{lboxInUse.SelectedItem}>";
+					break;
+				case "Add to Menu Value":
+					if (tbMenuVal.Text == "")
+						tbMenuVal.Text += $"<{lboxInUse.SelectedItem}>";
+					else
+						tbMenuVal.Text += $" - <{lboxInUse.SelectedItem}>";
+					break;
+
+			}
+		}
+
+		//CSM C2024-024
+		//Simple Selection of Fields to add to Return Values and Menu Values.
+		//Part of 2024 PROMS Upgrades
+		//Add Context Menu for In Use ComboBox
+		//(Replaces In Use Listbox when Applicability
+		//to allow for selection of items per Unit)
+		//Will allow user to right click Selected Items
+		//and add then to the Return Value / Menu Value Text Boxes
+		//without re-typing them
+		protected void lboxInUseCB_MouseUp(object sender, MouseEventArgs e)
+		{
+			if (e.Button == MouseButtons.Right && lboxInUseCB.SelectedItems.Count > 0)
+			{
+				ContextMenuStrip cn = new ContextMenuStrip();
+				if (tbRetVal.Visible)
+				{
+					var AddToReturnItem = new ToolStripMenuItem("Add to Return Value");
+					AddToReturnItem.Click += new EventHandler(lboxInUseCB_Click);
+					AddToReturnItem.Name = "Add to Return Value";
+					cn.Items.Add(AddToReturnItem);
+				}
+				var AddToMenuItem = new ToolStripMenuItem("Add to Menu Value");
+				AddToMenuItem.Click += new EventHandler(lboxInUseCB_Click);
+				AddToMenuItem.Name = "Add to Menu Value";
+				cn.Items.Add(AddToMenuItem);
+				this.lboxInUseCB.ContextMenuStrip = cn;
+				cn.Show(Control.MousePosition.X, Control.MousePosition.Y);
+			}
+		}
+		private void lboxInUseCB_Click(object sender, EventArgs e)
+		{
+			switch (((ToolStripMenuItem)sender).Name)
+            {
+				case "Add to Return Value":
+					if (tbRetVal.Text == "")
+						tbRetVal.Text += $"<{lboxInUseCB.SelectedItem}>";
+                    else
+						tbRetVal.Text += $" - <{lboxInUseCB.SelectedItem}>";
+					break;
+				case "Add to Menu Value":
+					if (tbMenuVal.Text == "")
+						tbMenuVal.Text += $"<{lboxInUseCB.SelectedItem}>";
+					else
+                        tbMenuVal.Text += $" - <{lboxInUseCB.SelectedItem}>";
+                    break;
+
+			}
+		}
+
 		private void btnRemove_Click(object sender, System.EventArgs e)
 		{
 			//get item in lboxInUse (in use list) and remove it from there
@@ -404,7 +504,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(copyrof.GetFieldname);
+					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -427,7 +527,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(copyrof.GetFieldname);
+					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -455,7 +555,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUseCB.Items.Add(copyrof.GetFieldname);
+					lboxInUseCB.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUseCB.Refresh();
@@ -477,7 +577,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUse.Items.Add(copyrof.GetFieldname);
+					lboxInUse.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUse.Refresh();
@@ -640,12 +740,13 @@ namespace ROEditor
 							{
 								ROField rof = (ROField) InUseList[i];
 								rofname = rof.GetFieldname;
-								if (inusename == rofname)
+								if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
 								{
 									found = true;
 									break;
 								}
 							}
+							if (inusename == "u") found = true; //to handle unit designation
 							if (found == false)syntax(inusename+" invalid field name",strt,where);
 							// used to have procini def stuff here.
 							start=where+1;
@@ -745,7 +846,7 @@ namespace ROEditor
 				{
 					ROField rof = (ROField) InUseList[i];
 					rofname = rof.GetFieldname;
-					if (inusename == rofname)
+					if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
 					{
 						found = true;
 						break;
@@ -1097,6 +1198,7 @@ namespace ROEditor
 				}
 			}
 
+			string origname = CvtFldToUserFld(rof.GetFieldname);
 			uint ftype = rof.GetFieldType;
 			if (ftype == (uint)FieldTypes.FrmtSingleTxt || ftype == (uint)FieldTypes.VariableTxt ||
 				ftype == (uint)FieldTypes.SingleTxt || ftype == (uint)FieldTypes.Table || 
@@ -1112,6 +1214,10 @@ namespace ROEditor
 				nwcomb.ShowDialog();
 			}
 
+			//need to refresh pull from table for fields in use.
+			_ = myrodb.RODB_GetFields(elem, 0, true);
+			string newname = CvtFldToUserFld(rof.GetFieldname);
+
 			// Update Lists & Text boxes to represent any modified text.
 			if (isInSelList)
 			{
@@ -1125,20 +1231,31 @@ namespace ROEditor
 					rof = (ROField) InUseList[i];
 					if (rof.GetFieldname != null)
 					{
+						string fieldname = CvtFldToUserFld(rof.GetFieldname);
+
 						// C2021-026 if doing Parent/Child enabled RO Editor, put the In Use fields in the Check Box List instead of the normal list
 						if (PCApplicabilityEnabled)
 						{
-							this.lboxInUseCB.Items.Add(rof.GetFieldname);
+							this.lboxInUseCB.Items.Add(fieldname);
 							if (rof.FieldTypeCanDoApplicability())
 							{
 								if (ContainedInUseApplicList(rof))
-									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(rof.GetFieldname), CheckState.Checked);
+									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(fieldname), CheckState.Checked);
 							}
 						}
 						else
-							this.lboxInUse.Items.Add(rof.GetFieldname);
+							this.lboxInUse.Items.Add(fieldname);
 					}
 				}
+
+				if (origname != newname)
+				{
+					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname}>", $"<{newname}>");
+					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname}>", $"<{newname}>");
+					//CSM-C2024-035 This is needed for items like Setpoint Value that may have commas with field lengths in them
+					tbMenuVal.Text = tbMenuVal.Text.Replace($"<{origname},", $"<{newname},");
+					tbRetVal.Text = tbRetVal.Text.Replace($"<{origname},", $"<{newname},");
+				}
 			}
 			else 
 			{
@@ -1148,7 +1265,7 @@ namespace ROEditor
 				{
 					rof = (ROField) AvailList[i];
 					if (rof.GetFieldname != null)
-						this.lboxAvail.Items.Add(rof.GetFieldname);
+						this.lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
 				}
 			}
 		}
@@ -1162,8 +1279,11 @@ namespace ROEditor
 			if (rof.GetFieldname != null)
 			{
 				AvailList.Add(rof);
-				lboxAvail.Items.Add(rof.GetFieldname);
+				lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
 			}
+
+            //need to refresh pull from table for fields in use.
+            _ = myrodb.RODB_GetFields(elem, 0, true);
 		}
 		// C2021-026 Check/un-check field for Parent/Child values
 		private void lboxInUseCB_ItemCheck(object sender, ItemCheckEventArgs e)
@@ -1397,6 +1517,7 @@ namespace ROEditor
 			this.btnCancel.Size = new System.Drawing.Size(80, 24);
 			this.btnCancel.TabIndex = 10;
 			this.btnCancel.Text = "Cancel";
+
 			// 
 			// RODefFrm
 			// 
@@ -1419,6 +1540,71 @@ namespace ROEditor
 			this.PerformLayout();
 
 		}
+
+		//if User clicked save (DialogResult.OK) close the form
+		//if use did not click save, ask if they are sure they want to close the form
+		//only close if they say "Yes, they want to"
+		protected override void OnFormClosing(FormClosingEventArgs e)
+		{
+			if (this.DialogResult != System.Windows.Forms.DialogResult.OK && IsPendingChange() && !CloseCancel())
+			{
+				e.Cancel = true;
+			}
+		}
+
+		public static bool CloseCancel()
+		{
+			const string message = "Are you sure that you would like to cancel? Information may not be saved.";
+			const string caption = "Cancel";
+			var result = MessageBox.Show(message, caption,
+										 MessageBoxButtons.YesNo,
+										 MessageBoxIcon.Question);
+
+            return result == DialogResult.Yes;
+        }
+
+		//return true if a field has been modified
+		private bool IsPendingChange()
+		{
+			if (origRetVal != this.tbRetVal.Text)
+				return true;
+			
+			if (origMenuItem != this.tbMenuVal.Text)
+				return true;
+
+			// check if in use records have changed
+			string inuserecs = null;
+			ROField rof;
+			for (int i = 0; i < InUseList.Count; i++)
+			{
+				rof = (ROField)InUseList[i];
+				if (rof.GetFieldname != null)   //DO YET: why null?
+				{
+					inuserecs = inuserecs + rof.GetRecID;
+					if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
+				}
+			}
+			if (inuserecs != origFieldsInUse)
+				return true;
+
+
+			//check if applicability fields have changed
+			string applicfieldrecs = null;
+			for (int i = 0; i < InUseApplcList.Count; i++)
+			{
+				rof = (ROField)InUseApplcList[i];
+				if (rof.GetFieldname != null)
+				{
+					applicfieldrecs = applicfieldrecs + rof.GetRecID;
+					if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
+				}
+			}
+			if (applicfieldrecs != origApplicFields)
+				return true;
+
+			//nothing has changed
+			return false;
+		}
 		#endregion
 	}
 }

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs

@@ -300,6 +300,8 @@ using RODBInterface;
 using ROFields;
 using Org.Mentalis.Files;
 using System.Runtime.InteropServices;
+using System.Linq;
+using System.Collections.Generic;
 //using IniFileIO;
 
 
@@ -334,6 +336,8 @@ namespace ROEditor
 		private System.Windows.Forms.MenuItem menuRONew;
 		private System.Windows.Forms.MenuItem menuNewRefObj;
 		private System.Windows.Forms.MenuItem menuROEdit;
+		private System.Windows.Forms.MenuItem menuROCut;
+		private System.Windows.Forms.MenuItem menuROPaste;
 		private System.Windows.Forms.MenuItem menuRODelete;
 		private System.Windows.Forms.MenuItem menuROSave;
 		private System.Windows.Forms.MenuItem menuROProperties;
@@ -357,6 +361,10 @@ namespace ROEditor
 			get { return _CurrentTextBox; }
 			set { _CurrentTextBox = value; }
 		}
+
+		public List<TreeNode> ROsSelectedforMultiMove { get; set; } //to allow multiple RO nodes to be selected
+		public bool ROCutWasSelected { get; set; } = false;
+
 		private VlnXmlElement rootXml;
 		private TreeNode rootNode;
 		
@@ -379,6 +387,7 @@ namespace ROEditor
 		private const int ROGROUPIMAGE = 0;
 		private System.Windows.Forms.Panel panel2;
 		private const int ROIMAGE = 1;
+		private Color MULTISELECTCOLOR = Color.LightGreen; //back color that multiselected ROs will show
 
 		private ToolBarButton tbtnSave;
 		private ToolBarButton tbtnRestore;
@@ -405,13 +414,15 @@ namespace ROEditor
 			DbConnectPath = PassedInPath;
 			
 			// Setup the context menu
-			MenuItem[] ContextMenuItemList = new MenuItem[6];
+			MenuItem[] ContextMenuItemList = new MenuItem[8];
 			ContextMenuItemList[0] = new MenuItem("Expand/Collaspe",new EventHandler(roTreeView_ToggleExpandCollapse));
 			ContextMenuItemList[1] = menuRONew.CloneMenu();
 			ContextMenuItemList[2] = menuROEdit.CloneMenu();
-			ContextMenuItemList[3] = menuRODelete.CloneMenu();
-			ContextMenuItemList[4] = menuROSave.CloneMenu();
-			ContextMenuItemList[5] = menuROProperties.CloneMenu();
+			ContextMenuItemList[3] = menuROCut.CloneMenu();
+			ContextMenuItemList[4] = menuROPaste.CloneMenu();
+			ContextMenuItemList[5] = menuRODelete.CloneMenu();
+			ContextMenuItemList[6] = menuROSave.CloneMenu();
+			ContextMenuItemList[7] = menuROProperties.CloneMenu();
 
 			ContextMenu treePopupMenu = new ContextMenu(ContextMenuItemList);
 
@@ -493,7 +504,6 @@ namespace ROEditor
 			// if a specific RO was passed in. Load the xml tree from it to the root & then
 			// edit it through the ctlXmledit.
 			// from the input tbl string, get a table name.
-
 			ArrayList levelRecids = new ArrayList();
 			int itbl = System.Convert.ToInt32(specificro.Substring(0,4),16);
 			string stbl = System.Convert.ToString(itbl,10);
@@ -583,12 +593,13 @@ namespace ROEditor
 				return;
 			}
 			roTreeView.SelectedNode = trnd;
-
 		}
 
 		protected void roTreeView_AfterSelect (object sender, 
 			System.Windows.Forms.TreeViewEventArgs e)
 		{
+			TreeNode PreviousNode = LastSelectedNode;
+
 			// if the same node was selected, don't do anything.
 			if (LastSelectedNode != null && LastSelectedNode.Equals(roTreeView.SelectedNode)) return;
 			
@@ -622,7 +633,7 @@ namespace ROEditor
 				// Enable the Save item if changes were made
 				// Just copy the state of the Save Button
 				menuROSave.Enabled = tbtnSave.Enabled;
-				roTreeView.ContextMenu.MenuItems[4].Enabled = tbtnSave.Enabled;
+				roTreeView.ContextMenu.MenuItems[6].Enabled = tbtnSave.Enabled;
 
 				// Should the properties menu item be available?
 				VlnXmlElement curelem = (VlnXmlElement) CurrentNode.Tag;
@@ -651,8 +662,83 @@ namespace ROEditor
 					EditRO(curelem);
 				else
 					updateRoListView(CurrentNode);
+
+				//cut is only enabled on RO Values
+				menuROCut.Enabled = roTreeView_IsSubgroupOrRO() && curelem.Name != "vlnGroup";
+				roTreeView.ContextMenu.MenuItems[3].Enabled = menuROCut.Enabled;
+				//paste is only enabled on subgroups and only once Cut has been selected
+				menuROPaste.Enabled = roTreeView_IsSubgroupOrRO() && curelem.Name == "vlnGroup" && ROCutWasSelected && (ROsSelectedforMultiMove.Count > 0);
+				roTreeView.ContextMenu.MenuItems[4].Enabled = menuROPaste.Enabled;
+
+				//code to allow selection of multiple nodes for Move
+				//if Ctrl/Shift Key is held down
+				if (ROsSelectedforMultiMove == null)
+					ROsSelectedforMultiMove = new List<TreeNode>();
+				// B2021-094 added check that Control and Alt keys were not pressed with shift key
+				//           if user does the <Ctrl><Shift><G> keystroke (Goto selected RO from step editor)
+				//           but only lifts up on the G key, it was dropping down into this code below
+				//           and getting a null reference error upon initial entry in to the RO Editor
+				if ((Control.ModifierKeys & Keys.Shift) != 0 && (Control.ModifierKeys & Keys.Control) == 0 && (Control.ModifierKeys & Keys.Alt) == 0)
+				{
+					//if shift is held down, clear existing nodes then add the range of nodes
+					roTreeView_ClearAllMultiSelect();
+					if (PreviousNode.Index < CurrentNode.Index)
+					{
+						//Traverse Down
+						TreeNode nodeIter = PreviousNode;
+						do
+						{
+							VlnXmlElement curelemforNodeIter = (VlnXmlElement)nodeIter.Tag;
+							if (curelemforNodeIter.Name != "RO_Root" && curelemforNodeIter.Name != "vlnGroup")
+                            {
+								nodeIter.BackColor = MULTISELECTCOLOR;
+								ROsSelectedforMultiMove.Add(nodeIter);
 							}
 						}
+						while (nodeIter != CurrentNode && (nodeIter = nodeIter.NextNode) != null);
+					}
+					else 
+					{
+						//Traverse Up
+						TreeNode nodeIter = PreviousNode;
+						do
+						{
+							VlnXmlElement curelemforNodeIter = (VlnXmlElement)nodeIter.Tag;
+							if (curelemforNodeIter.Name != "RO_Root" && curelemforNodeIter.Name != "vlnGroup")
+							{
+								nodeIter.BackColor = MULTISELECTCOLOR;
+								ROsSelectedforMultiMove.Add(nodeIter);
+							}
+						}
+						while (nodeIter != CurrentNode && (nodeIter = nodeIter.PrevNode) != null);
+					}
+				}
+				else
+				{
+					//deselect all currently selected if ctrl key not held down,
+					//add the current item that is clicked
+					//ignoring if a group or subgroup is clicked
+					if (curelem.Name != "RO_Root" && curelem.Name != "vlnGroup")
+					{
+						if ((Control.ModifierKeys & Keys.Control) == 0)
+							roTreeView_ClearAllMultiSelect();
+
+						roTreeView.SelectedNode.BackColor = MULTISELECTCOLOR;
+						ROsSelectedforMultiMove.Add(roTreeView.SelectedNode);
+					}
+				}
+
+			}
+		}
+
+		//clear all multiselected items
+		protected void roTreeView_ClearAllMultiSelect()
+		{
+			foreach (TreeNode tn in ROsSelectedforMultiMove)
+				tn.BackColor = Color.White;
+
+			ROsSelectedforMultiMove.Clear();
+		}
 
 		private string CvtUserFldToFld(string fldname)
 		{
@@ -783,25 +869,25 @@ namespace ROEditor
 
 					// Should the save option be available?
 					// Just reflect the Save button state.
-					roTreeView.ContextMenu.MenuItems[4].Enabled = tbtnSave.Enabled;
+					roTreeView.ContextMenu.MenuItems[6].Enabled = tbtnSave.Enabled;
 					menuROSave.Enabled = tbtnSave.Enabled;
 
 					// Should the properties menu item be available?
 					VlnXmlElement curelem = (VlnXmlElement) CurrentNode.Tag;
 					if (curelem.Name == "vlnGroup")
-						roTreeView.ContextMenu.MenuItems[5].Enabled = true;
+						roTreeView.ContextMenu.MenuItems[7].Enabled = true;
 					else
-						roTreeView.ContextMenu.MenuItems[5].Enabled = false;
+						roTreeView.ContextMenu.MenuItems[7].Enabled = false;
 
 					// should delete menu item be available, i.e. top node NO!
 					if (curelem.Name == "RO_Root")
 					{
-						roTreeView.ContextMenu.MenuItems[3].Enabled = false;
+						roTreeView.ContextMenu.MenuItems[5].Enabled = false;
 						roTreeView.ContextMenu.MenuItems[1].MenuItems[1].Enabled = false;
 					}
 					else
 					{
-						roTreeView.ContextMenu.MenuItems[3].Enabled = true;
+						roTreeView.ContextMenu.MenuItems[5].Enabled = true;
 						roTreeView.ContextMenu.MenuItems[1].MenuItems[1].Enabled = true;
 					}
 
@@ -1146,6 +1232,7 @@ namespace ROEditor
 							{
 								chldnd = new TreeNode(TheMenuTitle,ROIMAGE,ROIMAGE);
 								chldnd.Tag = echild;
+								chldnd.Name = echild.GetAttribute("RecID");
 								enode.Nodes.Add(chldnd);
 							}
 						}
@@ -1195,6 +1282,8 @@ namespace ROEditor
             this.menuNewRefObj = new System.Windows.Forms.MenuItem();
             this.menuItem1 = new System.Windows.Forms.MenuItem();
             this.menuROEdit = new System.Windows.Forms.MenuItem();
+			this.menuROCut = new System.Windows.Forms.MenuItem();
+			this.menuROPaste = new System.Windows.Forms.MenuItem();
 			this.menuRODelete = new System.Windows.Forms.MenuItem();
             this.menuROSave = new System.Windows.Forms.MenuItem();
             this.menuROProperties = new System.Windows.Forms.MenuItem();
@@ -1260,6 +1349,8 @@ namespace ROEditor
             this.menuRONew,
             this.menuItem1,
             this.menuROEdit,
+			this.menuROCut,
+			this.menuROPaste,
             this.menuRODelete,
             this.menuROSave,
             this.menuROProperties,
@@ -1298,34 +1389,48 @@ namespace ROEditor
             this.menuROEdit.Index = 2;
             this.menuROEdit.Text = "Edit";
             this.menuROEdit.Click += new System.EventHandler(this.menuROEdit_Click);
+			// 
+			// menuROCut
+			// 
+			this.menuROCut.Enabled = false;
+			this.menuROCut.Index = 3;
+			this.menuROCut.Text = "Cut (Move RO)";
+			this.menuROCut.Click += new System.EventHandler(this.menuROCut_Click);
+			// 
+			// menuROPaste
+			// 
+			this.menuROPaste.Enabled = false;
+			this.menuROPaste.Index = 4;
+			this.menuROPaste.Text = "Paste (Move RO)";
+			this.menuROPaste.Click += new System.EventHandler(this.menuROPaste_Click);
 			// 
 			// menuRODelete
 			// 
-			this.menuRODelete.Index = 3;
+			this.menuRODelete.Index = 5;
             this.menuRODelete.Text = "Delete";
             this.menuRODelete.Click += new System.EventHandler(this.menuRODelete_Click);
             // 
             // menuROSave
             // 
             this.menuROSave.Enabled = false;
-			this.menuROSave.Index = 4;
+            this.menuROSave.Index = 6;
             this.menuROSave.Text = "Save";
             this.menuROSave.Click += new System.EventHandler(this.menuROSave_Click);
             // 
             // menuROProperties
             // 
-			this.menuROProperties.Index = 5;
+            this.menuROProperties.Index = 7;
             this.menuROProperties.Text = "Properties";
             this.menuROProperties.Click += new System.EventHandler(this.menuROProperties_Click);
             // 
             // menuItem10
             // 
-			this.menuItem10.Index = 6;
+            this.menuItem10.Index = 8;
             this.menuItem10.Text = "-";
             // 
             // menuROExit
             // 
-			this.menuROExit.Index = 7;
+            this.menuROExit.Index = 9;
             this.menuROExit.Text = "Exit RO Editor";
             this.menuROExit.Click += new System.EventHandler(this.menuROExit_Click);
             // 
@@ -1434,7 +1539,7 @@ namespace ROEditor
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(228, 28);
             this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(710, 591);
+            this.panel1.Size = new System.Drawing.Size(752, 591);
             this.panel1.TabIndex = 5;
             // 
             // panel2
@@ -1475,7 +1580,7 @@ namespace ROEditor
             this.tbar.Location = new System.Drawing.Point(0, 0);
             this.tbar.Name = "tbar";
             this.tbar.ShowToolTips = true;
-			this.tbar.Size = new System.Drawing.Size(938, 28);
+            this.tbar.Size = new System.Drawing.Size(980, 28);
             this.tbar.TabIndex = 0;
             this.tbar.TextAlign = System.Windows.Forms.ToolBarTextAlign.Right;
             this.tbar.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.tbar_OnClick);
@@ -1537,7 +1642,7 @@ namespace ROEditor
             // 
             this.lblDuplicateRO.AutoSize = true;
             this.lblDuplicateRO.ForeColor = System.Drawing.Color.Red;
-			this.lblDuplicateRO.Location = new System.Drawing.Point(491, 9);
+            this.lblDuplicateRO.Location = new System.Drawing.Point(570, 9);
             this.lblDuplicateRO.Name = "lblDuplicateRO";
             this.lblDuplicateRO.Size = new System.Drawing.Size(139, 13);
             this.lblDuplicateRO.TabIndex = 6;
@@ -1561,6 +1666,173 @@ namespace ROEditor
             this.ResumeLayout(false);
             this.PerformLayout();
 
+		}
+
+		//Cut/Paste (Move ROs) added as part of CSM-C2024-027 / Part of 2024 PROMS Upgrades
+		private void menuROCut_Click(object sender, EventArgs e)
+        {
+			ROCutWasSelected = true;
+
+			string msgstr = "It is recommended that after moving ROs, you create a FST and use it to update RO Values in PROMS to ensure RO Links properly move to the new location as well.\n\n Are you sure you wish to move the RO(s)?";
+
+			DialogResult AnswerYN = MessageBox.Show(msgstr, "Moving ROs", MessageBoxButtons.YesNo);
+			if (AnswerYN != DialogResult.Yes)
+				ROCutWasSelected = false;
+
+		}
+
+		//part of CSM-C2024-027 / Part of 2024 PROMS Upgrades
+		//Paste Selected - will move individual ROs
+		private void menuROPaste_Click(object sender, EventArgs e)
+		{
+			if (ROCutWasSelected && ROsSelectedforMultiMove.Count == 0)
+			{
+				MessageBox.Show("Cut must be selected before able to Paste/Move a RO");
+				return;
+			}
+
+			foreach (TreeNode tnToCut in ROsSelectedforMultiMove)
+			{
+				VlnXmlElement ROtoCut = ((VlnXmlElement) tnToCut.Tag);
+				if (((VlnXmlElement)roTreeView.SelectedNode.Tag).GetAttribute("Table") != ROtoCut.GetAttribute("Table"))
+				{
+					MessageBox.Show("You can only move a RO within the same table.");
+					break;  //exit foreach loop
+				}
+				string TheMenuTitle = ROtoCut.GetAttribute("MenuTitle");
+				if (!string.IsNullOrEmpty(TheMenuTitle))
+				{
+					TreeNode orig_parent = tnToCut.Parent;
+					if (moveRO(ROtoCut))
+					{
+						//if move was successful, remove the moved item from it's previous parent
+						//so it will only have a parent of where it moved to
+						XmlNode node = ROtoCut.ParentNode;
+						node.RemoveChild(ROtoCut);
+
+						if (orig_parent != null)
+						{
+							roTreeView.Nodes.Remove(tnToCut);
+							updateRoListView(orig_parent);
+							roTreeView.Refresh();
+						}
+					}
+				}
+			}
+
+			roTreeView_ClearAllMultiSelect();
+			tbtnRestore.Enabled = false;
+			tbtnSave.Enabled = false;
+			tbtnCancel.Enabled = true;
+			tbtnSaveAs.Enabled = false;
+			tbtnDuplicate.Enabled = true;
+			duplicate_active = false;
+			ROCutWasSelected = false;
+			menuROCut.Enabled = false;
+			roTreeView.ContextMenu.MenuItems[3].Enabled = menuROCut.Enabled;
+			menuROPaste.Enabled = false;
+			roTreeView.ContextMenu.MenuItems[4].Enabled = menuROPaste.Enabled;
+			roTreeView.Refresh();
+			
+		}
+
+		//part of CSM-C2024-027 / Part of 2024 PROMS Upgrades
+		//Will move individual ROs
+		private bool moveRO(VlnXmlElement ROtoMove)
+		{
+			//making a copy into newro
+			//if everything is successful, once done
+			//will remove ROtoMove and keep the Clone with the changed position
+			//if any errors/issues, will remove the cloned newro and keep ROtoMove
+			VlnXmlElement newro = (VlnXmlElement)ROtoMove.Clone();
+			VlnXmlElement placetomoveroto = (VlnXmlElement)roTreeView.SelectedNode.Tag;
+			string orig_title = ROtoMove.GetMenuString(ROtoMove.GetMenuValueTemplate("MenuItem"), false);
+
+			//remove original link, and put it at new place in the menu
+			//set table to be new place that you are moving item to
+			//put at new place in menu
+			newro.SetAttribute("Table", placetomoveroto.GetAttribute("Table"));
+			newro.SetAttribute("ParentID", placetomoveroto.GetAttribute("RecID"));
+			placetomoveroto.AppendChild((XmlNode)newro);
+
+			//Check that must have the same Fields in use
+			string dummy = "";  // need for RODB_GetFIeldsInUse call, won't be used.
+			ArrayList AvailList_ROtoMove = myrodb.RODB_GetFields(ROtoMove, (uint)RecordType.Schema);
+			IEnumerable<ROField> InUseList_ROtoMove = myrodb.RODB_GetFieldsInUse(ROtoMove, AvailList_ROtoMove, "FieldsInUse", ref dummy, false).OfType<ROField>();
+			List<string> flds_InUseList_ROtoMove = InUseList_ROtoMove.Select(x => x.GetFieldname).OrderBy(t => t).ToList();
+			ArrayList AvailList_placetomoveroto = myrodb.RODB_GetFields(placetomoveroto, (uint)RecordType.Schema);
+			List<string> flds_InUseList_placetomoveroto = myrodb.RODB_GetFieldsInUse(placetomoveroto, AvailList_placetomoveroto, "FieldsInUse", ref dummy, false).OfType<ROField>().Select(x => x.GetFieldname).OrderBy(t => t).ToList();
+			if (!Enumerable.SequenceEqual(flds_InUseList_ROtoMove, flds_InUseList_placetomoveroto))
+			{
+				MessageBox.Show($"RO: {orig_title}. The fields in use must be the same between the item you are moving and where you are moving the item. The fields used in these values can be found under \"Properties => Referenced Object Definition\" of an RO Group. Cannot move.", "Problem moving RO item.");
+				placetomoveroto.RemoveChild(newro);
+				return false;
+			}
+
+			//if duplicate Accessory Page Id, return with Error message
+			string acctmpl = newro.GetAccPageIDTemplate();
+			string newacc = newro.GetAccPageIDString(acctmpl);
+			if (newacc == null)
+			{
+				MessageBox.Show($"RO: {orig_title}. Values for the fields used for the \"Accessory Pages Access\" are missing. The template required for the place this RO is moving to is: {acctmpl}", "Problem saving data");
+				placetomoveroto.RemoveChild(newro);
+
+				return false;
+			}
+			else if (myrodb.IsDuplicateAccPageID(newro, newacc))
+			{
+				MessageBox.Show($"RO: {orig_title}. The fields used for the \"Accessory Pages Access\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.", "Problem saving data");
+				placetomoveroto.RemoveChild(newro);
+
+				return false;
+			}
+
+			//if already an item in the menu with the same title, then return with Error message
+			string mnutmp = newro.GetMenuValueTemplate("MenuItem");
+			string mnutitle = newro.GetMenuString(mnutmp, false);
+			if (newro.IsDuplicateMenuTitle(mnutitle))
+			{
+				MessageBox.Show($"RO: {orig_title}. The fields used for the \"Menu\" values must be unique. The fields used in these values can be found under \"Properties\" of an RO Group. Cannot save.", "Problem saving data");
+				placetomoveroto.RemoveChild(newro);
+				return false;
+			}
+			newro.SetAttribute("MenuTitle", mnutitle);
+
+			//Check that required Fields have Values
+			ArrayList reqfields = newro.GetRequiredFields();
+			foreach (string fldname in reqfields)
+			{
+				string fname_inxml = fldname.Split(new string[] { "\t" }, StringSplitOptions.None)[0];
+				string fname = CvtFldToUserFld(fname_inxml);
+				if (!InUseList_ROtoMove.Any(x=> x.GetFieldname == CvtFldToUserFld(fldname.Split(new string[] { "\t" }, StringSplitOptions.None)[0])) || newro.ChildNodes.Cast<XmlNode>().Any(x => x.Name == fname_inxml && x.InnerText.Length == 0))
+				{
+					MessageBox.Show($"RO: {orig_title}. Required field \"{fname}\" is missing a value that is required. Please be sure RO has a value for this field before moving the RO.", "Problem saving data");
+					placetomoveroto.RemoveChild(newro);
+					return false;
+				}
+			}
+
+			bool success = myrodb.RODB_WriteRO(newro, true);
+
+			//if successful, update the UI
+			if (success)
+			{
+				TreeNode newt = new TreeNode(mnutitle, ROIMAGE, ROIMAGE);
+				newt.Tag = newro;
+				newt.Name = newro.GetAttribute("RecID");
+				roTreeView.SelectedNode.Nodes.Add(newt);
+				updateRoListView(newt.Parent);
+				roTreeView.Refresh();
+			}
+			else
+			{
+				MessageBox.Show($"RO: {orig_title}. Unable to Move Item. An unexpected error occurred while moving the item, please contact Volian Support", "Problem saving moved item");
+				placetomoveroto.RemoveChild(newro);
+				roTreeView.Refresh();
+			}
+
+			return success;
+
 		}
 		#endregion
 
@@ -2313,7 +2585,7 @@ namespace ROEditor
 				tbar_DuplicateClick();
 			else if (tbb.Text == "Restore")
 				tbar_RestoreClick();
-			else if (tbb.Text == "Zoom"||tbb.Text == "View Image")
+			else if (tbb.Text == "Zoom" || tbb.Text == "View Image")
 				ctlXMLEdit2.btnZoom_click(null, null);
 		}
 
@@ -2404,6 +2676,7 @@ namespace ROEditor
 					int img = (myro.Name=="vlnGroup")?ROGROUPIMAGE:ROIMAGE;
 					newt = new TreeNode(mnutitle,img,img);
 					newt.Tag = myro;
+					newt.Name = myro.GetAttribute("RecID");
 					TreeNewparent.Nodes.Add(newt);
 				}
 			}
@@ -2506,18 +2779,20 @@ namespace ROEditor
 			if (acctmpl!=null)newro.SetAttribute("AccPageID", newro.GetAccPageIDString(acctmpl));	
 			newro.SetAttribute("MenuTitle",mnutitle);
 			newro.RemoveAttribute("RecID");  // get a new one.
+
 			success = myrodb.RODB_InsertRO(newro);
-			if (success == true)
+			if (success)
 			{
-				int img = (newro.Name=="vlnGroup")?ROGROUPIMAGE:ROIMAGE;
-				TreeNode newt = new TreeNode(mnutitle,img,img);
+				int img = (newro.Name == "vlnGroup") ? ROGROUPIMAGE : ROIMAGE;
+				TreeNode newt = new TreeNode(mnutitle, img, img);
 				newt.Tag = newro;
+				newt.Name = newro.GetAttribute("RecID");
 				roTreeView.SelectedNode.Parent.Nodes.Add(newt);
 				roTreeView.SelectedNode.Tag = origro;
 				LastSelectedNode = newt;   //do this so that no prompt for data save on node select
 				newt.TreeView.SelectedNode = newt;
 				roTreeView.Refresh();
-				tbtnRestore.Enabled=false;
+				tbtnRestore.Enabled = false;
 				tbtnSave.Enabled = false;
 				tbtnCancel.Enabled = true;
 				tbtnSaveAs.Enabled = false;
@@ -2525,7 +2800,7 @@ namespace ROEditor
 				duplicate_active = false;
 			}
 			else
-				newro.SetAttribute("RecID",savrec);
+				newro.SetAttribute("RecID", savrec);
 
 			newone = null;
 			}

PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        CAAAAk1TRnQBSQFMAgEBAgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -336,10 +336,10 @@ namespace RODBInterface
 		public abstract bool RODB_GetChildData(VlnXmlElement node, bool CheckChildCount);
 		public abstract bool IsDuplicateAccPageID(VlnXmlElement ro, string newacc);
 		public abstract VlnXmlElement RODB_ReadRO(string tbl, string recid);
-		public abstract bool RODB_WriteRO(VlnXmlElement ro);
+		public abstract bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false);
 		public abstract bool RODB_InsertRO(VlnXmlElement ro);
 		public abstract ushort RODB_GetFieldType(VlnXmlElement elem, string TableName, string Fld);
-		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype);
+		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false);
 		public abstract string RODB_GetSchemaPiece(string Recid, string table);
 		public abstract bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype);
 		public abstract bool RODB_WriteSchemaPiece(string Recid, string table, string schpiece);
@@ -2120,7 +2120,7 @@ namespace RODBInterface
 			return retele;
 		}
 
-		public override bool RODB_WriteRO(VlnXmlElement ro)
+		public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -2140,6 +2140,13 @@ namespace RODBInterface
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
 				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
+				if (movedRO)
+				{
+					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
+					ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
+					strUpdate += ", ParentID = '" + ro.GetAttribute("ParentID") + "'";
+				}
+				
 				strUpdate = strUpdate + ", ModDateTime = '" + dt + "', AccPageID = '" + wraccid + "' WHERE RecID='" + ro.GetAttribute("RecID") + "'";
 				try
 				{
@@ -2192,6 +2199,8 @@ namespace RODBInterface
 				ro.SetAttribute("HasChild", "False");
 				if (ro.HasAttribute("AccPageID"))
 				{
+					// Code is never reached, but this was noticed - this next line should likely be:
+					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
 					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
@@ -2294,11 +2303,16 @@ namespace RODBInterface
 		}
 
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			else if (refresh)
+			{
+				FieldDefinitions.Remove(table);
+				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;
@@ -2391,7 +2405,7 @@ namespace RODBInterface
 				Info = null;
 			DBE.ReaderClose();
 			DBE.CommandDispose();
-			return Info.Replace("&apos;", "\'");
+			return Info?.Replace("&apos;", "\'");
 		}
 
 		public override bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype)
@@ -2653,8 +2667,9 @@ namespace RODBInterface
 					bool isused = RODB_CheckForStandardName(oldname);
 					if (isused == true)
 					{
-						MessageBox.Show("The field name is used to define new Setpoints or Graphics Database.\n The update will be for this local (database) group only.", "Field name modification.");
+                        DialogResult result = MessageBox.Show($"The field name is used to define new Setpoints or Graphics Database.\n\n The update will be for this local (database) group only.\n\n Select OK to update local definition for all items in that table ({GetTopParentName(myelem)}).", "Field name modification.", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
 						changegeneric = false;
+						if(result == DialogResult.Cancel) return false;
 					}
 				}
 
@@ -2666,8 +2681,8 @@ namespace RODBInterface
 					//	Generic definition, i.e. all Groups, and No updates only Local definition, i.e. just this Group  Added a
 					//	Cancel button to Cancel from this dialog and return to previous dialog.  Added more information to the
 					//	dialog to inform user of this
-					string dmsg = "Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
-						"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group.";
+					string dmsg = $"Update Generic definition?\r\n\r\n Yes - updates Generic definitions, \r\n No - updates Local definitions, \r\n Cancel - returns to previous dialog." +
+						$"\r\n\r\n 'Generic' updates definition in ALL groups that use the name\r\n 'Local' updates definition only in the selected group, and will change the definition for all items in that table ({GetTopParentName(myelem)}).";
 					System.Windows.Forms.DialogResult result = MessageBox.Show(dmsg, "Referenced Object Definition", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
 					if (result == DialogResult.Cancel) return false;
 					if (result == DialogResult.No) changegeneric = false;
@@ -2772,6 +2787,19 @@ namespace RODBInterface
 			return success;
 		}
 
+		//CSM-C2024-030
+		//Explain that Local is local to that table (and include Table name in wording displayed to user)
+		public string GetTopParentName(VlnXmlElement elem)
+		{
+		   VlnXmlElement nodetocheck = elem;
+		   while (nodetocheck.GetAttribute("ParentID") != "00000000" && nodetocheck.ParentNode != null)
+			{
+				nodetocheck = (VlnXmlElement) nodetocheck.ParentNode;
+			}
+
+			return nodetocheck.FirstChild.InnerText;
+		}
+
 		public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)
 		{
 			XmlSchema myschema;

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

@@ -1557,7 +1557,7 @@ namespace RODBInterface
 			}
 			return retele;
 		}
-		public override bool RODB_WriteRO(VlnXmlElement ro)
+		public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -1589,6 +1589,13 @@ namespace RODBInterface
 						command.Parameters.AddWithValue("@ModDateTime", dt);
 						command.Parameters.AddWithValue("@AccPageID", wraccid);		// B2020-003: set accpageid to correct value
 						command.Parameters.AddWithValue("@RecID", ro.GetAttribute("RecID"));
+						if (movedRO)
+						{
+							VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
+							ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
+							command.Parameters.AddWithValue("@ParentID", ro.GetAttribute("ParentID"));
+						}
+
 						using (SqlDataReader reader = command.ExecuteReader())
 						{
 							success = true;
@@ -1744,13 +1751,18 @@ namespace RODBInterface
 			return ftype;
 		}
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 			{
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
 			}
+			else if (refresh)
+			{
+				FieldDefinitions.Remove(table);
+				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;
@@ -1909,7 +1921,7 @@ namespace RODBInterface
 					command.Parameters.AddWithValue("@RecID", Recid);
 					using (SqlDataReader reader = command.ExecuteReader())
 					{
-						if (DBE.Read())
+						if (reader.Read())
 							Info = reader.GetString(0);
 						else
 							Info = null;

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

@@ -85,7 +85,7 @@ namespace VlnStatus
 			this.lblStatMsg.Name = "lblStatMsg";
 			this.lblStatMsg.Size = new System.Drawing.Size(420, 81);
 			this.lblStatMsg.TabIndex = 0;
-			this.lblStatMsg.Text = "Put Satus Message Here";
+			this.lblStatMsg.Text = "Put Status Message Here";
 			this.lblStatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// StatusMessageFrm

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -231,7 +231,6 @@ namespace VEPROMS
 			cbxOpenAfterCreate2.Visible = oneProcedure;
 			cbxOpenAfterCreate2.Checked = false;
 			cbxOverwritePDF2.Visible = oneProcedure;
-			cbxOverwritePDF2.Checked = true;
 			gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
 			swtbtnGeneratePlacekeeper.Value = false;
 			cbxGenerateConActSum.Checked = false;
@@ -1225,9 +1224,6 @@ namespace VEPROMS
 			return true;
 		}
 
-
-
-
 		private void txbRevDate_Enter(object sender, EventArgs e)
 		{
 			txbDate = txbRevDate;

PROMS/VEPROMS User Interface/ROBuild.Sql

@@ -674,7 +674,8 @@ CREATE PROCEDURE [dbo].[updateInfoAccidByRecid]
 	@RecID char(8),
 	@AccPageID char(32),
 	@Info nvarchar(max),
-	@ModDateTime char(14)
+	@ModDateTime char(14),
+	@ParentID varchar(8) = NULL
 )
 WITH EXECUTE AS OWNER
 AS
@@ -684,7 +685,8 @@ BEGIN TRY -- Try Block
 		SET
 			[Info]=@Info,
 			[ModDateTime]=@ModDateTime,
-			[AccPageID]=@AccPageID
+			[AccPageID]=@AccPageID,
+			[ParentID]=ISNULL(@ParentID, ParentID)
 		WHERE [ROTable]=@ROTable AND [RecID]=@RecID
 	IF @@ROWCOUNT = 0
 	BEGIN

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -163,6 +163,12 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgCheckOpenTabs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgCheckOpenTabs.Designer.cs">
+      <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
+    </Compile>
     <Compile Include="DlgCloseTabsOrExit.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -324,6 +330,9 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgCheckOpenTabs.resx">
+      <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DlgCloseTabsOrExit.resx">
       <DependentUpon>DlgCloseTabsOrExit.cs</DependentUpon>
     </EmbeddedResource>

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs

@@ -0,0 +1,116 @@
+
+namespace VEPROMS
+{
+    partial class dlgCheckOpenTabs
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.cbRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.btnOpenTabs = new DevComponents.DotNetBar.ButtonX();
+            this.btnNoTabs = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // labelX1
+            // 
+            // 
+            // 
+            // 
+            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelX1.Location = new System.Drawing.Point(23, 2);
+            this.labelX1.Name = "labelX1";
+            this.labelX1.Size = new System.Drawing.Size(363, 78);
+            this.labelX1.TabIndex = 0;
+            this.labelX1.Text = "Would you like for PROMS to reopen the tabs that you had open during your last se" +
+    "ssion?";
+            this.labelX1.WordWrap = true;
+            // 
+            // cbRemember
+            // 
+            // 
+            // 
+            // 
+            this.cbRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbRemember.Location = new System.Drawing.Point(23, 75);
+            this.cbRemember.Name = "cbRemember";
+            this.cbRemember.Size = new System.Drawing.Size(376, 47);
+            this.cbRemember.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbRemember.TabIndex = 1;
+            this.cbRemember.Text = "Check this box to not be prompted in the future when opening PROMS. \nNote that th" +
+    "ese settings can be adjusted at any time from the \nOPTIONS menu for PROMS.";
+            // 
+            // btnOpenTabs
+            // 
+            this.btnOpenTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnOpenTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnOpenTabs.DialogResult = System.Windows.Forms.DialogResult.Yes;
+            this.btnOpenTabs.Location = new System.Drawing.Point(23, 139);
+            this.btnOpenTabs.Name = "btnOpenTabs";
+            this.btnOpenTabs.Size = new System.Drawing.Size(150, 42);
+            this.btnOpenTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOpenTabs.TabIndex = 2;
+            this.btnOpenTabs.Text = "Yes, Open Tabs from Last Session";
+            this.btnOpenTabs.Click += new System.EventHandler(this.btnTabs_Click);
+            // 
+            // btnNoTabs
+            // 
+            this.btnNoTabs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnNoTabs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnNoTabs.DialogResult = System.Windows.Forms.DialogResult.No;
+            this.btnNoTabs.Location = new System.Drawing.Point(216, 139);
+            this.btnNoTabs.Name = "btnNoTabs";
+            this.btnNoTabs.Size = new System.Drawing.Size(150, 42);
+            this.btnNoTabs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnNoTabs.TabIndex = 3;
+            this.btnNoTabs.Text = "No, Do Not Open Tabs from Previous Session";
+            this.btnNoTabs.Click += new System.EventHandler(this.btnTabs_Click);
+            // 
+            // dlgCheckOpenTabs
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(411, 193);
+            this.ControlBox = false;
+            this.Controls.Add(this.btnNoTabs);
+            this.Controls.Add(this.btnOpenTabs);
+            this.Controls.Add(this.cbRemember);
+            this.Controls.Add(this.labelX1);
+            this.Name = "dlgCheckOpenTabs";
+            this.Text = "Open Tabs from Previous Session";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.LabelX labelX1;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbRemember;
+        private DevComponents.DotNetBar.ButtonX btnOpenTabs;
+        private DevComponents.DotNetBar.ButtonX btnNoTabs;
+    }
+}

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace VEPROMS
+{
+    public partial class dlgCheckOpenTabs : Form
+    {
+        public dlgCheckOpenTabs()
+        {
+            InitializeComponent();
+        }
+
+        public bool Remember { get; set; } = false;
+
+        private void btnTabs_Click(object sender, EventArgs e)
+        {
+            Remember = this.cbRemember.Checked;
+            this.Close();
+        }
+    }
+}

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PROMS/VEPROMS User Interface/dlgExportImport.cs

@@ -425,9 +425,9 @@ namespace VEPROMS
 				MessageBox.Show(msg, "Import Completed", MessageBoxButtons.OK, MessageBoxIcon.Information); // C2020-042 changed mesage box title
 																											//MessageBox.Show(string.Format("Finished Importing:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
 			}
-			if (canceledPressed)
+			if (canceledPressed || !isImported)
 			{
-				MessageBox.Show(string.Format("Canceling the import of:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				MessageBox.Show(string.Format("Cancelling the import of:\n\n{0}", txtImport.Text.Substring(txtImport.Text.LastIndexOf("\\") + 1)), "Cancelling Import", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				btnCloseImport.PerformClick();
 			}
 		}
@@ -906,8 +906,8 @@ namespace VEPROMS
 				// C2020-032: Import Procedure set when existing name exists, allow user to import with 'Copy (#) of'. 
 				//	This is similar functionality to the import of a procedure without the overwrite part.
 				string msg = string.Format("The procedure set you are importing, {0}, already exists.\n\nDo you want to import {0} as a COPY of the existing set?\n\nThis will prefix the name with \"Copy (#) of\"", name);
-				DialogResult dr = MessageBox.Show(this, msg, "Create Copy Of Existing Procedure Set", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Stop);
-				if (dr == DialogResult.Yes)
+				DialogResult dr = MessageBox.Show(this, msg, "Create Copy Of Existing Procedure Set", MessageBoxButtons.OKCancel, MessageBoxIcon.Stop);
+				if (dr == DialogResult.OK)
 				{
 					string number = "";
 					int max = -1;
@@ -931,6 +931,11 @@ namespace VEPROMS
 
 					ff = AddFolder(Folder.Get(MyFolder.FolderID), xd, name);
 				}
+				//else if (dr == System.Windows.Forms.DialogResult.Cancel)
+				//{
+				//	//canceledPressed = true;
+				//	//resolvedProcNum = false;
+				//}
 				else
 					return false;
 			}

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -139,10 +139,9 @@
             // 
             this.myTV.CheckBoxes = true;
             this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.myTV.Location = new System.Drawing.Point(0, 285);
-			this.myTV.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.myTV.Location = new System.Drawing.Point(0, 230);
             this.myTV.Name = "myTV";
-			this.myTV.Size = new System.Drawing.Size(436, 475);
+            this.myTV.Size = new System.Drawing.Size(291, 310);
             this.myTV.TabIndex = 4;
             this.myTV.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck);
             // 
@@ -150,7 +149,6 @@
             // 
             this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitContainer3.Name = "splitContainer3";
             this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
@@ -166,9 +164,8 @@
             // 
             this.splitContainer3.Panel2.BackColor = System.Drawing.SystemColors.Control;
             this.splitContainer3.Panel2.Controls.Add(this.panelEx4);
-			this.splitContainer3.Size = new System.Drawing.Size(1766, 902);
-			this.splitContainer3.SplitterDistance = 809;
-			this.splitContainer3.SplitterWidth = 6;
+            this.splitContainer3.Size = new System.Drawing.Size(1177, 586);
+            this.splitContainer3.SplitterDistance = 525;
             this.splitContainer3.TabIndex = 2;
             // 
             // panelEx3
@@ -180,10 +177,9 @@
             this.panelEx3.Controls.Add(this.label3);
             this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty;
             this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.panelEx3.Location = new System.Drawing.Point(1032, 0);
-			this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.panelEx3.Location = new System.Drawing.Point(688, 0);
             this.panelEx3.Name = "panelEx3";
-			this.panelEx3.Size = new System.Drawing.Size(734, 809);
+            this.panelEx3.Size = new System.Drawing.Size(489, 525);
             this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
             this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -198,12 +194,11 @@
             // 
             this.txtResults.Dock = System.Windows.Forms.DockStyle.Fill;
             this.txtResults.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.txtResults.Location = new System.Drawing.Point(0, 79);
-			this.txtResults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txtResults.Location = new System.Drawing.Point(0, 52);
             this.txtResults.Multiline = true;
             this.txtResults.Name = "txtResults";
             this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.txtResults.Size = new System.Drawing.Size(734, 730);
+            this.txtResults.Size = new System.Drawing.Size(489, 473);
             this.txtResults.TabIndex = 4;
             // 
             // panel1
@@ -211,19 +206,17 @@
             this.panel1.Controls.Add(this.btnSave);
             this.panel1.Controls.Add(this.btnClear);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-			this.panel1.Location = new System.Drawing.Point(0, 34);
-			this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.panel1.Location = new System.Drawing.Point(0, 23);
             this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(734, 45);
+            this.panel1.Size = new System.Drawing.Size(489, 29);
             this.panel1.TabIndex = 3;
             // 
             // btnSave
             // 
             this.btnSave.Dock = System.Windows.Forms.DockStyle.Left;
-			this.btnSave.Location = new System.Drawing.Point(142, 0);
-			this.btnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnSave.Location = new System.Drawing.Point(95, 0);
             this.btnSave.Name = "btnSave";
-			this.btnSave.Size = new System.Drawing.Size(142, 45);
+            this.btnSave.Size = new System.Drawing.Size(95, 29);
             this.btnSave.TabIndex = 3;
             this.btnSave.Text = "Save Results";
             this.btnSave.UseVisualStyleBackColor = true;
@@ -233,9 +226,8 @@
             // 
             this.btnClear.Dock = System.Windows.Forms.DockStyle.Left;
             this.btnClear.Location = new System.Drawing.Point(0, 0);
-			this.btnClear.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnClear.Name = "btnClear";
-			this.btnClear.Size = new System.Drawing.Size(142, 45);
+            this.btnClear.Size = new System.Drawing.Size(95, 29);
             this.btnClear.TabIndex = 2;
             this.btnClear.Text = "Clear Results";
             this.btnClear.UseVisualStyleBackColor = true;
@@ -247,9 +239,8 @@
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label3.Dock = System.Windows.Forms.DockStyle.Top;
             this.label3.Location = new System.Drawing.Point(0, 0);
-			this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(734, 34);
+            this.label3.Size = new System.Drawing.Size(489, 23);
             this.label3.TabIndex = 2;
             this.label3.Text = "Results";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -279,10 +270,9 @@
             this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
             this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
             this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-			this.expandableSplitter2.Location = new System.Drawing.Point(1023, 0);
-			this.expandableSplitter2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.expandableSplitter2.Location = new System.Drawing.Point(682, 0);
             this.expandableSplitter2.Name = "expandableSplitter2";
-			this.expandableSplitter2.Size = new System.Drawing.Size(9, 809);
+            this.expandableSplitter2.Size = new System.Drawing.Size(6, 525);
             this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
             this.expandableSplitter2.TabIndex = 38;
             this.expandableSplitter2.TabStop = false;
@@ -298,10 +288,9 @@
             this.panelEx2.Controls.Add(this.label4);
             this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
             this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
-			this.panelEx2.Location = new System.Drawing.Point(587, 0);
-			this.panelEx2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.panelEx2.Location = new System.Drawing.Point(391, 0);
             this.panelEx2.Name = "panelEx2";
-			this.panelEx2.Size = new System.Drawing.Size(436, 809);
+            this.panelEx2.Size = new System.Drawing.Size(291, 525);
             this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
             this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -317,21 +306,19 @@
             this.txtProcess.AcceptsReturn = true;
             this.txtProcess.Dock = System.Windows.Forms.DockStyle.Fill;
             this.txtProcess.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.txtProcess.Location = new System.Drawing.Point(0, 228);
-			this.txtProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txtProcess.Location = new System.Drawing.Point(0, 150);
             this.txtProcess.Multiline = true;
             this.txtProcess.Name = "txtProcess";
             this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.txtProcess.Size = new System.Drawing.Size(436, 581);
+            this.txtProcess.Size = new System.Drawing.Size(291, 375);
             this.txtProcess.TabIndex = 5;
             // 
             // pbProcess
             // 
             this.pbProcess.Dock = System.Windows.Forms.DockStyle.Top;
-			this.pbProcess.Location = new System.Drawing.Point(0, 190);
-			this.pbProcess.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pbProcess.Location = new System.Drawing.Point(0, 125);
             this.pbProcess.Name = "pbProcess";
-			this.pbProcess.Size = new System.Drawing.Size(436, 38);
+            this.pbProcess.Size = new System.Drawing.Size(291, 25);
             this.pbProcess.TabIndex = 6;
             // 
             // label6
@@ -339,10 +326,9 @@
             this.label6.BackColor = System.Drawing.SystemColors.ActiveCaption;
             this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label6.Dock = System.Windows.Forms.DockStyle.Top;
-			this.label6.Location = new System.Drawing.Point(0, 156);
-			this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Location = new System.Drawing.Point(0, 102);
             this.label6.Name = "label6";
-			this.label6.Size = new System.Drawing.Size(436, 34);
+            this.label6.Size = new System.Drawing.Size(291, 23);
             this.label6.TabIndex = 3;
             this.label6.Text = "Process Status";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -352,11 +338,10 @@
             this.panel3.Controls.Add(this.pnlLater);
             this.panel3.Controls.Add(this.chkLater);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
-			this.panel3.Location = new System.Drawing.Point(0, 34);
-			this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.panel3.Location = new System.Drawing.Point(0, 23);
             this.panel3.Name = "panel3";
-			this.panel3.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
-			this.panel3.Size = new System.Drawing.Size(436, 122);
+            this.panel3.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.panel3.Size = new System.Drawing.Size(291, 79);
             this.panel3.TabIndex = 2;
             // 
             // pnlLater
@@ -366,20 +351,18 @@
             this.pnlLater.Controls.Add(this.dtpDate);
             this.pnlLater.Dock = System.Windows.Forms.DockStyle.Top;
             this.pnlLater.Enabled = false;
-			this.pnlLater.Location = new System.Drawing.Point(9, 33);
-			this.pnlLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.pnlLater.Location = new System.Drawing.Point(6, 23);
             this.pnlLater.Name = "pnlLater";
-			this.pnlLater.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
-			this.pnlLater.Size = new System.Drawing.Size(418, 57);
+            this.pnlLater.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.pnlLater.Size = new System.Drawing.Size(279, 37);
             this.pnlLater.TabIndex = 3;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-			this.label5.Location = new System.Drawing.Point(158, 23);
-			this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(105, 15);
             this.label5.Name = "label5";
-			this.label5.Size = new System.Drawing.Size(25, 20);
+            this.label5.Size = new System.Drawing.Size(18, 13);
             this.label5.TabIndex = 5;
             this.label5.Text = "@";
             // 
@@ -389,30 +372,27 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.dtpTime.CustomFormat = "HH:mm";
             this.dtpTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-			this.dtpTime.Location = new System.Drawing.Point(194, 14);
-			this.dtpTime.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.dtpTime.Location = new System.Drawing.Point(129, 9);
             this.dtpTime.Name = "dtpTime";
             this.dtpTime.ShowUpDown = true;
-			this.dtpTime.Size = new System.Drawing.Size(198, 26);
+            this.dtpTime.Size = new System.Drawing.Size(133, 20);
             this.dtpTime.TabIndex = 4;
             // 
             // dtpDate
             // 
             this.dtpDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-			this.dtpDate.Location = new System.Drawing.Point(14, 14);
-			this.dtpDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.dtpDate.Location = new System.Drawing.Point(9, 9);
             this.dtpDate.Name = "dtpDate";
-			this.dtpDate.Size = new System.Drawing.Size(133, 26);
+            this.dtpDate.Size = new System.Drawing.Size(90, 20);
             this.dtpDate.TabIndex = 3;
             // 
             // chkLater
             // 
             this.chkLater.AutoSize = true;
             this.chkLater.Dock = System.Windows.Forms.DockStyle.Top;
-			this.chkLater.Location = new System.Drawing.Point(9, 9);
-			this.chkLater.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.chkLater.Location = new System.Drawing.Point(6, 6);
             this.chkLater.Name = "chkLater";
-			this.chkLater.Size = new System.Drawing.Size(418, 24);
+            this.chkLater.Size = new System.Drawing.Size(279, 17);
             this.chkLater.TabIndex = 4;
             this.chkLater.Text = "Process Later";
             this.chkLater.UseVisualStyleBackColor = true;
@@ -424,9 +404,8 @@
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label4.Dock = System.Windows.Forms.DockStyle.Top;
             this.label4.Location = new System.Drawing.Point(0, 0);
-			this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(436, 34);
+            this.label4.Size = new System.Drawing.Size(291, 23);
             this.label4.TabIndex = 3;
             this.label4.Text = "Process";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -456,10 +435,9 @@
             this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
             this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
             this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-			this.expandableSplitter1.Location = new System.Drawing.Point(578, 0);
-			this.expandableSplitter1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.expandableSplitter1.Location = new System.Drawing.Point(385, 0);
             this.expandableSplitter1.Name = "expandableSplitter1";
-			this.expandableSplitter1.Size = new System.Drawing.Size(9, 809);
+            this.expandableSplitter1.Size = new System.Drawing.Size(6, 525);
             this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
             this.expandableSplitter1.TabIndex = 4;
             this.expandableSplitter1.TabStop = false;
@@ -472,9 +450,8 @@
             this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
             this.panelEx1.Dock = System.Windows.Forms.DockStyle.Left;
             this.panelEx1.Location = new System.Drawing.Point(0, 0);
-			this.panelEx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.panelEx1.Name = "panelEx1";
-			this.panelEx1.Size = new System.Drawing.Size(578, 809);
+            this.panelEx1.Size = new System.Drawing.Size(385, 525);
             this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
             this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -506,10 +483,9 @@
             this.sideNavItmDelete,
             this.sideNavItmExit});
             this.sideNav1.Location = new System.Drawing.Point(0, 0);
-			this.sideNav1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.sideNav1.Name = "sideNav1";
-			this.sideNav1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-			this.sideNav1.Size = new System.Drawing.Size(578, 809);
+            this.sideNav1.Padding = new System.Windows.Forms.Padding(1, 1, 1, 1);
+            this.sideNav1.Size = new System.Drawing.Size(385, 525);
             this.sideNav1.TabIndex = 3;
             this.sideNav1.Text = "sideNav1";
             // 
@@ -522,10 +498,10 @@
             this.sideNavPanel4.Controls.Add(this.myTVdel);
             this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
             this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel4.Location = new System.Drawing.Point(109, 40);
-			this.sideNavPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sideNavPanel4.Location = new System.Drawing.Point(81, 31);
+            this.sideNavPanel4.MinimumSize = new System.Drawing.Size(0, 493);
             this.sideNavPanel4.Name = "sideNavPanel4";
-			this.sideNavPanel4.Size = new System.Drawing.Size(461, 767);
+            this.sideNavPanel4.Size = new System.Drawing.Size(300, 493);
             this.sideNavPanel4.TabIndex = 27;
             // 
             // swDeleteFolder
@@ -534,10 +510,9 @@
             // 
             // 
             this.swDeleteFolder.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swDeleteFolder.Location = new System.Drawing.Point(15, 66);
-			this.swDeleteFolder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swDeleteFolder.Location = new System.Drawing.Point(10, 43);
             this.swDeleteFolder.Name = "swDeleteFolder";
-			this.swDeleteFolder.Size = new System.Drawing.Size(104, 34);
+            this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
             this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
             this.swDeleteFolder.SwitchClickTogglesValue = true;
@@ -552,10 +527,9 @@
             // 
             this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX13.Location = new System.Drawing.Point(128, 65);
-			this.labelX13.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX13.Location = new System.Drawing.Point(85, 42);
             this.labelX13.Name = "labelX13";
-			this.labelX13.Size = new System.Drawing.Size(252, 34);
+            this.labelX13.Size = new System.Drawing.Size(168, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
             this.labelX13.TabIndex = 38;
             this.labelX13.Text = "Delete Folders";
@@ -566,10 +540,9 @@
             // 
             // 
             this.swDeleteAnnotations.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swDeleteAnnotations.Location = new System.Drawing.Point(15, 23);
-			this.swDeleteAnnotations.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swDeleteAnnotations.Location = new System.Drawing.Point(10, 15);
             this.swDeleteAnnotations.Name = "swDeleteAnnotations";
-			this.swDeleteAnnotations.Size = new System.Drawing.Size(104, 34);
+            this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
             this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
             this.swDeleteAnnotations.SwitchClickTogglesValue = true;
@@ -586,10 +559,9 @@
             // 
             this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX14.Location = new System.Drawing.Point(128, 22);
-			this.labelX14.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX14.Location = new System.Drawing.Point(85, 14);
             this.labelX14.Name = "labelX14";
-			this.labelX14.Size = new System.Drawing.Size(279, 34);
+            this.labelX14.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
             this.labelX14.TabIndex = 36;
             this.labelX14.Text = "Delete Annotations";
@@ -598,10 +570,9 @@
             // 
             this.myTVdel.CheckBoxes = true;
             this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
-			this.myTVdel.Location = new System.Drawing.Point(0, 205);
-			this.myTVdel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.myTVdel.Location = new System.Drawing.Point(0, 126);
             this.myTVdel.Name = "myTVdel";
-			this.myTVdel.Size = new System.Drawing.Size(461, 562);
+            this.myTVdel.Size = new System.Drawing.Size(300, 367);
             this.myTVdel.TabIndex = 34;
             this.myTVdel.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.myTV_AfterCheck_DelAnn);
             // 
@@ -612,10 +583,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.btnDeleteItems.Checked = true;
             this.btnDeleteItems.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnDeleteItems.Location = new System.Drawing.Point(58, 151);
-			this.btnDeleteItems.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnDeleteItems.Location = new System.Drawing.Point(39, 98);
             this.btnDeleteItems.Name = "btnDeleteItems";
-			this.btnDeleteItems.Size = new System.Drawing.Size(343, 35);
+            this.btnDeleteItems.Size = new System.Drawing.Size(221, 23);
             this.btnDeleteItems.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.btnDeleteItems, new DevComponents.DotNetBar.SuperTooltipInfo("Process Deletions", "", resources.GetString("btnDeleteItems.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
             this.btnDeleteItems.TabIndex = 35;
@@ -636,10 +606,10 @@
             this.sideNavPanel3.Controls.Add(this.myTV);
             this.sideNavPanel3.Controls.Add(this.btnFixLinks);
             this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel3.Location = new System.Drawing.Point(134, 48);
-			this.sideNavPanel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
+            this.sideNavPanel3.MinimumSize = new System.Drawing.Size(0, 540);
             this.sideNavPanel3.Name = "sideNavPanel3";
-			this.sideNavPanel3.Size = new System.Drawing.Size(436, 760);
+            this.sideNavPanel3.Size = new System.Drawing.Size(291, 540);
             this.sideNavPanel3.TabIndex = 10;
             this.sideNavPanel3.Visible = false;
             // 
@@ -649,10 +619,9 @@
             // 
             // 
             this.swCheckROLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCheckROLinks.Location = new System.Drawing.Point(15, 102);
-			this.swCheckROLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swCheckROLinks.Location = new System.Drawing.Point(10, 66);
             this.swCheckROLinks.Name = "swCheckROLinks";
-			this.swCheckROLinks.Size = new System.Drawing.Size(136, 34);
+            this.swCheckROLinks.Size = new System.Drawing.Size(91, 22);
             this.swCheckROLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swCheckROLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("swCheckROLinks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
             this.swCheckROLinks.SwitchClickTogglesValue = true;
@@ -667,10 +636,9 @@
             // 
             this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX12.Location = new System.Drawing.Point(160, 102);
-			this.labelX12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX12.Location = new System.Drawing.Point(107, 66);
             this.labelX12.Name = "labelX12";
-			this.labelX12.Size = new System.Drawing.Size(279, 34);
+            this.labelX12.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX12, new DevComponents.DotNetBar.SuperTooltipInfo("Check RO Links", "", resources.GetString("labelX12.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
             this.labelX12.TabIndex = 32;
             this.labelX12.Text = "Check RO Links";
@@ -680,21 +648,20 @@
             this.warningBox5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox5.CloseButtonVisible = false;
             this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
-			this.warningBox5.Location = new System.Drawing.Point(26, 223);
-			this.warningBox5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.warningBox5.Location = new System.Drawing.Point(17, 145);
+            this.warningBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.warningBox5.Name = "warningBox5";
             this.warningBox5.OptionsButtonVisible = false;
-			this.warningBox5.Size = new System.Drawing.Size(393, 49);
+            this.warningBox5.Size = new System.Drawing.Size(262, 32);
             this.warningBox5.TabIndex = 31;
             this.warningBox5.Text = "<b>NOTE</b> These tools can take a long time to run";
             // 
             // line3
             // 
             this.line3.BackColor = System.Drawing.Color.Transparent;
-			this.line3.Location = new System.Drawing.Point(9, 195);
-			this.line3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.line3.Location = new System.Drawing.Point(6, 127);
             this.line3.Name = "line3";
-			this.line3.Size = new System.Drawing.Size(428, 18);
+            this.line3.Size = new System.Drawing.Size(285, 12);
             this.line3.TabIndex = 30;
             this.line3.Text = "line3";
             // 
@@ -704,10 +671,9 @@
             // 
             // 
             this.swUpdateROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swUpdateROVals.Location = new System.Drawing.Point(15, 15);
-			this.swUpdateROVals.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swUpdateROVals.Location = new System.Drawing.Point(10, 10);
             this.swUpdateROVals.Name = "swUpdateROVals";
-			this.swUpdateROVals.Size = new System.Drawing.Size(136, 34);
+            this.swUpdateROVals.Size = new System.Drawing.Size(91, 22);
             this.swUpdateROVals.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swUpdateROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("swUpdateROVals.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
             this.swUpdateROVals.SwitchClickTogglesValue = true;
@@ -722,10 +688,9 @@
             // 
             // 
             this.swRefreshTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTrans.Location = new System.Drawing.Point(15, 58);
-			this.swRefreshTrans.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swRefreshTrans.Location = new System.Drawing.Point(10, 38);
             this.swRefreshTrans.Name = "swRefreshTrans";
-			this.swRefreshTrans.Size = new System.Drawing.Size(136, 34);
+            this.swRefreshTrans.Size = new System.Drawing.Size(91, 22);
             this.swRefreshTrans.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swRefreshTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("swRefreshTrans.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
             this.swRefreshTrans.SwitchClickTogglesValue = true;
@@ -740,10 +705,9 @@
             // 
             this.labelX11.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX11.Location = new System.Drawing.Point(160, 15);
-			this.labelX11.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX11.Location = new System.Drawing.Point(107, 10);
             this.labelX11.Name = "labelX11";
-			this.labelX11.Size = new System.Drawing.Size(279, 34);
+            this.labelX11.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX11, new DevComponents.DotNetBar.SuperTooltipInfo("Update RO Values", "", resources.GetString("labelX11.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
             this.labelX11.TabIndex = 28;
             this.labelX11.Text = "Update RO Values";
@@ -756,10 +720,9 @@
             // 
             this.labelX6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX6.Location = new System.Drawing.Point(160, 58);
-			this.labelX6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX6.Location = new System.Drawing.Point(107, 38);
             this.labelX6.Name = "labelX6";
-			this.labelX6.Size = new System.Drawing.Size(279, 34);
+            this.labelX6.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX6, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Transitions", "", resources.GetString("labelX6.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(256, 175)));
             this.labelX6.TabIndex = 28;
             this.labelX6.Text = "Refresh Transitions";
@@ -769,11 +732,11 @@
             this.warningBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox1.CloseButtonVisible = false;
             this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
-			this.warningBox1.Location = new System.Drawing.Point(26, 278);
-			this.warningBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.warningBox1.Location = new System.Drawing.Point(17, 181);
+            this.warningBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.warningBox1.Name = "warningBox1";
             this.warningBox1.OptionsButtonVisible = false;
-			this.warningBox1.Size = new System.Drawing.Size(393, 66);
+            this.warningBox1.Size = new System.Drawing.Size(262, 43);
             this.warningBox1.TabIndex = 7;
             this.warningBox1.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
     "tions";
@@ -783,10 +746,9 @@
             this.btnFixLinks.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btnFixLinks.Checked = true;
             this.btnFixLinks.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnFixLinks.Location = new System.Drawing.Point(15, 151);
-			this.btnFixLinks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnFixLinks.Location = new System.Drawing.Point(10, 98);
             this.btnFixLinks.Name = "btnFixLinks";
-			this.btnFixLinks.Size = new System.Drawing.Size(420, 35);
+            this.btnFixLinks.Size = new System.Drawing.Size(280, 23);
             this.btnFixLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.btnFixLinks, new DevComponents.DotNetBar.SuperTooltipInfo("Process Links", "", "This will run the selected RO Links or Transitions Links tool.\r\n\r\nClick on the on" +
             "/off switches to turn on/off each tool.\r\n\r\nNote that only one of these tools can" +
@@ -808,10 +770,9 @@
             this.sideNavPanel1.Controls.Add(this.labelX1);
             this.sideNavPanel1.Controls.Add(this.btnRunCheck);
             this.sideNavPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel1.Location = new System.Drawing.Point(134, 48);
-			this.sideNavPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sideNavPanel1.Location = new System.Drawing.Point(89, 31);
             this.sideNavPanel1.Name = "sideNavPanel1";
-			this.sideNavPanel1.Size = new System.Drawing.Size(436, 760);
+            this.sideNavPanel1.Size = new System.Drawing.Size(291, 494);
             this.sideNavPanel1.TabIndex = 2;
             this.sideNavPanel1.Visible = false;
             // 
@@ -820,11 +781,11 @@
             this.warningBox3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox3.CloseButtonVisible = false;
             this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
-			this.warningBox3.Location = new System.Drawing.Point(26, 318);
-			this.warningBox3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.warningBox3.Location = new System.Drawing.Point(17, 207);
+            this.warningBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.warningBox3.Name = "warningBox3";
             this.warningBox3.OptionsButtonVisible = false;
-			this.warningBox3.Size = new System.Drawing.Size(396, 49);
+            this.warningBox3.Size = new System.Drawing.Size(264, 32);
             this.warningBox3.TabIndex = 29;
             this.warningBox3.Text = "<b>NOTE</b> These tools can take a long time to run";
             // 
@@ -836,20 +797,18 @@
             // 
             this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX7.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX7.Location = new System.Drawing.Point(8, 5);
-			this.labelX7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX7.Location = new System.Drawing.Point(5, 3);
             this.labelX7.Name = "labelX7";
-			this.labelX7.Size = new System.Drawing.Size(376, 34);
+            this.labelX7.Size = new System.Drawing.Size(251, 22);
             this.labelX7.TabIndex = 19;
             this.labelX7.Text = "Check for these Data Issues:";
             // 
             // line1
             // 
             this.line1.BackColor = System.Drawing.Color.Transparent;
-			this.line1.Location = new System.Drawing.Point(12, 275);
-			this.line1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.line1.Location = new System.Drawing.Point(8, 179);
             this.line1.Name = "line1";
-			this.line1.Size = new System.Drawing.Size(428, 18);
+            this.line1.Size = new System.Drawing.Size(285, 12);
             this.line1.TabIndex = 18;
             this.line1.Text = "line1";
             // 
@@ -859,10 +818,9 @@
             // 
             // 
             this.swCkObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCkObsoleteROData.Location = new System.Drawing.Point(15, 152);
-			this.swCkObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swCkObsoleteROData.Location = new System.Drawing.Point(10, 99);
             this.swCkObsoleteROData.Name = "swCkObsoleteROData";
-			this.swCkObsoleteROData.Size = new System.Drawing.Size(136, 34);
+            this.swCkObsoleteROData.Size = new System.Drawing.Size(91, 22);
             this.swCkObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swCkObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("swCkObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
             this.swCkObsoleteROData.SwitchClickTogglesValue = true;
@@ -877,10 +835,9 @@
             // 
             // 
             this.swHiddenDataLocs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swHiddenDataLocs.Location = new System.Drawing.Point(15, 109);
-			this.swHiddenDataLocs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swHiddenDataLocs.Location = new System.Drawing.Point(10, 71);
             this.swHiddenDataLocs.Name = "swHiddenDataLocs";
-			this.swHiddenDataLocs.Size = new System.Drawing.Size(136, 34);
+            this.swHiddenDataLocs.Size = new System.Drawing.Size(91, 22);
             this.swHiddenDataLocs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swHiddenDataLocs, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("swHiddenDataLocs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.swHiddenDataLocs.SwitchClickTogglesValue = true;
@@ -897,10 +854,9 @@
             // 
             this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX3.Location = new System.Drawing.Point(160, 152);
-			this.labelX3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX3.Location = new System.Drawing.Point(107, 99);
             this.labelX3.Name = "labelX3";
-			this.labelX3.Size = new System.Drawing.Size(231, 34);
+            this.labelX3.Size = new System.Drawing.Size(154, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Obsolete RO Data", "", resources.GetString("labelX3.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 135)));
             this.labelX3.TabIndex = 11;
             this.labelX3.Text = "Obsolete RO Data";
@@ -913,10 +869,9 @@
             // 
             this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX2.Location = new System.Drawing.Point(160, 109);
-			this.labelX2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX2.Location = new System.Drawing.Point(107, 71);
             this.labelX2.Name = "labelX2";
-			this.labelX2.Size = new System.Drawing.Size(210, 34);
+            this.labelX2.Size = new System.Drawing.Size(140, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Hidden Data Locations", "", resources.GetString("labelX2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.labelX2.TabIndex = 12;
             this.labelX2.Text = "Hidden Data Locations";
@@ -927,10 +882,9 @@
             // 
             // 
             this.swCkOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swCkOrphanDataRecs.Location = new System.Drawing.Point(15, 66);
-			this.swCkOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swCkOrphanDataRecs.Location = new System.Drawing.Point(10, 43);
             this.swCkOrphanDataRecs.Name = "swCkOrphanDataRecs";
-			this.swCkOrphanDataRecs.Size = new System.Drawing.Size(136, 34);
+            this.swCkOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
             this.swCkOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swCkOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("swCkOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 193)));
             this.swCkOrphanDataRecs.SwitchClickTogglesValue = true;
@@ -947,10 +901,9 @@
             // 
             this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX1.Location = new System.Drawing.Point(160, 66);
-			this.labelX1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX1.Location = new System.Drawing.Point(107, 43);
             this.labelX1.Name = "labelX1";
-			this.labelX1.Size = new System.Drawing.Size(258, 34);
+            this.labelX1.Size = new System.Drawing.Size(172, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("Orphan Data Records", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 190)));
             this.labelX1.TabIndex = 8;
             this.labelX1.Text = "Orphan Data Records";
@@ -961,10 +914,9 @@
             this.btnRunCheck.Checked = true;
             this.btnRunCheck.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnRunCheck.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnRunCheck.Location = new System.Drawing.Point(8, 231);
-			this.btnRunCheck.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnRunCheck.Location = new System.Drawing.Point(5, 150);
             this.btnRunCheck.Name = "btnRunCheck";
-			this.btnRunCheck.Size = new System.Drawing.Size(429, 35);
+            this.btnRunCheck.Size = new System.Drawing.Size(286, 23);
             this.btnRunCheck.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.btnRunCheck, new DevComponents.DotNetBar.SuperTooltipInfo("Run Check", "", "This will run the database check tools selected.\r\n\r\nClick on the on/off switches " +
             "to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100)));
@@ -990,10 +942,9 @@
             this.sideNavPanel2.Controls.Add(this.line2);
             this.sideNavPanel2.Controls.Add(this.btnRunRepair);
             this.sideNavPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel2.Location = new System.Drawing.Point(134, 48);
-			this.sideNavPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sideNavPanel2.Location = new System.Drawing.Point(89, 31);
             this.sideNavPanel2.Name = "sideNavPanel2";
-			this.sideNavPanel2.Size = new System.Drawing.Size(436, 760);
+            this.sideNavPanel2.Size = new System.Drawing.Size(291, 494);
             this.sideNavPanel2.TabIndex = 6;
             this.sideNavPanel2.Visible = false;
             // 
@@ -1003,10 +954,9 @@
             // 
             // 
             this.swRefreshTblsForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshTblsForSrch.Location = new System.Drawing.Point(15, 235);
-			this.swRefreshTblsForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swRefreshTblsForSrch.Location = new System.Drawing.Point(10, 153);
             this.swRefreshTblsForSrch.Name = "swRefreshTblsForSrch";
-			this.swRefreshTblsForSrch.Size = new System.Drawing.Size(136, 34);
+            this.swRefreshTblsForSrch.Size = new System.Drawing.Size(91, 22);
             this.swRefreshTblsForSrch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swRefreshTblsForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshTblsForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.swRefreshTblsForSrch.SwitchClickTogglesValue = true;
@@ -1023,10 +973,9 @@
             // 
             this.lblRefreshTblForSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lblRefreshTblForSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblRefreshTblForSrch.Location = new System.Drawing.Point(160, 235);
-			this.lblRefreshTblForSrch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.lblRefreshTblForSrch.Location = new System.Drawing.Point(107, 153);
             this.lblRefreshTblForSrch.Name = "lblRefreshTblForSrch";
-			this.lblRefreshTblForSrch.Size = new System.Drawing.Size(279, 34);
+            this.lblRefreshTblForSrch.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.lblRefreshTblForSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("lblRefreshTblForSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.lblRefreshTblForSrch.TabIndex = 31;
             this.lblRefreshTblForSrch.Text = "Refresh Tables For Search";
@@ -1036,11 +985,11 @@
             this.warningBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox4.CloseButtonVisible = false;
             this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
-			this.warningBox4.Location = new System.Drawing.Point(18, 406);
-			this.warningBox4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.warningBox4.Location = new System.Drawing.Point(12, 264);
+            this.warningBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.warningBox4.Name = "warningBox4";
             this.warningBox4.OptionsButtonVisible = false;
-			this.warningBox4.Size = new System.Drawing.Size(396, 49);
+            this.warningBox4.Size = new System.Drawing.Size(264, 32);
             this.warningBox4.TabIndex = 30;
             this.warningBox4.Text = "<b>NOTE</b> These tools can take a long time to run";
             // 
@@ -1049,11 +998,11 @@
             this.warningBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
             this.warningBox2.CloseButtonVisible = false;
             this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
-			this.warningBox2.Location = new System.Drawing.Point(18, 465);
-			this.warningBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.warningBox2.Location = new System.Drawing.Point(12, 302);
+            this.warningBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.warningBox2.Name = "warningBox2";
             this.warningBox2.OptionsButtonVisible = false;
-			this.warningBox2.Size = new System.Drawing.Size(396, 66);
+            this.warningBox2.Size = new System.Drawing.Size(264, 43);
             this.warningBox2.TabIndex = 28;
             this.warningBox2.Text = " Be sure there is a current backup of the \r\n database prior to running these func" +
     "tions";
@@ -1064,10 +1013,9 @@
             // 
             // 
             this.swRmObsoleteROData.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRmObsoleteROData.Location = new System.Drawing.Point(15, 102);
-			this.swRmObsoleteROData.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swRmObsoleteROData.Location = new System.Drawing.Point(10, 66);
             this.swRmObsoleteROData.Name = "swRmObsoleteROData";
-			this.swRmObsoleteROData.Size = new System.Drawing.Size(136, 34);
+            this.swRmObsoleteROData.Size = new System.Drawing.Size(91, 22);
             this.swRmObsoleteROData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swRmObsoleteROData, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("swRmObsoleteROData.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205)));
             this.swRmObsoleteROData.SwitchClickTogglesValue = true;
@@ -1082,10 +1030,9 @@
             // 
             // 
             this.swRefreshWordAttmts.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRefreshWordAttmts.Location = new System.Drawing.Point(15, 188);
-			this.swRefreshWordAttmts.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swRefreshWordAttmts.Location = new System.Drawing.Point(10, 122);
             this.swRefreshWordAttmts.Name = "swRefreshWordAttmts";
-			this.swRefreshWordAttmts.Size = new System.Drawing.Size(136, 34);
+            this.swRefreshWordAttmts.Size = new System.Drawing.Size(91, 22);
             this.swRefreshWordAttmts.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swRefreshWordAttmts, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("swRefreshWordAttmts.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.swRefreshWordAttmts.SwitchClickTogglesValue = true;
@@ -1100,10 +1047,9 @@
             // 
             // 
             this.swStandardHypenChars.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swStandardHypenChars.Location = new System.Drawing.Point(15, 145);
-			this.swStandardHypenChars.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swStandardHypenChars.Location = new System.Drawing.Point(10, 94);
             this.swStandardHypenChars.Name = "swStandardHypenChars";
-			this.swStandardHypenChars.Size = new System.Drawing.Size(136, 34);
+            this.swStandardHypenChars.Size = new System.Drawing.Size(91, 22);
             this.swStandardHypenChars.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swStandardHypenChars, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("swStandardHypenChars.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129)));
             this.swStandardHypenChars.SwitchClickTogglesValue = true;
@@ -1120,10 +1066,9 @@
             // 
             this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX4.Location = new System.Drawing.Point(160, 102);
-			this.labelX4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX4.Location = new System.Drawing.Point(107, 66);
             this.labelX4.Name = "labelX4";
-			this.labelX4.Size = new System.Drawing.Size(250, 34);
+            this.labelX4.Size = new System.Drawing.Size(167, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX4, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Obsolete RO Data", "", resources.GetString("labelX4.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(230, 205)));
             this.labelX4.TabIndex = 24;
             this.labelX4.Text = "Remove Obsolete RO Data";
@@ -1136,10 +1081,9 @@
             // 
             this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX5.Location = new System.Drawing.Point(160, 188);
-			this.labelX5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX5.Location = new System.Drawing.Point(107, 122);
             this.labelX5.Name = "labelX5";
-			this.labelX5.Size = new System.Drawing.Size(279, 34);
+            this.labelX5.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX5, new DevComponents.DotNetBar.SuperTooltipInfo("Refresh Word Attachments", "", resources.GetString("labelX5.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(300, 200)));
             this.labelX5.TabIndex = 25;
             this.labelX5.Text = "Refresh Word Attachments";
@@ -1152,10 +1096,9 @@
             // 
             this.labelX9.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX9.Location = new System.Drawing.Point(160, 145);
-			this.labelX9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX9.Location = new System.Drawing.Point(107, 94);
             this.labelX9.Name = "labelX9";
-			this.labelX9.Size = new System.Drawing.Size(279, 34);
+            this.labelX9.Size = new System.Drawing.Size(186, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX9, new DevComponents.DotNetBar.SuperTooltipInfo("Standardize Hyphen Characters", "", resources.GetString("labelX9.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(225, 129)));
             this.labelX9.TabIndex = 25;
             this.labelX9.Text = "Standardize Hyphen Characters";
@@ -1166,10 +1109,9 @@
             // 
             // 
             this.swRmOrphanDataRecs.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.swRmOrphanDataRecs.Location = new System.Drawing.Point(15, 58);
-			this.swRmOrphanDataRecs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.swRmOrphanDataRecs.Location = new System.Drawing.Point(10, 38);
             this.swRmOrphanDataRecs.Name = "swRmOrphanDataRecs";
-			this.swRmOrphanDataRecs.Size = new System.Drawing.Size(136, 34);
+            this.swRmOrphanDataRecs.Size = new System.Drawing.Size(91, 22);
             this.swRmOrphanDataRecs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.swRmOrphanDataRecs, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("swRmOrphanDataRecs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140)));
             this.swRmOrphanDataRecs.SwitchClickTogglesValue = true;
@@ -1186,10 +1128,9 @@
             // 
             this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX10.Location = new System.Drawing.Point(160, 58);
-			this.labelX10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX10.Location = new System.Drawing.Point(107, 38);
             this.labelX10.Name = "labelX10";
-			this.labelX10.Size = new System.Drawing.Size(276, 34);
+            this.labelX10.Size = new System.Drawing.Size(184, 22);
             this.superTooltip1.SetSuperTooltip(this.labelX10, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Orphan Data Records", "", resources.GetString("labelX10.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(325, 140)));
             this.labelX10.TabIndex = 22;
             this.labelX10.Text = "Remove Orphan Data Records";
@@ -1202,20 +1143,18 @@
             // 
             this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.labelX8.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.labelX8.Location = new System.Drawing.Point(8, 5);
-			this.labelX8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.labelX8.Location = new System.Drawing.Point(5, 3);
             this.labelX8.Name = "labelX8";
-			this.labelX8.Size = new System.Drawing.Size(376, 34);
+            this.labelX8.Size = new System.Drawing.Size(251, 22);
             this.labelX8.TabIndex = 21;
             this.labelX8.Text = "Repair these Data Issues:";
             // 
             // line2
             // 
             this.line2.BackColor = System.Drawing.Color.Transparent;
-			this.line2.Location = new System.Drawing.Point(6, 365);
-			this.line2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.line2.Location = new System.Drawing.Point(4, 237);
             this.line2.Name = "line2";
-			this.line2.Size = new System.Drawing.Size(422, 18);
+            this.line2.Size = new System.Drawing.Size(281, 12);
             this.line2.TabIndex = 20;
             this.line2.Text = "line2";
             // 
@@ -1225,10 +1164,9 @@
             this.btnRunRepair.Checked = true;
             this.btnRunRepair.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnRunRepair.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.btnRunRepair.Location = new System.Drawing.Point(8, 305);
-			this.btnRunRepair.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnRunRepair.Location = new System.Drawing.Point(5, 198);
             this.btnRunRepair.Name = "btnRunRepair";
-			this.btnRunRepair.Size = new System.Drawing.Size(420, 35);
+            this.btnRunRepair.Size = new System.Drawing.Size(280, 23);
             this.btnRunRepair.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.btnRunRepair, new DevComponents.DotNetBar.SuperTooltipInfo("Run Repair", "", "This will run the database repair tools selected.\r\n\r\nClick on the on/off switches" +
             " to turn on/off each tool.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 103)));
@@ -1240,10 +1178,9 @@
             // 
             this.sideNavPanel5.Controls.Add(this.btn_ShowUsers);
             this.sideNavPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.sideNavPanel5.Location = new System.Drawing.Point(122, 48);
-			this.sideNavPanel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.sideNavPanel5.Location = new System.Drawing.Point(81, 31);
             this.sideNavPanel5.Name = "sideNavPanel5";
-			this.sideNavPanel5.Size = new System.Drawing.Size(448, 760);
+            this.sideNavPanel5.Size = new System.Drawing.Size(299, 494);
             this.sideNavPanel5.TabIndex = 14;
             this.sideNavPanel5.Visible = false;
             // 
@@ -1252,10 +1189,9 @@
             this.btn_ShowUsers.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btn_ShowUsers.Checked = true;
             this.btn_ShowUsers.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btn_ShowUsers.Location = new System.Drawing.Point(86, 57);
-			this.btn_ShowUsers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btn_ShowUsers.Location = new System.Drawing.Point(57, 37);
             this.btn_ShowUsers.Name = "btn_ShowUsers";
-			this.btn_ShowUsers.Size = new System.Drawing.Size(256, 35);
+            this.btn_ShowUsers.Size = new System.Drawing.Size(171, 23);
             this.btn_ShowUsers.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.superTooltip1.SetSuperTooltip(this.btn_ShowUsers, new DevComponents.DotNetBar.SuperTooltipInfo("Show Users", "", "This will return all of the users currently with open sessions in the database an" +
             "d the details of any items they have checked out.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80)));
@@ -1338,9 +1274,8 @@
             this.panelEx4.DisabledBackColor = System.Drawing.Color.Empty;
             this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelEx4.Location = new System.Drawing.Point(0, 0);
-			this.panelEx4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.panelEx4.Name = "panelEx4";
-			this.panelEx4.Size = new System.Drawing.Size(1766, 87);
+            this.panelEx4.Size = new System.Drawing.Size(1177, 57);
             this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panelEx4.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
             this.panelEx4.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -1367,10 +1302,9 @@
             this.stepItem3,
             this.stepItem4});
             this.progressSteps1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-			this.progressSteps1.Location = new System.Drawing.Point(184, 28);
-			this.progressSteps1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.progressSteps1.Location = new System.Drawing.Point(123, 18);
             this.progressSteps1.Name = "progressSteps1";
-			this.progressSteps1.Size = new System.Drawing.Size(1548, 40);
+            this.progressSteps1.Size = new System.Drawing.Size(1032, 26);
             this.progressSteps1.TabIndex = 18;
             // 
             // stepItem1
@@ -1409,10 +1343,9 @@
             // 
             this.lblAdmToolProgressType.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.lblAdmToolProgressType.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblAdmToolProgressType.Location = new System.Drawing.Point(28, 15);
-			this.lblAdmToolProgressType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.lblAdmToolProgressType.Location = new System.Drawing.Point(19, 10);
             this.lblAdmToolProgressType.Name = "lblAdmToolProgressType";
-			this.lblAdmToolProgressType.Size = new System.Drawing.Size(147, 52);
+            this.lblAdmToolProgressType.Size = new System.Drawing.Size(98, 34);
             this.lblAdmToolProgressType.TabIndex = 19;
             this.lblAdmToolProgressType.Text = "Checking:";
             // 
@@ -1428,11 +1361,10 @@
             // 
             // frmBatchRefresh
             // 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1766, 902);
+            this.ClientSize = new System.Drawing.Size(1177, 586);
             this.Controls.Add(this.splitContainer3);
-			this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "frmBatchRefresh";

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -11,6 +11,7 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -177,6 +178,8 @@ namespace VEPROMS
 			myDocVersions.Clear();
 			FolderInfo fi = FolderInfo.GetTop();
 
+			fi.RefreshChildFolders();
+
 			if (fi.ChildFolderCount > 0)
 			{
 				TreeNode tn = new TreeNode(fi.Name);
@@ -232,7 +235,7 @@ namespace VEPROMS
 				loadedWorkingDraft = true;
 			}
 
-			if (tn.Parent != null && !loadedWorkingDraft)
+			if (tn.Parent != null && !loadedWorkingDraft && fi.FolderDocVersionCount == 0)
 			{
 				tn.Remove();
 			}
@@ -480,12 +483,14 @@ namespace VEPROMS
 		// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
 		private int numTransProcessed = 0;
 		private int numTransFixed = 0;
+		private int numTransCantFix = 0;
 		private int numTransConverted = 0;
 		// B2018-002 - Invalid Transitions - Initialize Transition Refresh Statistics
 		private void ResetTransNumbers()
 		{
 			numTransProcessed = 0;
 			numTransFixed = 0;
+			numTransCantFix = 0;
 			numTransConverted = 0;
 		}
 		private void RefreshTransitions()
@@ -534,11 +539,12 @@ namespace VEPROMS
 						numTransConverted += ProcedureInfo.TranConvertCount;
 						numTransProcessed += ProcedureInfo.TranCheckCount;
 						numTransFixed += ProcedureInfo.TranFixCount;
+						numTransCantFix += ProcedureInfo.TranCantFixCount; //Bad Transition Link
 						pbProcess.PerformStep();
 						Application.DoEvents();
 					}
 				}
-				if (numTransFixed == 0 && numTransConverted == 0)
+				if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
 				{
 					txtResults.AppendText("No Transitions Needed Updated.");
 					txtResults.AppendText(Environment.NewLine);
@@ -550,16 +556,18 @@ namespace VEPROMS
 				txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
 				txtProcess.AppendText(Environment.NewLine);
 				// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
+				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed + numTransCantFix)));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Converted to text: {0}", numTransConverted));
+				txtProcess.AppendText(Environment.NewLine);
+				txtProcess.AppendText(string.Format("Transitions Unable to be Automatically Fixed (Annotation: Bad Transition Link): {0}", numTransCantFix));
 				Application.DoEvents();
 				if (pil.Count > 0)
 				{
 					StringBuilder sb = new StringBuilder();
-					sb.AppendLine("The batch refresh process was not usccessful for all procedures selected.");
+					sb.AppendLine("The batch refresh process was not successful for all procedures selected.");
 					sb.AppendLine("The following procedures were not able to be refreshed...");
 					sb.AppendLine();
 					sb.AppendLine(sbProcs.ToString());
@@ -578,11 +586,11 @@ namespace VEPROMS
 				}
 			}
 			this.Cursor = Cursors.Default;
-			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
-			if (numTransFixed == 0 && numTransConverted == 0)
+            // B2018-002 - Invalid Transitions - Display Transition Refresh Statistic
+            if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
 				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.\n\n {4} Transitions unable to be automatically fixed (Annotation: Bad Transition Link).", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted + numTransCantFix), numTransFixed, numTransConverted, numTransCantFix), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -1102,8 +1110,7 @@ namespace VEPROMS
 			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Elapsed Seconds:{5}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds));
-			//Console.WriteLine("\"{0}\"\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}", pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds, numTransProcessed, numTransFixed, numTransConverted);
+			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
 			if (myFixes.Length > 0)
 			{
 				txtResults.AppendText(myFixes.ToString());
@@ -1799,6 +1806,21 @@ namespace VEPROMS
 				}
 			}
 
+			//B2024-074 If only deleting annotations from an individual procedure, verify can check out procedure.
+			string msgpi = string.Empty;
+			foreach (ProcedureInfo pi in pil)
+			{
+				//LINQ used for 1st check of if statement
+				//basically check if procedure was already part of a docVersionsFolder
+				//before checking if procedure was checked out already
+				//to avoid duplicate messages for checked out procedures
+				if (!dvil.Any(x => x.Procedures.Any(y => y.ItemID == pi.ItemID)) && !MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgpi))
+				{
+					sbDocVersions.AppendLine(msgpi);
+					cancelledOut = true;
+				}
+			}
+
 			if (cancelledOut)
 			{
 				StringBuilder sb = new StringBuilder();

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -183,19 +183,19 @@ It is recommended that this be done during off hours.
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="swUpdateROVals.SuperTooltip" xml:space="preserve">
@@ -230,36 +230,36 @@ If more than one procedure is selected, it is recommended that this be performed
   </data>
   <data name="warningBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="warningBox3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="swCkObsoleteROData.SuperTooltip" xml:space="preserve">
@@ -324,36 +324,36 @@ This function will remove all of the saved attachment PDFS stored in the databas
   </data>
   <data name="warningBox4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="warningBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAplJREFUOE+N
-        k11IU2Ecxv9zouK8CULrzo8SU3QKaSYmOJ2uFL8SK4igEIok6qKUwggySTShC41CRiiGdWNfYBcVWiGl
-        FqN0lh+UTaekzuWcuu2c9316nSdKLPEHz817/s/zPv9zOPQ/nlVQEGulF3ILPe+8SIHK8eYR5lusLwHy
-        Oy08RqpXjjfHVCMlsydbGbekg4/r4HmwRbLWUZzyeGNqD5NK1O5lw8L8NQHckgh5SAdXA3UqIxuzZKSj
-        8ssI8Il9wMQeYDoVfD4HrsdhsNdRgTL2b4yl5Ce1qL+xcQOWxpKxMzwAMVEayIv7IU8XwVnv8+XuEfJV
-        xtfjMlKZ/CYG3JYJ96wOPj6EoCBfMCkfnJdguSMG89eoVBlfS+tJCpCafa1stgBYzAZbzoFGo0ZIiD84
-        KwJ350P+UQxHtfr7vUPkp9j+4GqiM1K3FtyVB8h5wlSI4GB/RIQHgjtzwWaywMb1WHwYg7lKOq3YVrlz
-        jPw8RrWFOUoAJhpwcaNciNDQQMRGB4FNpIMNp4B93A2pXw/7ZbWlufCvFguNdNzzOta7J5S6fP4AdkVq
-        kKQVAQNJYO8TwHq0kD8kwdkWhZkLdMJrrsonlfu2yszmSsA9Bat1p0XdsTTcvxmJtpowyL1ar/m3PKYM
-        2MpVgzcySUWTdWRwd+wAXzoo3r5B7CnqDqVg+lW89yuoVARrR/SaANm0F46mUFjOUjYtN9BTaVQYJzPA
-        RlPB+hNF3XjvP3C9bDuqTm2D9DZuTcCKXN1psJ2ndhGgnpJGciENGyB9zoJk1kMezFonySw0oIf0KVOs
-        oIO7L3MlYITstVTsrKNHCzXU5aimnvmrZPp5hfrtlWS2X6LBuQoatJWTWQz3C5mEeoS6hNqt5yj7FysJ
-        zJwL4b/EAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAp5JREFUOE+F
+        k11Ik1Ecxv9zouJ2E4TWnR8V5tAppJmYsLnNlaLTxAoiKIQiibpYSmEEmSSa0IVGISMUw7rpE+yiQiuk
+        /IhROssPyjanpL4udeq29z3nCdcH+Wb1g+fq/zzP+R8Oh+gvPK4kNWujp1IrPek8S5Hy+X9hbXSN9aVC
+        eq1FwEYN8vk/mWqiDPZwI+NOHbhLj8CdDaK7npLlvnWpO0AKqZV62YgO/GMquDMN0rAevkbqlHvXZdlG
+        h6Rn8eATu4GJncB0Fvh8HnwPYuGpJ4vcvwZbGYWJrcpPzGXG8ngGtsZFQJOggrS0B9J0MbwNIR9uHqRQ
+        ee4XPhuVSy814IIB/lk9QkIIanUomFgIzkux0qHB/CUqk+eCtB2jCLEl1M1mLcBSLthKHlQqJaKjw8FZ
+        Mbi/ENKXEizUKD/f2k9h8jz5mumk2K0F9xUAUgE4K0JUVDji4yLBvflgMyYwlxFL9zSYq6ITa8I3DlNY
+        wKZ0soVSgFkAXgwuFSEmJhJJiWqwCR3YSCbY2x0QB4zwnFc6W4p+22KxiY4EXiQF74kf6/L5vdi+TYV0
+        rRpsMB2sPxWsRwvpTTq87QmYOUNHg+HqQlL4ryscbK4UPGD5vu60CWw8G7evbkN7bSykXm0w/FMBew6E
+        CsXQFQMpaLKezP6OLeDL+8AFM5hLBzaciennKcFXUCgI7o7ENQWSfRcWmmPgPEW5tNJIj8QxM9hkDthY
+        FthAGlh/SvAPXC7fjOrjmyC+Sl5TsCpfdzYEK92llUbllDiaD3HEDPG9CaLDCGnI9IdEhwnioBHiOwMC
+        dj38fYbVglHy1FGJt57uL9ZS10IN9cxfJPvXCzTgqSKH5xwNzVXSkFBBDsFKA4KV7IKVegQrda2e7j5N
+        ud8AKwnMnBpmYFAAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="swRmObsoleteROData.SuperTooltip" xml:space="preserve">

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

@@ -76,6 +76,9 @@ namespace VEPROMS
             this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components);
             this.btnReset = new DevComponents.DotNetBar.ButtonX();
             this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
+            this.cbOTRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbOTAutoOpen = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.gpOpenTabs = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.gpSystemColor.SuspendLayout();
             this.panButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
@@ -91,16 +94,17 @@ namespace VEPROMS
             this.gpAnnotationSettings.SuspendLayout();
             this.gpTransRangeColor.SuspendLayout();
             this.gpPropPageStyle.SuspendLayout();
+            this.gpOpenTabs.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnCancel
             // 
             this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnCancel.Location = new System.Drawing.Point(821, 606);
-			this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnCancel.Location = new System.Drawing.Point(616, 492);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btnCancel.Name = "btnCancel";
-			this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.Size = new System.Drawing.Size(56, 19);
             this.btnCancel.TabIndex = 0;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -108,10 +112,10 @@ namespace VEPROMS
             // btnOK
             // 
             this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnOK.Location = new System.Drawing.Point(723, 606);
-			this.btnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnOK.Location = new System.Drawing.Point(542, 492);
+            this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btnOK.Name = "btnOK";
-			this.btnOK.Size = new System.Drawing.Size(75, 23);
+            this.btnOK.Size = new System.Drawing.Size(56, 19);
             this.btnOK.TabIndex = 1;
             this.btnOK.Text = "OK";
             this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
@@ -125,10 +129,10 @@ namespace VEPROMS
             this.gpSystemColor.Controls.Add(this.cbRibonSilver);
             this.gpSystemColor.Controls.Add(this.cbRibonBlue);
             this.gpSystemColor.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpSystemColor.Location = new System.Drawing.Point(52, 16);
-			this.gpSystemColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpSystemColor.Location = new System.Drawing.Point(39, 13);
+            this.gpSystemColor.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpSystemColor.Name = "gpSystemColor";
-			this.gpSystemColor.Size = new System.Drawing.Size(109, 119);
+            this.gpSystemColor.Size = new System.Drawing.Size(82, 97);
             // 
             // 
             // 
@@ -168,10 +172,10 @@ namespace VEPROMS
             // 
             this.cbRibonBlack.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbRibonBlack.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbRibonBlack.Location = new System.Drawing.Point(9, 66);
-			this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbRibonBlack.Location = new System.Drawing.Point(7, 54);
+            this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbRibonBlack.Name = "cbRibonBlack";
-			this.cbRibonBlack.Size = new System.Drawing.Size(89, 23);
+            this.cbRibonBlack.Size = new System.Drawing.Size(67, 19);
             this.cbRibonBlack.TabIndex = 2;
             this.cbRibonBlack.Text = "Black";
             this.cbRibonBlack.CheckedChanged += new System.EventHandler(this.cbRibonBlack_CheckedChanged);
@@ -184,10 +188,10 @@ namespace VEPROMS
             // 
             this.cbRibonSilver.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbRibonSilver.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbRibonSilver.Location = new System.Drawing.Point(9, 37);
-			this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbRibonSilver.Location = new System.Drawing.Point(7, 30);
+            this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbRibonSilver.Name = "cbRibonSilver";
-			this.cbRibonSilver.Size = new System.Drawing.Size(89, 23);
+            this.cbRibonSilver.Size = new System.Drawing.Size(67, 19);
             this.cbRibonSilver.TabIndex = 1;
             this.cbRibonSilver.Text = "Silver";
             this.cbRibonSilver.CheckedChanged += new System.EventHandler(this.cbRibonSilver_CheckedChanged);
@@ -200,10 +204,10 @@ namespace VEPROMS
             // 
             this.cbRibonBlue.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbRibonBlue.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbRibonBlue.Location = new System.Drawing.Point(9, 7);
-			this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbRibonBlue.Location = new System.Drawing.Point(7, 6);
+            this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbRibonBlue.Name = "cbRibonBlue";
-			this.cbRibonBlue.Size = new System.Drawing.Size(89, 23);
+            this.cbRibonBlue.Size = new System.Drawing.Size(67, 19);
             this.cbRibonBlue.TabIndex = 0;
             this.cbRibonBlue.Text = "Blue";
             this.cbRibonBlue.CheckedChanged += new System.EventHandler(this.cbRibonBlue_CheckedChanged);
@@ -215,10 +219,10 @@ namespace VEPROMS
             this.panButtons.Controls.Add(this.btnStartMsg);
             this.panButtons.Controls.Add(this.btnGeneral);
             this.panButtons.DisabledBackColor = System.Drawing.Color.Empty;
-			this.panButtons.Location = new System.Drawing.Point(19, 17);
-			this.panButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panButtons.Location = new System.Drawing.Point(14, 14);
+            this.panButtons.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.panButtons.Name = "panButtons";
-			this.panButtons.Size = new System.Drawing.Size(224, 566);
+            this.panButtons.Size = new System.Drawing.Size(168, 460);
             this.panButtons.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
             this.panButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -236,10 +240,10 @@ namespace VEPROMS
             this.btnIntrFaceStngs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btnIntrFaceStngs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnIntrFaceStngs.Dock = System.Windows.Forms.DockStyle.Top;
-			this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 46);
-			this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 38);
+            this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btnIntrFaceStngs.Name = "btnIntrFaceStngs";
-			this.btnIntrFaceStngs.Size = new System.Drawing.Size(224, 23);
+            this.btnIntrFaceStngs.Size = new System.Drawing.Size(168, 19);
             this.btnIntrFaceStngs.TabIndex = 2;
             this.btnIntrFaceStngs.Text = "My Interface Settings";
             this.btnIntrFaceStngs.Click += new System.EventHandler(this.btnIntrFaceStngs_Click);
@@ -249,10 +253,10 @@ namespace VEPROMS
             this.btnStartMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btnStartMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnStartMsg.Dock = System.Windows.Forms.DockStyle.Top;
-			this.btnStartMsg.Location = new System.Drawing.Point(0, 23);
-			this.btnStartMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnStartMsg.Location = new System.Drawing.Point(0, 19);
+            this.btnStartMsg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btnStartMsg.Name = "btnStartMsg";
-			this.btnStartMsg.Size = new System.Drawing.Size(224, 23);
+            this.btnStartMsg.Size = new System.Drawing.Size(168, 19);
             this.btnStartMsg.TabIndex = 1;
             this.btnStartMsg.Text = "Startup Message";
             this.btnStartMsg.Visible = false;
@@ -264,9 +268,9 @@ namespace VEPROMS
             this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top;
             this.btnGeneral.Location = new System.Drawing.Point(0, 0);
-			this.btnGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnGeneral.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btnGeneral.Name = "btnGeneral";
-			this.btnGeneral.Size = new System.Drawing.Size(224, 23);
+            this.btnGeneral.Size = new System.Drawing.Size(168, 19);
             this.btnGeneral.TabIndex = 0;
             this.btnGeneral.Text = "General";
             this.btnGeneral.Visible = false;
@@ -279,12 +283,12 @@ namespace VEPROMS
             this.tcSysOpts.Controls.Add(this.tabControlPanel3);
             this.tcSysOpts.Controls.Add(this.tabControlPanel1);
             this.tcSysOpts.Controls.Add(this.tabControlPanel2);
-			this.tcSysOpts.Location = new System.Drawing.Point(36, 21);
-			this.tcSysOpts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tcSysOpts.Location = new System.Drawing.Point(27, 17);
+            this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tcSysOpts.Name = "tcSysOpts";
             this.tcSysOpts.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold);
             this.tcSysOpts.SelectedTabIndex = 2;
-			this.tcSysOpts.Size = new System.Drawing.Size(860, 562);
+            this.tcSysOpts.Size = new System.Drawing.Size(645, 457);
             this.tcSysOpts.TabIndex = 3;
             this.tcSysOpts.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
             this.tcSysOpts.Tabs.Add(this.tiGeneral);
@@ -296,6 +300,7 @@ namespace VEPROMS
             // 
             // tabControlPanel3
             // 
+            this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
             this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt);
             this.tabControlPanel3.Controls.Add(this.gpVisioPath);
             this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
@@ -310,10 +315,10 @@ namespace VEPROMS
             this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty;
             this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControlPanel3.Location = new System.Drawing.Point(0, 27);
-			this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tabControlPanel3.Name = "tabControlPanel3";
             this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel3.Size = new System.Drawing.Size(860, 535);
+            this.tabControlPanel3.Size = new System.Drawing.Size(645, 430);
             this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
             this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
             this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
@@ -333,9 +338,10 @@ namespace VEPROMS
             this.grPanUCFImpOpt.Controls.Add(this.cbUCFLNotUsed);
             this.grPanUCFImpOpt.Controls.Add(this.cbUCFIgnore);
             this.grPanUCFImpOpt.DisabledBackColor = System.Drawing.Color.Empty;
-			this.grPanUCFImpOpt.Location = new System.Drawing.Point(417, 15);
+            this.grPanUCFImpOpt.Location = new System.Drawing.Point(313, 12);
+            this.grPanUCFImpOpt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.grPanUCFImpOpt.Name = "grPanUCFImpOpt";
-			this.grPanUCFImpOpt.Size = new System.Drawing.Size(195, 170);
+            this.grPanUCFImpOpt.Size = new System.Drawing.Size(146, 138);
             // 
             // 
             // 
@@ -375,10 +381,10 @@ namespace VEPROMS
             // 
             this.cbUCFLForSetOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbUCFLForSetOnly.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbUCFLForSetOnly.Location = new System.Drawing.Point(3, 110);
-			this.cbUCFLForSetOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbUCFLForSetOnly.Location = new System.Drawing.Point(2, 89);
+            this.cbUCFLForSetOnly.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbUCFLForSetOnly.Name = "cbUCFLForSetOnly";
-			this.cbUCFLForSetOnly.Size = new System.Drawing.Size(140, 23);
+            this.cbUCFLForSetOnly.Size = new System.Drawing.Size(105, 19);
             this.cbUCFLForSetOnly.TabIndex = 5;
             this.cbUCFLForSetOnly.Text = "Load For Set Only";
             this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
@@ -391,10 +397,10 @@ namespace VEPROMS
             // 
             this.cbUCFLUseAll.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbUCFLUseAll.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbUCFLUseAll.Location = new System.Drawing.Point(3, 83);
-			this.cbUCFLUseAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbUCFLUseAll.Location = new System.Drawing.Point(2, 67);
+            this.cbUCFLUseAll.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbUCFLUseAll.Name = "cbUCFLUseAll";
-			this.cbUCFLUseAll.Size = new System.Drawing.Size(140, 23);
+            this.cbUCFLUseAll.Size = new System.Drawing.Size(105, 19);
             this.cbUCFLUseAll.TabIndex = 4;
             this.cbUCFLUseAll.Text = "Load Use All";
             this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
@@ -407,10 +413,10 @@ namespace VEPROMS
             // 
             this.cbUCFLOnlyImport.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbUCFLOnlyImport.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbUCFLOnlyImport.Location = new System.Drawing.Point(3, 56);
-			this.cbUCFLOnlyImport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbUCFLOnlyImport.Location = new System.Drawing.Point(2, 46);
+            this.cbUCFLOnlyImport.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbUCFLOnlyImport.Name = "cbUCFLOnlyImport";
-			this.cbUCFLOnlyImport.Size = new System.Drawing.Size(140, 23);
+            this.cbUCFLOnlyImport.Size = new System.Drawing.Size(105, 19);
             this.cbUCFLOnlyImport.TabIndex = 3;
             this.cbUCFLOnlyImport.Text = "Load Only Imported";
             this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
@@ -423,10 +429,10 @@ namespace VEPROMS
             // 
             this.cbUCFLNotUsed.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbUCFLNotUsed.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbUCFLNotUsed.Location = new System.Drawing.Point(3, 29);
-			this.cbUCFLNotUsed.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbUCFLNotUsed.Location = new System.Drawing.Point(2, 24);
+            this.cbUCFLNotUsed.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbUCFLNotUsed.Name = "cbUCFLNotUsed";
-			this.cbUCFLNotUsed.Size = new System.Drawing.Size(118, 23);
+            this.cbUCFLNotUsed.Size = new System.Drawing.Size(88, 19);
             this.cbUCFLNotUsed.TabIndex = 2;
             this.cbUCFLNotUsed.Text = "Load Not Used";
             this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
@@ -439,10 +445,10 @@ namespace VEPROMS
             // 
             this.cbUCFIgnore.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbUCFIgnore.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbUCFIgnore.Location = new System.Drawing.Point(3, 2);
-			this.cbUCFIgnore.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbUCFIgnore.Location = new System.Drawing.Point(2, 2);
+            this.cbUCFIgnore.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbUCFIgnore.Name = "cbUCFIgnore";
-			this.cbUCFIgnore.Size = new System.Drawing.Size(89, 23);
+            this.cbUCFIgnore.Size = new System.Drawing.Size(67, 19);
             this.cbUCFIgnore.TabIndex = 1;
             this.cbUCFIgnore.Text = "Ignore";
             this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
@@ -454,10 +460,10 @@ namespace VEPROMS
             this.gpVisioPath.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpVisioPath.Controls.Add(this.txbxVisioPath);
             this.gpVisioPath.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpVisioPath.Location = new System.Drawing.Point(33, 427);
-			this.gpVisioPath.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpVisioPath.Location = new System.Drawing.Point(25, 347);
+            this.gpVisioPath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpVisioPath.Name = "gpVisioPath";
-			this.gpVisioPath.Size = new System.Drawing.Size(380, 85);
+            this.gpVisioPath.Size = new System.Drawing.Size(285, 69);
             // 
             // 
             // 
@@ -496,13 +502,12 @@ namespace VEPROMS
             // 
             this.txbxVisioPath.Border.Class = "TextBoxBorder";
             this.txbxVisioPath.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.txbxVisioPath.Location = new System.Drawing.Point(11, 16);
-			this.txbxVisioPath.Margin = new System.Windows.Forms.Padding(4);
+            this.txbxVisioPath.Location = new System.Drawing.Point(8, 13);
             this.txbxVisioPath.Name = "txbxVisioPath";
             this.txbxVisioPath.PreventEnterBeep = true;
             this.txbxVisioPath.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
             this.txbxVisioPath.ShortcutsEnabled = false;
-			this.txbxVisioPath.Size = new System.Drawing.Size(351, 22);
+            this.txbxVisioPath.Size = new System.Drawing.Size(263, 20);
             this.superTooltip1.SetSuperTooltip(this.txbxVisioPath, new DevComponents.DotNetBar.SuperTooltipInfo("Visio Path", "", "PROMS wil use this specified path to open Visio for use with inserting the Equati" +
             "on sub step type.\r\n\r\nIf this is blank, then PROMS will look in the registry for " +
             "the path to Visio.\r\n\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(300, 115)));
@@ -517,10 +522,10 @@ namespace VEPROMS
             this.gpSeparateWindows.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpSeparateWindows.Controls.Add(this.cbSeparateWindows);
             this.gpSeparateWindows.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpSeparateWindows.Location = new System.Drawing.Point(417, 310);
-			this.gpSeparateWindows.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpSeparateWindows.Location = new System.Drawing.Point(313, 252);
+            this.gpSeparateWindows.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpSeparateWindows.Name = "gpSeparateWindows";
-			this.gpSeparateWindows.Size = new System.Drawing.Size(169, 100);
+            this.gpSeparateWindows.Size = new System.Drawing.Size(127, 81);
             // 
             // 
             // 
@@ -559,10 +564,10 @@ namespace VEPROMS
             // 
             this.cbSeparateWindows.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbSeparateWindows.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbSeparateWindows.Location = new System.Drawing.Point(11, 10);
-			this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbSeparateWindows.Location = new System.Drawing.Point(8, 8);
+            this.cbSeparateWindows.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbSeparateWindows.Name = "cbSeparateWindows";
-			this.cbSeparateWindows.Size = new System.Drawing.Size(143, 23);
+            this.cbSeparateWindows.Size = new System.Drawing.Size(107, 19);
             this.cbSeparateWindows.TabIndex = 9;
             this.cbSeparateWindows.Text = "By Procedure Set";
             this.cbSeparateWindows.CheckedChanged += new System.EventHandler(this.cbSeparateWindows_CheckedChanged);
@@ -574,10 +579,10 @@ namespace VEPROMS
             this.gpEnhancedDocs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpEnhancedDocs.Controls.Add(this.cbEnhancedDocumentSync);
             this.gpEnhancedDocs.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpEnhancedDocs.Location = new System.Drawing.Point(223, 310);
-			this.gpEnhancedDocs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpEnhancedDocs.Location = new System.Drawing.Point(167, 252);
+            this.gpEnhancedDocs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpEnhancedDocs.Name = "gpEnhancedDocs";
-			this.gpEnhancedDocs.Size = new System.Drawing.Size(169, 100);
+            this.gpEnhancedDocs.Size = new System.Drawing.Size(127, 81);
             // 
             // 
             // 
@@ -619,10 +624,10 @@ namespace VEPROMS
             this.cbEnhancedDocumentSync.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbEnhancedDocumentSync.CheckValue = "Y";
             this.cbEnhancedDocumentSync.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbEnhancedDocumentSync.Location = new System.Drawing.Point(11, 10);
-			this.cbEnhancedDocumentSync.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbEnhancedDocumentSync.Location = new System.Drawing.Point(8, 8);
+            this.cbEnhancedDocumentSync.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbEnhancedDocumentSync.Name = "cbEnhancedDocumentSync";
-			this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(132, 23);
+            this.cbEnhancedDocumentSync.Size = new System.Drawing.Size(99, 19);
             this.cbEnhancedDocumentSync.TabIndex = 9;
             this.cbEnhancedDocumentSync.Text = "Sync Navigation";
             // 
@@ -634,10 +639,10 @@ namespace VEPROMS
             this.gpPasteSettings.Controls.Add(this.cbPastePlainText);
             this.gpPasteSettings.Controls.Add(this.cbPasteNoReturns);
             this.gpPasteSettings.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpPasteSettings.Location = new System.Drawing.Point(33, 310);
-			this.gpPasteSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpPasteSettings.Location = new System.Drawing.Point(25, 252);
+            this.gpPasteSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpPasteSettings.Name = "gpPasteSettings";
-			this.gpPasteSettings.Size = new System.Drawing.Size(159, 100);
+            this.gpPasteSettings.Size = new System.Drawing.Size(119, 81);
             // 
             // 
             // 
@@ -679,10 +684,10 @@ namespace VEPROMS
             this.cbPastePlainText.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbPastePlainText.CheckValue = "Y";
             this.cbPastePlainText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbPastePlainText.Location = new System.Drawing.Point(11, 10);
-			this.cbPastePlainText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbPastePlainText.Location = new System.Drawing.Point(8, 8);
+            this.cbPastePlainText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbPastePlainText.Name = "cbPastePlainText";
-			this.cbPastePlainText.Size = new System.Drawing.Size(123, 23);
+            this.cbPastePlainText.Size = new System.Drawing.Size(92, 19);
             this.cbPastePlainText.TabIndex = 9;
             this.cbPastePlainText.Text = "Plain Text";
             this.cbPastePlainText.CheckedChanged += new System.EventHandler(this.cbPastePlainText_CheckedChanged);
@@ -697,10 +702,10 @@ namespace VEPROMS
             this.cbPasteNoReturns.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbPasteNoReturns.CheckValue = "Y";
             this.cbPasteNoReturns.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbPasteNoReturns.Location = new System.Drawing.Point(11, 34);
-			this.cbPasteNoReturns.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbPasteNoReturns.Location = new System.Drawing.Point(8, 28);
+            this.cbPasteNoReturns.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbPasteNoReturns.Name = "cbPasteNoReturns";
-			this.cbPasteNoReturns.Size = new System.Drawing.Size(123, 23);
+            this.cbPasteNoReturns.Size = new System.Drawing.Size(92, 19);
             this.cbPasteNoReturns.TabIndex = 10;
             this.cbPasteNoReturns.Text = "No Returns";
             this.cbPasteNoReturns.CheckedChanged += new System.EventHandler(this.cbPasteNoReturns_CheckedChanged);
@@ -712,10 +717,10 @@ namespace VEPROMS
             this.gpTreeView.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpTreeView.Controls.Add(this.cbTVExpand);
             this.gpTreeView.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpTreeView.Location = new System.Drawing.Point(416, 203);
-			this.gpTreeView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpTreeView.Location = new System.Drawing.Point(312, 165);
+            this.gpTreeView.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpTreeView.Name = "gpTreeView";
-			this.gpTreeView.Size = new System.Drawing.Size(159, 89);
+            this.gpTreeView.Size = new System.Drawing.Size(119, 72);
             // 
             // 
             // 
@@ -757,10 +762,10 @@ namespace VEPROMS
             this.cbTVExpand.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbTVExpand.CheckValue = "Y";
             this.cbTVExpand.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbTVExpand.Location = new System.Drawing.Point(11, 16);
-			this.cbTVExpand.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbTVExpand.Location = new System.Drawing.Point(8, 13);
+            this.cbTVExpand.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbTVExpand.Name = "cbTVExpand";
-			this.cbTVExpand.Size = new System.Drawing.Size(123, 23);
+            this.cbTVExpand.Size = new System.Drawing.Size(92, 19);
             this.superTooltip1.SetSuperTooltip(this.cbTVExpand, new DevComponents.DotNetBar.SuperTooltipInfo("Remember Last", "", "When checked, PROMS will remember the last procedure you had seleced from the tre" +
             "e and expand the tree to that location the next time PROMS is started.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 130)));
             this.cbTVExpand.TabIndex = 7;
@@ -774,10 +779,10 @@ namespace VEPROMS
             this.gpStepTypeToolTip.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpStepTypeToolTip.Controls.Add(this.cbStepTypeToolTip);
             this.gpStepTypeToolTip.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpStepTypeToolTip.Location = new System.Drawing.Point(223, 203);
-			this.gpStepTypeToolTip.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpStepTypeToolTip.Location = new System.Drawing.Point(167, 165);
+            this.gpStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpStepTypeToolTip.Name = "gpStepTypeToolTip";
-			this.gpStepTypeToolTip.Size = new System.Drawing.Size(159, 89);
+            this.gpStepTypeToolTip.Size = new System.Drawing.Size(119, 72);
             // 
             // 
             // 
@@ -816,10 +821,10 @@ namespace VEPROMS
             // 
             this.cbStepTypeToolTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbStepTypeToolTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbStepTypeToolTip.Location = new System.Drawing.Point(11, 16);
-			this.cbStepTypeToolTip.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbStepTypeToolTip.Location = new System.Drawing.Point(8, 13);
+            this.cbStepTypeToolTip.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbStepTypeToolTip.Name = "cbStepTypeToolTip";
-			this.cbStepTypeToolTip.Size = new System.Drawing.Size(123, 23);
+            this.cbStepTypeToolTip.Size = new System.Drawing.Size(92, 19);
             this.cbStepTypeToolTip.TabIndex = 7;
             this.cbStepTypeToolTip.Text = "Show Tool Tip";
             this.cbStepTypeToolTip.CheckedChanged += new System.EventHandler(this.cbStepTypeToolTip_CheckedChanged);
@@ -831,10 +836,10 @@ namespace VEPROMS
             this.gpAnnotationSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpAnnotationSettings.Controls.Add(this.cbAnnotationPopup);
             this.gpAnnotationSettings.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpAnnotationSettings.Location = new System.Drawing.Point(33, 203);
-			this.gpAnnotationSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpAnnotationSettings.Location = new System.Drawing.Point(25, 165);
+            this.gpAnnotationSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpAnnotationSettings.Name = "gpAnnotationSettings";
-			this.gpAnnotationSettings.Size = new System.Drawing.Size(159, 89);
+            this.gpAnnotationSettings.Size = new System.Drawing.Size(119, 72);
             // 
             // 
             // 
@@ -876,10 +881,10 @@ namespace VEPROMS
             this.cbAnnotationPopup.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbAnnotationPopup.CheckValue = "Y";
             this.cbAnnotationPopup.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbAnnotationPopup.Location = new System.Drawing.Point(11, 16);
-			this.cbAnnotationPopup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbAnnotationPopup.Location = new System.Drawing.Point(8, 13);
+            this.cbAnnotationPopup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbAnnotationPopup.Name = "cbAnnotationPopup";
-			this.cbAnnotationPopup.Size = new System.Drawing.Size(123, 23);
+            this.cbAnnotationPopup.Size = new System.Drawing.Size(92, 19);
             this.cbAnnotationPopup.TabIndex = 7;
             this.cbAnnotationPopup.Text = "Auto Popup";
             this.cbAnnotationPopup.CheckedChanged += new System.EventHandler(this.cbAnnotationPopup_CheckedChanged);
@@ -891,10 +896,9 @@ namespace VEPROMS
             this.gpTransRangeColor.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
             this.gpTransRangeColor.Controls.Add(this.colorPickerButton1);
             this.gpTransRangeColor.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpTransRangeColor.Location = new System.Drawing.Point(650, 16);
-			this.gpTransRangeColor.Margin = new System.Windows.Forms.Padding(4);
+            this.gpTransRangeColor.Location = new System.Drawing.Point(488, 13);
             this.gpTransRangeColor.Name = "gpTransRangeColor";
-			this.gpTransRangeColor.Size = new System.Drawing.Size(195, 76);
+            this.gpTransRangeColor.Size = new System.Drawing.Size(146, 62);
             // 
             // 
             // 
@@ -932,11 +936,10 @@ namespace VEPROMS
             this.colorPickerButton1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.colorPickerButton1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.colorPickerButton1.Image = ((System.Drawing.Image)(resources.GetObject("colorPickerButton1.Image")));
-			this.colorPickerButton1.Location = new System.Drawing.Point(9, 15);
-			this.colorPickerButton1.Margin = new System.Windows.Forms.Padding(4);
+            this.colorPickerButton1.Location = new System.Drawing.Point(7, 12);
             this.colorPickerButton1.Name = "colorPickerButton1";
             this.colorPickerButton1.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12);
-			this.colorPickerButton1.Size = new System.Drawing.Size(137, 28);
+            this.colorPickerButton1.Size = new System.Drawing.Size(103, 23);
             this.colorPickerButton1.TabIndex = 0;
             this.colorPickerButton1.SelectedColorChanged += new System.EventHandler(this.colorPickerButton1_SelectedColorChanged);
             // 
@@ -949,10 +952,10 @@ namespace VEPROMS
             this.gpPropPageStyle.Controls.Add(this.cbTabbedIntrFace);
             this.gpPropPageStyle.Controls.Add(this.cbButtonIntrFace);
             this.gpPropPageStyle.DisabledBackColor = System.Drawing.Color.Empty;
-			this.gpPropPageStyle.Location = new System.Drawing.Point(207, 15);
-			this.gpPropPageStyle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gpPropPageStyle.Location = new System.Drawing.Point(155, 12);
+            this.gpPropPageStyle.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gpPropPageStyle.Name = "gpPropPageStyle";
-			this.gpPropPageStyle.Size = new System.Drawing.Size(169, 132);
+            this.gpPropPageStyle.Size = new System.Drawing.Size(127, 107);
             // 
             // 
             // 
@@ -991,10 +994,10 @@ namespace VEPROMS
             // 
             this.cbPropGrid.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbPropGrid.Location = new System.Drawing.Point(11, 73);
-			this.cbPropGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbPropGrid.Location = new System.Drawing.Point(8, 59);
+            this.cbPropGrid.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbPropGrid.Name = "cbPropGrid";
-			this.cbPropGrid.Size = new System.Drawing.Size(129, 25);
+            this.cbPropGrid.Size = new System.Drawing.Size(97, 20);
             this.cbPropGrid.TabIndex = 2;
             this.cbPropGrid.Text = "Property Grid";
             this.cbPropGrid.Visible = false;
@@ -1006,10 +1009,10 @@ namespace VEPROMS
             // 
             this.cbTabbedIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbTabbedIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbTabbedIntrFace.Location = new System.Drawing.Point(11, 42);
-			this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbTabbedIntrFace.Location = new System.Drawing.Point(8, 34);
+            this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbTabbedIntrFace.Name = "cbTabbedIntrFace";
-			this.cbTabbedIntrFace.Size = new System.Drawing.Size(148, 25);
+            this.cbTabbedIntrFace.Size = new System.Drawing.Size(111, 20);
             this.cbTabbedIntrFace.TabIndex = 1;
             this.cbTabbedIntrFace.Text = "Tabbed Interface";
             // 
@@ -1020,10 +1023,10 @@ namespace VEPROMS
             // 
             this.cbButtonIntrFace.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbButtonIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.cbButtonIntrFace.Location = new System.Drawing.Point(11, 12);
-			this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.cbButtonIntrFace.Location = new System.Drawing.Point(8, 10);
+            this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cbButtonIntrFace.Name = "cbButtonIntrFace";
-			this.cbButtonIntrFace.Size = new System.Drawing.Size(129, 25);
+            this.cbButtonIntrFace.Size = new System.Drawing.Size(97, 20);
             this.cbButtonIntrFace.TabIndex = 0;
             this.cbButtonIntrFace.Text = "Button Interface";
             // 
@@ -1038,10 +1041,10 @@ namespace VEPROMS
             this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
             this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControlPanel1.Location = new System.Drawing.Point(0, 27);
-			this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tabControlPanel1.Name = "tabControlPanel1";
             this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel1.Size = new System.Drawing.Size(860, 535);
+            this.tabControlPanel1.Size = new System.Drawing.Size(645, 430);
             this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
             this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
             this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
@@ -1063,10 +1066,10 @@ namespace VEPROMS
             this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty;
             this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabControlPanel2.Location = new System.Drawing.Point(0, 27);
-			this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tabControlPanel2.Name = "tabControlPanel2";
             this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel2.Size = new System.Drawing.Size(860, 535);
+            this.tabControlPanel2.Size = new System.Drawing.Size(645, 430);
             this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
             this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
             this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
@@ -1087,11 +1090,11 @@ namespace VEPROMS
             // 
             this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
             this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnReset.Location = new System.Drawing.Point(259, 606);
-			this.btnReset.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnReset.Location = new System.Drawing.Point(194, 492);
+            this.btnReset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btnReset.Name = "btnReset";
             this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-			this.btnReset.Size = new System.Drawing.Size(105, 23);
+            this.btnReset.Size = new System.Drawing.Size(79, 19);
             this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the Proms system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95)));
             this.btnReset.TabIndex = 3;
             this.btnReset.Text = "Default Settings";
@@ -1102,13 +1105,87 @@ namespace VEPROMS
             this.superTooltip1.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
             this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
             // 
+            // cbOTRemember
+            // 
+            // 
+            // 
+            // 
+            this.cbOTRemember.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbOTRemember.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cbOTRemember.Location = new System.Drawing.Point(8, 5);
+            this.cbOTRemember.Margin = new System.Windows.Forms.Padding(2);
+            this.cbOTRemember.Name = "cbOTRemember";
+            this.cbOTRemember.Size = new System.Drawing.Size(119, 19);
+            this.cbOTRemember.TabIndex = 9;
+            this.cbOTRemember.Text = "Remember Setting";
+            this.cbOTRemember.CheckedChanged += new System.EventHandler(this.cbOTRemember_CheckedChanged);
+            // 
+            // cbOTAutoOpen
+            // 
+            // 
+            // 
+            // 
+            this.cbOTAutoOpen.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbOTAutoOpen.Enabled = false;
+            this.cbOTAutoOpen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cbOTAutoOpen.Location = new System.Drawing.Point(8, 28);
+            this.cbOTAutoOpen.Margin = new System.Windows.Forms.Padding(2);
+            this.cbOTAutoOpen.Name = "cbOTAutoOpen";
+            this.cbOTAutoOpen.Size = new System.Drawing.Size(92, 19);
+            this.cbOTAutoOpen.TabIndex = 10;
+            this.cbOTAutoOpen.Text = "Auto Open";
+            this.cbOTAutoOpen.Visible = false;
+            // 
+            // gpOpenTabs
+            // 
+            this.gpOpenTabs.BackColor = System.Drawing.Color.Transparent;
+            this.gpOpenTabs.CanvasColor = System.Drawing.SystemColors.Control;
+            this.gpOpenTabs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.gpOpenTabs.Controls.Add(this.cbOTRemember);
+            this.gpOpenTabs.Controls.Add(this.cbOTAutoOpen);
+            this.gpOpenTabs.DisabledBackColor = System.Drawing.Color.Empty;
+            this.gpOpenTabs.Location = new System.Drawing.Point(462, 252);
+            this.gpOpenTabs.Margin = new System.Windows.Forms.Padding(2);
+            this.gpOpenTabs.Name = "gpOpenTabs";
+            this.gpOpenTabs.Size = new System.Drawing.Size(139, 81);
+            // 
+            // 
+            // 
+            this.gpOpenTabs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.gpOpenTabs.Style.BackColorGradientAngle = 90;
+            this.gpOpenTabs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.gpOpenTabs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpOpenTabs.Style.BorderBottomWidth = 1;
+            this.gpOpenTabs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.gpOpenTabs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpOpenTabs.Style.BorderLeftWidth = 1;
+            this.gpOpenTabs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpOpenTabs.Style.BorderRightWidth = 1;
+            this.gpOpenTabs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpOpenTabs.Style.BorderTopWidth = 1;
+            this.gpOpenTabs.Style.CornerDiameter = 4;
+            this.gpOpenTabs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.gpOpenTabs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.gpOpenTabs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.gpOpenTabs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.gpOpenTabs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.gpOpenTabs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.gpOpenTabs.TabIndex = 13;
+            this.gpOpenTabs.Text = "Open Tabs";
+            // 
             // frmSysOptions
             // 
             this.AcceptButton = this.btnOK;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-			this.ClientSize = new System.Drawing.Size(932, 640);
+            this.ClientSize = new System.Drawing.Size(699, 520);
             this.ControlBox = false;
             this.Controls.Add(this.btnReset);
             this.Controls.Add(this.tcSysOpts);
@@ -1117,7 +1194,7 @@ namespace VEPROMS
             this.Controls.Add(this.btnCancel);
             this.DoubleBuffered = true;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "frmSysOptions";
             this.Text = "Proms System Options";
             this.Load += new System.EventHandler(this.frmSysOptions_Load);
@@ -1136,6 +1213,7 @@ namespace VEPROMS
             this.gpAnnotationSettings.ResumeLayout(false);
             this.gpTransRangeColor.ResumeLayout(false);
             this.gpPropPageStyle.ResumeLayout(false);
+            this.gpOpenTabs.ResumeLayout(false);
             this.ResumeLayout(false);
 
 		}
@@ -1189,9 +1267,8 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLOnlyImport;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFIgnore;
-
-
-
-
+        private DevComponents.DotNetBar.Controls.GroupPanel gpOpenTabs;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbOTRemember;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbOTAutoOpen;
     }
 }

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -11,6 +11,7 @@ using DevComponents.DotNetBar;
 using VEPROMS.Properties;
 using Volian.Base.Library;
 using DescriptiveEnum;
+using VEPROMS.CSLA.Library;
 
 namespace VEPROMS
 {
@@ -24,6 +25,9 @@ namespace VEPROMS
       get { return _CanChangeSeparateWindowsSetting; }
       set { _CanChangeSeparateWindowsSetting = value; }
     }
+
+		private UserSettings _usersettings;
+
 		public frmSysOptions()
 		{
 			_initializing = true;
@@ -89,6 +93,13 @@ namespace VEPROMS
 					break;
 			}
 
+			//CSM - C2024-031 - Getting User Settings
+			//and set checkboxes based on what they are set to
+			_usersettings = new UserSettings(VlnSettings.UserID);
+			cbOTRemember.Checked = _usersettings.UserSetting_OpenTabs_Remember;
+			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
+			cbOTAutoOpen.Checked = _usersettings.UserSetting_OpenTabs_AutoOpen || !cbOTRemember.Checked;
+			
 		}
 		private void cbEnhancedDocumentSync_CheckedChanged(object sender, System.EventArgs e)
 		{
@@ -151,6 +162,15 @@ namespace VEPROMS
 				Settings.Default.PropPageStyle = 3;
 
 			Settings.Default.Save();
+			//CSM - C2024-031 - Save User Settings
+			//based on what checkboxes are set to
+			bool? OTAuto = null;
+			if (cbOTRemember.Checked)
+            {
+                OTAuto = cbOTAutoOpen.Checked;
+            }
+            _usersettings.SetUserSettings(cbOTRemember.Checked, OTAuto);
+
 			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}
@@ -324,5 +344,10 @@ namespace VEPROMS
 				Settings.Default.UCFImportOpt = 4;
 			}
 		}
+
+        private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
+        {
+			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
+        }
     }
 }

PROMS/VEPROMS User Interface/frmSysOptions.resx

@@ -112,21 +112,20 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="colorPickerButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
-        EnEB89x6jgAAACpJREFUOE9j+P//P0UYQgApcjCKASCaFDxqwKgBIDwcDSAHww0gH/9nAACxLJWH1IMf
-        ngAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAKklE
+        QVQ4T2P4//8/RRhCAClyMIoBIJoUPGrAqAEgPBwNIAfDDSAf/2cAALEslYfUgx+eAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1654,6 +1654,10 @@ namespace VEPROMS
 			// B2017-214 added a null reference check
 			// B2010-071 Since we cannot tell if the user click on the X in Word or the X in PROMS, ask if the current tab
 			//           should be closed or if we should exit PROMS or just Cancel to continue working
+			if (tc._MyDisplayTabItems.Count < 1) // If all thabs are closed in the editor will indicate that in the database.
+			{
+				VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+			}
 			if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
 			{
 				// B2019-071 dialog to ask user if we are to close one tab or exit
@@ -1676,10 +1680,32 @@ namespace VEPROMS
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
+					if (_WeAreExitingPROMS)
+					{
+						string DisplayTabID = "";
+						int pos;
+						int TabItemID;
+						string DisplayTabName = "";
+						int cnt = 0;
+						// Deactivate previous procedure tab state by user
+						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+						// Save current procedure tab state
+						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+						{
+							cnt++;
+							DisplayTabID = pgTab.Key;
+							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+							DisplayTabName = pgTab.Value.ToString();
+							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
+						}
+					}
+
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
+
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2320,6 +2346,58 @@ namespace VEPROMS
 					CurrentID = txtSearch.Text;
 				}
 			}
+
+			// Add retrieve displaytabs state here.
+			openDisplaytabstate();
+		}
+
+		public void openDisplaytabstate()
+		{
+			// Retrieve edit tab state from database.
+			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
+
+			//CSM - C2024-031 - Getting User Settings
+			//and set checkboxes based on what they are set to
+			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
+
+			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+			{
+				//will open tabs by default / ask by default
+				DialogResult result = DialogResult.Yes;
+				if (!usersettings.UserSetting_OpenTabs_Remember)
+				{
+					dlgCheckOpenTabs checkOpenTabs = new dlgCheckOpenTabs();
+					result = checkOpenTabs.ShowDialog();
+
+					//if checkbox was checked in form, then update User Settings in database
+					if (checkOpenTabs.Remember)
+						usersettings.SetUserSettings(true, result == DialogResult.Yes);
+				}
+
+
+				if (result == DialogResult.Yes)
+				{
+					foreach (DataRow TabState in DisPlayTabState.Rows)
+					{
+						int _ItemID = (int)TabState["ItemID"];
+						ItemInfo _Procedure = ItemInfo.Get(_ItemID);
+						// Open procedure in the editor.
+						OpenItem(_Procedure);
+						// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
+						SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
+
+						//CSM B2024-090 - if last displaytab item,
+						//select the steptab panel for it
+						//and set the EditItem for Find/Replace
+						//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
+						if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
+						{
+							SelectedStepTabPanel.Select();
+							dlgFindReplace.MyEditItem = tc.MyEditItem;
+						}
+					}
+				}
+			}
 		}
 
 		void tc_RefreshEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

@@ -511,7 +511,7 @@ namespace VEPROMS
 
 		private void btnPC_Click(object sender, EventArgs e)
 		{
-			if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Stop) == DialogResult.Yes)
+			if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNo, MessageBoxIcon.Stop) == DialogResult.Yes)
 			{
 				btnApplicability.Visible = true;
 				tiApplicability.Visible = true;

PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs

@@ -474,6 +474,25 @@ namespace VEPROMS.CSLA.Library
 				OnPropertyChanged("Step_FixedTblForSrch");
 			}
 		}
+		//CSM F2024-080: For South Texas - Ability to toggle off Initial Line
+		public bool Step_DisableInitialLine
+		{
+			get
+			{
+				string s = _Xp["Step", "DisableInitialLine"];
+
+				if (s == string.Empty) return false;
+				if (s == "True") return true;
+				return false;
+			}
+			set
+			{
+				string s = _Xp["Step", "DisableInitialLine"];
+				if (value.ToString() == s) return;
+				_Xp["Step", "DisableInitialLine"] = value.ToString();
+				OnPropertyChanged("Step_DisableInitialLine");
+			}
+		}
 		#region RO image sizing
 		// if the RO image (figure) is resized, save it in the step config, not in the ROImageConfig.  If stored in ROImageConfig
 		// the size is set for ALL uses.

PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs

@@ -687,19 +687,46 @@ namespace VEPROMS.CSLA.Library
 								myLength += mg.Groups[3].Length;
 							}
 							string gg = MyGrid.Data.Substring(myIndex, myLength);
+							//CSM B2024-003 Updating RO Values inside a text Grid, adding a karat
+							// and/or dash into the RO value changes to question marks in the UI,
 							if (newvalue.Contains(@"\u8209?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u8209?", "-");
+								else if (m.Groups[1].Value == "")
+									newvalue = newvalue.Replace(@"\u8209?", "-");
 								else
 									newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
 							}
+							int indx_to_addfont = -1;
+							if (newvalue.Contains(@"\u916?"))
+							{
+								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
+								if (m == null)
+									newvalue = newvalue.Replace(@"\u916?", "^");
+								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+									newvalue = newvalue.Replace(@"\u916?", "^");
+								else if (m.Groups[1].Value == "")
+                                {
+									//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+									//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
+									//  This is to handle if ConvertCaretToDelta is true
+									//  since delta is not part of the standard ascii
+									//  may need to add a font to handle it.
+									newvalue = newvalue.Replace(@"\u916?", @"\f9\u916?\f0 ");
+									indx_to_addfont = GetLocationToInsertFontInGrid(myIndex);
+								}
+								else
+									newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
+							}
 							if (newvalue.Contains(@"\u8593?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u8593?", "^");
+								else if (m.Groups[1].Value == "")
+									newvalue = newvalue.Replace(@"\u8593?", "^");
 								else
 									newvalue = newvalue.Replace(@"\u8593?", m.Groups[1].Value + @"\u8593?" + m.Groups[3].Value);
 							}
@@ -708,6 +735,8 @@ namespace VEPROMS.CSLA.Library
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u9586?", @"\\");
+								else if (m.Groups[1].Value == "")
+									newvalue = newvalue.Replace(@"\u9586?", @"\\");
 								else
 									newvalue = newvalue.Replace(@"\u9586?", m.Groups[1].Value + @"\u9586?" + m.Groups[3].Value);
 							}
@@ -719,7 +748,17 @@ namespace VEPROMS.CSLA.Library
 							if (gg != newvalue)
 							{
 								retval = gg;
-								MyGrid.Data = MyGrid.Data.Substring(0, myIndex) + newvalue + MyGrid.Data.Substring(myIndex + myLength);
+								//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+								//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
+								//  This is to handle if ConvertCaretToDelta is true
+								//  since delta is not part of the standard ascii
+								//  may need to add a font to handle it.
+								string begin_str = MyGrid.Data.Substring(0, myIndex);
+								if (indx_to_addfont > -1)
+									begin_str = begin_str.Insert(indx_to_addfont, @"{\f9\fnil\fcharset0 FreeMono;}");
+
+								MyGrid.Data = begin_str + newvalue + MyGrid.Data.Substring(myIndex + myLength);
+								MyGrid.Save();
 								break;
 							}
 						}
@@ -729,6 +768,64 @@ namespace VEPROMS.CSLA.Library
 			return retval;
 		}
 
+		//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+		//  adding a caret and/or dash into the RO value and then updating RO values changed to question marks in the UI.
+		//  This is to handle if ConvertCaretToDelta is true
+		//  since delta is not part of the standard ascii
+		//  may need to add a font to handle it.
+		// startIndex = Index in the Grid at which the text we want to replace is starting
+		//basic Grid data partitioning using the variables in this sub is as follows:
+		//
+		//                                 [indexOfPrefix]               [indx]
+		//                                        |                         |
+		// [text before last occurrence of prefix]  {prefix} [rest of fonts]  [text after fonts]
+		private int GetLocationToInsertFontInGrid(int startIndex)
+        {
+			//searches backwards from the srtIndex for the last previous occurrence of the prefix
+			string prefix = @"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{";
+			int indexOfPrefix = MyGrid.Data.LastIndexOf(prefix, startIndex);
+
+			//find the end of the font section
+			//by passing in the Grid data 
+			//with the following removed:
+			// - Everything before the last occurrence of the prefix
+			// - the prefix itself removed
+			int indx = GetIndexOfCloseBracket(MyGrid.Data.Substring(indexOfPrefix + prefix.Length, startIndex - indexOfPrefix - prefix.Length));
+
+			if (indx > -1)
+			{
+				indx += indexOfPrefix;
+				indx += prefix.Length;
+			}
+
+			//indx will contain last spot inside the font section
+			return indx;
+
+		}
+
+		//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+		//  this function will find the corresponding occurrence of a closing bracket :
+		// usage is you pass in some text after an opening bracket, and it will tell you what the index is for it closing
+		private int GetIndexOfCloseBracket(string text)
+        {
+			int indx = 0;
+			Stack<char> stk = new System.Collections.Generic.Stack<char>();
+
+			foreach (char c in text)
+			{
+				if (c == '{')
+					stk.Push('{');
+				else if (c == '}' && stk.Count == 0)
+					return indx;
+				else if (c == '}')
+					stk.Pop();
+
+				indx++;
+			}
+
+			return -1;
+        }
+
 		public static string MakeConsistentFormat(string gg)
 		{
 			// replace degree, bullet dash, hardspace
@@ -1255,6 +1352,16 @@ namespace VEPROMS.CSLA.Library
 						{
 							gg = ItemInfo.ConvertToDisplayText(gg);
 							newvalue = ItemInfo.ConvertToDisplayText(newvalue);
+
+							//CSM B2024-094 - Carats (as Deltas) print as question marks in tables when unit <u> is used in RO Definition Value
+							//If there is a grid, need to keep these as the \u code
+							//Otherwise they will not use the correct font and end up as question marks
+							if (MyGrid != null)
+                            {
+								gg = gg.Replace($"{(char)916}", @"\u916?");
+								newvalue = newvalue.Replace($"{(char)916}", @"\u916?");
+							}
+
 							// Debug  - jsj 5-19-2017 - left in for initial check-in
 							//string xx_gg = gg_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
 							//string xx_nv = newval_org.Replace(@"\'b0", @"\'B0").Replace(@"\u8209?", "-").Replace(@"\u160?", " ").Replace("\xA0", " ");
@@ -1307,7 +1414,19 @@ namespace VEPROMS.CSLA.Library
 								else
 									newvalue = newvalue.Replace(@"\u8209?", m.Groups[1].Value + @"\u8209?" + m.Groups[3].Value);
 							}
-
+							//B2024-003, B2023-113, B2024-093 - Updating RO Values inside a text Grid,
+							//  This will handle if there is a delta and the column/row of the grid is removed
+							//then restored from history
+							if (newvalue.Contains(@"\u916?"))
+							{
+								Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
+								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+									newvalue = newvalue.Replace(@"\u916?", "^");
+								else if (m.Groups.Count < 3)
+									newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
+								else
+									newvalue = newvalue.Replace(@"\u916?", m.Groups[1].Value + @"\u916?" + m.Groups[3].Value);
+							}
 							if (newvalue.Contains(@"\u8593?"))
 							{
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");

PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs

@@ -1165,7 +1165,10 @@ namespace VEPROMS.CSLA.Library
 					{
 						int sp = odte.Link.IndexOf(" ") + 1;   // get past tran type
 						string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp);
-						recid = System.Convert.ToInt32(srecid);
+
+						//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
+						if (int.TryParse(srecid, out recid))
+						{
 							foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
 							{
 								if (ct.TransitionID == recid)
@@ -1175,6 +1178,7 @@ namespace VEPROMS.CSLA.Library
 								}
 							}
 						}
+					}
 					else
 					{
 						int sp = odte.Link.IndexOf(" "); 
@@ -1656,7 +1660,15 @@ namespace VEPROMS.CSLA.Library
 		private string FixTransition(string link, string text)
 		{
 			if (link.IndexOf("<NewID>") != -1) return text;
-			int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
+
+			//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
+			int transitionID;
+			string[] splt_link = link.Split(' ');
+			if (splt_link.Length < 2 || !int.TryParse(splt_link[1], out transitionID))
+			{
+				return text;
+			}
+
 			// Find the transition
 			if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
 			{

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -11,6 +11,7 @@ using System.Xml;
 using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
+using System.Linq;
 
 namespace VEPROMS.CSLA.Library
 {
@@ -402,6 +403,99 @@ namespace VEPROMS.CSLA.Library
 			return tmpForLink;
 		}
 
+		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+		// This will be used to simulate the non-high level part of a tab
+		// for case where sorting and all other fields match
+		// Note: This is cut down to improve the sort's performance
+		// but congruent to Volian.Print.Library.PDFReport-> BuildStepTab(ItemInfo item)
+		public string BuildStepTab()
+		{
+			StringBuilder sret = new StringBuilder();
+			ItemInfo pitem = this;
+
+			while (!pitem.IsSection && !pitem.IsHigh)
+            {
+                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
+                {
+                    string thisTab = stpinfo.MyTab.CleanText;
+
+                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
+
+                    if (!string.IsNullOrEmpty(thisTab))
+                    {
+                        thisTab = thisTab.Trim();
+                    }
+
+                    // if the tab is null or
+                    // if the the tab is not a letter or number OR
+                    // the tab is an AND or OR type and is the letter "o"
+                    // then reset the tab an empty string so that the type name along with the count of that type 
+                    // (ex. "AND 2", "OR 3")
+                    if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
+                    {
+                        thisTab = string.Empty;
+                    }
+
+                    if (pitem.IsRNOPart)
+                    {
+                        if (string.IsNullOrEmpty(thisTab))
+                        {
+                            sret.Insert(0, "RNO.");
+                        }
+                        else
+                        {
+                            thisTab = thisTab.Trim();
+
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            {
+                                thisTab += ".";
+                            }
+
+                            sret.Insert(0, "RNO." + thisTab);
+                        }
+                    }
+                    else if (pitem.IsCaution || pitem.IsNote)
+                    {
+                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
+                        if (string.IsNullOrEmpty(thisTab))
+                        {
+                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
+                        }
+                        else
+                        {
+                            thisTab = thisTab.Trim(" ".ToCharArray());
+                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
+                        }
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(thisTab))
+                        {
+                            thisTab = thisTab.Trim(" ".ToCharArray());
+
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            {
+                                thisTab += ".";
+                            }
+                        }
+                        else
+                        {
+                            thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
+                        }
+
+                        sret.Insert(0, thisTab);
+                    }
+                }
+
+                pitem = pitem.ActiveParent as ItemInfo;
+
+                if (pitem == null)
+                    break;
+            }
+
+            return sret.ToString().Trim(" .)".ToCharArray());
+		}
+
 		public void SetHeader(VE_Font myFont, string myText)
 		{
 			_MyHeader = new MetaTag(myFont);
@@ -619,12 +713,14 @@ namespace VEPROMS.CSLA.Library
 		{
 			TranCheckCount = 0;
 			TranFixCount = 0;
+			TranCantFixCount = 0;
 			TranConvertCount = 0;// B2018-002 - Invalid Transitions - Initialize Transition Conversion Count
 		}
 
 		public static int TranCheckCount = 0;
 		public static int TranFixCount = 0;
 		public static int TranConvertCount = 0;// B2018-002 - Invalid Transitions - Declare Transition Conversion Count
+		public static int TranCantFixCount = 0;
 		internal static TransitionInfoList TransitionsToDisconnected;
 		internal static TransitionInfoList TransitionsToNonEditable;
 
@@ -731,6 +827,15 @@ namespace VEPROMS.CSLA.Library
 								content.Save();
 							}
 						}
+						else if (newText.Contains("<CTID=-"))
+						{
+							//CSM C2024-028 - Bad Transition Link - Make an annotation					
+							using (Item itm = Item.Get(itemInfo.ItemID))
+							{
+								TranCantFixCount++;
+								Annotation.MakeAnnotation(itm, AnnotationType.GetByNameOrCreate("Bad Transition Link"), "", $"Invalid Transition Link: ({ItemInfo.ConvertToDisplayText(newValue)})", null);
+							}
+						}
 					}
 				}
 			}
@@ -2752,6 +2857,29 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion UnlinkEnhanced
 		#region Search
+
+		//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+		//Create cleaned version of variable for use in DisplaySearch
+		//This is the Function that does the cleaning
+		public string CleanSearchString(string value)
+		{
+			// \u000C = PageBreak
+			// \u0009 = Tab
+			// \u160? = Hard Space
+			// \u0007 = Bell (Separates Parent Path and Child Path)
+			// \u0011 - Separates DisplayNumber & DisplayText of Step
+
+			if (value == null)
+				return null;
+
+			string tmp = value.Replace("\a", "\\").Replace("\u0007", "\\");
+			tmp = tmp.Replace("\u000C", " ").Replace("\u0009", " ").Replace(@"\u160?", " ").Replace("\u0011", " ");
+
+			if (tmp.StartsWith("\\"))
+				tmp = tmp.Substring(1);
+			return tmp;
+		}
+
 		internal string _SearchDVPath;
 		public string SearchDVPath
 		{
@@ -2767,6 +2895,10 @@ namespace VEPROMS.CSLA.Library
 				return _SearchDVPath;
 			}
 		}
+        //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+        //Create cleaned version of variable for use in DisplaySearch
+        public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
+
         internal string _SearchPath;
 		public string SearchPath
 		{
@@ -2790,6 +2922,10 @@ namespace VEPROMS.CSLA.Library
 				return _SearchPath;
 			}
 		}
+		//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+		//Create cleaned version of variable for use in DisplaySearch
+		public string SearchPath_clean => CleanSearchString(SearchPath);
+
 		public string ShortSearchPath
 		{
 			get 
@@ -2800,6 +2936,9 @@ namespace VEPROMS.CSLA.Library
 				return dtext;
 			}
 		}
+		//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+		//Create cleaned version of variable for use in DisplaySearch
+		public string ShortSearchPath_clean => CleanSearchString(ShortSearchPath);
 
 		// B2021-076: Proms search results are not presented in order when printed to PDF
 		internal string _SearchDefaultSort;
@@ -3100,6 +3239,24 @@ namespace VEPROMS.CSLA.Library
 			//get { return ConvertToDisplayText(MyContent.Number); }
 		}
 
+		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+		//Get Numeric part of HLS Tab
+		//Used for Certain sorting situations
+		//If no numeric part then use 999 (will be at end of that level of the sort if there are other items with numbered HLS)
+		public int NumericSortNumber
+		{
+			get
+			{
+				string numericpart = null;
+				if (MyHLS != null)
+					numericpart = new string(MyHLS?.MyTab?.CleanTextNoSymbols.TakeWhile(Char.IsDigit).ToArray());
+				if (!string.IsNullOrEmpty(numericpart) && numericpart.All(char.IsNumber))
+					return int.Parse(numericpart);
+				else
+					return 999;
+			}
+		}
+
 		// for step designators (a redefined caution type used in Comanche Peak with the SameRowAsParentMultiLines format flag)
 		// we what to allow for a hard return to allow for multiple designator lines - jsj 5/21/2015
 		public static string ConvertToMulitLineStepDesignatorDisplayText(string txt)
@@ -4251,6 +4408,13 @@ namespace VEPROMS.CSLA.Library
 				if (tbformat.Contains("{!.+?}"))
 					tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph
 				_MyTab.Text = tstr;
+				//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+				if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
+				{
+					if (tstr.StartsWith(" "))
+						tstr = tstr.Substring(1);
+					tstr = FormatStepData.TabData.MacroEditTag + tstr;
+				}
 				_MyTab.CleanText = tstr;
 				return;
 			}
@@ -4341,25 +4505,73 @@ namespace VEPROMS.CSLA.Library
 						incSub = (ord + 1).ToString();
 						if (MyParent.MyTab.CleanText.Trim().EndsWith(")"))
 						{
-							_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub;
+							//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+							string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub;
+							if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
+							{
+								if (tstr.StartsWith(" "))
+									tstr = tstr.Substring(1);
+								tstr = FormatStepData.TabData.MacroEditTag + tstr;
+							}
+							else if (IsInitialLineDisabled && tstr.StartsWith("_"))
+								tstr = tstr.Substring(1);
+
+							_MyTab.CleanText = tstr;
 							_MyTab.Text = _MyTab.CleanText;
 							return;
 						}
 						if (MyParent.MyTab.CleanText.Contains(ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB))
 						{
-							_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
+							//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+							string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
+							if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
+							{
+								if (tstr.StartsWith(" "))
+									tstr = tstr.Substring(1);
+								tstr = FormatStepData.TabData.MacroEditTag + tstr;
+							}
+							else if(IsInitialLineDisabled && tstr.StartsWith("_"))
+								tstr = tstr.Substring(1);
+
+							_MyTab.CleanText = tstr;
 							_MyTab.Text = _MyTab.CleanText;
 							return;
 						}
 						string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
-						_MyTab.CleanText = tmprnotab.TrimStart();
-						_MyTab.Text = tmprnotab.TrimStart();
+						//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+						tmprnotab = tmprnotab.TrimStart();
+						if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_"))
+						{
+							if (tmprnotab.StartsWith(" "))
+								tmprnotab = tmprnotab.Substring(1);
+							tmprnotab = FormatStepData.TabData.MacroEditTag + tmprnotab;
+						}
+						else if (IsInitialLineDisabled && tmprnotab.StartsWith("_"))
+							tmprnotab = tmprnotab.Substring(1);
+
+						_MyTab.CleanText = tmprnotab;
+						_MyTab.Text = tmprnotab;
 						return;
 					}
 					if ((((ItemInfo)ActiveParent).IsHigh && FormatStepData.NumberHighLevel) || ((!((ItemInfo)ActiveParent).IsHigh) && ((tbformat == null || tbformat == "") && (RNOLevel <= ColumnMode))))
 					{
 						_MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText;
 						_MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text;
+						//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+						if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_"))
+						{
+							if (_MyTab.CleanText.StartsWith(" "))
+								_MyTab.CleanText = _MyTab.CleanText.Substring(1);
+							_MyTab.CleanText = FormatStepData.TabData.MacroEditTag + _MyTab.CleanText;
+						}
+						if (IsInitialLineDisabled && _MyTab.CleanText.StartsWith("_"))
+						{
+							_MyTab.CleanText = _MyTab.CleanText.Substring(1);
+						}
+						if (IsInitialLineDisabled && _MyTab.Text.StartsWith("_"))
+						{
+							_MyTab.Text = _MyTab.Text.Substring(1);
+						}
 						_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
 						if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset;
 						if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
@@ -4694,7 +4906,7 @@ namespace VEPROMS.CSLA.Library
 					//           Note could have modified logic for clock macro (above) but older logic uses the IdentEdit setting
 					//           for CAS (Continuous Action Summary steps) that have a circle printed around the step number
 					//           this is the least impact of current code/formats
-					if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag))
+					if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag))
 					{
 						int eidx = tbformat.IndexOf("}", macroindx);
 						if (eidx > -1)
@@ -4716,6 +4928,17 @@ namespace VEPROMS.CSLA.Library
 						cltext = cltext + " ";
 					}
 				}
+				//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+				else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
+				{
+					if (cltext == null)
+						cltext = tbformat;
+					if (cltext.StartsWith(" "))
+						cltext = cltext.Substring(1);
+					if (tbformat.StartsWith(" "))
+						tbformat = tbformat.Substring(1);
+					cltext = FormatStepData.TabData.MacroEditTag + cltext;
+				}
 			}
 		macroindx = tbformat.IndexOf("{!diamond1}");
 			if (macroindx > -1)	//i found it
@@ -5520,10 +5743,27 @@ namespace VEPROMS.CSLA.Library
 					}
 					if (count <= macro.Grouping) addToList = false;
 				}
+
+				//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
+				if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
+					addToList = false;
+
 				if (addToList) tmp.Add(macro);
 			}
 			if (tmp.Count > 0) _MyMacros = tmp;
 		}
+
+		//CSM F2024 - 080: For South Texas - check if initial line is disabled for this step
+		public bool IsInitialLineDisabled
+		{
+			get
+			{
+				if (!IsStep) return false;
+				StepConfig sc = MyConfig as StepConfig;
+				return sc.Step_DisableInitialLine;
+			}
+        }
+
         #endregion
         #region UseSmartTemplate
 
@@ -6022,6 +6262,168 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
 			}
 		}
+
+        //CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+        // Found various inconsistencies in the reports so adding this to manually sort
+		//instead of binding the sort to 1 or 2 individual fields
+        public List<ItemInfo> SortedList(bool sortbyFoundRoid = false)
+		{
+			List<ItemInfo> tmp = new List<ItemInfo>(this);
+			if (sortbyFoundRoid)
+			{
+				// Priority of Sorting order:
+				// 1. FoundRoid (by Referenced Object ID)
+				// 2. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
+				// 3. Keep in order of the Procedures within the set
+				// 4. Keep in the order of the Section within the Procedure
+				// 5. NumericSortNumber - numeric part of the HLS if there is one
+				// 6. Substep Tab - will sort as a string since combined numbers/text
+				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
+				{
+					int cmp = 0;
+					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
+					switch (FoundROID_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 10000000;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 10000000;
+							break;
+						default:
+							break;
+					}
+
+					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
+					switch (DVPath_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 1000000;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 1000000;
+							break;
+						default:
+							break;
+					}
+
+					if (x.MyProcedure != null && y.MyProcedure != null)
+					{
+						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 100000);
+					}
+
+					if (x.ActiveSection != null && y.ActiveSection != null)
+					{
+						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
+					}
+
+					cmp += x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 10;
+
+					if (cmp == 0)
+					{
+						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
+						switch (StepTab_cmp)
+						{
+							case int result when result < 0:
+								cmp -= 1;
+								break;
+							case int result when result == 0:
+								break;
+							case int result when result > 0:
+								cmp += 1;
+								break;
+							default:
+								break;
+						}
+					}
+
+					return cmp;
+				});
+			}
+            else 
+			{
+				// Priority of Sorting order:
+				// 1. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
+				// 2. Keep in order of the Procedures within the set
+				// 3. Keep in the order of the Section within the Procedure
+				// 4. NumericSortNumber - numeric part of the HLS if there is one
+				// 5. Substep Tab - will sort as a string since combined numbers/text
+				// 6. FoundRoid (by Referenced Object ID)
+				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
+				{
+					int cmp = 0;
+
+					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
+					switch (DVPath_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 10000000;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 10000000;
+							break;
+						default:
+							break;
+					}
+
+					if (x.MyProcedure != null && y.MyProcedure != null)
+					{
+						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 1000000);
+					}
+
+					if (x.ActiveSection != null && y.ActiveSection != null)
+					{
+						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
+					}
+
+					cmp += (x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 100);
+
+					if (cmp == 0)
+					{
+						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
+						switch (StepTab_cmp)
+						{
+							case int result when result < 0:
+								cmp -= 10;
+								break;
+							case int result when result == 0:
+								break;
+							case int result when result > 0:
+								cmp += 10;
+								break;
+							default:
+								break;
+						}
+					}
+
+					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
+					switch (FoundROID_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 1;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 1;
+							break;
+						default:
+							break;
+					}
+
+					return cmp;
+				});
+			}
+
+			return tmp;
+        }
+
 		[Serializable()]
 		private class MoveItemCriteria
 		{
@@ -8004,6 +8406,81 @@ namespace VEPROMS.CSLA.Library
 			MyContent.Config = _ProcedureConfig.ToString();
 		}
 		#endregion
+		public class DisplayTabs
+		{
+			private int _ItemID;
+			public int ItemID
+			{
+				get { return _ItemID; }
+				set { _ItemID = value; }
+
+			}
+			private string _DisplayTabID;
+			public string DisplayTabID
+			{
+				get { return _DisplayTabID; }
+				set { _DisplayTabID = value; }
+			}
+			private string _DisplayTabName;
+			public string DisplayTabName
+			{
+				get { return _DisplayTabName; }
+				set { _DisplayTabName = value; }
+			}
+
+			public SafeDataReader Dr { get; }
+
+			public DisplayTabs()
+			{
+
+			}
+
+			public DisplayTabs(int itemID, String displayTabID, String displayTabName)
+			{
+				_ItemID = itemID;
+				_DisplayTabID = displayTabID;
+				_DisplayTabName = displayTabName;
+			}
+
+			public DisplayTabs(SafeDataReader dr)
+			{
+				Dr = dr;
+			}
+		}
+
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.ExecuteNonQuery();
+						//SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+
+				}
+			}
+
+		}
 	}
 	#endregion
 	#region SectionInfo

PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs

@@ -1876,6 +1876,10 @@ namespace VEPROMS.CSLA.Library
 			if (IsCaution) enhType = 20006;
 			return enhType;
 		}
+
+		// B2024-075: Paste Before/After with Enhanced Documents is creating situation
+		//where Background item is linked to Source but Source is not linked to Background
+		//When Fixing the linking, need to not create a duplicate link if one already exists
 		public void DoCreateLinksEnhancedSingleItem(ItemInfo enhii, int enhtype)
 		{
 			// Link the 2 items, srcII & enhii:
@@ -1893,6 +1897,8 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					StepConfig sc = enhii.MyConfig as StepConfig;
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
 						sc.AddEnhancedDocument(0, this.ItemID);
 						sc.SaveEnhancedDocuments();
 						ei.MyContent.Text = DisplayText;
@@ -1901,6 +1907,7 @@ namespace VEPROMS.CSLA.Library
 						enhii.RefreshConfig();
 					}
 				}
+			}
 			else if (IsSection)
 			{
 				using (Item ii = this.Get())
@@ -1916,6 +1923,8 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					SectionConfig sc = enhii.MyConfig as SectionConfig;
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
 						sc.AddEnhancedDocument(0, this.ItemID);
 						sc.SaveEnhancedDocuments();
 						ei.MyContent.Text = DisplayText;
@@ -1924,6 +1933,7 @@ namespace VEPROMS.CSLA.Library
 						enhii.RefreshConfig();
 					}
 				}
+			}
 			else if (IsProcedure)
 			{
                 // To fix B2017-268 the order of the following 2 'usings' had to be changed and the
@@ -1942,6 +1952,8 @@ namespace VEPROMS.CSLA.Library
                 using (Item ii = this.Get())
                 {
                     ProcedureConfig sc = this.MyConfig as ProcedureConfig;
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
 						sc.AddEnhancedDocument(enhtype, enhii.ItemID);
 						sc.SaveEnhancedDocuments();
 						ii.MyContent.Config = sc.ToString();
@@ -1950,8 +1962,56 @@ namespace VEPROMS.CSLA.Library
 					}
                 }
 			}
+		}
 		#endregion
 		#region DataPortal
+		// C2017-031:  Support for paste/replace an enhanced step
+		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					Csla.ApplicationContext.LocalContext["cn"] = cn;
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
+						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
+						cm.Parameters.AddWithValue("@Type", criteria.Type);
+						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
+						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
+						SqlParameter param_ContentID = new SqlParameter("@NewItemID", SqlDbType.Int);
+						param_ContentID.Direction = ParameterDirection.Output;
+						cm.Parameters.Add(param_ContentID);
+						cm.CommandText = "PasteItemEnhancedReplace";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (!dr.Read())
+							{
+								_ErrorMessage = "No Record Found";
+								return;
+							}
+							ReadData(dr);
+						}
+					}
+					// removing of item only needed for local data portal
+					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
+						Csla.ApplicationContext.LocalContext.Remove("cn");
+				}
+			}
+			catch (Exception ex)
+			{
+				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
+				{
+					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
+				}
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
+			}
+		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2074,6 +2134,69 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 	#endregion
+	#region PastingPartEnhancedCriteria
+	// C2017-031:  Support for paste/replace an enhanced step
+	[Serializable()]
+	public class PastingPartEnhancedCriteria
+	{
+		#region Properties
+		private int _StartItemID;
+		public int StartItemID
+		{
+			get { return _StartItemID; }
+			set { _StartItemID = value; }
+		}
+		private int _ItemID;            // paste relative to this itemid
+		public int ItemID
+		{
+			get { return _ItemID; }
+			set { _ItemID = value; }
+		}
+		private EAddpingPart _AddType;
+		public EAddpingPart AddType
+		{
+			get { return _AddType; }
+			set { _AddType = value; }
+		}
+		private int? _FromType = null;
+		public int? FromType
+		{
+			get { return _FromType; }
+			set { _FromType = value; }
+		}
+		private int? _Type = null;
+		public int? Type
+		{
+			get { return _Type; }
+			set { _Type = value; }
+		}
+		private DateTime _DTS;
+		public DateTime DTS
+		{
+			get { return _DTS; }
+			set { _DTS = value; }
+		}
+		private string _UserID;
+		public string UserID
+		{
+			get { return _UserID; }
+			set { _UserID = value; }
+		}
+			#endregion
+			#region Constructor
+			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
+			{
+				_StartItemID = startItemid;
+				_ItemID = itemID;
+				_AddType = addType;
+				_Type = type;
+				_FromType = fromType;
+				_DTS = dts;
+				_UserID = userID;
+			}
+		#endregion
+	}
+	#endregion
 	#region PastingPartCriteria
 	[Serializable()]
 		public class PastingPartCriteria
@@ -2364,6 +2487,14 @@ namespace VEPROMS.CSLA.Library
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
 		}
+		// C2017-031:  Support for paste/replace an enhanced step
+		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo)
+		{
+			ItemInfo tmp = null;
+			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
+			AddToCache(tmp);
+			return tmp;
+		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2519,15 +2650,99 @@ namespace VEPROMS.CSLA.Library
 			firstTrans = false;
 			if (!CanDeleteObject())
 				throw new System.Security.SecurityException("User not authorized to remove a Item");
-			// B2016-009 check source and desintation types and display message box if needed
+			// B2016-009 check source and destination types and display message box if needed
 			// C2022-017 moved the CheckSourceDestinationType call to  btnPasteReplace_Click in StepTabRibbon
 			// B2023-101 Handle Paste Replace when procedure to be replaced has Incoming Transitions, i.e. do a separate try/catch for this case
 			ItemInfo newItemInfo = null;
+			using (ItemInfo copyItemInfo = ItemInfo.Get(copyStartID))
+			{
 				try
 				{
-				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
+					// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
+					if (itemInfo.IsEnhancedStep)
+					{
+						newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
 						if (newItemInfo == null) return null;
 					}
+					//C2025-003 Enhanced Copy/Paste Upgrade - Added support for paste/replace on a master step
+					else if (itemInfo.HasEnhancedLinkedStep || copyItemInfo.HasEnhancedLinkedStep)
+					{
+						DialogResult rslt = DialogResult.No;
+
+						SectionConfig secCfg = itemInfo.ActiveSection.MyConfig as SectionConfig;
+						if (copyItemInfo.HasEnhancedLinkedStep && secCfg.MyEnhancedDocuments.Count > 0)
+							rslt = FlexibleMessageBox.Show("The step you are copying contains linked background documents." +
+									"\r\n\r\nDo you also wish to make a copy of the background documents?",
+									"Paste background documents", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
+						//unlink and remove any background documents attached to where you are copying to
+						//and then delete them
+						//if selected want to replace BG step (DialogResult.Yes)
+						if (itemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
+						{
+							foreach (EnhancedDocument ed in itemInfo.GetMyEnhancedDocuments())
+							{
+								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
+								{
+									exEnh.DoUnlinkEnhanced(exEnh, 0, false);
+									DeleteItemAndChildren(exEnh);
+								}
+
+							}
+						}
+
+						//do copy/paste replace of the master step
+						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo);
+						if (newItemInfo == null) return null;
+
+						//copy any background documents
+						//if selected want to replace BG step (DialogResult.Yes)
+						if (copyItemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
+						{
+							foreach (EnhancedDocument ed in copyItemInfo.GetMyEnhancedDocuments())
+							{
+								using (ItemInfo exEnh = newItemInfo.DoAddMissingEnhancedItems(ed.Type))
+								{
+									PasteReplace(exEnh, ed.ItemID, chgid, ref firstTrans);
+								}
+
+							}
+						}
+						else if (rslt == DialogResult.No)
+						{
+							//if selected didn't want to copy BG documents (DialogResult.No)
+							//need to unlink BG doc from old removed content (what was pasted over top of)
+							//re-link BG document to new paste replace master doc
+							//this should also auto update the text of the main linked item
+							//to match the new master doc wording
+
+							//get original BG documents
+							EnhancedDocuments orig_eds = itemInfo.GetMyEnhancedDocuments();
+
+							//remove link from pre-existing BG docs
+							foreach (EnhancedDocument ed in orig_eds)
+							{
+								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
+									{ exEnh.DoUnlinkEnhanced(exEnh, 0, false); }
+							}
+
+							//remove link from steps just copied
+							ItemInfo.PasteClearEnhanced(newItemInfo);
+
+							//re-link pre-existing BG docs to newly replaced master step
+							foreach (EnhancedDocument ed in orig_eds)
+							{
+								using (ItemInfo orig_ed_item = ItemInfo.Get(ed.ItemID))
+									{ newItemInfo.DoCreateLinksEnhancedSingleItem(orig_ed_item, ed.Type); }
+							}
+
+						}
+					}
+					else
+					{
+						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+					}
+				}
 				catch (Exception ex1)
 				{
 					if (ex1.Message.Contains("has External Transitions and has no next step")
@@ -2545,7 +2760,7 @@ namespace VEPROMS.CSLA.Library
 					ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
 					using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
 					ItemInfo.PasteSetChangeId(newItemInfo, chgid);
-				ItemInfo.PasteClearEnhanced(newItemInfo);
+					if (!copyItemInfo.HasEnhancedLinkedStep && !itemInfo.HasEnhancedLinkedStep) ItemInfo.PasteClearEnhanced(newItemInfo);
 					if (newItemInfo.NextItem != null) using (Item item = newItemInfo.NextItem.Get()) ItemInfo.Refresh(item);
 					newItemInfo.RefreshNextItems();
 					// if inserting after a caution or note, refreshes tabs.  This will adjust bullets
@@ -2594,9 +2809,9 @@ namespace VEPROMS.CSLA.Library
 						if (ex.Message.Contains("has External Transitions and has no next step")
 							|| ex.Message.Contains("has External Transitions to Procedure")
 							|| ex.Message.Contains("has External Transitions to it's children")
-            || ex.Message.Contains("This step has been deleted")
-            )
+							|| ex.Message.Contains("This step has been deleted"))
 								throw ex;
+
 						FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
 						return itemInfo;
 					}
@@ -2604,6 +2819,7 @@ namespace VEPROMS.CSLA.Library
 					  return itemInfo;
 				}
 			}
+		}
 		#endregion
     private static bool HandleSqlExceptionOnCopy(Exception ex)
     {

PROMS/VEPROMS.CSLA.Library/Extension/MultiUserExt.cs

@@ -181,7 +181,13 @@ namespace VEPROMS.CSLA.Library
 				{
 					if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Procedure)
 					{
-						message = string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(objectID).MyProcedure.DisplayNumber, si.UserID);
+						//B2024-074 If no Number for Procedure, Display Title
+						ProcedureInfo tmpproc = ItemInfo.Get(objectID).MyProcedure;
+						string name = tmpproc.DisplayNumber;
+						if (string.IsNullOrEmpty(name))
+						{ name = tmpproc.DisplayText; }
+
+						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)
@@ -195,8 +201,16 @@ namespace VEPROMS.CSLA.Library
 						OwnerInfo oi = OwnerInfo.GetBySessionIDandVersionID(si.SessionID, objectID);
 						if (oi == null)
 							message = message + string.Format("The working draft is already checked out to {0}", si.UserID) + Environment.NewLine;
-						else if(oi.OwnerType == 0)
-							message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
+						else if (oi.OwnerType == 0)
+						{
+							//B2024-074 If no Number for Procedure, Display Title
+							ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
+							string name = tmpproc.DisplayNumber;
+							if (string.IsNullOrEmpty(name))
+							{ name = tmpproc.DisplayText; }
+
+							message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
+						}
 						else if (oi.OwnerType == 1)
 							message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 						else if (oi.OwnerType == 2)
@@ -211,7 +225,15 @@ namespace VEPROMS.CSLA.Library
 						if (oi != null)
 						{
 							if (oi.OwnerType == 0)
-								message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
+							{
+								//B2024-074 If no Number for Procedure, Display Title
+								ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
+								string name = tmpproc.DisplayNumber;
+								if (string.IsNullOrEmpty(name))
+								{ name = tmpproc.DisplayText; }
+
+								message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
+							}
 							else if (oi.OwnerType == 1)
 								message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 							else if (oi.OwnerType == 2)

PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs

@@ -676,37 +676,47 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void AppendPrefix()
 		{
-			if (HasText && Prefix != null)
+			if (Prefix == null) return; // no Prefix text to add
+			if (HasText)
 			{
-				if (!_Results.ToString().EndsWith(_Prefix))
+				if (!_Results.ToString().EndsWith(_Prefix)) //existing transition text does not end with Prefix text, OK to append
 					_Results.Append(Prefix);
 				_Prefix = null;
 			}
 			else if (_TranType == 4 && _ToItem.MoreThanOneStepSection())
 			{
-				if (!HasText && Prefix != null && Prefix.ToUpper().StartsWith(", STEP")
-					&& _FromItem.ActiveFormat.Name.StartsWith("WEP"))
-				{
-					Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
-					_Prefix = null;
-					return;
-				}
-				_Results.Append(Prefix);
-				_Prefix = null;
-			}
-			else if (_TranType == 5 && Prefix != null)
-			{
-				if (!HasText && Prefix.StartsWith(", "))
-					_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
-				else
+				// WEP (Point Beach) is no longer a customer - commented out
+				//if (!HasText && Prefix.ToUpper().StartsWith(", STEP")
+				//	&& _FromItem.ActiveFormat.Name.StartsWith("WEP")) 
+				//{
+				//	Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
+				//	_Prefix = null;
+				//	return;
+				//}
 				_Results.Append(Prefix);
 				_Prefix = null;
 			}
 			// If the prefix contains an open paren, we want to add the open paren regardless
 			// of whether there already is text in the resulting string.
-			else if (!HasText && Prefix != null && Prefix.Contains("("))
+			else if (!HasText && Prefix.Contains("("))
 			{
 				_Results.Append(Prefix.TrimStart(" ".ToCharArray()));   // since no text in result, trim starting space.
+				_Prefix = null;
+			}
+			else if (!HasText && Prefix.StartsWith(", "))
+			{
+				_Results.Append(Prefix.TrimStart(", ".ToCharArray()));// no preceeding text, remove comma and space
+				_Prefix = null;
+			}
+			else if (!HasText && Prefix.StartsWith(","))
+			{
+				_Results.Append(Prefix.TrimStart(",".ToCharArray())); // no preceeding text, remove comma
+				_Prefix = null;
+			}
+			else
+			{
+				_Results.Append(Prefix); // append prefix as is
+				_Prefix = null;
 			}
 		}
 		public string OverridePrefix

PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs

@@ -3175,6 +3175,17 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ChangeFontUpperCaseIinArial, "@ChangeFontUpperCaseIinArial");
 			}
 		}
+
+		// F2024-080 South Texas
+		// Used to show if "Initial Line Disable" checkbox should show in the DisplayTab
+		private LazyLoad<bool> _ShowInitialLineDisable;
+		public bool ShowInitialLineDisable
+		{
+			get
+			{
+				return LazyLoad(ref _ShowInitialLineDisable, "@ShowInitialLineDisable");
+			}
+		}
 	}
 	#endregion - StepSectionData
 	#region TextTypeValue
@@ -6202,6 +6213,36 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
+		// F2024-078 adjusts the the spacing before the Note/Caution tab - the space betwee the top of the box and the tab text
+		private LazyLoad<float?> _AdjSpB4Tab;
+		public float? AdjSpB4Tab
+		{
+			get
+			{
+				return LazyLoad(ref _AdjSpB4Tab, "@AdjSpB4Tab");
+			}
+		}
+
+		// F2024-078 adjusts the the spacing after the Note/Caution tab - the space betwee the tab text and the first line of of Note/Caution text
+		private LazyLoad<float?> _AdjSpAftTab;
+		public float? AdjSpAftTab
+		{
+			get
+			{
+				return LazyLoad(ref _AdjSpAftTab, "@AdjSpAftTab");
+			}
+		}
+
+		// F2024-078 adjusts the the spacing after the last line of Note/Caution text - between the last line of text and the bottom of the box
+		private LazyLoad<float?> _AdjLastBlnkLn;
+		public float? AdjLastBlnkLn
+		{
+			get
+			{
+				return LazyLoad(ref _AdjLastBlnkLn, "@AdjLastBlnkLn");
+			}
+		}
+
 		// this will adjust the line spacing when an extra thick line is used for a box, so that the text below the box doesn't hit up against the bottom of the box
 		private LazyLoad<bool> _ThickDouble;    // F2021-026: Barakah single column 2 thick double lines around Warnings
 		public bool ThickDouble
@@ -6396,7 +6437,7 @@ public StepData Equation		// equation has a parent of embedded object.
 		}
 		public TransData(XmlNode xmlNode) : base(xmlNode) { }
 
-		// a character that is placed before and after the title that's in the transition text
+		// a character that is placed before and after the procedure title that's in the transition text
 		private LazyLoad<string> _DelimiterForTransitionTitle;
 		public string DelimiterForTransitionTitle
 		{
@@ -6673,7 +6714,9 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
-		// holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers
+		// Holdover from 16bit, used to define whether transitions are range (types 2 & 3).
+		// This is used in the logic for transitions with page numbers. This gets defined as "Type" in the code for the transition class.
+		// NOTE: the TransType you see in the code is actually the index into the list of transition definitions for given format. 
 		private LazyLoad<int?> _Type;
 		public int? Type
 		{

PROMS/VEPROMS.CSLA.Library/Generated/Item.cs

@@ -1132,6 +1132,88 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.Add", ex);
 			}
 		}
+		public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "DeactivateStateDisplayTabTmp";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName, string UserID, int order)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.Parameters.AddWithValue("@order", order);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+				}
+			}
+		}
+		public static DataTable GetDisplayTabs(string UserID) //, string displayTabID, string displayTabName)
+														   //public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabdata";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);				
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//B2025-004
+						//if it fails loading previously open tabs, simply treat it as if no tabs were open
+						//instead of crashing
+						return new DataTable();
+					}
+
+				}
+			}
+		}
 		[Transactional(TransactionalTypes.TransactionScope)]
 		protected override void DataPortal_Update()
 		{

PROMS/VEPROMS.CSLA.Library/Minimal/UserSettings.cs

@@ -0,0 +1,91 @@
+using System;
+using Csla.Data;
+using System.Data;
+using System.Data.SqlClient;
+
+//CSM - C2024-031 - Minimal Class for Saving / Getting User Settings
+//For Use with getting / saving if a User wishes to have tabs kept open
+namespace VEPROMS.CSLA.Library
+{
+    public class UserSettings
+    {
+        #region Private Properties
+        private readonly string _userid;
+		#endregion
+
+		#region Public Properties
+		public bool UserSetting_OpenTabs_Remember { get; protected set; } = false;
+		public bool UserSetting_OpenTabs_AutoOpen { get; protected set; } = true;
+		#endregion
+
+
+		#region Constructor
+		public UserSettings(string UserID)
+		{
+			_userid = UserID;
+
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.Text;
+						cm.CommandText = "Select RememberOpenTabs, AutoOpenTabs FROM Users where UserID = @UID";
+						cm.Parameters.AddWithValue("@UID", _userid);
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (dr.Read())
+							{
+								UserSetting_OpenTabs_Remember = (bool) dr.GetValue("RememberOpenTabs");
+								UserSetting_OpenTabs_AutoOpen = (bool) dr.GetValue("AutoOpenTabs");
+							}
+						}
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Database.LogException("UserSettings_GetData", ex);
+				throw new DbCslaException("UserSettings_GetData", ex);
+			}
+
+		}
+		#endregion
+
+		#region Save Properties
+		public void SetUserSettings(bool OpenTabs_Remember, bool? OpenTabs_AutoOpen = null)
+		{
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "vesp_UpdateUserSettings";
+						cm.Parameters.AddWithValue("@UID", _userid);
+						UserSetting_OpenTabs_Remember = OpenTabs_Remember;
+						cm.Parameters.AddWithValue("@Remember", OpenTabs_Remember);					
+						if (OpenTabs_AutoOpen != null)
+						{
+							UserSetting_OpenTabs_AutoOpen = (bool) OpenTabs_AutoOpen;
+							cm.Parameters.AddWithValue("@AutoOpen", OpenTabs_AutoOpen);
+						}
+						cm.CommandTimeout = Database.DefaultTimeout;
+
+						cm.ExecuteNonQuery();
+					}
+				}
+			}
+			catch (Exception ex)
+			{
+				Database.LogException("UserSettings_SetUserSettings", ex);
+				throw new DbCslaException("UserSettings_SetUserSettings", ex);
+			}
+
+		}
+		#endregion
+	}
+}

PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj

@@ -380,6 +380,7 @@
     <Compile Include="Generated\ZContentInfo.cs" />
     <Compile Include="Generated\ZTransition.cs" />
     <Compile Include="Generated\ZTransitionInfo.cs" />
+    <Compile Include="Minimal\UserSettings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VEObjects\VEDrillDown.cs" />
     <Compile Include="VEObjects\VETreeNode.cs" />

PROMS/Volian.Base.Library/RtfTools.cs

@@ -125,32 +125,9 @@ namespace Volian.Base.Library
 			//  converting the unicode \u8482? to \'99, but once this is done, PROMS StepRTB (edit windows) does not show it
 			rtnStr = rtnStr.Replace(@"\'99", @"\u8482?");
 			// convert \'ae to \u174? this is for the registered symbol.  RTF converts the unicode character to \'ae
-			rtnStr = rtnStr.Replace(@"\'ae",@"\u174?");
+			rtnStr = rtnStr.Replace(@"\'ae", @"\u174?");
 			// convert \'a9 to \u169? this is for the copyright symbol.  RTF converts the unicode character to \'a9
-			rtnStr = rtnStr.Replace(@"\'a9",@"\u169?");
-			// B2021-039: paste of the greek symbols was not working correctly, RTF was converting unicode, similar to above
-			// B2022-052: Division symbol converted to an x, caused by fix B2021-039. The code below was translating the division 
-			//	symbol but it should only be translated if the character's font is Greek or Baltic.  Unfortunately this is not
-			//	a complete solution since it converts characters it shouldn't, for example, using the following steps: all
-			//	of Proms symbols are entered into a step; a ctrl-a/ctrl-c is used to copy these and then ctrl-v to paste
-			//	into another new step. The paste (from the underlying richtextbox) causes some characters to be in plain
-			//	arial font, and others to be in arial with Greek flag. Some character codes exist in each font, for example f7.
-			//	The code below does not look into what font is used, just converts the character.  Since any kind of font
-			//	can occur during paste, if from an external program, a message will be given stating that a symbol may be incorrect
-			//	because an unsupported font was pasted. It was felt that this was sufficient based on estimate of fix versus chance of
-			//	occurrence.  Note that the message was moved into StepRTB since this code is called by non-UI code (5/26/22)
-			if (str.ToUpper().Contains("GREEK") || str.ToUpper().Contains("BALTIC"))
-			{
-				//System.Windows.Forms.MessageBox.Show("Pasted text may use an unsupported font so some characters may not paste correctly and may require delete/reenter of character from within Proms.",
-				//	"Paste Font Issue", System.Windows.Forms.MessageBoxButtons.OK);
-				for (int i = 0; i < 26; i++)
-				{
-					rtnStr = rtnStr.Replace(string.Format("\\'{0:x2}", 0xc0 + i)        // upper case Greek
-						, string.Format("\\u{0}?", 912 + i));
-					rtnStr = rtnStr.Replace(string.Format("\\'{0:x2}", 0xe0 + i)        // lower case Greek
-						, string.Format("\\u{0}?", 944 + i));
-				}
-			}
+			rtnStr = rtnStr.Replace(@"\'a9", @"\u169?");
 			return rtnStr;
 		}
 	}

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -276,6 +276,9 @@ namespace Volian.Controls.Library
 		}
 
 		private void btnRemoveAnnotation_Click(object sender, EventArgs e)
+		{
+			// CSM B2024-068 / B2024-069 - check if current annotation is not selected before removal of annotation
+			if (CurrentAnnotation != null)
 			{
 				//using (Annotation annotation = CurrentAnnotation.Get())
 				//{
@@ -289,6 +292,13 @@ namespace Volian.Controls.Library
 				_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
 																   //}
 			}
+			else
+			{
+				FlexibleMessageBox.Show("You Must Select an Annotation To Remove", "Annotation Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+				return;
+			}
+
+		}
 
 		private void btnSaveAnnotation_Click(object sender, EventArgs e)
 		{

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -236,7 +236,11 @@ namespace Volian.Controls.Library
 			else
 			{
 				StringBuilder sb = new StringBuilder();
-				sb.AppendLine("Changing the applicability for this step will invalidate a transition in the following steps...");
+				string tmpwrd = MyItemInfo.IsSection ? "section" : "step";
+				sb.AppendLine($"The applicability for this {tmpwrd} cannot be changed due to transition links.");
+				sb.AppendLine("Applicability settings will return to original settings when OK is selected.");
+				sb.AppendLine($"Changing the applicability for this {tmpwrd} will invalidate a transition in the following steps...");
+
 				sb.AppendLine();
 				// B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external
 				//	determine this by looking strings for source and target (to), if procedure level and internal the target starts

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -1078,7 +1078,13 @@ namespace Volian.Controls.Library
 					}
 					else if (searchValue.Contains("#Link:ReferencedObject")) // RO Link (roid)
 					{
-						searchValue = searchValue.Replace("1[END>", string.Empty).Trim();
+						// we where only removing the END if the searchValue ended in "1[END>"
+						// but sometimes it ended in "2[END>" and cause a null reference error
+						// - was seen only running via Visual Studio debugger
+						// I cleaned up the code to remove in ether case so that we get the expected roid value  - jsj 11-18-2024
+						string substr = searchValue.Substring(searchValue.LastIndexOf(" "));
+						if (substr.Contains("[END>"))
+							searchValue = searchValue.Substring(0, searchValue.Length - substr.Length);
 						string roid = ROFSTLookup.FormatRoidKey(searchValue.Substring(searchValue.LastIndexOf(" ")), true);
 
 						if (roid != selectedChld.roid)

PROMS/Volian.Controls.Library/DisplayReports.Designer.cs

@@ -503,7 +503,7 @@ namespace Volian.Controls.Library
 			this.cbxSortBySetpointID.Size = new System.Drawing.Size(121, 23);
 			this.cbxSortBySetpointID.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbxSortBySetpointID.TabIndex = 11;
-			this.cbxSortBySetpointID.Text = "Sort By Sepoint ID";
+			this.cbxSortBySetpointID.Text = "Sort By Setpoint ID";
 			this.cbxSortBySetpointID.Visible = false;
 			// 
 			// DisplayReports
@@ -511,8 +511,8 @@ namespace Volian.Controls.Library
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.Controls.Add(this.btnPrintReport);
-			this.Controls.Add(this.xpSetToReport);
 			this.Controls.Add(this.xpSelROs);
+			this.Controls.Add(this.xpSetToReport);
 			this.Controls.Add(this.tctrlReports);
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplayReports";

PROMS/Volian.Controls.Library/DisplayReports.cs

@@ -805,17 +805,9 @@ namespace Volian.Controls.Library
 				string SearchString = GetListOfROs(true);// Include the RODbID in the RO list
 				ItemInfoList SearchResults = ItemInfoList.GetListFromROReport(DocVersionList, "", SearchString, "");
 
-				if (!usageSortedByProcedure) // sort on ROs
-				{
-					Csla.SortedBindingList<ItemInfo> sortedResults = new Csla.SortedBindingList<ItemInfo>(SearchResults);
-					sortedResults.ApplySort("FoundROID", ListSortDirection.Ascending);
+				List<ItemInfo> sortedResults = SearchResults.SortedList(!usageSortedByProcedure);
 				OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By RO", "RO Usage", sortedResults, usageSortedByProcedure, cbxIncldMissingROs.Checked, paperSize));
 			}
-				else
-				{
-					OnPrintRequest(new DisplayReportsEventArgs("Referenced Objects Usage By Procedure", "RO Usage", SearchResults, usageSortedByProcedure, cbxIncldMissingROs.Checked, paperSize));
-				}
-			}
 			else if (cbxTransFromProcs.Checked)
 			{
 			}

PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs

@@ -270,7 +270,7 @@ namespace Volian.Controls.Library
 			this.cbxTranCategory.Name = "cbxTranCategory";
 			this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
 			this.cbxTranCategory.TabIndex = 1;
-			this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions";
+			this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
 			// 
 			// lblTranCategory
 			// 
@@ -402,7 +402,7 @@ namespace Volian.Controls.Library
 			this.cbxTranCategory.Name = "cbxTranCategory";
 			this.cbxTranCategory.Size = new System.Drawing.Size(215, 21);
 			this.cbxTranCategory.TabIndex = 1;
-			this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions";
+			this.cbxTranCategory.WatermarkText = "Select Category of Transitions";
 			// 
 			// lblTranCategory
 			// 
@@ -658,7 +658,7 @@ namespace Volian.Controls.Library
 			this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cmboTreeROs.TabIndex = 1;
 			this.cmboTreeROs.ThemeAware = true;
-			this.cmboTreeROs.WatermarkText = "Select an RO to seach";
+			this.cmboTreeROs.WatermarkText = "Select an RO to search";
 			this.cmboTreeROs.SelectedIndexChanged += new System.EventHandler(this.cmboTreeROs_SelectedIndexChanged);
 			// 
 			// tabROSearch

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -66,7 +66,7 @@ namespace Volian.Controls.Library
 		private Color saveGrpPanSearchResults;
 		private ItemInfoList _SearchResults;
 
-		private string _DisplayMember = "SearchPath";
+		private string _DisplayMember = "SearchPath_clean";
 		private bool _OpenDocFromSearch;
 		private ROFSTLookup _MyROFSTLookup;
 		private bool _LoadingList = false;
@@ -1745,7 +1745,7 @@ namespace Volian.Controls.Library
 			}
 
 			// B2021-076: Proms search results are not presented in order when printed to PDF
-			if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath")
+			if (_DisplayMember == "SearchPath_clean" || _DisplayMember == "ShortSearchPath_clean")
 			{
 				cbSorted.Checked = false;
 				cbSorted.Enabled = false;
@@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library
 			switch (cmbResultsStyle.Text)
 			{
 				case "Document Path":
-					_DisplayMember = "SearchDVPath";
+					_DisplayMember = "SearchDVPath_clean";
 					break;
 				case "Step Path":
-					_DisplayMember = "ShortSearchPath";
+					_DisplayMember = "ShortSearchPath_clean";
 					break;
 				case "Annotation Text":
 					_DisplayMember = "SearchAnnotationText";
@@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library
 					_DisplayMember = "DisplayText";
 					break;
 				default:
-					_DisplayMember = "SearchPath";
+					_DisplayMember = "SearchPath_clean";
 					break;
 			}
 			DisplayResults();

PROMS/Volian.Controls.Library/DisplayTags.Designer.cs

@@ -34,6 +34,7 @@ namespace Volian.Controls.Library
             this.cbCAS = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cmbCheckoff = new DevComponents.DotNetBar.Controls.ComboBoxEx();
             this.groupPanelCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.cbInitialLine = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.groupPanelChgBar = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.tbChgID = new System.Windows.Forms.TextBox();
             this.lblChgId = new System.Windows.Forms.Label();
@@ -78,7 +79,7 @@ namespace Volian.Controls.Library
             this.groupPanelPaginate.Controls.Add(this.cbPageBreak);
             this.groupPanelPaginate.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelPaginate.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelPaginate.Location = new System.Drawing.Point(0, 330);
+            this.groupPanelPaginate.Location = new System.Drawing.Point(0, 339);
             this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelPaginate.Name = "groupPanelPaginate";
             this.groupPanelPaginate.Size = new System.Drawing.Size(202, 58);
@@ -187,13 +188,14 @@ namespace Volian.Controls.Library
             // 
             this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelCheckoff.Controls.Add(this.cbInitialLine);
             this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff);
             this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 145);
             this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelCheckoff.Name = "groupPanelCheckoff";
-			this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 77);
+            this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 86);
             // 
             // 
             // 
@@ -226,6 +228,25 @@ namespace Volian.Controls.Library
             this.groupPanelCheckoff.Text = "Signoff / Checkoff";
             this.groupPanelCheckoff.VisibleChanged += new System.EventHandler(this.groupPanelCheckoff_VisibleChanged);
             // 
+            // cbInitialLine
+            // 
+            this.cbInitialLine.AutoSize = true;
+            this.cbInitialLine.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.cbInitialLine.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbInitialLine.Location = new System.Drawing.Point(3, 44);
+            this.cbInitialLine.Margin = new System.Windows.Forms.Padding(2);
+            this.cbInitialLine.Name = "cbInitialLine";
+            this.cbInitialLine.Size = new System.Drawing.Size(112, 15);
+            this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: <Ctrl><Ente" +
+            "r>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.cbInitialLine.TabIndex = 1;
+            this.cbInitialLine.Text = "Disable Initial Line";
+            this.cbInitialLine.Visible = false;
+            this.cbInitialLine.CheckedChanged += new System.EventHandler(this.cbInitialLine_CheckedChanged);
+            // 
             // groupPanelChgBar
             // 
             this.groupPanelChgBar.BackColor = System.Drawing.Color.Transparent;
@@ -237,7 +258,7 @@ namespace Volian.Controls.Library
             this.groupPanelChgBar.Controls.Add(this.rbChgBarOn);
             this.groupPanelChgBar.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelChgBar.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelChgBar.Location = new System.Drawing.Point(0, 222);
+            this.groupPanelChgBar.Location = new System.Drawing.Point(0, 231);
             this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelChgBar.Name = "groupPanelChgBar";
             this.groupPanelChgBar.Size = new System.Drawing.Size(202, 108);
@@ -480,8 +501,7 @@ namespace Volian.Controls.Library
             this.cbTCAS.Margin = new System.Windows.Forms.Padding(2);
             this.cbTCAS.Name = "cbTCAS";
             this.cbTCAS.Size = new System.Drawing.Size(167, 15);
-			this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: <Shift" +
-            "><F7>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Time Critical Action Summary", "", "Include this in the Time Critical Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.cbTCAS.TabIndex = 3;
             this.cbTCAS.Text = "Time Critical Action Summary";
             this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged);
@@ -498,7 +518,7 @@ namespace Volian.Controls.Library
             this.groupPanelIncludeOn.Controls.Add(this.cbCAS);
             this.groupPanelIncludeOn.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelIncludeOn.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 388);
+            this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 397);
             this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelIncludeOn.Name = "groupPanelIncludeOn";
             this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 121);
@@ -541,7 +561,7 @@ namespace Volian.Controls.Library
             this.groupPanelWcnTrnResp.Controls.Add(this.tbRespons);
             this.groupPanelWcnTrnResp.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelWcnTrnResp.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 509);
+            this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 518);
             this.groupPanelWcnTrnResp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupPanelWcnTrnResp.Name = "groupPanelWcnTrnResp";
             this.groupPanelWcnTrnResp.Size = new System.Drawing.Size(202, 138);
@@ -600,7 +620,7 @@ namespace Volian.Controls.Library
             this.groupPanelFigSize.Controls.Add(this.lblFSWidth);
             this.groupPanelFigSize.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelFigSize.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelFigSize.Location = new System.Drawing.Point(0, 647);
+            this.groupPanelFigSize.Location = new System.Drawing.Point(0, 656);
             this.groupPanelFigSize.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelFigSize.Name = "groupPanelFigSize";
             this.groupPanelFigSize.Size = new System.Drawing.Size(202, 135);
@@ -724,6 +744,7 @@ namespace Volian.Controls.Library
             this.groupPanelPaginate.ResumeLayout(false);
             this.groupPanelPaginate.PerformLayout();
             this.groupPanelCheckoff.ResumeLayout(false);
+            this.groupPanelCheckoff.PerformLayout();
             this.groupPanelChgBar.ResumeLayout(false);
             this.groupPanelChgBar.PerformLayout();
             this.groupPanelChgStepType.ResumeLayout(false);
@@ -772,5 +793,6 @@ namespace Volian.Controls.Library
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPrefPageBreak;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeInTOC;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbTCAS;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbInitialLine;
     }
 }

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -103,7 +103,7 @@ namespace Volian.Controls.Library
 		public string TbFSwd
 		{
 			get	{return tbFSWd.Text;}
-			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); } //  trBarFS.Value = Convert.ToInt32(value);
 		}
 
 		public string TbFSht
@@ -142,6 +142,8 @@ namespace Volian.Controls.Library
 			tbChgID.Enabled = false;
 			lblChgId.Visible = tbChgID.Visible = false;
 			CurItemInfo = null;
+			cbInitialLine.Visible = cbInitialLine.Enabled = false;
+
 		}
 		private bool StepOverRide()
 		{
@@ -553,6 +555,16 @@ namespace Volian.Controls.Library
 					}
 				}
 			}
+
+			//CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats
+			//Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step
+			cbInitialLine.Visible = cbInitialLine.Enabled = false;
+			if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData?.TabData?.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO))
+			{
+				cbInitialLine.Visible = cbInitialLine.Enabled = true;
+				cbInitialLine.Checked = sc.Step_DisableInitialLine;
+			}
+
 			_Initalizing = false;
 		}
 		public void SetFigure(double wd, double wd2)
@@ -969,6 +981,23 @@ namespace Volian.Controls.Library
 			sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
 			MyEditItem.ChangeBarForConfigItemChange = true;
 		}
+
+        private void cbInitialLine_CheckedChanged(object sender, EventArgs e)
+        {
+			if (_Initalizing) return;
+			MyEditItem.SaveContents();
+			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+			if (sc == null) return;
+			MyEditItem.ChangeBarForConfigItemChange = false;
+			sc.Step_DisableInitialLine = cbInitialLine.Checked;
+			MyEditItem.ChangeBarForConfigItemChange = true;
+
+			//needed to refresh display changing
+			MyEditItem.RefreshContent();
+			MyEditItem.SetAllTabs();
+
+		}
+
         //private void txbxAltConActSumText_Leave(object sender, EventArgs e)
         //{
         //	// User left Atlernate Continuous Action Text field.  If text changed, then prompt

PROMS/Volian.Controls.Library/DisplayTransition.Designer.cs

@@ -30,25 +30,26 @@ namespace Volian.Controls.Library
 		{
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
             this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.cbHoldProcSet = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.btnTranCancel = new DevComponents.DotNetBar.ButtonX();
             this.btnTranSave = new DevComponents.DotNetBar.ButtonX();
             this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.listBoxTranFmt = new System.Windows.Forms.ListBox();
             this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
             this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbTranProcs = new System.Windows.Forms.ComboBox();
             this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbTranSects = new System.Windows.Forms.ComboBox();
             this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.tvTran = new Volian.Controls.Library.vlnTreeView3();
             this.pnlTranStepBtns = new System.Windows.Forms.Panel();
             this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX();
             this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX();
             this.btnUp1 = new DevComponents.DotNetBar.ButtonX();
             this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip();
-			this.tvTran = new Volian.Controls.Library.vlnTreeView3();
-			this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
             this.groupPanelBtns.SuspendLayout();
             this.groupPanelTranFmt.SuspendLayout();
             this.groupPanelTransitionSets.SuspendLayout();
@@ -62,6 +63,7 @@ namespace Volian.Controls.Library
             // 
             this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelBtns.Controls.Add(this.cbHoldProcSet);
             this.groupPanelBtns.Controls.Add(this.cbPageNum);
             this.groupPanelBtns.Controls.Add(this.btnTranCancel);
             this.groupPanelBtns.Controls.Add(this.btnTranSave);
@@ -69,7 +71,7 @@ namespace Volian.Controls.Library
             this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
             this.groupPanelBtns.Name = "groupPanelBtns";
-			this.groupPanelBtns.Size = new System.Drawing.Size(376, 58);
+            this.groupPanelBtns.Size = new System.Drawing.Size(376, 82);
             // 
             // 
             // 
@@ -100,6 +102,23 @@ namespace Volian.Controls.Library
             this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.groupPanelBtns.TabIndex = 25;
             // 
+            // cbHoldProcSet
+            // 
+            this.cbHoldProcSet.BackColor = System.Drawing.Color.Transparent;
+            // 
+            // 
+            // 
+            this.cbHoldProcSet.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbHoldProcSet.Location = new System.Drawing.Point(0, 54);
+            this.cbHoldProcSet.Margin = new System.Windows.Forms.Padding(2);
+            this.cbHoldProcSet.Name = "cbHoldProcSet";
+            this.cbHoldProcSet.Size = new System.Drawing.Size(214, 15);
+            this.cbHoldProcSet.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.superToolTipDispTran.SetSuperTooltip(this.cbHoldProcSet, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbHoldProcSet.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.cbHoldProcSet.TabIndex = 27;
+            this.cbHoldProcSet.Text = "Hold Procedure Set / Procedure";
+            this.cbHoldProcSet.CheckedChanged += new System.EventHandler(this.cbHoldProcSet_CheckedChanged);
+            // 
             // cbPageNum
             // 
             this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
@@ -108,7 +127,7 @@ namespace Volian.Controls.Library
             // 
             this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbPageNum.Location = new System.Drawing.Point(0, 35);
-			this.cbPageNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cbPageNum.Margin = new System.Windows.Forms.Padding(2);
             this.cbPageNum.Name = "cbPageNum";
             this.cbPageNum.Size = new System.Drawing.Size(126, 15);
             this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -123,7 +142,7 @@ namespace Volian.Controls.Library
             this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
-			this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2);
             this.btnTranCancel.Name = "btnTranCancel";
             this.btnTranCancel.Size = new System.Drawing.Size(88, 36);
             this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" +
@@ -154,7 +173,7 @@ namespace Volian.Controls.Library
             this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
             this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 58);
+            this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 82);
             this.groupPanelTranFmt.Name = "groupPanelTranFmt";
             this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
             // 
@@ -208,7 +227,7 @@ namespace Volian.Controls.Library
             this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
             this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 199);
+            this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 223);
             this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
             this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
             // 
@@ -242,6 +261,18 @@ namespace Volian.Controls.Library
             this.groupPanelTransitionSets.TabIndex = 31;
             this.groupPanelTransitionSets.Text = "Select Procedure Set";
             // 
+            // vlnTreeComboSets
+            // 
+            this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
+            this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
+            this.vlnTreeComboSets.Name = "vlnTreeComboSets";
+            this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
+            this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.vlnTreeComboSets.TabIndex = 33;
+            this.vlnTreeComboSets.Value = null;
+            this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
+            // 
             // groupPanelTransitionProcs
             // 
             this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
@@ -249,7 +280,7 @@ namespace Volian.Controls.Library
             this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
             this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 247);
+            this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 271);
             this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
             this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
             // 
@@ -302,7 +333,7 @@ namespace Volian.Controls.Library
             this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
             this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 293);
+            this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 317);
             this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
             this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
             // 
@@ -357,9 +388,9 @@ namespace Volian.Controls.Library
             this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
             this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 342);
+            this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366);
             this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
-			this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334);
+            this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310);
             // 
             // 
             // 
@@ -391,6 +422,17 @@ namespace Volian.Controls.Library
             this.groupPanelTranstionSteps.TabIndex = 34;
             this.groupPanelTranstionSteps.Text = "Select Step";
             // 
+            // tvTran
+            // 
+            this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tvTran.HideSelection = false;
+            this.tvTran.Location = new System.Drawing.Point(0, 46);
+            this.tvTran.Name = "tvTran";
+            this.tvTran.Size = new System.Drawing.Size(370, 243);
+            this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.tvTran.TabIndex = 31;
+            this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
+            // 
             // pnlTranStepBtns
             // 
             this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
@@ -410,7 +452,7 @@ namespace Volian.Controls.Library
             // 
             this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.cbIncStepNum.Location = new System.Drawing.Point(8, 12);
-			this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2);
             this.cbIncStepNum.Name = "cbIncStepNum";
             this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
             this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -465,29 +507,6 @@ namespace Volian.Controls.Library
             this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
             this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
             // 
-			// tvTran
-			// 
-			this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tvTran.HideSelection = false;
-			this.tvTran.Location = new System.Drawing.Point(0, 46);
-			this.tvTran.Name = "tvTran";
-			this.tvTran.Size = new System.Drawing.Size(370, 267);
-			this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.tvTran.TabIndex = 31;
-			this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
-			// 
-			// vlnTreeComboSets
-			// 
-			this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
-			this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
-			this.vlnTreeComboSets.Name = "vlnTreeComboSets";
-			this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
-			this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.vlnTreeComboSets.TabIndex = 33;
-			this.vlnTreeComboSets.Value = null;
-			this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
-			// 
             // DisplayTransition
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -498,7 +517,7 @@ namespace Volian.Controls.Library
             this.Controls.Add(this.groupPanelTransitionSets);
             this.Controls.Add(this.groupPanelTranFmt);
             this.Controls.Add(this.groupPanelBtns);
-			this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "DisplayTransition";
             this.Size = new System.Drawing.Size(376, 676);
             this.groupPanelBtns.ResumeLayout(false);
@@ -535,5 +554,6 @@ namespace Volian.Controls.Library
 		private DevComponents.DotNetBar.SuperTooltip superToolTipDispTran;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncStepNum;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPageNum;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbHoldProcSet;
     }
 }

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -27,7 +27,31 @@ namespace Volian.Controls.Library
 			set 
 			{
 				if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
-				if (value == null)			// Insert a transition
+				//CSM-C2024-026 Evaluate the transitions panel
+				//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+				//HeldLinkText will store if a transition was manually selected 
+				//to override defaulting the listboxes to the current step / selected transition
+				if (HeldLinkText != "" && value != null)
+                {
+					//handle case where is held text and click on an already existing transition so cannot save one on top of the other.
+					_CurTrans = value;
+					btnTranSave.Enabled = false;
+					btnTranCancel.Enabled = true;
+					return;
+				}
+				else if (HeldLinkText != "" && MyRTB.MyItemInfo.ActiveFormat.Name == HeldLink_CurItemFrom.ActiveFormat.Name)
+                {
+					//this else if will handle case of defaulting to held transition instead of what has been clicked on
+					//Note that if format is not the same, it will ignore the held item
+					//This is because if different format, then options / selections may be different so will need to refresh the lists
+					if (_CurTrans == value && _CurItemFrom == HeldLink_CurItemFrom) return;
+					_CurItemFrom = HeldLink_CurItemFrom;
+					_TranFmtIndx = HeldLink_TranFmtIndx;
+					bool isenh = MyRTB != null && HeldLink_CurItemFrom != null && HeldLink_CurItemFrom.IsEnhancedStep;
+					btnTranSave.Enabled = !isenh && UserInfo.CanEdit(MyUserInfo, Mydvi) && (value == null); //Can Insert Transitions
+					btnTranCancel.Enabled = true;
+				}
+				else if (value == null)			// Insert a transition
 				{
 					if (MyRTB == null) return;
 					if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return;
@@ -121,13 +145,7 @@ namespace Volian.Controls.Library
 		}
 		void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)
 		{
-			//if (_MyRTB.MyLinkText == null)
-			//  CurTrans = null;
-			//else
-			//{
-			//  StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
 			CurTrans = args.MyLinkText.MyTransitionInfo;
-			//}
 		}
 		private ItemInfo _CurrentItemProcedure;		// the selected item's procedure
 		private ItemInfo _CurrentToProcedure;		// the 'to' location's procedure (may be same as _CurrentItemProcedure)
@@ -138,6 +156,12 @@ namespace Volian.Controls.Library
 		private Color _OrigGroupPanelProcs;
 		private Color _OrigGroupPanelSects;
 		private Color _OrigGroupPanelSteps;
+		//CSM-C2024-026 Evaluate the transitions panel
+		//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+		public string HeldLinkText { get; protected set; } = "";  //will hold link text to stay on
+		public int HeldLink_TranFmtIndx { get; protected set; } = 0; //this will hold transition format that was selected on held item
+		public ItemInfo HeldLink_CurItemFrom { get; protected set; } //this will hold item that transitioning from
+
 		#endregion
 		#region Constructors
 		public DisplayTransition()
@@ -237,7 +261,7 @@ namespace Volian.Controls.Library
 				if (selitm != null && selitm.MyContent.Type >= 20000)
 				{
 					
-					if (_DoingRange)
+					if (_DoingRange && CurTrans != null)
 					{
 						tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1);
 					}
@@ -938,6 +962,17 @@ namespace Volian.Controls.Library
 				}
 				_InitializingTrans = false;
 				SaveCancelEnabling();
+
+				//CSM-C2024-026 Evaluate the transitions panel
+				//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+				//If checkbox is checked to enable holding an item,
+				//then store the first step in the currently selected item
+				if (cbHoldProcSet.Checked && secitm.Steps != null && secitm.Steps.Count > 0)
+				{
+					HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, secitm.Steps[0].ItemID);
+					HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
+					HeldLink_CurItemFrom = secitm.Steps[0];
+				}
 			}
 		}
 		// B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
@@ -1089,6 +1124,18 @@ namespace Volian.Controls.Library
 				return;
 			}
 			SaveCancelEnabling();
+
+			//CSM-C2024-026 Evaluate the transitions panel
+			//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+			//If checkbox is checked to enable holding an item,
+			//then store the currently selected item
+			if (cbHoldProcSet.Checked)
+			{
+				HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
+				HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
+				HeldLink_CurItemFrom = selii;
+			}
+
 			if (_DoingRange)
 			{
 				if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null))
@@ -1370,6 +1417,13 @@ namespace Volian.Controls.Library
 				_MyLog.InfoFormat("ItemID {0}, LinkText '{1}'", MyRTB.MyItemInfo.ItemID, linkText);
 			int sel = MyRTB.SelectionStart + MyRTB.SelectionLength;
 			MyRTB.Select(sel, 0);// Move cursor to end of LINK
+
+			//CSM-C2024-026 Evaluate the transitions panel
+			//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+			//After save a transition, set the Linktext / tab to go back to the held transition
+			//if none then this will refresh it to the currently selected item as it did before this csm
+			MyRTB.MyLinkText = HeldLinkText;
+
 			MyRTB.Focus();
 		}
 		#endregion
@@ -1489,6 +1543,32 @@ namespace Volian.Controls.Library
 				btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
 			}
 		}
+
+		//CSM-C2024-026 Evaluate the transitions panel
+		//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+		//If checkbox is checked to enable holding an item,
+		//then store the currently selected item
+		//if checkbox becomes unchecked then clear item.
+		private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e)
+        {
+			if (cbHoldProcSet.Checked)
+			{
+				VETreeNode vt = tvTran.SelectedNode as VETreeNode;
+				ItemInfo selii = vt.VEObject as ItemInfo;
+				if (selii != null)
+				{
+					HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
+					HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
+					HeldLink_CurItemFrom = selii;
+				}
+			}
+			else
+			{
+				HeldLinkText = "";
+				HeldLink_CurItemFrom = null;
+				HeldLink_TranFmtIndx = 0;
+			}
+        }
     }
     public class TransItem
 	{

PROMS/Volian.Controls.Library/DisplayTransition.resx

@@ -112,14 +112,21 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superToolTipDispTran.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superToolTipDispTran.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="cbHoldProcSet.SuperTooltip" xml:space="preserve">
+    <value>By default, PROMS will load the Procedure Set/Procedure in this window for the step (or transition link within a step) that is selected with the mouse.
+
+Selecting this checkbox temporarily disables that behavior so that clicking on various steps within the procedure will not move away from the Procedure Set/Procedure that has currently been selected in these windows.
+
+Note: One exception to this is if you navigate to a Procedure set that has a different format. In that case, it will refresh these options based on that new format.</value>
+  </data>
   <data name="vlnTreeComboSets.SuperTooltip" xml:space="preserve">
     <value>This allows you to select the procedure set that the transition points to, if the selected transition format allows for the transition to point to another set.  If the format does NOT allow for pointing to another set, a selection will not be available.</value>
   </data>

PROMS/Volian.Controls.Library/EditItem.cs

@@ -9,6 +9,7 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -285,7 +286,7 @@ namespace Volian.Controls.Library
 		}
 		public EditItem ActiveParent
 		{
-			get { return _MyParentEditItem != null ? _MyParentEditItem : _MyPreviousEditItem.ActiveParent; }
+			get { return _MyParentEditItem != null ? _MyParentEditItem : _MyPreviousEditItem?.ActiveParent; }
 		}
 		/// <summary>
 		/// Return the Parent EditItem
@@ -893,6 +894,18 @@ namespace Volian.Controls.Library
 			b4topadjust -= newFocus.Top;
 			TopMostYBefore -= b4topadjust;
 
+			//B2024-075: If Deleting an item in a Source Document that is unlinked
+			//and the overall procedure has connected Background Documents
+			//and a window is open containing the background documents
+			//then need to force a refresh on that window as
+			//step numbering will shift
+			EnhancedDocuments ProcEnh = MyItemInfo.MyProcedure.GetMyEnhancedDocuments();
+			if (ProcEnh.Count > 0)
+			{
+				DisplayTabItem wndowToRefresh = MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {ProcEnh[0].ItemID}");
+				wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+			}
+
 			//_MyTimer.ActiveProcess = "Dispose";
 			Dispose();
 			//_MyTimer.ActiveProcess = "SetAllTabs";
@@ -1634,10 +1647,54 @@ namespace Volian.Controls.Library
 			MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.Before, newItemInfo.MyContent.Type));
 
 			// MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced.
-			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(MyItemInfo));
+			//if doing a paste before/after and item being copied is unlinked, item pasted should also be unlinked.
+			ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID);
+			ItemInfo newEnh = null;
+			if (tmpCopyStartSourceItem.GetMyEnhancedDocuments().Count > 0)
+			{
+				newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Before, GetChangeId(MyItemInfo));
+			}
+
+			//B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+			//since source is done first
+			//this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+			if (newEditItem != null && newEnh != null)
+			{
+				FixEnhanceLinkOnSource(newEditItem.MyItemInfo, newEnh, MyItemInfo.GetMyEnhancedDocuments());
+			}
+			else if (newEnh == null && newEditItem != null && newEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				UnlinkEnhanced(newEditItem);
+			}
+			else if (newEnh == null && newEditItem != null)
+			{
+				//if did a paste before/after in a source document that contains enhanced steps
+				//but step being pasted was non-enhanced (unlinked)
+				//then look to see if the background page is open
+				//and if it is, do a refresh so that step numbers update appropriately
+				//without having to close and re-open the background steps
+				foreach (EnhancedDocument edSource in MyItemInfo.GetMyEnhancedDocuments())
+				{
+					ItemInfo exEnh = ItemInfo.Get(edSource.ItemID);
+					DisplayTabItem wndowToRefresh = newEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {exEnh.MyProcedure.ItemID}");
+					wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+				}
+			}
+
 			// if enhanced items were created, then see if they need displayed:
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
+
+        //B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+        //since source is done first
+        //this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+        //if enhanced document wasn't created then paste happened inside a enhanced Step/background step - so remove any links that shouldn't be there
+        //and don't have a corresponding spot in the Source
+        private void FixEnhanceLinkOnSource(ItemInfo SourceItem, ItemInfo newEnhItem,  EnhancedDocuments enhancedDocuments)
+		{
+			if (enhancedDocuments.Count > 0)
+				CreateLinksEnhancedSingleItem(SourceItem, newEnhItem, enhancedDocuments[0].Type); 
+		}
 		private void AddAllEnhancedItemsToDisplay(ItemInfo newItemInfo)
 		{
 			EnhancedDocuments eds = newItemInfo.GetMyEnhancedDocuments();
@@ -1684,12 +1741,15 @@ namespace Volian.Controls.Library
 				}
 			}
 		}
-		public void UnlinkEnhanced(ItemInfo enhII)
+		public void UnlinkEnhanced(EditItem enhII)
 		{
 			// B2022-049: Copy/paste of enhanced procedure and bad links between source and enhanced
 			//	Pass in to unlink as before this change
-			enhII.DoUnlinkEnhanced(enhII, 0, false);
+			// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+			//so can refresh the UI
+			enhII.MyItemInfo.DoUnlinkEnhanced(enhII.MyItemInfo, 0, false);
 			SetFocus();
+			enhII.MyStepPanel.Reset(enhII.MyItemInfo); //need to reset parts so refreshes display to show as unlinked
 		}
 		public ItemInfo AddMissingEnhancedStep(ItemInfo ii, int EnhType)
 		{
@@ -1753,7 +1813,42 @@ namespace Volian.Controls.Library
 			MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.After, newItemInfo.MyContent.Type));
 
 			// MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced.
-			ItemInfo newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
+			//if doing a paste before/after and item being copied is unlinked, item pasted should also be unlinked.
+			ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID);
+			ItemInfo newEnh = null;
+			if (tmpCopyStartSourceItem.GetMyEnhancedDocuments().Count > 0)
+			{
+				newEnh = newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.After, GetChangeId(MyItemInfo));
+			}
+
+			//B2024-075: When doing Paste Before / After with Enhanced Documents only link from Background document to source was created
+			//since source is done first
+			//this is so that after the steps are created in the enhanced, go back and update the link in the source to point to the correct item
+			//if enhanced document wasn't created then paste happened inside a enhanced Step/background step - so remove any links that shouldn't be there
+			//and don't have a cooresponding spot in the Source
+			if (newEditItem != null && newEnh != null)
+			{
+				FixEnhanceLinkOnSource(newEditItem.MyItemInfo, newEnh, MyItemInfo.GetMyEnhancedDocuments());
+			}
+			else if (newEnh == null && newEditItem != null && newEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				UnlinkEnhanced(newEditItem);
+			}
+			else if (newEnh == null && newEditItem != null)
+			{
+				//if did a paste before/after in a source document that contains enhanced steps
+				//but step being pasted was non-enhanced (unlinked)
+				//then look to see if the background page is open
+				//and if it is, do a refresh so that step numbers update appropriately
+				//without having to close and re-open the background steps
+				foreach (EnhancedDocument edSource in MyItemInfo.GetMyEnhancedDocuments())
+				{
+					ItemInfo exEnh = ItemInfo.Get(edSource.ItemID);
+					DisplayTabItem wndowToRefresh = newEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyBar.Items.Cast<DisplayTabItem>().FirstOrDefault(x => x.MyKey == $"Item - {exEnh.MyProcedure.ItemID}");
+					wndowToRefresh?.MyStepTabPanel.MyStepPanel.Reset(wndowToRefresh.MyItemInfo);
+				}
+			}
+
 			if (newEnh != null) AddAllEnhancedItemsToDisplay(newItemInfo);
 		}
 		public void PasteChild(int copyStartID)
@@ -1944,7 +2039,8 @@ namespace Volian.Controls.Library
 					sia.IdentifyChildren(highlight);
 				}
 			}
-			if (MyBeforeEditItems != null)
+			// C2017-031:  Support for paste/replace an enhanced step: don't identify/copy before items, i.e. notes/cautions
+			if (MyBeforeEditItems != null && !MyItemInfo.IsEnhancedStep)
 			{
 				foreach (EditItem sib in MyBeforeEditItems)
 				{

PROMS/Volian.Controls.Library/FindReplace.Designer.cs

@@ -279,18 +279,24 @@ namespace Volian.Controls.Library
 			// 
 			// btnCmCut
 			// 
+			this.btnCmCut.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmCut.Image = global::Volian.Controls.Library.Properties.Resources.Cut_Image;
 			this.btnCmCut.Name = "btnCmCut";
 			this.btnCmCut.Text = "Cut";
 			this.btnCmCut.Click += new System.EventHandler(this.btnCmCut_Click);
 			// 
 			// btnCmCopy
 			// 
+			this.btnCmCopy.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmCopy.Image = global::Volian.Controls.Library.Properties.Resources.Copy_Image;
 			this.btnCmCopy.Name = "btnCmCopy";
 			this.btnCmCopy.Text = "Copy";
 			this.btnCmCopy.Click += new System.EventHandler(this.btnCmCopy_Click);
 			// 
 			// btnCmPaste
 			// 
+			this.btnCmPaste.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmPaste.Image = global::Volian.Controls.Library.Properties.Resources.PasteSmall_Image;
 			this.btnCmPaste.Name = "btnCmPaste";
 			this.btnCmPaste.Text = "Paste";
 			this.btnCmPaste.Click += new System.EventHandler(this.btnCmPaste_Click);
@@ -305,12 +311,16 @@ namespace Volian.Controls.Library
 			// 
 			// btnCmHardSp
 			// 
+			this.btnCmHardSp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmHardSp.Image = global::Volian.Controls.Library.Properties.Resources.HardSpace_Image;
 			this.btnCmHardSp.Name = "btnCmHardSp";
 			this.btnCmHardSp.Text = "Hard Space";
 			this.btnCmHardSp.Click += new System.EventHandler(this.btnCmHardSp_Click);
 			// 
 			// btnCmSymbol
 			// 
+			this.btnCmSymbol.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image;
 			this.btnCmSymbol.Name = "btnCmSymbol";
 			this.btnCmSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.galSymbols});

PROMS/Volian.Controls.Library/FormatUtility.cs

@@ -30,7 +30,8 @@ namespace Volian.Controls.Library
                 //We need to check to see if the current database has been updated with the necessary changes
                 //to the folder configuration value.  If so then build the list of available to be returned
                 //to the calling code
-                if (fList == null)
+                // added check for a list count of zero.  Was getting null error from data gotten from customer
+                if (fList == null || fList.Count == 0)
                 {
                     _MyLog.InfoFormat("Filtered format list not available: Database update needed for config value of top folder record");
                     return RawList;

PROMS/Volian.Controls.Library/ImageItem.cs

@@ -256,7 +256,8 @@ namespace Volian.Controls.Library
 		private int _origCfgHt = 0;	// keep track if original size was stored in cfg
 		private int _origCfgWd = 0;
 		private bool _pastedNew = false;   // need this for flagging newly pasted image (may need to clear cfg)
-		private DisplayTags _displayTags;
+		private DisplayTags _displayTags = new DisplayTags();
+		//House myhouse = new House();
 
 		#endregion
 		#region Constructors
@@ -316,8 +317,11 @@ namespace Volian.Controls.Library
 		}
 		private void SetWidthsAndHeights(System.Drawing.Image img)
 		{
+
 			int wd = img.Width * MyStepPanel.DPI / 72; // converts from screen resolution's DPI to image's points (72/inch)
 			int ht = img.Height * MyStepPanel.DPI / 72;
+
+
 			if (MyItemInfo.MyContent.MyImage != null)   // image is null if creating new.
 			{
 				ImageConfig ic = new ImageConfig(MyItemInfo.MyContent.MyImage);
@@ -340,9 +344,9 @@ namespace Volian.Controls.Library
 				_displayTags.TbFSwd = wd.ToString();
 				_displayTags.TbFSht = ht.ToString();
 			}
-
-
 		}
+
+
 		// the following gets called for 'NEW' images
 		private E_ImageSource InsType = E_ImageSource.None;
 		public ImageItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand, EditItem nextEditItem, ImageItem.E_ImageSource insType, DisplayTags displayTags)

PROMS/Volian.Controls.Library/StepPanel.cs

@@ -1231,7 +1231,7 @@ namespace Volian.Controls.Library
 		}
 		public ItemSelectedChangedEventArgs(EditItem myEditItem)
 		{
-			_MyItemInfo = myEditItem.MyItemInfo;
+			_MyItemInfo = myEditItem?.MyItemInfo;
 			_MyEditItem = myEditItem;
 		}
 	}

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -11,6 +11,7 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -485,6 +486,8 @@ namespace Volian.Controls.Library
 		public void RefreshDisplay(bool activeMode)
 		{
 			if (IsExperimenting) return;
+			if (IsDisposed) return;
+
 			ActiveMode = activeMode;
 			OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
 			//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");
@@ -2853,7 +2856,10 @@ namespace Volian.Controls.Library
 			return false;
 		}
 
-		public string GetPasteText(bool PasteNoReturnsSetting, IDataObject myDO)
+		//CSM B2023-095/U2022-004 When Copy/Pasting Symbols, some of the symbols paste in an incorrect font
+		//   Changed this to put in the unicode code for any symbols outside the normal ascii range
+		// if supplied convertunicode flag is true
+		public string GetPasteText(bool PasteNoReturnsSetting, IDataObject myDO, bool convertunicode = false)
 		{
 			// B2021-0039: symbols not pasting correctly from ctrl-v:
 			//	get base list of valid symbols, use base format if MyItemInfo is null.  Use symbols from
@@ -2870,36 +2876,27 @@ namespace Volian.Controls.Library
 			if (PasteNoReturnsSetting) ptext = ptext.Replace("\r\n", " ");
 
             StringBuilder sb = new StringBuilder();
-			bool didCharReplace = false;
 			bool hasBadChar = false;
-			for (int i = 0; i < ptext.Length; i++)
+			foreach (char c in ptext)
             {
-				didCharReplace = false;
-				string sym = string.Format(@"{0}", Convert.ToInt32(ptext[i]));
-				if ((ptext[i] > 0x7e))
+				if ((c > 0x7e))
 				{
 					// is this an allowable symbol/character:
-					for (int j = 0; j < sl.Count; j++)
+					if (allowableSymbols.Any(x => x == $@"{(short)c}"))
 					{
-						if (sym == allowableSymbols[j])
-						{
-							sb = sb.Append((char)(Convert.ToInt32(allowableSymbols[j])));
-							didCharReplace = true;
-							break;
+						if (convertunicode)
+							sb.Append($"\\u{(short) c}?");
+						else
+							sb.Append(c);
 					}
-					}
-					// if not allowable, put in a "?" and give a message to user (below)
-					if (!didCharReplace)
+					else
 					{
-						sb = sb.Append("?");
-					didCharReplace = true;
 						hasBadChar = true;
+						sb.Append("?");
 					}
-				if (!didCharReplace)
-					sb = sb.Append(ptext[i]);
 				}
-				if (!didCharReplace)
-					sb = sb.Append(ptext[i]);
+				else
+					sb.Append(c);
             }
             ptext = sb.ToString();
             ptext = ptext.Replace("\u2013", "-"); // Replace EN Dash with hyphen

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -337,8 +337,10 @@ namespace Volian.Controls.Library
 				else if (btn.Name.Contains("Unlink"))
 				{
 					// C2019=003: add a confirmation dialog before unlinking a step:
+					// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+					//so can refresh the UI
 					if (FlexibleMessageBox.Show(this, "Do you want to unlink this step?", "Confirm Enhanced Step Unlink", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-						MyEditItem.UnlinkEnhanced(MyEditItem.MyItemInfo);
+						MyEditItem.UnlinkEnhanced(MyEditItem);
 				}
 			}
 			else
@@ -1374,7 +1376,9 @@ namespace Volian.Controls.Library
 		public static String GetDefaultKeyValue(String key)
 		{
 			object xxx = null;
-			return Registry.GetValue(key, "", xxx).ToString();
+			// fixed null reference error - appeared only while debugged - for user was handled via Try/Catch and ignored
+			object gtval = Registry.GetValue(key, "", xxx);
+			return (string)((gtval != null) ? gtval.ToString() : gtval);
 		}
 		private EditItem FindStepAfter(string types, int contenttype)
 		{
@@ -1750,7 +1754,7 @@ namespace Volian.Controls.Library
 			// note in follow if statements, 'setting' == false when in enhanced document:
 			if (setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0))	// this step is in enhanced, but not linked // B2018-112 and is allowed to edit
 				allowDel = true;	// allow delete if not linked
-			btnCpyStp.Enabled = setting;
+			btnCpyStp.Enabled = MyUserInfo.IsAllowedToEdit(Mydvi); // C2017-031:  Support for paste/replace an enhanced step
 			//B20170-158 Allow a Unlinked Step to be pasted before or after a linked step.
 			StepTabPanel tmp = Parent as StepTabPanel;
 			//B2020-058: crash on null reference
@@ -1801,7 +1805,8 @@ namespace Volian.Controls.Library
 			btnPasteAfter.Enabled = btnCMPasteAfter.Enabled = enable;
 			//B20170-158 Don't allow a step to replace a linked step
 			//B2017-180:  The fix for B2017-158 also needed the 'HasEnhancedLinkedStep' to check if the copied step is a source step
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && !MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep;
+			// C2017-031:  Support for paste/replace an enhanced step, enable button
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable;
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -1861,25 +1866,6 @@ namespace Volian.Controls.Library
 					if (stepToCfg.MyEnhancedDocuments != null && stepToCfg.MyEnhancedDocuments.Count > 0 && stepToCfg.MyEnhancedDocuments[0].Type != 0) toSourceHasEnhancedLinks = true;
 				}
 			}
-			// enhanced: if 'from' step is not enhanced, only allow paste before/after
-			if (MyItemInfo.IsHigh && !MyItemInfo.IsEnhancedStep)
-			{
-				stepToCfg = MyItemInfo.MyConfig as StepConfig;
-				if (stepToCfg.MyEnhancedDocuments != null && stepToCfg.MyEnhancedDocuments.Count > 0 && stepToCfg.MyEnhancedDocuments[0].Type != 0)
-				{
-					// Current selected step is source (i.e. has enhanced links to enhanced steps)
-					// check if 'from' step is non.  If so, allow paste before/after but not replace
-					if (tmp.MyDisplayTabControl.MyCopyStep.IsHigh)
-					{
-						StepConfig fromCfg = tmp.MyDisplayTabControl.MyCopyStep.MyConfig as StepConfig;
-						if (fromCfg != null && (fromCfg.MyEnhancedDocuments==null || fromCfg.MyEnhancedDocuments.Count==0))
-						{
-							btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = false;
-							return;
-						}
-					}
-				}
-			}
       //copy item is high level step
 			// Allow a High Level step to be pasted to a sub-step, but not to a table, figure, section or procedure type
       if (tmp.MyDisplayTabControl.MyCopyStep.IsHigh && (MyItemInfo.IsTable || MyItemInfo.IsFigure || MyItemInfo.IsSection || MyItemInfo.IsProcedure))
@@ -1982,6 +1968,9 @@ namespace Volian.Controls.Library
 				case "Cont. Act\r\nSummary":
 					btnCASCreate_Click(sender, e);
 					break;
+				case "Time Crit\r\nSummary":
+					btnTCASCreate_Click(sender, e);
+					break;
 			}
 			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0; // unselect the unit (child)
 		}
@@ -1996,6 +1985,9 @@ namespace Volian.Controls.Library
 			btnCASCreate.SubItems.Clear();
 			btnCASCreate.Tag = null;
 			btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click);
+			btnTCASCreate.SubItems.Clear();
+			btnTCASCreate.Tag = null;
+			btnTCASCreate.Click -= new System.EventHandler(btnTCASCreate_Click);
 			btnReviewCreatePDF.SubItems.Clear();
 			btnReviewCreatePDF.Tag = null;
 			btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click);
@@ -2022,6 +2014,9 @@ namespace Volian.Controls.Library
 				btnCASCreate.SubItems.Add(btn);
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
+				btnTCASCreate.SubItems.Add(btn);
+				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
+				btn.Enabled = procAppl;
 				btnReviewPdfQuickCreate.SubItems.Add(btn);
 			}
 			btnPdfCreate.AutoExpandOnClick = true;
@@ -2029,6 +2024,7 @@ namespace Volian.Controls.Library
 			btnReviewCreatePDF.AutoExpandOnClick = true;
 			btnReviewPdfQuickCreate.AutoExpandOnClick = true;
 			btnCASCreate.AutoExpandOnClick = true;
+			btnTCASCreate.AutoExpandOnClick = true;
 		}
 		private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler)
 		{
@@ -2873,7 +2869,14 @@ namespace Volian.Controls.Library
 
 			}
 			else if (myDO.GetDataPresent(DataFormats.Text))
-				myRtb.SelectedText = _MyStepRTB.GetPasteText(PasteNoReturnsSetting, myDO);
+            {
+				//CSM B2023-095/U2022-004 When Copy/Pasting Symbols, some of the symbols paste in an incorrect font
+				//   Changed this to put in the unicode code for any symbols outside the normal ascii range
+				//   Also need to input as an RTF so that correct font is used with these
+				//   and unicode is converted to actual text
+				string clipboardtext = _MyStepRTB.GetPasteText(PasteNoReturnsSetting, myDO, true);
+				myRtb.SelectedRtf = _MyStepRTB.RtfPrefixForSymbols + clipboardtext + @"}";
+			}
 			if (myRtb.SelectionLength == 0 && myRtb is StepRTB) myRtb.SelectionFont = (myRtb as StepRTB).MyStyleFont.WindowsFont;
 			_PastePlainTextOvrRide = false;
 			_PasteStepTextOvrRide = false;
@@ -3119,7 +3122,13 @@ namespace Volian.Controls.Library
 			// a referenced object, bring up ReferencedObject Editor (for now, just put up a message box.
 			if (_MyStepRTB.MyLinkText != null && _MyStepRTB.MyLinkText.IndexOf("Transition") > -1)
 			{
-				_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(_MyStepRTB.MyLinkText));
+				// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
+				//           Needed to clear the selection of the link or it will be used the next time
+				//           <Shift><Ctrl><G> is used
+				string lnkText = _MyStepRTB.MyLinkText; // save the transition link information
+				_MyStepRTB.SetSelection(0, 0); // Clear the selection of the transition link
+											   // note _MyStepRTB.DeselectAll() did not work all the time
+				_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(lnkText));
 			}
 			else
 			{
@@ -3142,7 +3151,12 @@ namespace Volian.Controls.Library
 				}
 				else
 				{
-					LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
+					LinkText lt = new LinkText(_MyStepRTB.MyLinkText); // save the RO link information
+					// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
+					//           Needed to clear the selection of the link or it will be used the next time
+					//           <Shift><Ctrl><G> is used
+					_MyStepRTB.SetSelection(0, 0); // clear the selection of the RO link
+												   // note _MyStepRTB.DeselectAll() did not work all the time
 					//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
 					if (lt.MyRoUsageInfo != null)
 					{
@@ -3782,7 +3796,7 @@ namespace Volian.Controls.Library
       ProcedureInfo.RefreshTransitions(MyItemInfo.MyProcedure as ProcedureInfo);
       this.Cursor = Cursors.Default;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions, {3} transitions unable to be fixed (Annotation: Bad Transition Link)", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
     }
     private void btnRefObjRefresh_Click(object sender, System.EventArgs e)
     {
@@ -4110,9 +4124,19 @@ namespace Volian.Controls.Library
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
 			ItemInfo.PasteStepIsWithinDefinedSubStepLevels(tmp.MyDisplayTabControl.MyCopyStep.ItemID, MyItemInfo, true);
 			EditItem oldEditItem = MyEditItem;
+			// C2017-031:  Support for paste/replace an enhanced step, if pasting an enhanced, remove its EditItem from the 'cache'.  A new EditItem gets created during paste.
+			if (MyEditItem != null && MyEditItem.MyItemInfo.IsEnhancedStep) MyEditItem.MyStepPanel._LookupEditItems.Remove(MyEditItem.MyItemInfo.ItemID);
 			MyEditItem = MyEditItem.PasteReplace(tmp.MyDisplayTabControl.MyCopyStep.ItemID);
 			if (MyEditItem == null) oldEditItem.IdentifyMe(false); // B2017-179 if null then we didn't do the replace but did position to the first transition that needs resolved
-			if (MyEditItem != null && MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, add Dispose of old EditItem if enhanced
+			if (MyEditItem != null && ((MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) || MyEditItem.MyItemInfo.IsEnhancedStep))
+				oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, refresh ItemInfo's in user interface caches.
+			if (MyEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				MyEditItem.MyItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+				tmp.MyStepPanel.SelectedItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+			}
 		}
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)

PROMS/Volian.Print.Library/PDFChronologyReport.cs

@@ -308,7 +308,7 @@ namespace Volian.Print.Library
 				h.Font = f3;
 				string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.ChangeBarDate ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
+					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
 				else
 					h.Add(actionWhat);
 				if (cai.DTS > maxDTS)
@@ -1465,7 +1465,7 @@ namespace Volian.Print.Library
 				//				h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original");
 				string actionWhat = ((cai.ActionWhat == "Added" || cai.ActionWhat == "Changed") && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat;	//(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
+					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
 				else
 					h.Add(actionWhat);
 				c = new PdfPCell(h);

PROMS/Volian.Print.Library/PDFReport.cs

@@ -1074,7 +1074,9 @@ namespace Volian.Print.Library
 
 			string lastProcNum = string.Empty;
 			string lastSection = string.Empty;
-			string lastDVPath = string.Empty;
+			//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+			//setting this to something other than empty - otherwise will not print first initial header
+			string lastDVPath = "start"; 
 			if (_ResultList.Count > 0)
 			{
 				foreach (ItemInfo item in _ResultList)
@@ -1088,6 +1090,12 @@ namespace Volian.Print.Library
 					// procedure set title at the top of the report (once).
 					if (lastDVPath != "" && lastDVPath != item.SearchDVPath)
 					{
+						//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+						//was placing last item from the precious section in the new section
+						//place it before starting the new section and then clear items
+						PutROusageForProcedure(datatable, roUse, headerwidths);
+						roUse.Clear();
+
 						subTable = new PdfPTable(headerwidths);
 						AddMainPathGroup(datatable, item.SearchDVPath, splitAt, f2, Color.LIGHT_GRAY, 0);
 						lastProcNum = string.Empty;
@@ -1138,7 +1146,7 @@ namespace Volian.Print.Library
 			document.Add(datatable);
 		}
 
-		private void AddProcROUse(ItemInfo item, SortedDictionary<string, List<ItemInfo>> procRoUse)
+		private void AddProcROUse(ItemInfo item, Dictionary<string, List<ItemInfo>> procRoUse)
 		{
 			string dictKey = GetCurProcNum(item.SearchPath) + " " + GetCurSectionNumTitle(item);
 
@@ -1157,7 +1165,7 @@ namespace Volian.Print.Library
 			}
 		}
 
-		private void PutStepListForProcedure(PdfPTable rotable, SortedDictionary<string, ItemInfo> sortedStepList)
+		private void PutStepListForProcedure(PdfPTable rotable, Dictionary<string, ItemInfo> sortedStepList)
 		{
 			// C2017-036 get best available proportional font for symbols that looks close to Arial
 			//           Note that Microsoft no longer supplies Arial Unicode MS as of Word16
@@ -1173,13 +1181,13 @@ namespace Volian.Print.Library
 			sortedStepList.Clear();
 		}
 
-		private void PutROusageForROID(PdfPTable curTable, SortedDictionary<string, List<ItemInfo>> procRoUse, float[] headerwidths, int splitAt, bool moreThanOneProcSet)
+		private void PutROusageForROID(PdfPTable curTable, Dictionary<string, List<ItemInfo>> procRoUse, float[] headerwidths, int splitAt, bool moreThanOneProcSet)
 		{
 			// C2017-036 get best available proportional font for symbols that looks close to Arial
 			//           Note that Microsoft no longer supplies Arial Unicode MS as of Word16
 			iTextSharp.text.Font f2 = pdf.GetFont(Volian.Base.Library.vlnFont.ReportsFont, 10, 0, Color.BLACK);
 
-			SortedDictionary<string, ItemInfo> sortedStepList = new SortedDictionary<string, ItemInfo>();
+			Dictionary<string, ItemInfo> sortedStepList = new Dictionary<string, ItemInfo>();
 			string lastProcKey = string.Empty;
 			string lastProcNumTitle = string.Empty;
 			string lastDVPath = string.Empty;
@@ -1293,7 +1301,7 @@ namespace Volian.Print.Library
 
 		private void BuildROUsageTableByRO(iTextSharp.text.Document document)
 		{
-			SortedDictionary<string, List<ItemInfo>> procRoUse = new SortedDictionary<string, List<ItemInfo>>();
+			Dictionary<string, List<ItemInfo>> procRoUse = new Dictionary<string, List<ItemInfo>>();
 
 			float[] headerwidths = { 20, 80 };
 			PdfPTable datatable = new PdfPTable(1);

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -2953,7 +2953,7 @@ namespace Volian.Print.Library
 			if (ii.Sections == null) return;        // B2021-067 crash on null reference
 			foreach (SectionInfo si in ii.Sections)
 			{
-				if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && si.ItemID == MyPromsPrinter.PrtSectID))
+				if (MyPromsPrinter.PrtSectID == -1 || (MyPromsPrinter.PrtSectID > -1 && (ii.ItemID == MyPromsPrinter.PrtSectID || si.ItemID == MyPromsPrinter.PrtSectID)))
 				{
 				if (si.IsStepSection)
 					{

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -226,6 +226,8 @@ namespace Volian.Print.Library
 									else
 										yoff += vlnPrintObject.SixLinesPerInch;
 								}
+								if (box.MyBox != null)
+									yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
 							}
 							bxIndex = bxIndx;
 						}
@@ -273,6 +275,8 @@ namespace Volian.Print.Library
 								box.YOffset = yoff + ((ln - 1) * vlnPrintObject.SixLinesPerInch);
 								if (childItemInfo.FormatStepData.OneLineBeforeTab) ln++;
 								yoff += ln * vlnPrintObject.SixLinesPerInch;
+								if (box.MyBox != null)
+									yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
 							}
 						}
 						bxIndex = bxIndx;
@@ -3781,7 +3785,12 @@ namespace Volian.Print.Library
 					else if (itemInfo.MyTab.AltPrintTab != null)
 						mytab = new vlnTab(cb, this, itemInfo.MyTab.AltPrintTab, itemInfo.MyTab.AltPrintTab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
 					else
-						mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, itemInfo.MyTab.CleanText, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
+                    {
+						string clntxt = itemInfo.MyTab.CleanText;
+						if (!string.IsNullOrEmpty(itemInfo.FormatStepData?.TabData?.MacroEditTag) && itemInfo.FormatStepData.TabData.MacroEditTag == "_" && clntxt.StartsWith("_"))
+								clntxt = clntxt.Substring(1);
+						mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, clntxt, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
+					}
 					PartsLeft.Add(mytab);
 					if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro);
 				}
@@ -5492,7 +5501,23 @@ namespace Volian.Print.Library
 			//		code looks up parents to see if they have next before returning a 0 (no blank line)
 			// B2022-042: double Caution followed by Critical Step missing bullet
 			// F2022-010: substeps in multiple notes, cautions, warning print differently
-			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
+			if (MyItemInfo.IsInCautionOrNote)
+			{
+				float adjLastBlankLineInNoteCautionWarning = 0;
+				// Get the box information for the Note, Caution, or Warning
+				ItemInfo tifo = (MyItemInfo.IsCaution || MyItemInfo.IsNote) ? MyItemInfo : MyItemInfo.ParentNoteOrCaution;
+				int typ = ((int)tifo.MyContent.Type) % 10000;
+				int? bxIndx = tifo.ActiveFormat.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
+				if (bxIndx != null)
+				{
+					Box bx = tifo.ActiveFormat.PlantFormat.FormatData.BoxList[(int)bxIndx];
+					// F2024-078 save the adjustment of the last blank line - this value will be added to the SixLinesPerInch value (a blank line)
+					adjLastBlankLineInNoteCautionWarning = (float)(bx.AdjLastBlnkLn ?? 0); 
+				}
+				//}
+				//			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
+				// F2024-078 added check for adjustment of the last blank line in the Note/Caution box
+				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn || adjLastBlankLineInNoteCautionWarning != 0)
 				{
 					if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null))    // there are no sub-steps, see if any parents have next
 					{
@@ -5505,9 +5530,22 @@ namespace Volian.Print.Library
 							if ((par.NextItem == null) || (par.MyContent.Type != par.NextItem.MyContent.Type)) par = par.MyParent;
 							else break;
 						}
-					if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type)) return 0;
+						if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type))
+						{
+							if (adjLastBlankLineInNoteCautionWarning != 0)
+								return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning; // F2024-078 adjust the size of the last blank line of Note/Caution box
+							else
+								return 0; // no blank line after last text line of Note/Caution/Warning
+						}
+					}
+					if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)
+					{
+						if (adjLastBlankLineInNoteCautionWarning != 0)
+							return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning;
+						else
+							return 0; // no blank line after last text line of Note/Caution/Warning
+					}
 				}
-				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type) return 0;
 			}
 				if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;
 			// B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. Added a format flag so as not to affect other plants. 
@@ -5792,6 +5830,7 @@ namespace Volian.Print.Library
 			float hdrWidth = (itemInfo.MyHeader.CleanText == null) ? 0 : itemInfo.MyHeader.CleanText.Length * 6;
 			int typ = ((int)itemInfo.MyContent.Type) % 10000;
 			int? bxIndx = formatInfo.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
+			float adjmentAfterBoxedNoteCautionTab = 0; // F2024-078 used to save the adjustment of the space after the Note/Caution tab
 
 			if (itemInfo.MyHeader.Justify == System.Drawing.ContentAlignment.MiddleCenter)
 			{
@@ -5802,6 +5841,7 @@ namespace Volian.Print.Library
 						xoff += (float)bx.TabPos;							// xoff starts as left margin
 					else
 						xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2));   // xoff starts as left margin
+					adjmentAfterBoxedNoteCautionTab = (float) (bx.AdjSpAftTab ?? 0); // F2024-078 save the adjustment of the space (line) after the Note/Caution tab
 				}
 				else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote))	// C2014-009
 					xoff = XOffset + (para.Width / 2) - (hdrWidth / 2);
@@ -5836,7 +5876,7 @@ namespace Volian.Print.Library
 			// F2022-121 added SpecialStepsFoldoutKeepWhiteSpace flag to allow for all of the other special foldout formatting, but 
 			//           not compress the page - this need to handle explicit OR and AND sub-steps to ensure there are blank lines before and after
 			//           the separator text.
-			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0);
+			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0) + adjmentAfterBoxedNoteCautionTab; // F2024-078 add adjustment to the space after the Note/Caution tab
 		}
 		private float AdjustToCharPosition(float position, float? CPI)
 		{
@@ -6847,7 +6887,13 @@ namespace Volian.Print.Library
 			}
 			else if (itemInfo.IsSection)
 			{
-				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO);
+				// B2023-074 The itemInfo we are processing is a section (number and title). Change maxRNO to zero to getting the width.
+				//           The Width is used when printing the section number and title (when the check box on the properties page is checked)
+				//           and is assumemed the section is a single column section (maxRNO = 0) and uses the format variable WidSTablePrint
+				//           which holds the widths for then the section has one column, two column, or three column.
+				//           For printing section numbers and titles like this, we always want to accomodate for lone section title text.
+				//           So the initial width should always be set to the one column width value so that it can spane across the page.
+				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, 0);
 				float adjwidths = 0;
 				adjwidths = AdjustMetaWidth(itemInfo, formatInfo, adjwidths, false);
 				Width += (adjwidths + _WidthAdjust);