Merge pull request 'F2024-078 - Adjust the spacing before and after the Note tab, along with the blank space (line) at the bottom of the Note box per the example supplied by the customer. Also made similar adjustments to the Caution tab and box.' (#465) from F2024-078_BVNoteSpacing into Development

Looks good - Ready for QA

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

@@ -433,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);

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

@@ -151,7 +151,7 @@ namespace ROEditor
 		private string origMenuItem;
 		StringBuilder parseerror;
 		private int hi, lo;
-		private Label lb_chkApplc; 
+		private Label lb_chkApplc;
 		private int dbtype;
 		//  C2021-026 returns true is Parent/Child info was passed into the RO Editor
 		public bool PCApplicabilityEnabled
@@ -188,33 +188,33 @@ 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()
 		{
 			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);
 			}
@@ -277,7 +277,7 @@ namespace ROEditor
 			_initializing = false;
 		}
 
-		
+
 		private void DoValueTextBoxes()
 		{
 			string menuitm, retval;
@@ -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 = "";
@@ -332,7 +332,7 @@ namespace ROEditor
 		}
 
 		private void FillInData(string grptxt)
-		{	
+		{
 			this.lblGroupText.Text = grptxt;
 			DoValueTextBoxes();
 			SetUpListBoxes();
@@ -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,7 +740,7 @@ namespace ROEditor
 							{
 								ROField rof = (ROField) InUseList[i];
 								rofname = rof.GetFieldname;
-								if (inusename == rofname)
+								if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
 								{
 									found = true;
 									break;
@@ -745,7 +845,7 @@ namespace ROEditor
 				{
 					ROField rof = (ROField) InUseList[i];
 					rofname = rof.GetFieldname;
-					if (inusename == rofname)
+					if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
 					{
 						found = true;
 						break;
@@ -1096,7 +1196,8 @@ namespace ROEditor
 					return;
 				}
 			}
-			
+
+			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 +1213,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 +1230,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 +1264,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 +1278,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 +1516,7 @@ namespace ROEditor
 			this.btnCancel.Size = new System.Drawing.Size(80, 24);
 			this.btnCancel.TabIndex = 10;
 			this.btnCancel.Text = "Cancel";
+
 			// 
 			// RODefFrm
 			// 
@@ -1419,6 +1539,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.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/PROMSFixes.Sql

@@ -24039,6 +24039,66 @@ GO
 ==========================================================================================================
 */
 
+---The following RememberOpenTabs/AlwaysOpenTabs columns were added for Remeber Open Tabs.
+--- RememberOpenTabs = Do not prompt User when PROMS opens
+--- AutoOpenTabs = OpenTabs when PROMS opens - Default to On
+IF NOT EXISTS(SELECT *
+          FROM   INFORMATION_SCHEMA.COLUMNS
+          WHERE  TABLE_NAME = 'Users'
+                 AND COLUMN_NAME = 'RememberOpenTabs') 
+ALTER TABLE Users ADD RememberOpenTabs bit NOT NULL DEFAULT(0);
+go
+-- Display the status
+IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for RememberOpenTabs'
+ELSE PRINT 'Altered table [Users] Error on Alter for RememberOpenTabs'
+go
+
+IF NOT EXISTS(SELECT *
+          FROM   INFORMATION_SCHEMA.COLUMNS
+          WHERE  TABLE_NAME = 'Users'
+                 AND COLUMN_NAME = 'AutoOpenTabs') 
+ALTER TABLE Users ADD AutoOpenTabs bit NOT NULL DEFAULT(1);
+go
+-- Display the status
+IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for AutoOpenTabs'
+ELSE PRINT 'Altered table [Users] Error on Alter for AutoOpenTabs'
+go
+
+/****** Object:  StoredProcedure [dbo].[vesp_UpdateUserSettings]    Script Date: 10/24/2024 11:29:44 AM ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateUserSettings]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [vesp_UpdateUserSettings];
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Matthew Schill
+-- Create date: 10/24/2024
+-- Description:	Update User Settings
+-- =============================================
+CREATE PROCEDURE [dbo].[vesp_UpdateUserSettings]
+
+(
+	@UID varchar(100),
+	@Remember bit = null,
+	@AutoOpen bit = null
+)
+WITH EXECUTE AS OWNER
+AS
+   UPDATE Users SET 
+     RememberOpenTabs = ISNULL(@Remember,RememberOpenTabs),
+	 AutoOpenTabs = ISNULL(@AutoOpen,AutoOpenTabs)
+	WHERE UserID =@UID
+
+	RETURN
+GO
+
+IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettings Succeeded'
+ELSE PRINT 'Running vesp_UpdateUserSettings Failed to Execute'
+GO
+
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -24072,7 +24132,7 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '10/03/2024 11:24'
+	set @RevDate = '10/28/2024 11:24'
 	set @RevDescription = 'Add the ability for PROMS to remember the procedure tabs that were open when you closed PROMS'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription

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>
@@ -626,4 +635,4 @@
   <PropertyGroup>
     <PreBuildEvent>cmd /c "$(ProjectDir)FixRev.bat"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

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/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
@@ -2349,18 +2353,49 @@ namespace VEPROMS
 
 		public void openDisplaytabstate()
 		{
+			// Retrieve edit tab state from database.
 			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
-		
-			if (DisPlayTabState.Rows.Count > 0)
+
+			//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))
 			{
-				foreach (DataRow TabState in DisPlayTabState.Rows)
+				//will open tabs by default / ask by default
+				DialogResult result = DialogResult.Yes;
+				if (!usersettings.UserSetting_OpenTabs_Remember)
 				{
-					int _ItemID = (int)TabState["ItemID"];
-					//ItemInfoList _Procedures = ItemInfoList.GetList(_ItemID, (int)E_FromType.Procedure));
-					ItemInfo _Procedure = ItemInfo.Get(_ItemID);
-					//ItemInfo.Get
-					//ItemInfo.Get
-					OpenItem(_Procedure);
+					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;
+						}
+					}
 				}
 			}
 		}

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/DisplayText.cs

@@ -1165,13 +1165,17 @@ 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);
-						foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
+
+						//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))
 						{
-							if (ct.TransitionID == recid)
+							foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
 							{
-								itm.MyContent.ContentTransitions.Remove(ct);
-								break;
+								if (ct.TransitionID == recid)
+								{
+									itm.MyContent.ContentTransitions.Remove(ct);
+									break;
+								}
 							}
 						}
 					}
@@ -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

@@ -2752,6 +2752,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,7 +2790,11 @@ namespace VEPROMS.CSLA.Library
 				return _SearchDVPath;
 			}
 		}
-		internal string _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 SearchDVPath_clean => CleanSearchString(SearchDVPath);
+
+        internal string _SearchPath;
 		public string SearchPath
 		{
 			get
@@ -2790,6 +2817,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 +2831,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;
@@ -4251,6 +4285,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 +4382,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 +4783,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 +4805,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,15 +5620,32 @@ 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;
 		}
-		#endregion
-		#region UseSmartTemplate
 
-		// TemplateIndex is for Calvert only:
-		private int _TemplateIndex = -2;  // -2 not set; -1 not a template
+		//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
+
+        // TemplateIndex is for Calvert only:
+        private int _TemplateIndex = -2;  // -2 not set; -1 not a template
 		public int TemplateIndex
 		{
 			get

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;
-				}
+				// 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;
 			}
-			else if (_TranType == 5 && Prefix != null)
-			{
-				if (!HasText && Prefix.StartsWith(", "))
-					_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
-				else
-					_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/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.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/DisplayReports.Designer.cs

@@ -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/DisplaySearch.Designer.cs

@@ -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.cs

@@ -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,25 +981,42 @@ namespace Volian.Controls.Library
 			sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
 			MyEditItem.ChangeBarForConfigItemChange = true;
 		}
-		//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
-		//{
-		//	// User left Atlernate Continuous Action Text field.  If text changed, then prompt
-		//	// to see if save should occur.
-		//	StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-		//	if (sc == null) return;
-		//	bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == "");
-		//	if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text)
-		//	{
-		//		if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-		//		{
-		//			MyEditItem.SaveContents();
-		//			sc.Step_AlternateContActSumText = txbxAltConActSumText.Text;	// this actually saves the config
-		//		}
-		//		else
-		//			txbxAltConActSumText.Text = sc.Step_AlternateContActSumText;
-		//	}
 
-		//}
+        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
+        //	// to see if save should occur.
+        //	StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+        //	if (sc == null) return;
+        //	bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == "");
+        //	if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text)
+        //	{
+        //		if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+        //		{
+        //			MyEditItem.SaveContents();
+        //			sc.Step_AlternateContActSumText = txbxAltConActSumText.Text;	// this actually saves the config
+        //		}
+        //		else
+        //			txbxAltConActSumText.Text = sc.Step_AlternateContActSumText;
+        //	}
+
+        //}
+
+    }
 }

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

@@ -28,488 +28,507 @@ namespace Volian.Controls.Library
 		/// </summary>
 		private void InitializeComponent()
 		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
-			this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
-			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.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.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();
-			this.groupPanelTransitionProcs.SuspendLayout();
-			this.groupPanelTransitionSect.SuspendLayout();
-			this.groupPanelTranstionSteps.SuspendLayout();
-			this.pnlTranStepBtns.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// groupPanelBtns
-			// 
-			this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelBtns.Controls.Add(this.cbPageNum);
-			this.groupPanelBtns.Controls.Add(this.btnTranCancel);
-			this.groupPanelBtns.Controls.Add(this.btnTranSave);
-			this.groupPanelBtns.DisabledBackColor = System.Drawing.Color.Empty;
-			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.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelBtns.Style.BackColorGradientAngle = 90;
-			this.groupPanelBtns.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelBtns.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderBottomWidth = 1;
-			this.groupPanelBtns.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelBtns.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderLeftWidth = 1;
-			this.groupPanelBtns.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderRightWidth = 1;
-			this.groupPanelBtns.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderTopWidth = 1;
-			this.groupPanelBtns.Style.CornerDiameter = 4;
-			this.groupPanelBtns.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelBtns.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelBtns.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelBtns.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.groupPanelBtns.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelBtns.TabIndex = 25;
-			// 
-			// cbPageNum
-			// 
-			this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			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.Name = "cbPageNum";
-			this.cbPageNum.Size = new System.Drawing.Size(126, 15);
-			this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.cbPageNum.TabIndex = 26;
-			this.cbPageNum.Text = "Include Page Number";
-			this.cbPageNum.CheckedChanged += new System.EventHandler(this.cbPageNum_CheckedChanged);
-			// 
-			// btnTranCancel
-			// 
-			this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnTranCancel.AutoSize = true;
-			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.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" +
+            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.groupPanelBtns.SuspendLayout();
+            this.groupPanelTranFmt.SuspendLayout();
+            this.groupPanelTransitionSets.SuspendLayout();
+            this.groupPanelTransitionProcs.SuspendLayout();
+            this.groupPanelTransitionSect.SuspendLayout();
+            this.groupPanelTranstionSteps.SuspendLayout();
+            this.pnlTranStepBtns.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupPanelBtns
+            // 
+            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);
+            this.groupPanelBtns.DisabledBackColor = System.Drawing.Color.Empty;
+            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, 82);
+            // 
+            // 
+            // 
+            this.groupPanelBtns.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelBtns.Style.BackColorGradientAngle = 90;
+            this.groupPanelBtns.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelBtns.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderBottomWidth = 1;
+            this.groupPanelBtns.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelBtns.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderLeftWidth = 1;
+            this.groupPanelBtns.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderRightWidth = 1;
+            this.groupPanelBtns.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderTopWidth = 1;
+            this.groupPanelBtns.Style.CornerDiameter = 4;
+            this.groupPanelBtns.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelBtns.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelBtns.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelBtns.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelBtns.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            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;
+            // 
+            // 
+            // 
+            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);
+            this.cbPageNum.Name = "cbPageNum";
+            this.cbPageNum.Size = new System.Drawing.Size(126, 15);
+            this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbPageNum.TabIndex = 26;
+            this.cbPageNum.Text = "Include Page Number";
+            this.cbPageNum.CheckedChanged += new System.EventHandler(this.cbPageNum_CheckedChanged);
+            // 
+            // btnTranCancel
+            // 
+            this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnTranCancel.AutoSize = true;
+            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);
+            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" +
             "ted, or the original transition if one had been selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnTranCancel.TabIndex = 25;
-			this.btnTranCancel.Text = "Cancel";
-			this.btnTranCancel.Click += new System.EventHandler(this.btnTranCancel_Click);
-			// 
-			// btnTranSave
-			// 
-			this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnTranSave.AutoSize = true;
-			this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left;
-			this.btnTranSave.Location = new System.Drawing.Point(0, 0);
-			this.btnTranSave.Name = "btnTranSave";
-			this.btnTranSave.Size = new System.Drawing.Size(103, 36);
-			this.superToolTipDispTran.SetSuperTooltip(this.btnTranSave, new DevComponents.DotNetBar.SuperTooltipInfo("Save Transition", "", "- This will place the selected Transition at the cursor position.\r\n- This will re" +
+            this.btnTranCancel.TabIndex = 25;
+            this.btnTranCancel.Text = "Cancel";
+            this.btnTranCancel.Click += new System.EventHandler(this.btnTranCancel_Click);
+            // 
+            // btnTranSave
+            // 
+            this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnTranSave.AutoSize = true;
+            this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnTranSave.Location = new System.Drawing.Point(0, 0);
+            this.btnTranSave.Name = "btnTranSave";
+            this.btnTranSave.Size = new System.Drawing.Size(103, 36);
+            this.superToolTipDispTran.SetSuperTooltip(this.btnTranSave, new DevComponents.DotNetBar.SuperTooltipInfo("Save Transition", "", "- This will place the selected Transition at the cursor position.\r\n- This will re" +
             "place a Transition with the selected Transition.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnTranSave.TabIndex = 24;
-			this.btnTranSave.Text = "Save Transition";
-			this.btnTranSave.Click += new System.EventHandler(this.btnTranSave_Click);
-			// 
-			// groupPanelTranFmt
-			// 
-			this.groupPanelTranFmt.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			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.Name = "groupPanelTranFmt";
-			this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
-			// 
-			// 
-			// 
-			this.groupPanelTranFmt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTranFmt.Style.BackColorGradientAngle = 90;
-			this.groupPanelTranFmt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTranFmt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderBottomWidth = 1;
-			this.groupPanelTranFmt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTranFmt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderLeftWidth = 1;
-			this.groupPanelTranFmt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderRightWidth = 1;
-			this.groupPanelTranFmt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderTopWidth = 1;
-			this.groupPanelTranFmt.Style.CornerDiameter = 4;
-			this.groupPanelTranFmt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTranFmt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTranFmt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTranFmt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.groupPanelTranFmt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.groupPanelTranFmt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTranFmt.TabIndex = 27;
-			this.groupPanelTranFmt.Text = "Select Format";
-			// 
-			// listBoxTranFmt
-			// 
-			this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.listBoxTranFmt.FormattingEnabled = true;
-			this.listBoxTranFmt.HorizontalScrollbar = true;
-			this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0);
-			this.listBoxTranFmt.Name = "listBoxTranFmt";
-			this.listBoxTranFmt.Size = new System.Drawing.Size(370, 120);
-			this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected.  This also defines how the transitio" +
+            this.btnTranSave.TabIndex = 24;
+            this.btnTranSave.Text = "Save Transition";
+            this.btnTranSave.Click += new System.EventHandler(this.btnTranSave_Click);
+            // 
+            // groupPanelTranFmt
+            // 
+            this.groupPanelTranFmt.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            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, 82);
+            this.groupPanelTranFmt.Name = "groupPanelTranFmt";
+            this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
+            // 
+            // 
+            // 
+            this.groupPanelTranFmt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTranFmt.Style.BackColorGradientAngle = 90;
+            this.groupPanelTranFmt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTranFmt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderBottomWidth = 1;
+            this.groupPanelTranFmt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTranFmt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderLeftWidth = 1;
+            this.groupPanelTranFmt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderRightWidth = 1;
+            this.groupPanelTranFmt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderTopWidth = 1;
+            this.groupPanelTranFmt.Style.CornerDiameter = 4;
+            this.groupPanelTranFmt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTranFmt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTranFmt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTranFmt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelTranFmt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.groupPanelTranFmt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTranFmt.TabIndex = 27;
+            this.groupPanelTranFmt.Text = "Select Format";
+            // 
+            // listBoxTranFmt
+            // 
+            this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.listBoxTranFmt.FormattingEnabled = true;
+            this.listBoxTranFmt.HorizontalScrollbar = true;
+            this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0);
+            this.listBoxTranFmt.Name = "listBoxTranFmt";
+            this.listBoxTranFmt.Size = new System.Drawing.Size(370, 120);
+            this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected.  This also defines how the transitio" +
             "n will look in the text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.listBoxTranFmt.TabIndex = 13;
-			this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click);
-			// 
-			// groupPanelTransitionSets
-			// 
-			this.groupPanelTransitionSets.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			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.Name = "groupPanelTransitionSets";
-			this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
-			// 
-			// 
-			// 
-			this.groupPanelTransitionSets.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTransitionSets.Style.BackColorGradientAngle = 90;
-			this.groupPanelTransitionSets.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTransitionSets.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderBottomWidth = 1;
-			this.groupPanelTransitionSets.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTransitionSets.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderLeftWidth = 1;
-			this.groupPanelTransitionSets.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderRightWidth = 1;
-			this.groupPanelTransitionSets.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderTopWidth = 1;
-			this.groupPanelTransitionSets.Style.CornerDiameter = 4;
-			this.groupPanelTransitionSets.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTransitionSets.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTransitionSets.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTransitionSets.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.groupPanelTransitionSets.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.groupPanelTransitionSets.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTransitionSets.TabIndex = 31;
-			this.groupPanelTransitionSets.Text = "Select Procedure Set";
-			// 
-			// groupPanelTransitionProcs
-			// 
-			this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			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.Name = "groupPanelTransitionProcs";
-			this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
-			// 
-			// 
-			// 
-			this.groupPanelTransitionProcs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTransitionProcs.Style.BackColorGradientAngle = 90;
-			this.groupPanelTransitionProcs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTransitionProcs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionProcs.Style.BorderBottomWidth = 1;
-			this.groupPanelTransitionProcs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTransitionProcs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionProcs.Style.BorderLeftWidth = 1;
-			this.groupPanelTransitionProcs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionProcs.Style.BorderRightWidth = 1;
-			this.groupPanelTransitionProcs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionProcs.Style.BorderTopWidth = 1;
-			this.groupPanelTransitionProcs.Style.CornerDiameter = 4;
-			this.groupPanelTransitionProcs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTransitionProcs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTransitionProcs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTransitionProcs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.groupPanelTransitionProcs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.groupPanelTransitionProcs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTransitionProcs.TabIndex = 32;
-			this.groupPanelTransitionProcs.Text = "Select Procedure";
-			// 
-			// cbTranProcs
-			// 
-			this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.cbTranProcs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.cbTranProcs.FormattingEnabled = true;
-			this.cbTranProcs.Location = new System.Drawing.Point(0, 0);
-			this.cbTranProcs.Name = "cbTranProcs";
-			this.cbTranProcs.Size = new System.Drawing.Size(370, 21);
-			this.superToolTipDispTran.SetSuperTooltip(this.cbTranProcs, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranProcs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbTranProcs.TabIndex = 14;
-			this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged);
-			// 
-			// groupPanelTransitionSect
-			// 
-			this.groupPanelTransitionSect.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			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.Name = "groupPanelTransitionSect";
-			this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
-			// 
-			// 
-			// 
-			this.groupPanelTransitionSect.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTransitionSect.Style.BackColorGradientAngle = 90;
-			this.groupPanelTransitionSect.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTransitionSect.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSect.Style.BorderBottomWidth = 1;
-			this.groupPanelTransitionSect.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTransitionSect.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSect.Style.BorderLeftWidth = 1;
-			this.groupPanelTransitionSect.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSect.Style.BorderRightWidth = 1;
-			this.groupPanelTransitionSect.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSect.Style.BorderTopWidth = 1;
-			this.groupPanelTransitionSect.Style.CornerDiameter = 4;
-			this.groupPanelTransitionSect.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTransitionSect.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTransitionSect.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTransitionSect.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.groupPanelTransitionSect.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.groupPanelTransitionSect.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTransitionSect.TabIndex = 33;
-			this.groupPanelTransitionSect.Text = "Select Section";
-			// 
-			// cbTranSects
-			// 
-			this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.cbTranSects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.cbTranSects.FormattingEnabled = true;
-			this.cbTranSects.Location = new System.Drawing.Point(0, 0);
-			this.cbTranSects.Name = "cbTranSects";
-			this.cbTranSects.Size = new System.Drawing.Size(370, 21);
-			this.superToolTipDispTran.SetSuperTooltip(this.cbTranSects, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranSects.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbTranSects.TabIndex = 20;
-			this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
-			this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
-			// 
-			// groupPanelTranstionSteps
-			// 
-			this.groupPanelTranstionSteps.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTranstionSteps.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelTranstionSteps.Controls.Add(this.tvTran);
-			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.Name = "groupPanelTranstionSteps";
-			this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334);
-			// 
-			// 
-			// 
-			this.groupPanelTranstionSteps.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTranstionSteps.Style.BackColorGradientAngle = 90;
-			this.groupPanelTranstionSteps.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTranstionSteps.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranstionSteps.Style.BorderBottomWidth = 1;
-			this.groupPanelTranstionSteps.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTranstionSteps.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranstionSteps.Style.BorderLeftWidth = 1;
-			this.groupPanelTranstionSteps.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranstionSteps.Style.BorderRightWidth = 1;
-			this.groupPanelTranstionSteps.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranstionSteps.Style.BorderTopWidth = 1;
-			this.groupPanelTranstionSteps.Style.CornerDiameter = 4;
-			this.groupPanelTranstionSteps.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTranstionSteps.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTranstionSteps.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTranstionSteps.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.groupPanelTranstionSteps.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.groupPanelTranstionSteps.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTranstionSteps.TabIndex = 34;
-			this.groupPanelTranstionSteps.Text = "Select Step";
-			// 
-			// pnlTranStepBtns
-			// 
-			this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
-			this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip);
-			this.pnlTranStepBtns.Controls.Add(this.btnTranRangeClear);
-			this.pnlTranStepBtns.Controls.Add(this.btnUp1);
-			this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top;
-			this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0);
-			this.pnlTranStepBtns.Name = "pnlTranStepBtns";
-			this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46);
-			this.pnlTranStepBtns.TabIndex = 30;
-			// 
-			// cbIncStepNum
-			// 
-			// 
-			// 
-			// 
-			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.Name = "cbIncStepNum";
-			this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
-			this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.cbIncStepNum.TabIndex = 0;
-			this.cbIncStepNum.Text = "Include Step Number";
-			this.cbIncStepNum.CheckedChanged += new System.EventHandler(this.cbIncStepNum_CheckedChanged);
-			// 
-			// lblxTranRangeTip
-			// 
-			// 
-			// 
-			// 
-			this.lblxTranRangeTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right;
-			this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0);
-			this.lblxTranRangeTip.Name = "lblxTranRangeTip";
-			this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46);
-			this.superToolTipDispTran.SetSuperTooltip(this.lblxTranRangeTip, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "For range transitions, shows which selection, first or second, that the next sele" +
+            this.listBoxTranFmt.TabIndex = 13;
+            this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click);
+            // 
+            // groupPanelTransitionSets
+            // 
+            this.groupPanelTransitionSets.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            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, 223);
+            this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
+            this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
+            // 
+            // 
+            // 
+            this.groupPanelTransitionSets.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTransitionSets.Style.BackColorGradientAngle = 90;
+            this.groupPanelTransitionSets.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTransitionSets.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderBottomWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTransitionSets.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderLeftWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderRightWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderTopWidth = 1;
+            this.groupPanelTransitionSets.Style.CornerDiameter = 4;
+            this.groupPanelTransitionSets.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTransitionSets.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTransitionSets.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTransitionSets.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelTransitionSets.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.groupPanelTransitionSets.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            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;
+            this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            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, 271);
+            this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
+            this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
+            // 
+            // 
+            // 
+            this.groupPanelTransitionProcs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTransitionProcs.Style.BackColorGradientAngle = 90;
+            this.groupPanelTransitionProcs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTransitionProcs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Style.BorderBottomWidth = 1;
+            this.groupPanelTransitionProcs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTransitionProcs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Style.BorderLeftWidth = 1;
+            this.groupPanelTransitionProcs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Style.BorderRightWidth = 1;
+            this.groupPanelTransitionProcs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Style.BorderTopWidth = 1;
+            this.groupPanelTransitionProcs.Style.CornerDiameter = 4;
+            this.groupPanelTransitionProcs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTransitionProcs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTransitionProcs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTransitionProcs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelTransitionProcs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.groupPanelTransitionProcs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionProcs.TabIndex = 32;
+            this.groupPanelTransitionProcs.Text = "Select Procedure";
+            // 
+            // cbTranProcs
+            // 
+            this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.cbTranProcs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbTranProcs.FormattingEnabled = true;
+            this.cbTranProcs.Location = new System.Drawing.Point(0, 0);
+            this.cbTranProcs.Name = "cbTranProcs";
+            this.cbTranProcs.Size = new System.Drawing.Size(370, 21);
+            this.superToolTipDispTran.SetSuperTooltip(this.cbTranProcs, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranProcs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.cbTranProcs.TabIndex = 14;
+            this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged);
+            // 
+            // groupPanelTransitionSect
+            // 
+            this.groupPanelTransitionSect.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            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, 317);
+            this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
+            this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
+            // 
+            // 
+            // 
+            this.groupPanelTransitionSect.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTransitionSect.Style.BackColorGradientAngle = 90;
+            this.groupPanelTransitionSect.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTransitionSect.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Style.BorderBottomWidth = 1;
+            this.groupPanelTransitionSect.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTransitionSect.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Style.BorderLeftWidth = 1;
+            this.groupPanelTransitionSect.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Style.BorderRightWidth = 1;
+            this.groupPanelTransitionSect.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Style.BorderTopWidth = 1;
+            this.groupPanelTransitionSect.Style.CornerDiameter = 4;
+            this.groupPanelTransitionSect.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTransitionSect.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTransitionSect.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTransitionSect.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelTransitionSect.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.groupPanelTransitionSect.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionSect.TabIndex = 33;
+            this.groupPanelTransitionSect.Text = "Select Section";
+            // 
+            // cbTranSects
+            // 
+            this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.cbTranSects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbTranSects.FormattingEnabled = true;
+            this.cbTranSects.Location = new System.Drawing.Point(0, 0);
+            this.cbTranSects.Name = "cbTranSects";
+            this.cbTranSects.Size = new System.Drawing.Size(370, 21);
+            this.superToolTipDispTran.SetSuperTooltip(this.cbTranSects, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranSects.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.cbTranSects.TabIndex = 20;
+            this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
+            this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
+            // 
+            // groupPanelTranstionSteps
+            // 
+            this.groupPanelTranstionSteps.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelTranstionSteps.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelTranstionSteps.Controls.Add(this.tvTran);
+            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, 366);
+            this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
+            this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310);
+            // 
+            // 
+            // 
+            this.groupPanelTranstionSteps.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTranstionSteps.Style.BackColorGradientAngle = 90;
+            this.groupPanelTranstionSteps.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTranstionSteps.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Style.BorderBottomWidth = 1;
+            this.groupPanelTranstionSteps.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTranstionSteps.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Style.BorderLeftWidth = 1;
+            this.groupPanelTranstionSteps.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Style.BorderRightWidth = 1;
+            this.groupPanelTranstionSteps.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Style.BorderTopWidth = 1;
+            this.groupPanelTranstionSteps.Style.CornerDiameter = 4;
+            this.groupPanelTranstionSteps.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTranstionSteps.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTranstionSteps.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTranstionSteps.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelTranstionSteps.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.groupPanelTranstionSteps.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            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);
+            this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip);
+            this.pnlTranStepBtns.Controls.Add(this.btnTranRangeClear);
+            this.pnlTranStepBtns.Controls.Add(this.btnUp1);
+            this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0);
+            this.pnlTranStepBtns.Name = "pnlTranStepBtns";
+            this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46);
+            this.pnlTranStepBtns.TabIndex = 30;
+            // 
+            // cbIncStepNum
+            // 
+            // 
+            // 
+            // 
+            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);
+            this.cbIncStepNum.Name = "cbIncStepNum";
+            this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
+            this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbIncStepNum.TabIndex = 0;
+            this.cbIncStepNum.Text = "Include Step Number";
+            this.cbIncStepNum.CheckedChanged += new System.EventHandler(this.cbIncStepNum_CheckedChanged);
+            // 
+            // lblxTranRangeTip
+            // 
+            // 
+            // 
+            // 
+            this.lblxTranRangeTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0);
+            this.lblxTranRangeTip.Name = "lblxTranRangeTip";
+            this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46);
+            this.superToolTipDispTran.SetSuperTooltip(this.lblxTranRangeTip, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "For range transitions, shows which selection, first or second, that the next sele" +
             "ction will be.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.lblxTranRangeTip.TabIndex = 33;
-			this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range";
-			// 
-			// btnTranRangeClear
-			// 
-			this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left;
-			this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0);
-			this.btnTranRangeClear.Name = "btnTranRangeClear";
-			this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46);
-			this.superToolTipDispTran.SetSuperTooltip(this.btnTranRangeClear, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This clears the Range selection in the tree view", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnTranRangeClear.TabIndex = 31;
-			this.btnTranRangeClear.Text = "Clear Range Selection";
-			this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click);
-			// 
-			// btnUp1
-			// 
-			this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS;
-			this.btnUp1.Location = new System.Drawing.Point(210, 0);
-			this.btnUp1.Name = "btnUp1";
-			this.btnUp1.Size = new System.Drawing.Size(43, 46);
-			this.superToolTipDispTran.SetSuperTooltip(this.btnUp1, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This will display the tree for selecting the transition one level higher than cur" +
+            this.lblxTranRangeTip.TabIndex = 33;
+            this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range";
+            // 
+            // btnTranRangeClear
+            // 
+            this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0);
+            this.btnTranRangeClear.Name = "btnTranRangeClear";
+            this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46);
+            this.superToolTipDispTran.SetSuperTooltip(this.btnTranRangeClear, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This clears the Range selection in the tree view", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.btnTranRangeClear.TabIndex = 31;
+            this.btnTranRangeClear.Text = "Clear Range Selection";
+            this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click);
+            // 
+            // btnUp1
+            // 
+            this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS;
+            this.btnUp1.Location = new System.Drawing.Point(210, 0);
+            this.btnUp1.Name = "btnUp1";
+            this.btnUp1.Size = new System.Drawing.Size(43, 46);
+            this.superToolTipDispTran.SetSuperTooltip(this.btnUp1, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This will display the tree for selecting the transition one level higher than cur" +
             "rently shown. If already showing High Level Steps, this button has no effect.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnUp1.TabIndex = 30;
-			this.btnUp1.Visible = false;
-			// 
-			// superToolTipDispTran
-			// 
-			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);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.groupPanelTranstionSteps);
-			this.Controls.Add(this.groupPanelTransitionSect);
-			this.Controls.Add(this.groupPanelTransitionProcs);
-			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.Name = "DisplayTransition";
-			this.Size = new System.Drawing.Size(376, 676);
-			this.groupPanelBtns.ResumeLayout(false);
-			this.groupPanelBtns.PerformLayout();
-			this.groupPanelTranFmt.ResumeLayout(false);
-			this.groupPanelTransitionSets.ResumeLayout(false);
-			this.groupPanelTransitionProcs.ResumeLayout(false);
-			this.groupPanelTransitionSect.ResumeLayout(false);
-			this.groupPanelTranstionSteps.ResumeLayout(false);
-			this.pnlTranStepBtns.ResumeLayout(false);
-			this.ResumeLayout(false);
+            this.btnUp1.TabIndex = 30;
+            this.btnUp1.Visible = false;
+            // 
+            // superToolTipDispTran
+            // 
+            this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
+            this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+            // 
+            // DisplayTransition
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupPanelTranstionSteps);
+            this.Controls.Add(this.groupPanelTransitionSect);
+            this.Controls.Add(this.groupPanelTransitionProcs);
+            this.Controls.Add(this.groupPanelTransitionSets);
+            this.Controls.Add(this.groupPanelTranFmt);
+            this.Controls.Add(this.groupPanelBtns);
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Name = "DisplayTransition";
+            this.Size = new System.Drawing.Size(376, 676);
+            this.groupPanelBtns.ResumeLayout(false);
+            this.groupPanelBtns.PerformLayout();
+            this.groupPanelTranFmt.ResumeLayout(false);
+            this.groupPanelTransitionSets.ResumeLayout(false);
+            this.groupPanelTransitionProcs.ResumeLayout(false);
+            this.groupPanelTransitionSect.ResumeLayout(false);
+            this.groupPanelTranstionSteps.ResumeLayout(false);
+            this.pnlTranStepBtns.ResumeLayout(false);
+            this.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;
@@ -115,19 +139,13 @@ namespace Volian.Controls.Library
 				_MyRTB.LinkChanged += new StepRTBLinkEvent(_MyRTB_LinkChanged);
 				if (_MyRTB.MyLinkText == null)
 				{
-					CurTrans = null;
+						CurTrans = null;
 				}
-			}
+            }
 		}
 		void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)
 		{
-			//if (_MyRTB.MyLinkText == null)
-			//  CurTrans = null;
-			//else
-			//{
-			//  StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
-				CurTrans = args.MyLinkText.MyTransitionInfo;
-			//}
+			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,8 +1543,34 @@ namespace Volian.Controls.Library
 				btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
 			}
 		}
-	}
-	public class TransItem
+
+		//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
 	{
 		private string _ItemDescription;
 

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/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});
@@ -566,9 +576,9 @@ namespace Volian.Controls.Library
 
 		}
 
-		#endregion
+        #endregion
 
-		private DevComponents.DotNetBar.ButtonX btnReplace;
+        private DevComponents.DotNetBar.ButtonX btnReplace;
 		private DevComponents.DotNetBar.ButtonX btnFndRplDone;
 		private DevComponents.DotNetBar.ButtonX btnFindNext;
 		private DevComponents.DotNetBar.Controls.ComboBoxEx cmboReplaceText;

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1985,6 +1985,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)
 		}
@@ -1999,6 +2002,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);
@@ -2025,6 +2031,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;
@@ -2032,6 +2041,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)
 		{

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,24 +5501,53 @@ 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)
 			{
-				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null))    // there are no sub-steps, see if any parents have next
+				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)
 				{
-					ItemInfo par = MyItemInfo.MyParent;
-					while (par.IsInCautionOrNote)        // while in the caution or note, see if there is anything below this item
-					{
-						// if there is no next item, or content types are different, go up to see if the parent has any next item.  If note
-						//	keep going up tree, otherwise there is a next so don't return 0, i.e. continue on with code to determine
-						//	whether there is a blank line
-						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;
+					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
+					{
+						ItemInfo par = MyItemInfo.MyParent;
+						while (par.IsInCautionOrNote)        // while in the caution or note, see if there is anything below this item
+						{
+							// if there is no next item, or content types are different, go up to see if the parent has any next item.  If note
+							//	keep going up tree, otherwise there is a next so don't return 0, i.e. continue on with code to determine
+							//	whether there is a blank line
+							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))
+						{
+							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;
+				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. 
 			if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.StepPrintData != null && MyItemInfo.FormatStepData.StepPrintData.BlankAfterSubWithSub && MyItemInfo.NextItem != null && MyItemInfo.HasChildren && MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0) return SixLinesPerInch;
 
@@ -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)
 			{
@@ -5801,7 +5840,8 @@ namespace Volian.Print.Library
 					if (bx.TabPos > 0)
 						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
+						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)
 		{