C2020-049-Add-the-ability-for-PROMS-to-remember-the-procedure-tabs-that-were-open-when-you-closed-PROMS

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.2410.907")]
-[assembly: AssemblyFileVersion("2.3.2410.907")]
+[assembly: AssemblyVersion("2.3.2404.1611")]
+[assembly: AssemblyFileVersion("2.3.2404.1611")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -91,8 +91,6 @@ using System.Runtime.CompilerServices;
 
 
 
-
-
 
 
 

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

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

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

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

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

@@ -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,27 +344,24 @@ 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;
@@ -378,7 +375,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();
@@ -388,103 +385,6 @@ 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
@@ -504,7 +404,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxAvail.Items.Add(copyrof.GetFieldname);
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -527,7 +427,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					AvailList.Add(copyrof);
 
-					lboxAvail.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxAvail.Items.Add(copyrof.GetFieldname);
 					InUseList.RemoveAt(indx);
 					if (InUseApplcList.Contains(rof)) // C2021-026 remove from the field applicability list
 						InUseApplcList.Remove(rof);
@@ -555,7 +455,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUseCB.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxInUseCB.Items.Add(copyrof.GetFieldname);
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUseCB.Refresh();
@@ -577,7 +477,7 @@ namespace ROEditor
 					ROField copyrof = new ROField(rof.GetFieldname, rof.GetRecID, rof.GetMasterRecID, rof.GetFieldType);
 					InUseList.Add(copyrof);
 
-					lboxInUse.Items.Add(CvtFldToUserFld(copyrof.GetFieldname));
+					lboxInUse.Items.Add(copyrof.GetFieldname);
 					AvailList.RemoveAt(indx);
 					lboxAvail.Refresh();
 					lboxInUse.Refresh();
@@ -740,13 +640,12 @@ namespace ROEditor
 							{
 								ROField rof = (ROField) InUseList[i];
 								rofname = rof.GetFieldname;
-								if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
+								if (inusename == rofname)
 								{
 									found = true;
 									break;
 								}
 							}
-							if (inusename == "u") found = true; //to handle unit designation
 							if (found == false)syntax(inusename+" invalid field name",strt,where);
 							// used to have procini def stuff here.
 							start=where+1;
@@ -846,7 +745,7 @@ namespace ROEditor
 				{
 					ROField rof = (ROField) InUseList[i];
 					rofname = rof.GetFieldname;
-					if (inusename == rofname || inusename == CvtFldToUserFld(rofname))
+					if (inusename == rofname)
 					{
 						found = true;
 						break;
@@ -1197,8 +1096,7 @@ 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 || 
@@ -1214,10 +1112,6 @@ 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)
 			{
@@ -1231,31 +1125,20 @@ 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(fieldname);
+							this.lboxInUseCB.Items.Add(rof.GetFieldname);
 							if (rof.FieldTypeCanDoApplicability())
 							{
 								if (ContainedInUseApplicList(rof))
-									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(fieldname), CheckState.Checked);
+									this.lboxInUseCB.SetItemCheckState(lboxInUseCB.Items.IndexOf(rof.GetFieldname), CheckState.Checked);
 							}
 						}
 						else
-							this.lboxInUse.Items.Add(fieldname);
+							this.lboxInUse.Items.Add(rof.GetFieldname);
 					}
 				}
-
-				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 
 			{
@@ -1265,7 +1148,7 @@ namespace ROEditor
 				{
 					rof = (ROField) AvailList[i];
 					if (rof.GetFieldname != null)
-						this.lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
+						this.lboxAvail.Items.Add(rof.GetFieldname);
 				}
 			}
 		}
@@ -1279,11 +1162,8 @@ namespace ROEditor
 			if (rof.GetFieldname != null)
 			{
 				AvailList.Add(rof);
-				lboxAvail.Items.Add(CvtFldToUserFld(rof.GetFieldname));
+				lboxAvail.Items.Add(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)
@@ -1517,7 +1397,6 @@ namespace ROEditor
 			this.btnCancel.Size = new System.Drawing.Size(80, 24);
 			this.btnCancel.TabIndex = 10;
 			this.btnCancel.Text = "Cancel";
-
 			// 
 			// RODefFrm
 			// 
@@ -1540,71 +1419,6 @@ 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
-        CAAAAk1TRnQBSQFMAgEBAgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAARwBAAEcAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -175,7 +175,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAe
-        CwAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBgEAARwBAAEcAQABEAEAARABAAT/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, bool movedRO = false);
+		public abstract bool RODB_WriteRO(VlnXmlElement ro);
 		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, bool refresh = false);
+		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype);
 		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, bool movedRO = false)
+		public override bool RODB_WriteRO(VlnXmlElement ro)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -2140,13 +2140,6 @@ 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
 				{
@@ -2199,8 +2192,6 @@ 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 + "');";
@@ -2303,16 +2294,11 @@ 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, bool refresh = false)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
 		{
 			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;
@@ -2405,7 +2391,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)
@@ -2667,9 +2653,8 @@ namespace RODBInterface
 					bool isused = RODB_CheckForStandardName(oldname);
 					if (isused == true)
 					{
-                        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);
+						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.");
 						changegeneric = false;
-						if(result == DialogResult.Cancel) return false;
 					}
 				}
 
@@ -2681,8 +2666,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, and will change the definition for all items in that table ({GetTopParentName(myelem)}).";
+					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.";
 					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;
@@ -2787,19 +2772,6 @@ 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, bool movedRO = false)
+		public override bool RODB_WriteRO(VlnXmlElement ro)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -1589,13 +1589,6 @@ 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;
@@ -1751,18 +1744,13 @@ 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, bool refresh = false)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
 		{
 			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;
@@ -1921,7 +1909,7 @@ namespace RODBInterface
 					command.Parameters.AddWithValue("@RecID", Recid);
 					using (SqlDataReader reader = command.ExecuteReader())
 					{
-						if (reader.Read())
+						if (DBE.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 Status Message Here";
+			this.lblStatMsg.Text = "Put Satus Message Here";
 			this.lblStatMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// StatusMessageFrm

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

@@ -324,17 +324,29 @@ namespace ctlXMLEditLib
 			string ROINI = Directory.GetCurrentDirectory()+ "\\ROAPP.INI";
 
 			// Get the default file extension for graphic files
-			//			DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention","",5,"ROAPP.INI");
+//			DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention","",5,"ROAPP.INI");
 			// Bug fix: B2006-025
 			//  needed to pass the full path of ROAPP.INI
-			// B2025-007 only use the default file location (remove 16 bit PROMS location)
 			IniReader in1 = new IniReader(ROINI);
-			DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extention");
-			if (string.IsNullOrEmpty(DefaultGraphicFileExtension)) DefaultGraphicFileExtension = in1.ReadString("ROApp", "Extension", ".TIF");
-			//			if (File.Exists(PromsINI))
-			//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI);
-			//			if (File.Exists("ROAPP.INI"))
-			//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI");
+			DefaultGraphicFileExtension = in1.ReadString("ROApp","Extention","");
+			if (DefaultGraphicFileExtension.Equals(""))
+			{
+				string ApplPathUp = ApplicationPath.ToUpper();
+				int idx = ApplPathUp.IndexOf("VE-PROMS.NET\\BIN");
+				if (idx >= 0)
+				{
+					string PromsINI = ApplicationPath.Substring(0, idx);
+					PromsINI += "VE-PROMS\\VEPROMS.INI";
+					IniReader in2 = new IniReader(PromsINI);
+					DefaultGraphicFileExtension = in2.ReadString("Graphics", "defaultext", ".TIF");
+				}
+				else
+					DefaultGraphicFileExtension = ".TIF";
+			}
+//			if (File.Exists(PromsINI))
+//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("Graphics","defaultext",".TIF",5,PromsINI);
+//			if (File.Exists("ROAPP.INI"))
+//				DefaultGraphicFileExtension = TheIniFile.GetINIKeyValueStr("ROApp","Extention",".TIF",5,"ROAPP.INI");
 			if (!DefaultGraphicFileExtension.StartsWith("."))
 				DefaultGraphicFileExtension = "." + DefaultGraphicFileExtension;
 
@@ -772,7 +784,6 @@ namespace ctlXMLEditLib
 				dosaveflag = false;
 				return (true);
 			}
-			MessageBox.Show("Save Failed");
 			return (false);
 		}
 
@@ -1118,7 +1129,7 @@ namespace ctlXMLEditLib
 			mylabel.BackColor = chlbckcolor; // PC Applic fields are shaded blue otherwise backcolor is transparent
 			mylabel.Location = new Point(screenx+indent, screeny);
 			mylabel.Name = (pcChildIdx == 0) ? CvtUserFldToFld(element.Name) : CvtUserFldToFld(pcChildFldName); 
-			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name).Replace("Image_",""); // C2021-026  applicLabel is the P/C Child name
+			mylabel.Text = (applicLabel.Length > 0) ? applicLabel : CvtFldToUserFld(element.Name); // C2021-026  applicLabel is the P/C Child name
 			mylabel.AutoSize = true;
 			Controls.Add(mylabel);
 			// add 3 onto screeny so that textbox is slightly below label.
@@ -1473,15 +1484,12 @@ namespace ctlXMLEditLib
 			if (fnamebox.Text != "" && fnamebox.Modified == true)
 			{
 				FileInfo ifi = new FileInfo(fnamebox.Text);
-				if (ifi.Exists == false)
+				if (ifi.Exists == false) 
 				{
-					FileInfo ifi2 = new FileInfo(fnamebox.Text + DefaultGraphicFileExtension);
-					if (!ifi2.Exists)
-					{
-						MessageBox.Show("File does not exist.",
-							"File Input Error", MessageBoxButtons.OK);
-						return;
-					}
+					MessageBoxButtons buttons = MessageBoxButtons.OK;
+					MessageBox.Show( "File does not exist.", 
+						"File Input Error", buttons);
+					return;
 				}
 				bool ok = ValidGraphicsFile(fnamebox.Text);
 				if (ok != true)	
@@ -1688,7 +1696,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Height Input");
+					MessageBox.Show("Invalid Height Input",ee.ToString());
 				}
 			}
 		}
@@ -1705,7 +1713,7 @@ namespace ctlXMLEditLib
 				}
 				catch (Exception ee)
 				{
-					MessageBox.Show("The Height and Width cannot be empty fields. Enter a number in either field and the other will automatically adjust to a proportional size.", "Invalid Width Input");
+					MessageBox.Show("Invalid Width Input", ee.ToString());
 				}
 			}
 		}					

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -23798,7 +23798,7 @@ BEGIN TRY -- Try Block
 		--then remove the link from the copy
 		--if original item was not linked, update new items to not be linked
 		DECLARE @xconfig XML = (Select cast(config as xml) xconfig from Contents where ContentID = @ContentID);
-		IF ISNULL(@xconfig.exist('//Enhanced[1]'),0) = 0
+		IF @xconfig.exist('//Enhanced[1]') = 0
 		BEGIN
 		  UPDATE Contents SET Config = dbo.vefn_RemoveEnhanced(Contents.Config)
 		    Where ContentID in (Select ContentID FROM vefn_ChildItems(@NewItemID))
@@ -24001,104 +24001,12 @@ UPDATE [dbo].[DisplayTabTmp]
 SET Active = 0 
 WHERE UserID = @UserID
 GO
--- Table: DisplayTabTmp
-                -- If DisplayTabTmp table already exists then don't drop and recreate it
-                IF Not Exists(SELECT * FROM sys.objects Where name = 'DisplayTabTmp' AND type in (N'U'))
-                Begin
-                                SET ANSI_NULLS ON
-                                SET QUOTED_IDENTIFIER ON
-                                                -- =============================================
-                                                -- Author:                            Paul Larsen
-                                                -- Create date: 9/30/2024
-                                                -- Description:    Table to hold tab state in PROMS editor.
-                                                -- =============================================
-                                /****** Object:  Table [dbo].[DisplayTabTmp]    Script Date: 10/3/2024 11:22:00 AM ******/
-
-                                CREATE TABLE [dbo].[DisplayTabTmp](
-                                                [ID] [int] IDENTITY(1,1) NOT NULL,
-                                                [ItemID] [int] NOT NULL,
-                                                [DisplayTabID] [nvarchar](100) NOT NULL,
-                                                [DisplayTabName] [nchar](100) NOT NULL,
-                                                [UpdateDate] [datetime] NOT NULL,
-                                                [UserID] [nchar](100) NOT NULL,
-                                                [Active] [bit] NOT NULL,
-                                                [taborder] [int] NOT NULL
-                                ) ON [PRIMARY]
-                                
-                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  CONSTRAINT [DF_DisplayTabTmp_UpdateDate]  DEFAULT (getdate()) FOR [UpdateDate]
-                                
-                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  CONSTRAINT [DF_DisplayTabTmp_Active]  DEFAULT ((1)) FOR [Active]
-                                
-                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  DEFAULT ((0)) FOR [taborder]
-                                
-                End        
-GO
 /*
 ==========================================================================================================
  End: C2017-031: SQL to allow copy/replace enhanced step
 ==========================================================================================================
 */
 
----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                    |
@@ -24132,8 +24040,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	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'
+	set @RevDate = '09/26/2024 11:24'
+	set @RevDescription = 'SQL to allow copy/replace enhanced step.'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs

@@ -328,18 +328,6 @@ namespace VEPROMS.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool cbShwRplWrdsColor {
-            get {
-                return ((bool)(this["cbShwRplWrdsColor"]));
-            }
-            set {
-                this["cbShwRplWrdsColor"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]

PROMS/VEPROMS User Interface/Properties/Settings.settings

@@ -80,11 +80,6 @@
     <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-
-    <Setting Name="cbShwRplWrdsColor" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    
     <Setting Name="PasteNoReturns" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>

PROMS/VEPROMS User Interface/ROBuild.Sql

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

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

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

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs

@@ -1,116 +0,0 @@
-
-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

@@ -1,28 +0,0 @@
-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

@@ -1,120 +0,0 @@
-<?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/frmBatchRefresh.cs

@@ -178,8 +178,6 @@ namespace VEPROMS
 			myDocVersions.Clear();
 			FolderInfo fi = FolderInfo.GetTop();
 
-			fi.RefreshChildFolders();
-
 			if (fi.ChildFolderCount > 0)
 			{
 				TreeNode tn = new TreeNode(fi.Name);
@@ -235,7 +233,7 @@ namespace VEPROMS
 				loadedWorkingDraft = true;
 			}
 
-			if (tn.Parent != null && !loadedWorkingDraft && fi.FolderDocVersionCount == 0)
+			if (tn.Parent != null && !loadedWorkingDraft)
 			{
 				tn.Remove();
 			}
@@ -483,14 +481,12 @@ namespace VEPROMS
 		// B2018-002 - Invalid Transitions - Define Transition Refresh Statistics
 		private int numTransProcessed = 0;
 		private int numTransFixed = 0;
-		private int numTransCantFix = 0;
 		private int numTransConverted = 0;
 		// B2018-002 - Invalid Transitions - Initialize Transition Refresh Statistics
 		private void ResetTransNumbers()
 		{
 			numTransProcessed = 0;
 			numTransFixed = 0;
-			numTransCantFix = 0;
 			numTransConverted = 0;
 		}
 		private void RefreshTransitions()
@@ -539,12 +535,11 @@ namespace VEPROMS
 						numTransConverted += ProcedureInfo.TranConvertCount;
 						numTransProcessed += ProcedureInfo.TranCheckCount;
 						numTransFixed += ProcedureInfo.TranFixCount;
-						numTransCantFix += ProcedureInfo.TranCantFixCount; //Bad Transition Link
 						pbProcess.PerformStep();
 						Application.DoEvents();
 					}
 				}
-				if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
+				if (numTransFixed == 0 && numTransConverted == 0)
 				{
 					txtResults.AppendText("No Transitions Needed Updated.");
 					txtResults.AppendText(Environment.NewLine);
@@ -556,18 +551,16 @@ namespace VEPROMS
 				txtProcess.AppendText(string.Format("Transitions Checked: {0}", numTransProcessed));
 				txtProcess.AppendText(Environment.NewLine);
 				// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed + numTransCantFix)));
+				txtProcess.AppendText(string.Format("Transitions Correct As Is: {0}", numTransProcessed - (numTransConverted + numTransFixed)));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Modified: {0}", numTransFixed));
 				txtProcess.AppendText(Environment.NewLine);
 				txtProcess.AppendText(string.Format("Transitions Converted to text: {0}", numTransConverted));
-				txtProcess.AppendText(Environment.NewLine);
-				txtProcess.AppendText(string.Format("Transitions Unable to be Automatically Fixed (Annotation: Bad Transition Link): {0}", numTransCantFix));
 				Application.DoEvents();
 				if (pil.Count > 0)
 				{
 					StringBuilder sb = new StringBuilder();
-					sb.AppendLine("The batch refresh process was not successful for all procedures selected.");
+					sb.AppendLine("The batch refresh process was not usccessful for all procedures selected.");
 					sb.AppendLine("The following procedures were not able to be refreshed...");
 					sb.AppendLine();
 					sb.AppendLine(sbProcs.ToString());
@@ -586,11 +579,11 @@ namespace VEPROMS
 				}
 			}
 			this.Cursor = Cursors.Default;
-            // B2018-002 - Invalid Transitions - Display Transition Refresh Statistic
-            if (numTransFixed == 0 && numTransConverted == 0 && numTransCantFix == 0)
+			// B2018-002 - Invalid Transitions - Display Transition Refresh Statisitic
+			if (numTransFixed == 0 && numTransConverted == 0)
 				MessageBox.Show(string.Format("{0} Transitions Checked.\n\nNo Transitions Modified.", numTransProcessed), "Refresh Transitions Completed");
 			else
-				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.\n\n {4} Transitions unable to be automatically fixed (Annotation: Bad Transition Link).", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted + numTransCantFix), numTransFixed, numTransConverted, numTransCantFix), "Refresh Transitions Completed");
+				MessageBox.Show(string.Format("{0} Transitions Checked.\n\n {1} Correct as is.\n\n {2} Transitions modified.\n\n {3} Transitions converted to text.", numTransProcessed, numTransProcessed - (numTransFixed + numTransConverted), numTransFixed, numTransConverted), "Refresh Transitions Completed");
 		}
 
 		// C2017-030 - new Admin Tools user interface
@@ -1110,7 +1103,8 @@ namespace VEPROMS
 			ProcedureInfo.RefreshTransitions(pq);//, transitionsToDisconnected, transitionsToNonEditable);
 			TimeSpan ts = DateTime.Now - start;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Cant Fix (Annotation: Bad Transition Link) {5} Transitions{0}Elapsed Seconds:{6}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount, ts.TotalSeconds));
+			txtProcess.AppendText(string.Format("Procedure:  {1}{0}Checked {2} Transitions{0}Fixed {3} Transitions{0}Converted to Text {4} Transitions{0}Elapsed Seconds:{5}{0}{0}", Environment.NewLine, pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds));
+			//Console.WriteLine("\"{0}\"\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}", pq.DisplayNumber, ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ts.TotalSeconds, numTransProcessed, numTransFixed, numTransConverted);
 			if (myFixes.Length > 0)
 			{
 				txtResults.AppendText(myFixes.ToString());

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

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

PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs

@@ -88,12 +88,6 @@ namespace VEPROMS
 			this.btnFormat = new DevComponents.DotNetBar.ButtonX();
 			this.btnGeneral = new DevComponents.DotNetBar.ButtonX();
 			this.tcSectionProp = new DevComponents.DotNetBar.TabControl();
-			this.tcpFormat = new DevComponents.DotNetBar.TabControlPanel();
-			this.ppCbShowRplWords = new System.Windows.Forms.CheckBox();
-			this.rbWordSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.rbStepSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.ppGpbxSignoffCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.tiFormat = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel();
 			this.ppCbAutoIndent = new System.Windows.Forms.CheckBox();
 			this.ppCbEditableData = new System.Windows.Forms.CheckBox();
@@ -101,6 +95,11 @@ namespace VEPROMS
 			this.ppSectNumberStpRTB = new Volian.Controls.Library.StepRTB(this.components);
 			this.ppSectTitleStpRTB = new Volian.Controls.Library.StepRTB(this.components);
 			this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tcpFormat = new DevComponents.DotNetBar.TabControlPanel();
+			this.rbWordSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.rbStepSect = new DevComponents.DotNetBar.Controls.CheckBoxX();
+			this.ppGpbxSignoffCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
+			this.tiFormat = new DevComponents.DotNetBar.TabItem(this.components);
 			this.tcpAutomation = new DevComponents.DotNetBar.TabControlPanel();
 			this.ppCbNoDuplexFoldout = new System.Windows.Forms.CheckBox();
 			this.gpTOC = new DevComponents.DotNetBar.Controls.GroupPanel();
@@ -121,9 +120,9 @@ namespace VEPROMS
 			this.panSectBtns.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.tcSectionProp)).BeginInit();
 			this.tcSectionProp.SuspendLayout();
+			this.tcpGeneral.SuspendLayout();
 			this.tcpFormat.SuspendLayout();
 			this.ppGpbxSignoffCheckoff.SuspendLayout();
-			this.tcpGeneral.SuspendLayout();
 			this.tcpAutomation.SuspendLayout();
 			this.gpTOC.SuspendLayout();
 			this.grpLnkEnh.SuspendLayout();
@@ -872,8 +871,8 @@ namespace VEPROMS
 			this.tcSectionProp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
 			this.tcSectionProp.BackColor = System.Drawing.Color.Transparent;
 			this.tcSectionProp.CanReorderTabs = true;
-			this.tcSectionProp.Controls.Add(this.tcpFormat);
 			this.tcSectionProp.Controls.Add(this.tcpGeneral);
+			this.tcSectionProp.Controls.Add(this.tcpFormat);
 			this.tcSectionProp.Controls.Add(this.tcpAutomation);
 			this.tcSectionProp.Controls.Add(this.tcpLibDoc);
 			this.tcSectionProp.Controls.Add(this.tabControlPanel4);
@@ -893,151 +892,6 @@ namespace VEPROMS
 			this.tcSectionProp.TabsVisible = false;
 			this.tcSectionProp.Text = "tabControl2";
 			// 
-			// tcpFormat
-			// 
-			this.tcpFormat.Controls.Add(this.ppCbShowRplWords);
-			this.tcpFormat.Controls.Add(this.cbIsFoldoutSection);
-			this.tcpFormat.Controls.Add(this.ppCbDefaultStepSection);
-			this.tcpFormat.Controls.Add(this.cbKeepWordDocMargins);
-			this.tcpFormat.Controls.Add(this.ppLblDefaultNumColumns);
-			this.tcpFormat.Controls.Add(this.ppLblDefPaginationStyle);
-			this.tcpFormat.Controls.Add(this.ppBtnDefaultNumColumns);
-			this.tcpFormat.Controls.Add(this.ppBtnDefaultPaginationStyle);
-			this.tcpFormat.Controls.Add(this.rbWordSect);
-			this.tcpFormat.Controls.Add(this.rbStepSect);
-			this.tcpFormat.Controls.Add(this.ppGpbxSignoffCheckoff);
-			this.tcpFormat.Controls.Add(this.lblFormat);
-			this.tcpFormat.Controls.Add(this.ppCmbxNumColumns);
-			this.tcpFormat.Controls.Add(this.lblColumns);
-			this.tcpFormat.Controls.Add(this.ppCmbxSectPagination);
-			this.tcpFormat.Controls.Add(this.lblSectType);
-			this.tcpFormat.Controls.Add(this.ppCmbxStyleSectionType);
-			this.tcpFormat.Controls.Add(this.lblPagination);
-			this.tcpFormat.Controls.Add(this.ppBtnDefaultFmt);
-			this.tcpFormat.Controls.Add(this.ppCmbxFormat);
-			this.tcpFormat.Controls.Add(this.ppLblFormatDefault);
-			this.tcpFormat.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tcpFormat.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tcpFormat.Location = new System.Drawing.Point(0, 22);
-			this.tcpFormat.Margin = new System.Windows.Forms.Padding(2);
-			this.tcpFormat.Name = "tcpFormat";
-			this.tcpFormat.Padding = new System.Windows.Forms.Padding(1);
-			this.tcpFormat.Size = new System.Drawing.Size(557, 318);
-			this.tcpFormat.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tcpFormat.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tcpFormat.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tcpFormat.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tcpFormat.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tcpFormat.Style.GradientAngle = 90;
-			this.tcpFormat.TabIndex = 2;
-			this.tcpFormat.TabItem = this.tiFormat;
-			this.tcpFormat.Enter += new System.EventHandler(this.tabpage_Enter);
-			// 
-			// ppCbShowRplWords
-			// 
-			this.ppCbShowRplWords.AutoSize = true;
-			this.ppCbShowRplWords.BackColor = System.Drawing.Color.Transparent;
-			this.ppCbShowRplWords.Location = new System.Drawing.Point(272, 252);
-			this.ppCbShowRplWords.Name = "ppCbShowRplWords";
-			this.ppCbShowRplWords.Size = new System.Drawing.Size(130, 17);
-			this.ppCbShowRplWords.TabIndex = 62;
-			this.ppCbShowRplWords.Text = "Show Replace Words";
-			this.ppCbShowRplWords.UseVisualStyleBackColor = false;
-			this.ppCbShowRplWords.CheckedChanged += new System.EventHandler(this.ppCbShowRplWords_CheckedChanged);
-			// 
-			// rbWordSect
-			// 
-			this.rbWordSect.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.rbWordSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.rbWordSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.rbWordSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.rbWordSect.Location = new System.Drawing.Point(247, 60);
-			this.rbWordSect.Margin = new System.Windows.Forms.Padding(2);
-			this.rbWordSect.Name = "rbWordSect";
-			this.rbWordSect.Size = new System.Drawing.Size(88, 19);
-			this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.rbWordSect.TabIndex = 23;
-			this.rbWordSect.TabStop = false;
-			this.rbWordSect.Text = "Word Section";
-			// 
-			// rbStepSect
-			// 
-			this.rbStepSect.BackColor = System.Drawing.Color.Transparent;
-			// 
-			// 
-			// 
-			this.rbStepSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.rbStepSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
-			this.rbStepSect.Checked = true;
-			this.rbStepSect.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.rbStepSect.CheckValue = "Y";
-			this.rbStepSect.FocusCuesEnabled = false;
-			this.rbStepSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.rbStepSect.Location = new System.Drawing.Point(138, 60);
-			this.rbStepSect.Margin = new System.Windows.Forms.Padding(2);
-			this.rbStepSect.Name = "rbStepSect";
-			this.rbStepSect.Size = new System.Drawing.Size(86, 19);
-			this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.rbStepSect.TabIndex = 22;
-			this.rbStepSect.TabStop = false;
-			this.rbStepSect.Text = "Step Section";
-			this.rbStepSect.CheckedChanged += new System.EventHandler(this.rbStepSect_CheckedChanged);
-			// 
-			// ppGpbxSignoffCheckoff
-			// 
-			this.ppGpbxSignoffCheckoff.BackColor = System.Drawing.Color.Transparent;
-			this.ppGpbxSignoffCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
-			this.ppGpbxSignoffCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffHeading);
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType);
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType);
-			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading);
-			this.ppGpbxSignoffCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
-			this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123);
-			this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2);
-			this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff";
-			this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117);
-			// 
-			// 
-			// 
-			this.ppGpbxSignoffCheckoff.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.ppGpbxSignoffCheckoff.Style.BackColorGradientAngle = 90;
-			this.ppGpbxSignoffCheckoff.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.ppGpbxSignoffCheckoff.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderBottomWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.ppGpbxSignoffCheckoff.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderLeftWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderRightWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.ppGpbxSignoffCheckoff.Style.BorderTopWidth = 1;
-			this.ppGpbxSignoffCheckoff.Style.CornerDiameter = 4;
-			this.ppGpbxSignoffCheckoff.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.ppGpbxSignoffCheckoff.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.ppGpbxSignoffCheckoff.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.ppGpbxSignoffCheckoff.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
-			// 
-			// 
-			this.ppGpbxSignoffCheckoff.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
-			// 
-			// 
-			this.ppGpbxSignoffCheckoff.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.ppGpbxSignoffCheckoff.TabIndex = 51;
-			this.ppGpbxSignoffCheckoff.Text = "Signoffs / Checkoffs";
-			// 
-			// tiFormat
-			// 
-			this.tiFormat.AttachedControl = this.tcpFormat;
-			this.tiFormat.Name = "tiFormat";
-			this.tiFormat.Text = "Format";
-			// 
 			// tcpGeneral
 			// 
 			this.tcpGeneral.Controls.Add(this.ppCbAutoIndent);
@@ -1192,6 +1046,138 @@ namespace VEPROMS
 			this.tiGeneral.Name = "tiGeneral";
 			this.tiGeneral.Text = "General";
 			// 
+			// tcpFormat
+			// 
+			this.tcpFormat.Controls.Add(this.cbIsFoldoutSection);
+			this.tcpFormat.Controls.Add(this.ppCbDefaultStepSection);
+			this.tcpFormat.Controls.Add(this.cbKeepWordDocMargins);
+			this.tcpFormat.Controls.Add(this.ppLblDefaultNumColumns);
+			this.tcpFormat.Controls.Add(this.ppLblDefPaginationStyle);
+			this.tcpFormat.Controls.Add(this.ppBtnDefaultNumColumns);
+			this.tcpFormat.Controls.Add(this.ppBtnDefaultPaginationStyle);
+			this.tcpFormat.Controls.Add(this.rbWordSect);
+			this.tcpFormat.Controls.Add(this.rbStepSect);
+			this.tcpFormat.Controls.Add(this.ppGpbxSignoffCheckoff);
+			this.tcpFormat.Controls.Add(this.lblFormat);
+			this.tcpFormat.Controls.Add(this.ppCmbxNumColumns);
+			this.tcpFormat.Controls.Add(this.lblColumns);
+			this.tcpFormat.Controls.Add(this.ppCmbxSectPagination);
+			this.tcpFormat.Controls.Add(this.lblSectType);
+			this.tcpFormat.Controls.Add(this.ppCmbxStyleSectionType);
+			this.tcpFormat.Controls.Add(this.lblPagination);
+			this.tcpFormat.Controls.Add(this.ppBtnDefaultFmt);
+			this.tcpFormat.Controls.Add(this.ppCmbxFormat);
+			this.tcpFormat.Controls.Add(this.ppLblFormatDefault);
+			this.tcpFormat.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tcpFormat.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tcpFormat.Location = new System.Drawing.Point(0, 22);
+			this.tcpFormat.Margin = new System.Windows.Forms.Padding(2);
+			this.tcpFormat.Name = "tcpFormat";
+			this.tcpFormat.Padding = new System.Windows.Forms.Padding(1);
+			this.tcpFormat.Size = new System.Drawing.Size(557, 318);
+			this.tcpFormat.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tcpFormat.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tcpFormat.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tcpFormat.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tcpFormat.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tcpFormat.Style.GradientAngle = 90;
+			this.tcpFormat.TabIndex = 2;
+			this.tcpFormat.TabItem = this.tiFormat;
+			this.tcpFormat.Enter += new System.EventHandler(this.tabpage_Enter);
+			// 
+			// rbWordSect
+			// 
+			this.rbWordSect.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.rbWordSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.rbWordSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+			this.rbWordSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.rbWordSect.Location = new System.Drawing.Point(247, 60);
+			this.rbWordSect.Margin = new System.Windows.Forms.Padding(2);
+			this.rbWordSect.Name = "rbWordSect";
+			this.rbWordSect.Size = new System.Drawing.Size(88, 19);
+			this.rbWordSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.rbWordSect.TabIndex = 23;
+			this.rbWordSect.TabStop = false;
+			this.rbWordSect.Text = "Word Section";
+			// 
+			// rbStepSect
+			// 
+			this.rbStepSect.BackColor = System.Drawing.Color.Transparent;
+			// 
+			// 
+			// 
+			this.rbStepSect.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.rbStepSect.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+			this.rbStepSect.Checked = true;
+			this.rbStepSect.CheckState = System.Windows.Forms.CheckState.Checked;
+			this.rbStepSect.CheckValue = "Y";
+			this.rbStepSect.FocusCuesEnabled = false;
+			this.rbStepSect.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.rbStepSect.Location = new System.Drawing.Point(138, 60);
+			this.rbStepSect.Margin = new System.Windows.Forms.Padding(2);
+			this.rbStepSect.Name = "rbStepSect";
+			this.rbStepSect.Size = new System.Drawing.Size(86, 19);
+			this.rbStepSect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+			this.rbStepSect.TabIndex = 22;
+			this.rbStepSect.TabStop = false;
+			this.rbStepSect.Text = "Step Section";
+			this.rbStepSect.CheckedChanged += new System.EventHandler(this.rbStepSect_CheckedChanged);
+			// 
+			// ppGpbxSignoffCheckoff
+			// 
+			this.ppGpbxSignoffCheckoff.BackColor = System.Drawing.Color.Transparent;
+			this.ppGpbxSignoffCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
+			this.ppGpbxSignoffCheckoff.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffHeading);
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffType);
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.ppCmbxCheckoffType);
+			this.ppGpbxSignoffCheckoff.Controls.Add(this.lblCheckoffHeading);
+			this.ppGpbxSignoffCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
+			this.ppGpbxSignoffCheckoff.Location = new System.Drawing.Point(272, 123);
+			this.ppGpbxSignoffCheckoff.Margin = new System.Windows.Forms.Padding(2);
+			this.ppGpbxSignoffCheckoff.Name = "ppGpbxSignoffCheckoff";
+			this.ppGpbxSignoffCheckoff.Size = new System.Drawing.Size(206, 117);
+			// 
+			// 
+			// 
+			this.ppGpbxSignoffCheckoff.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.ppGpbxSignoffCheckoff.Style.BackColorGradientAngle = 90;
+			this.ppGpbxSignoffCheckoff.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.ppGpbxSignoffCheckoff.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderBottomWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.ppGpbxSignoffCheckoff.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderLeftWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderRightWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+			this.ppGpbxSignoffCheckoff.Style.BorderTopWidth = 1;
+			this.ppGpbxSignoffCheckoff.Style.CornerDiameter = 4;
+			this.ppGpbxSignoffCheckoff.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+			this.ppGpbxSignoffCheckoff.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+			this.ppGpbxSignoffCheckoff.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.ppGpbxSignoffCheckoff.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+			// 
+			// 
+			// 
+			this.ppGpbxSignoffCheckoff.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			// 
+			// 
+			// 
+			this.ppGpbxSignoffCheckoff.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+			this.ppGpbxSignoffCheckoff.TabIndex = 51;
+			this.ppGpbxSignoffCheckoff.Text = "Signoffs / Checkoffs";
+			// 
+			// tiFormat
+			// 
+			this.tiFormat.AttachedControl = this.tcpFormat;
+			this.tiFormat.Name = "tiFormat";
+			this.tiFormat.Text = "Format";
+			// 
 			// tcpAutomation
 			// 
 			this.tcpAutomation.Controls.Add(this.ppCbNoDuplexFoldout);
@@ -1479,7 +1465,7 @@ namespace VEPROMS
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ClientSize = new System.Drawing.Size(722, 390);
+			this.ClientSize = new System.Drawing.Size(730, 398);
 			this.ControlBox = false;
 			this.Controls.Add(this.tcSectionProp);
 			this.Controls.Add(this.panSectBtns);
@@ -1503,12 +1489,12 @@ namespace VEPROMS
 			this.panSectBtns.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.tcSectionProp)).EndInit();
 			this.tcSectionProp.ResumeLayout(false);
+			this.tcpGeneral.ResumeLayout(false);
+			this.tcpGeneral.PerformLayout();
 			this.tcpFormat.ResumeLayout(false);
 			this.tcpFormat.PerformLayout();
 			this.ppGpbxSignoffCheckoff.ResumeLayout(false);
 			this.ppGpbxSignoffCheckoff.PerformLayout();
-			this.tcpGeneral.ResumeLayout(false);
-			this.tcpGeneral.PerformLayout();
 			this.tcpAutomation.ResumeLayout(false);
 			this.tcpAutomation.PerformLayout();
 			this.gpTOC.ResumeLayout(false);
@@ -1612,6 +1598,5 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.ButtonX ppBtnConvertToDocX;
 		private System.Windows.Forms.CheckBox cbIsFoldoutSection;
 		private System.Windows.Forms.CheckBox ppCbNoDuplexFoldout;
-		private System.Windows.Forms.CheckBox ppCbShowRplWords;
-	}
+  }
 }

PROMS/VEPROMS User Interface/frmSectionProperties.cs

@@ -523,23 +523,6 @@ namespace VEPROMS
 				else
 					ppCbDefaultStepSection.Text = "Make this the Default Step Section";
 			}
-			// Show Replace Words
-			ppCbShowRplWords.Visible = false;
-			if (_isStepSection && _SectionConfig.MySection.MySectionInfo.MyActiveParent.IsProcedure)
-			{
-				ppCbShowRplWords.Visible = true;
-				ppCbShowRplWords.Checked = _SectionConfig.Section_ShwRplWords == "Y";
-				// Use checkbox text to clarify what is case for this section, i.e. is it already
-				// the default or can it be set.  Note that this is used when printing of page numbers
-				// that use the 'WithSteps' numbering sequence.
-				if (_SectionConfig.Section_OriginalSteps == "Y")
-				{
-					ppCbShowRplWords.Text = "Show Replace Words"; // C2020-021 add the word "the"
-					_isDefaultStepSection = true;
-				}
-				else
-					ppCbShowRplWords.Text = "Show Replace Words";
-			}
 
 			// if the parent has enhanced documents (and is not an enhanced document, i.e. the test
 			// ed.Type != 0 proves that) put up the group panel on the automation tab that allows for setting of 
@@ -1228,7 +1211,6 @@ namespace VEPROMS
 			ppGpbxSignoffCheckoff.Visible = _isStepSection;
 			cbKeepWordDocMargins.Visible = !_isStepSection;
 			ppCbDefaultStepSection.Visible = _isStepSection;
-			ppCbShowRplWords.Visible = _isStepSection;
 		}
 
 		private void rbStepSect_CheckedChanged(object sender, EventArgs e)
@@ -1398,8 +1380,7 @@ namespace VEPROMS
 				_SectionConfig.Section_OriginalSteps = ppCbDefaultStepSection.Checked ? "Y" : "N";
 			}
 		}
-	
-			private void ppBtnConvertToDocX_Click(object sender, EventArgs e)
+		private void ppBtnConvertToDocX_Click(object sender, EventArgs e)
 		{
 			// Get Document as file
 			ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID);
@@ -1466,14 +1447,6 @@ namespace VEPROMS
 		{
 			_SectionConfig.Section_DontIncludeDuplexFoldout = ppCbNoDuplexFoldout.Checked;
 		}
-			// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-		private void ppCbShowRplWords_CheckedChanged(object sender, EventArgs e)
-		{
-			if (!_Initializing)
-			{
-				_SectionConfig.Section_ShwRplWords = ppCbShowRplWords.Checked ? "Y" : "N";
-			}
-		}
 
 		//private void ppBtnDefaultPrintSize_Click(object sender, EventArgs e)
 		//{

PROMS/VEPROMS User Interface/frmSectionProperties.resx

@@ -142,11 +142,8 @@ When a format other than the inherited one is selected, a button labeled "Defaul
 Pressing the "Default" button will revert back to using the inherited format for this section.
 </value>
   </data>
-  <metadata name="sectionConfigBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>128, 18</value>
-  </metadata>
   <data name="cbIsFoldoutSection.SuperTooltip" xml:space="preserve">
-    <value>If the format supports duplex Foldouts:
+     <value>If the format supports duplex Foldouts:
 
 - This can be used to turn On duplexing of the Foldout instead
   of using "FOLDOUT" as the section number

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -11,7 +11,6 @@ using DevComponents.DotNetBar;
 using VEPROMS.Properties;
 using Volian.Base.Library;
 using DescriptiveEnum;
-using VEPROMS.CSLA.Library;
 
 namespace VEPROMS
 {
@@ -25,9 +24,6 @@ namespace VEPROMS
       get { return _CanChangeSeparateWindowsSetting; }
       set { _CanChangeSeparateWindowsSetting = value; }
     }
-
-		private UserSettings _usersettings;
-
 		public frmSysOptions()
 		{
 			_initializing = true;
@@ -68,7 +64,6 @@ namespace VEPROMS
 			colorPickerButton1.SelectedColor = Settings.Default.TransitionRangeColor;
 			cbAnnotationPopup.Checked = Settings.Default.AutoPopUpAnnotations;
 			cbStepTypeToolTip.Checked = Settings.Default.StepTypeToolTip;
-			cbShwRplWrdsColor.Checked = Settings.Default.cbShwRplWrdsColor;
 			cbTVExpand.Checked = Settings.Default.SaveTreeviewExpanded;
 			cbPasteNoReturns.Checked = Settings.Default.PasteNoReturns;
 			cbPastePlainText.Checked = Settings.Default.PastePlainText;
@@ -94,13 +89,6 @@ 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)
 		{
@@ -163,15 +151,6 @@ 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();
 		}
@@ -181,7 +160,6 @@ namespace VEPROMS
 		private	Color ss_TransRangeColor;
 		private	bool ss_PopUPAnnotations;
 		private	bool ss_StepTypeToolTip;
-		private bool ss_cbShwRplWrdsColor;
 		private	bool ss_SaveTreeviewExpanded;
 		private	bool ss_PasteNoReturns;
 		private	bool ss_PastePlainText;
@@ -197,8 +175,6 @@ namespace VEPROMS
 			ss_TransRangeColor = Settings.Default.TransitionRangeColor;
 			ss_PopUPAnnotations = Settings.Default.AutoPopUpAnnotations;
 			ss_StepTypeToolTip = Settings.Default.StepTypeToolTip;
-
-			ss_cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			ss_SaveTreeviewExpanded = Settings.Default.SaveTreeviewExpanded;
 			ss_PasteNoReturns = Settings.Default.PasteNoReturns;
 			ss_PastePlainText = Settings.Default.PastePlainText;
@@ -215,7 +191,6 @@ namespace VEPROMS
 			Settings.Default.TransitionRangeColor = ss_TransRangeColor;
 			Settings.Default.AutoPopUpAnnotations = ss_PopUPAnnotations;
 			Settings.Default.StepTypeToolTip = ss_StepTypeToolTip;
-			Settings.Default.cbShwRplWrdsColor = ss_cbShwRplWrdsColor;
 			Settings.Default.SaveTreeviewExpanded = ss_SaveTreeviewExpanded;
 			Settings.Default.PasteNoReturns = ss_PasteNoReturns;
 			Settings.Default.PastePlainText = ss_PastePlainText;
@@ -349,16 +324,5 @@ namespace VEPROMS
 				Settings.Default.UCFImportOpt = 4;
 			}
 		}
-		private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
-		{
-			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked;
-		}
-		private void cbShwRplWrdsColor_CheckedChanged(object sender, EventArgs e)
-        {
-			Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked;
-			VlnSettings.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked;
-			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
-			Properties.Settings.Default.Save(); // save settings
-		}
-    }
+	}
 }

PROMS/VEPROMS User Interface/frmSysOptions.resx

@@ -112,20 +112,21 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.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/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAAAKklE
-        QVQ4T2P4//8/RRhCAClyMIoBIJoUPGrAqAEgPBwNIAfDDSAf/2cAALEslYfUgx+eAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA
+        EnEB89x6jgAAACpJREFUOE9j+P//P0UYQgApcjCKASCaFDxqwKgBIDwcDSAHww0gH/9nAACxLJWH1IMf
+        ngAAAABJRU5ErkJggg==
 </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

@@ -524,7 +524,6 @@ namespace VEPROMS
 			this.Activated += new EventHandler(frmVEPROMS_Activated);
 
 			VlnSettings.StepTypeToolType = Settings.Default.StepTypeToolTip;
-			VlnSettings.cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			displayLibDocs.PrintRequest += new DisplayLibDocEvent(displayLibDocs_PrintRequest);
 			ContentInfo.InfoChanged += new ContentInfoEvent(RefreshDisplayHistory);
 			AnnotationInfo.InfoChanged += new AnnotationInfoEvent(RefreshDisplayHistory);
@@ -817,11 +816,6 @@ namespace VEPROMS
 			set { frmVEPROMS._ErrorLogFileName = value; }
 		}
 
-		public static bool colorReplaceWords()
-		{
-			return Properties.Settings.Default.cbShwRplWrdsColor;
-		}
-
 		static bool ChangeLogFileName(string AppenderName, string NewFilename)
 		{
 			log4net.Repository.ILoggerRepository RootRep;
@@ -1660,10 +1654,6 @@ 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
@@ -1686,25 +1676,23 @@ namespace VEPROMS
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
-					if (_WeAreExitingPROMS)
-					{
-						string DisplayTabID = "";
-						int pos;
-						int TabItemID;
-						string DisplayTabName = "";
-						int cnt = 0;
+
+					string DisplayTabID = "";
+					int pos;
+					int TabItemID;
+					string DisplayTabName = "";
+					int cnt = 0;
 						// Deactivate previous procedure tab state by user
-						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+					VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
 						// Save current procedure tab state
-						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
-						{
-							cnt++;
-							DisplayTabID = pgTab.Key;
-							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
-							DisplayTabName = pgTab.Value.ToString();
-							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
-							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
-						}
+					foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+					{
+						cnt++;
+						DisplayTabID = pgTab.Key;
+						TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+						DisplayTabName = pgTab.Value.ToString();
+						//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+						VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
 					}
 
 					int n = tc._MyDisplayTabItems.Count;
@@ -2359,49 +2347,18 @@ namespace VEPROMS
 
 		public void openDisplaytabstate()
 		{
-			// Retrieve edit tab state from database.
 			DataTable DisPlayTabState = VEPROMS.CSLA.Library.Item.GetDisplayTabs(VlnSettings.UserID);
-
-			//CSM - C2024-031 - Getting User Settings
-			//and set checkboxes based on what they are set to
-			UserSettings usersettings = new UserSettings(VlnSettings.UserID);
-
-			if (DisPlayTabState.Rows.Count > 0 && (usersettings.UserSetting_OpenTabs_AutoOpen || !usersettings.UserSetting_OpenTabs_Remember))
+		
+			if (DisPlayTabState.Rows.Count > 0)
 			{
-				//will open tabs by default / ask by default
-				DialogResult result = DialogResult.Yes;
-				if (!usersettings.UserSetting_OpenTabs_Remember)
+				foreach (DataRow TabState in DisPlayTabState.Rows)
 				{
-					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;
-						}
-					}
+					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);
 				}
 			}
 		}

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

@@ -517,57 +517,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion CheckOff
-		#region ShwRplWds
-		[Serializable]
-		[TypeConverter(typeof(ExpandableObjectConverter))]
-		public class ShwRplWds
-		{
-			private string _MenuItem;
-			[XmlAttribute("MenuItem")]
-			[Browsable(false)]
-			public string MenuItem
-			{
-				get { return _MenuItem; }
-				set { _MenuItem = value; }
-			}
-			private string _Index;
-			[XmlAttribute("Index")]
-			[Browsable(false)]              // Don't show in the property grid
-			public string Index
-			{
-				get { return _Index; }
-				set { _Index = value; }
-			}
-
-			private bool? _Active;
-			[DisplayName("Active ShwRplWds")]
-			[Description("Allow use of this ShwRplWds")]
-			public bool? Active
-			{
-				get { return _Active; }
-				set { _Active = value; }
-			}
-			private bool? _OrigActive;
-			[XmlIgnore]
-			[Browsable(false)]
-			public bool? OrigActive
-			{
-				get { return _OrigActive; }
-				set { _OrigActive = value; }
-			}
-			public ShwRplWds()
-			{
-			}
-			public string ConvertToString()
-			{
-				return GenericSerializer<ShwRplWds>.StringSerialize(this);
-			}
-			public override string ToString()
-			{
-				return MenuItem;
-			}
-		}
-		#endregion ShwRplWds
 		#region StepData (list)
 		[Serializable]
 		[TypeConverter(typeof(ExpandableObjectConverter))]

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

@@ -528,24 +528,6 @@ namespace VEPROMS.CSLA.Library
 				OnPropertyChanged("Section_OriginalSteps");
 			}
 		}
-		[Browsable(false)]
-		[DisplayName("Section ShowReplaceWords")]
-		[RefreshProperties(RefreshProperties.All)]
-		[Description("Section ShowReplaceWords")]
-		public string Section_ShwRplWords
-		{
-			get
-			{
-				//return _Xp["Section", "ShwRplWords"];
-				string tmp = _Xp["Section", "ShwRplWords"];
-				return tmp == null || tmp == "" ? "Y" : tmp;
-			}
-			set
-			{
-				_Xp["Section", "ShwRplWords"] = value;
-				OnPropertyChanged("Section_ShwRplWords");
-			}
-		}
 		[Category("Section")]
 		//PROPGRID: Hide Section NumPages
 		[Browsable(false)]

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

@@ -474,53 +474,6 @@ 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");
-			}
-		}
-		//C2019-025 Ability to Toggle Replace Words
-		public int Step_ShwRplWdsIndex
-		{
-			get
-			{
-				string s = _Xp["Step", "ShwRplWdsIndex"];
-
-				if (s == string.Empty) return 0;
-
-				if (s == "0") return 0;
-
-				if (s == "1") return 1;
-
-				if (s == "2") return 2;
-
-				if (s == "3") return 3;
-
-				return 0;
-
-			}
-			set
-			{
-				string s = _Xp["Step", ""];
-				if (value.ToString() == s) return;
-				_Xp["Step", "ShwRplWdsIndex"] = value.ToString();
-				OnPropertyChanged("Step_ShwRplWdsIndex");
-			}
-		}
 		#region RO image sizing
 		// if the RO image (figure) is resized, save it in the step config, not in the ROImageConfig.  If stored in ROImageConfig
 		// the size is set for ALL uses.

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

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

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

@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
 using System.Drawing;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-//using VEPROMS.colorReplaceWords;
 
 // This was moved from volian.controls.library
 namespace VEPROMS.CSLA.Library
@@ -47,45 +46,6 @@ namespace VEPROMS.CSLA.Library
 				return string.Empty;
 			}
 		}
-		private string ShwRplWords(ItemInfo _MyItemInfo)
-		{
-			//if (_Initalizing) return "N";
-			//_MyItemInfo.
-			SectionConfig sc = _MyItemInfo.MyConfig as SectionConfig;
-			if (sc == null) return "N";
-			return sc.Section_ShwRplWords;
-		}
-
-		// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-		private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
-		{
-			StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
-			int setting = sc.Step_ShwRplWdsIndex;
-			switch (setting)
-			{
-				case 2:
-					return false;
-					break;
-				case 1:
-					return true;
-					break;
-				case 0:
-					//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
-					SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
-					if (sc2 == null || sc2.Section_ShwRplWords == "Y")
-					{
-						return true;
-					}
-					else
-					{
-						return false;
-					}
-					break;
-				default:
-					return false;
-					break;
-			}
-		}
 		private Item _MyItem;
 		private string EditText
 		{
@@ -397,34 +357,9 @@ namespace VEPROMS.CSLA.Library
 			// But don't do ReplaceWords if the TurnOffReplaceWords format flag is set
 			if (wordsShouldBeReplaced && !_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.TurnOffReplaceWords)
 			{
-
 				int profileDepth1 = ProfileTimer.Push(">>>> DoReplaceWords2");
-
-					// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-				if (_MyItemInfo.IsSection)
-				{
-					string ShwRplWrds = ShwRplWords(_MyItemInfo);
-					if (ShwRplWrds == "Y")
-					{
-						text = DoReplaceWords2(text, epMode);
-					}
-				}
-				if (_MyItemInfo.IsStep)
-				{
-					bool ShwRplWrds = ShwRplWdsIndex(_MyItemInfo);
-					if (ShwRplWrds == true)
-					{
-						text = DoReplaceWords2(text, epMode);
-					}
-				}
-
-
-				if (_MyItemInfo.IsFolder || _MyItemInfo.IsProcedure)
-				{
-					text = DoReplaceWords2(text, epMode);
-				}
-
-
+				
+				text = DoReplaceWords2(text);
 				ProfileTimer.Pop(profileDepth1);
 			}
 			if (_MyItemInfo != null && ROsShouldBeAdjusted) // B2017-019 - added check for ROsShouldBeAdjusted so that these token are not "cooked" on property pages
@@ -1230,17 +1165,13 @@ 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);
-
-						//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))
+						recid = System.Convert.ToInt32(srecid);
+						foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
 						{
-							foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
+							if (ct.TransitionID == recid)
 							{
-								if (ct.TransitionID == recid)
-								{
-									itm.MyContent.ContentTransitions.Remove(ct);
-									break;
-								}
+								itm.MyContent.ContentTransitions.Remove(ct);
+								break;
 							}
 						}
 					}
@@ -1725,15 +1656,7 @@ namespace VEPROMS.CSLA.Library
 		private string FixTransition(string link, string text)
 		{
 			if (link.IndexOf("<NewID>") != -1) return text;
-
-			//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;
-			}
-
+			int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
 			// Find the transition
 			if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
 			{
@@ -2166,7 +2089,7 @@ namespace VEPROMS.CSLA.Library
 				return (bool) _ProcessReplaceWords; 
 			}
 		}
-		private string DoReplaceWords2(string Text, E_EditPrintMode epMode)
+		private string DoReplaceWords2(string Text)
 		{
 			if(!ProcessReplaceWords) return Text;
 			// F2021-053: BNPP Alarm - need ability to have super/sub scripts in the text of Alarm Tables (ROs).
@@ -2227,7 +2150,6 @@ namespace VEPROMS.CSLA.Library
 							// CASEINSENS: Do ReplaceWords for all words that match, regardless of case, and replace with the ReplaceWith string as is
 							//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline;
 							string replaceWord = Regex.Replace(rs.ReplaceWord, @"[[\]\\()]", @"\$0");
-
 							// if first or last character in replaceword is a non-word character, for example, ',', ')', or '.',
 							// don't use the \W, i.e. don't bother to look for a non-word character.
 							string wordMatchBeg = Regex.IsMatch(replaceWord.Substring(0, 1), @"\W") ? "" : @"(?<=\W|^)";
@@ -2254,7 +2176,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			//ProfileTimer.Pop(profileDepth);
 			//int profileDepth5 = ProfileTimer.Push(">>>> DoReplaceWords2.ReplaceMatches");
-			Text = myMatches.ReplaceMatches(epMode);
+			Text = myMatches.ReplaceMatches();
 			//ProfileTimer.Pop(profileDepth5);
 			Text = Text.Replace(@"\xA0", @"\u160?"); //replace hard space
 			return Text;
@@ -2546,8 +2468,7 @@ namespace VEPROMS.CSLA.Library
 				if (str.Length == index && str == text.Substring(0, str.Length)) return true;
 			return false;
 		}
-		
-		public string ReplaceMatches(E_EditPrintMode epMode)
+		public string ReplaceMatches()
 		{
 			int offset = 0;
 			string text = _Text;
@@ -2639,11 +2560,6 @@ namespace VEPROMS.CSLA.Library
 								with = with.Replace(@"\ul ", "");
 								with = with.Replace(@"\ulnone ", "");
 							}
-							//if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
-							if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
-							{
-								with = $@"\cf2{with}\cf0 ";
-							}
 
 							text = text.Substring(0, offset + foundMatch.MyMatch.Index) + with + text.Substring(offset + foundMatch.MyMatch.Index + foundMatch.MyMatch.Length);
 							//offset += foundMatch.MyWord.ReplaceWith.Length - foundMatch.MyMatch.Length;

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

@@ -11,7 +11,6 @@ using System.Xml;
 using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
-using System.Linq;
 
 namespace VEPROMS.CSLA.Library
 {
@@ -403,99 +402,6 @@ namespace VEPROMS.CSLA.Library
 			return tmpForLink;
 		}
 
-		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-		// This will be used to simulate the non-high level part of a tab
-		// for case where sorting and all other fields match
-		// Note: This is cut down to improve the sort's performance
-		// but congruent to Volian.Print.Library.PDFReport-> BuildStepTab(ItemInfo item)
-		public string BuildStepTab()
-		{
-			StringBuilder sret = new StringBuilder();
-			ItemInfo pitem = this;
-
-			while (!pitem.IsSection && !pitem.IsHigh)
-            {
-                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
-                {
-                    string thisTab = stpinfo.MyTab.CleanText;
-
-                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
-
-                    if (!string.IsNullOrEmpty(thisTab))
-                    {
-                        thisTab = thisTab.Trim();
-                    }
-
-                    // if the tab is null or
-                    // if the the tab is not a letter or number OR
-                    // the tab is an AND or OR type and is the letter "o"
-                    // then reset the tab an empty string so that the type name along with the count of that type 
-                    // (ex. "AND 2", "OR 3")
-                    if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
-                    {
-                        thisTab = string.Empty;
-                    }
-
-                    if (pitem.IsRNOPart)
-                    {
-                        if (string.IsNullOrEmpty(thisTab))
-                        {
-                            sret.Insert(0, "RNO.");
-                        }
-                        else
-                        {
-                            thisTab = thisTab.Trim();
-
-                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-                            {
-                                thisTab += ".";
-                            }
-
-                            sret.Insert(0, "RNO." + thisTab);
-                        }
-                    }
-                    else if (pitem.IsCaution || pitem.IsNote)
-                    {
-                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
-                        if (string.IsNullOrEmpty(thisTab))
-                        {
-                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
-                        }
-                        else
-                        {
-                            thisTab = thisTab.Trim(" ".ToCharArray());
-                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
-                        }
-                    }
-                    else
-                    {
-                        if (!string.IsNullOrEmpty(thisTab))
-                        {
-                            thisTab = thisTab.Trim(" ".ToCharArray());
-
-                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
-                            {
-                                thisTab += ".";
-                            }
-                        }
-                        else
-                        {
-                            thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
-                        }
-
-                        sret.Insert(0, thisTab);
-                    }
-                }
-
-                pitem = pitem.ActiveParent as ItemInfo;
-
-                if (pitem == null)
-                    break;
-            }
-
-            return sret.ToString().Trim(" .)".ToCharArray());
-		}
-
 		public void SetHeader(VE_Font myFont, string myText)
 		{
 			_MyHeader = new MetaTag(myFont);
@@ -713,14 +619,12 @@ namespace VEPROMS.CSLA.Library
 		{
 			TranCheckCount = 0;
 			TranFixCount = 0;
-			TranCantFixCount = 0;
 			TranConvertCount = 0;// B2018-002 - Invalid Transitions - Initialize Transition Conversion Count
 		}
 
 		public static int TranCheckCount = 0;
 		public static int TranFixCount = 0;
 		public static int TranConvertCount = 0;// B2018-002 - Invalid Transitions - Declare Transition Conversion Count
-		public static int TranCantFixCount = 0;
 		internal static TransitionInfoList TransitionsToDisconnected;
 		internal static TransitionInfoList TransitionsToNonEditable;
 
@@ -827,15 +731,6 @@ namespace VEPROMS.CSLA.Library
 								content.Save();
 							}
 						}
-						else if (newText.Contains("<CTID=-"))
-						{
-							//CSM C2024-028 - Bad Transition Link - Make an annotation					
-							using (Item itm = Item.Get(itemInfo.ItemID))
-							{
-								TranCantFixCount++;
-								Annotation.MakeAnnotation(itm, AnnotationType.GetByNameOrCreate("Bad Transition Link"), "", $"Invalid Transition Link: ({ItemInfo.ConvertToDisplayText(newValue)})", null);
-							}
-						}
 					}
 				}
 			}
@@ -2857,29 +2752,6 @@ 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
 		{
@@ -2895,11 +2767,7 @@ namespace VEPROMS.CSLA.Library
 				return _SearchDVPath;
 			}
 		}
-        //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
-        //Create cleaned version of variable for use in DisplaySearch
-        public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
-
-        internal string _SearchPath;
+		internal string _SearchPath;
 		public string SearchPath
 		{
 			get
@@ -2922,10 +2790,6 @@ 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 
@@ -2936,9 +2800,6 @@ 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;
@@ -3239,24 +3100,6 @@ namespace VEPROMS.CSLA.Library
 			//get { return ConvertToDisplayText(MyContent.Number); }
 		}
 
-		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-		//Get Numeric part of HLS Tab
-		//Used for Certain sorting situations
-		//If no numeric part then use 999 (will be at end of that level of the sort if there are other items with numbered HLS)
-		public int NumericSortNumber
-		{
-			get
-			{
-				string numericpart = null;
-				if (MyHLS != null)
-					numericpart = new string(MyHLS?.MyTab?.CleanTextNoSymbols.TakeWhile(Char.IsDigit).ToArray());
-				if (!string.IsNullOrEmpty(numericpart) && numericpart.All(char.IsNumber))
-					return int.Parse(numericpart);
-				else
-					return 999;
-			}
-		}
-
 		// for step designators (a redefined caution type used in Comanche Peak with the SameRowAsParentMultiLines format flag)
 		// we what to allow for a hard return to allow for multiple designator lines - jsj 5/21/2015
 		public static string ConvertToMulitLineStepDesignatorDisplayText(string txt)
@@ -4408,13 +4251,6 @@ 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;
 			}
@@ -4505,73 +4341,25 @@ namespace VEPROMS.CSLA.Library
 						incSub = (ord + 1).ToString();
 						if (MyParent.MyTab.CleanText.Trim().EndsWith(")"))
 						{
-							//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.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub;
 							_MyTab.Text = _MyTab.CleanText;
 							return;
 						}
 						if (MyParent.MyTab.CleanText.Contains(ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB))
 						{
-							//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.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
 							_MyTab.Text = _MyTab.CleanText;
 							return;
 						}
 						string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
-						//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;
+						_MyTab.CleanText = tmprnotab.TrimStart();
+						_MyTab.Text = tmprnotab.TrimStart();
 						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)
@@ -4906,7 +4694,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)
@@ -4928,17 +4716,6 @@ 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
@@ -5743,32 +5520,15 @@ 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
 
-		//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
+		// TemplateIndex is for Calvert only:
+		private int _TemplateIndex = -2;  // -2 not set; -1 not a template
 		public int TemplateIndex
 		{
 			get
@@ -6262,168 +6022,6 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
 			}
 		}
-
-        //CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
-        // Found various inconsistencies in the reports so adding this to manually sort
-		//instead of binding the sort to 1 or 2 individual fields
-        public List<ItemInfo> SortedList(bool sortbyFoundRoid = false)
-		{
-			List<ItemInfo> tmp = new List<ItemInfo>(this);
-			if (sortbyFoundRoid)
-			{
-				// Priority of Sorting order:
-				// 1. FoundRoid (by Referenced Object ID)
-				// 2. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
-				// 3. Keep in order of the Procedures within the set
-				// 4. Keep in the order of the Section within the Procedure
-				// 5. NumericSortNumber - numeric part of the HLS if there is one
-				// 6. Substep Tab - will sort as a string since combined numbers/text
-				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
-				{
-					int cmp = 0;
-					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
-					switch (FoundROID_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 10000000;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 10000000;
-							break;
-						default:
-							break;
-					}
-
-					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
-					switch (DVPath_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 1000000;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 1000000;
-							break;
-						default:
-							break;
-					}
-
-					if (x.MyProcedure != null && y.MyProcedure != null)
-					{
-						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 100000);
-					}
-
-					if (x.ActiveSection != null && y.ActiveSection != null)
-					{
-						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
-					}
-
-					cmp += x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 10;
-
-					if (cmp == 0)
-					{
-						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
-						switch (StepTab_cmp)
-						{
-							case int result when result < 0:
-								cmp -= 1;
-								break;
-							case int result when result == 0:
-								break;
-							case int result when result > 0:
-								cmp += 1;
-								break;
-							default:
-								break;
-						}
-					}
-
-					return cmp;
-				});
-			}
-            else 
-			{
-				// Priority of Sorting order:
-				// 1. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
-				// 2. Keep in order of the Procedures within the set
-				// 3. Keep in the order of the Section within the Procedure
-				// 4. NumericSortNumber - numeric part of the HLS if there is one
-				// 5. Substep Tab - will sort as a string since combined numbers/text
-				// 6. FoundRoid (by Referenced Object ID)
-				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
-				{
-					int cmp = 0;
-
-					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
-					switch (DVPath_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 10000000;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 10000000;
-							break;
-						default:
-							break;
-					}
-
-					if (x.MyProcedure != null && y.MyProcedure != null)
-					{
-						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 1000000);
-					}
-
-					if (x.ActiveSection != null && y.ActiveSection != null)
-					{
-						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
-					}
-
-					cmp += (x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 100);
-
-					if (cmp == 0)
-					{
-						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
-						switch (StepTab_cmp)
-						{
-							case int result when result < 0:
-								cmp -= 10;
-								break;
-							case int result when result == 0:
-								break;
-							case int result when result > 0:
-								cmp += 10;
-								break;
-							default:
-								break;
-						}
-					}
-
-					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
-					switch (FoundROID_cmp)
-					{
-						case int result when result < 0:
-							cmp -= 1;
-							break;
-						case int result when result == 0:
-							break;
-						case int result when result > 0:
-							cmp += 1;
-							break;
-						default:
-							break;
-					}
-
-					return cmp;
-				});
-			}
-
-			return tmp;
-        }
-
 		[Serializable()]
 		private class MoveItemCriteria
 		{
@@ -7599,11 +7197,11 @@ namespace VEPROMS.CSLA.Library
 			}
 			this.RaiseListChangedEvents = true;
 		}
-        #endregion
-    }
-    #endregion
-    #region new class TransitionLookup
-    public delegate ProcedureInfo TransitionLookupEvent(object sender, TransitionLookupEventArgs args);
+		#endregion
+	}
+	#endregion
+	#region new class TransitionLookup
+	public delegate ProcedureInfo TransitionLookupEvent(object sender, TransitionLookupEventArgs args);
 	public class TransitionLookupEventArgs
 	{
 		private int _ProcID;
@@ -8447,7 +8045,97 @@ namespace VEPROMS.CSLA.Library
 				Dr = dr;
 			}
 		}
+		public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
+		{
+			try
+			{
+				DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
+																								  //ItemInfo.AddList(tmp);
+																								  //tmp.AddEvents();
+				return tmp;
+			}
+			catch (Exception ex)
+			{
+				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+			}
+		}
+		private DataTable dt = new DataTable();
+		private DataTable DataPortal_Fetch(DisplayTabs criteria)
+		{
+			
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabData";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						da.Fill(dt);
+						cn.Close();
+						da.Dispose();
+						return dt;
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+						throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+					}
 
+				}			
+			}
+
+		}
+		//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//{
+		//	try
+		//	{
+		//		//DisplayTabs tmp = 
+		//		DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
+		//																											  //ItemInfo.AddList(tmp);
+		//																											  //tmp.AddEvents();
+		//		//return tmp;
+		//	}
+		//	catch (Exception ex)
+		//	{
+		//		throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+		//	}
+		//}
+		//private DataTable dt = new DataTable();
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		//{
+
+		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+		//	{
+		//		using (SqlCommand cm = cn.CreateCommand())
+		//		{
+		//			try
+		//			{
+		//				cm.CommandType = CommandType.StoredProcedure;
+		//				cm.CommandText = "AddDisplayTabState";
+		//				cm.CommandTimeout = Database.DefaultTimeout;
+		//				cm.Parameters.AddWithValue("@ItemID", ItemID);
+		//				cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+		//				cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+		//				cm.ExecuteNonQuery();
+		//				//SqlDataAdapter da = new SqlDataAdapter(cm);
+		//				//da.Fill(dt);
+		//				//cn.Close();
+		//				//da.Dispose();
+		//				//return dt; // fix
+		//			}
+		//			catch (Exception ex)
+		//			{
+		//				//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+		//				throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+		//			}
+
+		//		}
+		//	}
+
+		//}
 		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
 		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
 		{

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

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

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

@@ -676,47 +676,37 @@ namespace VEPROMS.CSLA.Library
 		}
 		public void AppendPrefix()
 		{
-			if (Prefix == null) return; // no Prefix text to add
-			if (HasText)
+			if (HasText && Prefix != null)
 			{
-				if (!_Results.ToString().EndsWith(_Prefix)) //existing transition text does not end with Prefix text, OK to append
+				if (!_Results.ToString().EndsWith(_Prefix))
 					_Results.Append(Prefix);
 				_Prefix = null;
 			}
 			else if (_TranType == 4 && _ToItem.MoreThanOneStepSection())
 			{
-				// 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;
-				//}
+				if (!HasText && Prefix != null && Prefix.ToUpper().StartsWith(", STEP")
+					&& _FromItem.ActiveFormat.Name.StartsWith("WEP"))
+				{
+					Console.WriteLine("Format,'{0}'", _FromItem.ActiveFormat.Name);
+					_Prefix = null;
+					return;
+				}
 				_Results.Append(Prefix);
 				_Prefix = null;
 			}
+			else if (_TranType == 5 && Prefix != null)
+			{
+				if (!HasText && Prefix.StartsWith(", "))
+					_Results.Append(Prefix.TrimStart(", ".ToCharArray()));
+				else
+					_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.Contains("("))
+			else if (!HasText && Prefix != null && 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

@@ -2173,7 +2173,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 	}
-
 	#endregion
 	#region CheckOff
 	[TypeConverter(typeof(ExpandableObjectConverter))]
@@ -2285,49 +2284,6 @@ namespace VEPROMS.CSLA.Library
 		}
 	}
 	#endregion
-	#region ShwRplWds
-	// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-	public class ShwRplWds : vlnFormatItem, IVlnIndexedFormatItem
-	{
-		public ShwRplWds(XmlNode xmlNode) : base(xmlNode) { }
-		public ShwRplWds() : base() { }
-		private LazyLoad<int?> _Index;
-		public int? Index
-		{
-			get
-			{
-				return LazyLoad(ref _Index, "@Index");
-			}
-		}
-
-		// User Interface Mark (UIMark) is the deimal number of an ASCII character that is desplayed in the step editor
-		// to indicate the selected checkoff
-		private LazyLoad<int?> _UIMark;
-		public int? UIMark
-		{
-			get
-			{
-				return LazyLoad(ref _UIMark, "@UIMark");
-			}
-		}
-
-
-		//Descriptive text shown in the checkoff selection list
-		private LazyLoad<string> _MenuItem;
-		public string MenuItem
-		{
-			get
-			{
-				return LazyLoad(ref _MenuItem, "@MenuItem");
-			}
-		}
-
-		public override string ToString()
-		{
-			return MenuItem;
-		}
-	}
-#endregion
 	#region CheckOffList
 	[TypeConverter(typeof(vlnIndexedListConverter<CheckOffList, CheckOff>))]
 	public class CheckOffList : vlnIndexedFormatList<CheckOff>
@@ -3219,17 +3175,6 @@ 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
@@ -6257,36 +6202,6 @@ 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
@@ -6481,7 +6396,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 procedure title that's in the transition text
+		// a character that is placed before and after the title that's in the transition text
 		private LazyLoad<string> _DelimiterForTransitionTitle;
 		public string DelimiterForTransitionTitle
 		{
@@ -6758,9 +6673,7 @@ 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. 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. 
+		// holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers
 		private LazyLoad<int?> _Type;
 		public int? Type
 		{

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

@@ -105,7 +105,7 @@ namespace VEPROMS.CSLA.Library
 				if (tmp._MyContent != null)
 				{
 					ContentInfo.Refresh(tmp._MyContent);
-					if (tmp._MyContent?.MyImage != null) ImageInfo.Refresh(tmp._MyContent.MyImage);
+					if (tmp._MyContent.MyImage != null) ImageInfo.Refresh(tmp._MyContent.MyImage);
 				}
 				ItemInfo.Refresh(tmp);
 			}
@@ -1148,7 +1148,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					catch (Exception ex)
 					{
-						Database.LogException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
 					}
 
 				}
@@ -1175,7 +1176,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					catch (Exception ex)
 					{
-						Database.LogException("ItemExt.AddDisplayTabsState", ex);
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
 					}
 				}
 			}
@@ -1192,8 +1194,13 @@ namespace VEPROMS.CSLA.Library
 						cm.CommandType = CommandType.StoredProcedure;
 						cm.CommandText = "GetDisplayTabdata";
 						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@UserID", UserID);				
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						//cm.ExecuteNonQuery();						
 						SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
 
 						SqlDataReader reader = cm.ExecuteReader();
 						DataTable dt = new DataTable();
@@ -1203,10 +1210,8 @@ namespace VEPROMS.CSLA.Library
 					}
 					catch (Exception ex)
 					{
-						//B2025-004
-						//if it fails loading previously open tabs, simply treat it as if no tabs were open
-						//instead of crashing
-						return new DataTable();
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
 					}
 
 				}

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

@@ -1,90 +0,0 @@
-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);
-			}
-
-		}
-		#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

@@ -103,9 +103,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\VEPROMS User Interface\Properties\Settings.Designer.cs">
-      <Link>Properties\Settings.Designer.cs</Link>
-    </Compile>
     <Compile Include="Config\AnnotationTypeConfig.cs" />
     <Compile Include="Config\AssocConfig.cs" />
     <Compile Include="Config\ColorConfig.cs" />
@@ -383,7 +380,6 @@
     <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" />
@@ -422,7 +418,6 @@
       <DependentUpon>frmRofstLoadStatus.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

PROMS/Volian.Base.Library/RtfTools.cs

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

PROMS/Volian.Base.Library/VlnSettings.cs

@@ -201,13 +201,6 @@ namespace Volian.Base.Library
 		{
 			get { return VlnSettings._StepTypeToolTip; }
 			set { VlnSettings._StepTypeToolTip = value; }
-		}
-			// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-		private static bool _cbShwRplWrdsColor = false;
-		public static bool cbShwRplWrdsColor
-		{
-			get { return VlnSettings._cbShwRplWrdsColor; }
-			set { VlnSettings._cbShwRplWrdsColor = value; }
 		}
 		private static string _ReleaseMode = null;
 		public static string ReleaseMode

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -236,11 +236,7 @@ namespace Volian.Controls.Library
 			else
 			{
 				StringBuilder sb = new StringBuilder();
-				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("Changing the applicability for this step will invalidate a transition in the following steps...");
 				sb.AppendLine();
 				// B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external
 				//	determine this by looking strings for source and target (to), if procedure level and internal the target starts

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -587,13 +587,6 @@ namespace Volian.Controls.Library
 
 			if (forceReload || RoTreeNeedsReloaded || tvROFST.Nodes == null || tvROFST.Nodes.Count <= 0)
 			{
-				//B2025-008
-				//in cases where a RO table is clicked on
-				//it will refresh the list
-				//temp store what the ROID was before the list refreshes
-				//so can go to it after the refresh
-				string tmpROID = CurROLink?.ROID;
-
 				ROFSTLookup.rodbi[] dbs = MyROFSTLookup.GetRODatabaseList(true);
 
 				// B2022-123: RO Tab Treeview not showing correct RO values when switching between procedures.
@@ -616,8 +609,6 @@ namespace Volian.Controls.Library
 				_currDocVersionID = null;
 
 				if(_docVersionInfo != null) _currDocVersionID = (int?)_docVersionInfo.VersionID;
-
-				if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
 			}
 
 			var unitInfoNode = tvROFST.Nodes.Cast<TreeNode>().Where(x => x.Text == "Unit Information").FirstOrDefault();
@@ -1087,13 +1078,7 @@ namespace Volian.Controls.Library
 					}
 					else if (searchValue.Contains("#Link:ReferencedObject")) // RO Link (roid)
 					{
-						// we where only removing the END if the searchValue ended in "1[END>"
-						// but sometimes it ended in "2[END>" and cause a null reference error
-						// - was seen only running via Visual Studio debugger
-						// I cleaned up the code to remove in ether case so that we get the expected roid value  - jsj 11-18-2024
-						string substr = searchValue.Substring(searchValue.LastIndexOf(" "));
-						if (substr.Contains("[END>"))
-							searchValue = searchValue.Substring(0, searchValue.Length - substr.Length);
+						searchValue = searchValue.Replace("1[END>", string.Empty).Trim();
 						string roid = ROFSTLookup.FormatRoidKey(searchValue.Substring(searchValue.LastIndexOf(" ")), true);
 
 						if (roid != selectedChld.roid)

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.xpSelROs);
 			this.Controls.Add(this.xpSetToReport);
+			this.Controls.Add(this.xpSelROs);
 			this.Controls.Add(this.tctrlReports);
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplayReports";

PROMS/Volian.Controls.Library/DisplayReports.cs

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

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

@@ -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 search";
+			this.cmboTreeROs.WatermarkText = "Select an RO to seach";
 			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_clean";
+		private string _DisplayMember = "SearchPath";
 		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_clean" || _DisplayMember == "ShortSearchPath_clean")
+			if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath")
 			{
 				cbSorted.Checked = false;
 				cbSorted.Enabled = false;
@@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library
 			switch (cmbResultsStyle.Text)
 			{
 				case "Document Path":
-					_DisplayMember = "SearchDVPath_clean";
+					_DisplayMember = "SearchDVPath";
 					break;
 				case "Step Path":
-					_DisplayMember = "ShortSearchPath_clean";
+					_DisplayMember = "ShortSearchPath";
 					break;
 				case "Annotation Text":
 					_DisplayMember = "SearchAnnotationText";
@@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library
 					_DisplayMember = "DisplayText";
 					break;
 				default:
-					_DisplayMember = "SearchPath_clean";
+					_DisplayMember = "SearchPath";
 					break;
 			}
 			DisplayResults();
@@ -2362,17 +2362,6 @@ namespace Volian.Controls.Library
 				if (n.Nodes != null && n.Nodes.Count > 0 && n.Nodes[0].Text != DummyNodeText) CheckTreeNodeChildren(n.Nodes);
 				checkingChildren = false;
 			}
-			else
-            {
-				//C2025-005 Find Step Elements
-				//uncheck the parents if there are any
-				DevComponents.AdvTree.Node tmp_n = n;
-				while (tmp_n.Parent != null)
-				{
-					tmp_n = tmp_n.Parent;
-					tmp_n.Checked = false;
-				}
-			}
 
 			// if the selected folder has a docversion, handle it:
 			if (n.Tag != SelectAllProcedureSetsText)
@@ -2390,26 +2379,6 @@ namespace Volian.Controls.Library
 
 			SetupContextMenu();
 			buildSetToSearchPanelTitle();
-
-			//C2025-005 Find Step Elements
-			//Need to refresh the Doc List and Available Step Types
-			//if All Procedure Sets was selected
-			if (n.Tag == SelectAllProcedureSetsText)
-			{
-				if (n.Checked)
-				{
-					checkingChildren = true;
-					foreach (Node node in advTreeProcSets.Nodes[0].Nodes)
-					{
-						node.Checked = true;
-						CheckTreeNodeChildren(node.Nodes);
-					}
-					checkingChildren = false;
-				}
-				RefreshLstCheckedDocVersions();
-				RefreshStepTypes();
-			}
-
 		}
 
 		// check all folder nodes below this
@@ -2483,19 +2452,14 @@ namespace Volian.Controls.Library
 			ResetStepTypes("....select a procedure set for types to appear...");
 		}
 
-		//C2025-005 Find Step Elements
-		//improve messaging when multiple formats
-		private void ResetStepTypes(params string[] strs)
+		private void ResetStepTypes(string str)
 		{
 			advTreeStepTypes.Nodes.Clear();
 			lstCheckedStepTypes.Clear();
 			lstCheckedStepTypesStr.Clear();
-			foreach (string str in strs)
-			{
-				Node newnode = new DevComponents.AdvTree.Node();
-				newnode.Text = str;
-				advTreeStepTypes.Nodes.Add(newnode);
-			}
+			Node newnode = new DevComponents.AdvTree.Node();
+			newnode.Text = str;
+			advTreeStepTypes.Nodes.Add(newnode);
 			buildStepTypePannelTitle();
 		}
 
@@ -2522,11 +2486,7 @@ namespace Volian.Controls.Library
 			{
 				if (formatName != dvi.ActiveFormat.Name)
 				{
-					//C2025-005 Find Step Elements
-					//improve messaging when multiple formats
-					string frmt1 = $"    Format is {formatName} before {dvi.MyFolder.Name}";
-					string frmt2 = $"    which begins format: {dvi.ActiveFormat.Name}";
-					ResetStepTypes("...folders selected include multiple formats.", frmt1, frmt2);
+					ResetStepTypes("...folders selected include multiple formats");
 					return;
 				}
 			}

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -16,6 +16,12 @@ namespace Volian.Controls.Library
 	public delegate ItemInfo DisplayTabControlEditorSearchIncTransEvent(object sender, vlnTreeItemInfoEventArgs args);
 	public delegate void DisplayTabControlEvent(object sender, EventArgs args);
 	public delegate void DisplayTabControlStatusEvent(object sender, DisplayTabControlStatusEventArgs args);
+	public class DisplayTabData
+	{
+		public int ItemID { get; set; }
+		public string DisplayTabID { get; set; }
+		public string DisplayTabName { get; set; }
+	}
 	public partial class DisplayTabControlStatusEventArgs : EventArgs
 	{
 		private VolianStatusType _Type;
@@ -1145,6 +1151,9 @@ namespace Volian.Controls.Library
 			}
 			else // If not already open, create a new Page
 			{
+
+				List<DisplayTabData> DisplayTabs = new List<DisplayTabData>();
+
 				pg = new DisplayTabItem(this.components, this, proc, key); // Open a new Procedure Tab
 				_MyDisplayTabItems.Add(key, pg);
 				if (setFocus)

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -124,7 +124,6 @@ namespace Volian.Controls.Library
 		private void ClearControls()
 		{
 			cmbCheckoff.Enabled = false;
-			cmbShwRplWds.Enabled = false; 
 			cbPageBreak.Enabled = false;
 			cbPrefPageBreak.Enabled = false;
 			cbPlaceKeeper.Enabled = false;
@@ -142,10 +141,7 @@ namespace Volian.Controls.Library
 			tbChgID.Text = "";
 			tbChgID.Enabled = false;
 			lblChgId.Visible = tbChgID.Visible = false;
-			btnSaveChangeID.Enabled = btnSaveChangeID.Visible = false;
 			CurItemInfo = null;
-			cbInitialLine.Visible = cbInitialLine.Enabled = false;
-
 		}
 		private bool StepOverRide()
 		{
@@ -260,7 +256,6 @@ namespace Volian.Controls.Library
 			groupPanelChgStepType.Style.BackColor = Color.Cornsilk;
 			groupPanelPaginate.Style.BackColor = Color.Cornsilk;
 			groupPanelCheckoff.Style.BackColor = Color.Cornsilk;
-			groupPanelcmbShwRplWds.Style.BackColor = Color.Cornsilk;
 			groupPanelIncludeOn.Style.BackColor = Color.Cornsilk;
 			groupPanelWcnTrnResp.Style.BackColor = Color.Cornsilk;
 			groupPanelFigSize.Style.BackColor = Color.Cornsilk;
@@ -301,21 +296,10 @@ namespace Volian.Controls.Library
 			// in certain cases, the checkbox control should be disabled, check for this stuff now...
 			int formatSteptype = CurItemInfo.FormatStepType;
 			cmbCheckoff.Enabled = true;
-				// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-			cmbShwRplWds.Enabled = true; // new show replace words
-			if (cmbShwRplWds.Visible)
-			{
-				cmbShwRplWds.SelectedIndex = 0;
-				//StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-				cmbShwRplWds.Enabled = true;
-				cmbShwRplWds.SelectedIndex = sc.Step_ShwRplWdsIndex;
-			}
 			if ((CurItemInfo.IsCaution || CurItemInfo.IsNote) & !fmtdata.SectData.StepSectionData.StepSectionLayoutData.TieTabToLevel)
 				cmbCheckoff.Enabled = false;
-
 			if (CurItemInfo.IsRNOPart && sc != null && sc.Step_CheckOffIndex != -1 && !fmtdata.StepDataList[formatSteptype].CheckOffSameAsParent)
-				cmbCheckoff.Enabled = false;                    // Checkoffs already assigned to RNO.
-
+				cmbCheckoff.Enabled = false;					// Checkoffs already assigned to RNO.
 			if (StepOverRide()) cmbCheckoff.Enabled = false;	// Checkoffs already assigned to AER
 
 			//// if there are no checkoffs OR
@@ -522,10 +506,9 @@ namespace Volian.Controls.Library
 				tbChgID.Text = sc1.Step_ChangeID;
 				tbChgID.Enabled = true;
 				lblChgId.Visible = tbChgID.Visible = true;
-				btnSaveChangeID.Enabled = btnSaveChangeID.Visible = true;
 			}
 			else
-				lblChgId.Visible = tbChgID.Visible = btnSaveChangeID.Enabled = btnSaveChangeID.Visible = false;
+				lblChgId.Visible = tbChgID.Visible = false;
 
 			// Walk up tree until this step type's parentType is "Base".  Start adding menuitems from this step type.
 			StepData top = fmtdata.StepDataList[formatSteptype];
@@ -547,7 +530,7 @@ namespace Volian.Controls.Library
 				tbRespons.Text = sc2.Step_Responsibility;
 			}
 			// diable fields if user is only a reviewer
-			groupPanelCheckoff.Enabled = groupPanelChgBar.Enabled = groupPanelChgStepType.Enabled = groupPanelIncludeOn.Enabled = groupPanelPaginate.Enabled = groupPanelWcnTrnResp.Enabled = groupPanelcmbShwRplWds.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); // Can Change Tag Info
+			groupPanelCheckoff.Enabled = groupPanelChgBar.Enabled = groupPanelChgStepType.Enabled = groupPanelIncludeOn.Enabled = groupPanelPaginate.Enabled = groupPanelWcnTrnResp.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); // Can Change Tag Info
 
 			// C2021-015: Barakah - High Level Steps in Table of Contents.  Make the check box visible if format has TofCAllowHLS and
 			//	if format allow this and on a HLS, get the database from step's config to see if included and set checkbox accordingly.
@@ -570,16 +553,6 @@ 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)
@@ -809,12 +782,6 @@ namespace Volian.Controls.Library
 			if (Visible == true && NotVisibleEditItem != null)
 				MyEditItem = NotVisibleEditItem;
 		}
-		private void groupPanelcmbShwRplWds_VisibleChanged(object sender, EventArgs e)
-		{
-			// If it becomes visible, update the panel
-			if (Visible == true && NotVisibleEditItem != null)
-				MyEditItem = NotVisibleEditItem;
-		}
 		private void rbChgBarOvrRideOn_CheckedChanged(object sender, EventArgs e)
 		{
 			if (_Initalizing) return;
@@ -883,28 +850,20 @@ namespace Volian.Controls.Library
 			//  cnt.Save();
 			//}
 		}
-		// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
-		private void cmbShwRplWds_SelectedIndexChanged(object sender, EventArgs e)  //  new  show replace words
-		{
-
-			// --------
-
-			if (_Initalizing) return;
-			MyEditItem.SaveContents();
-			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-			if (sc == null) return;
-			MyEditItem.ChangeBarForConfigItemChange = false;
-			//sc.Step_DisableInitialLine = cbInitialLine.Checked;
-			sc.Step_ShwRplWdsIndex = cmbShwRplWds.SelectedIndex;
-			MyEditItem.ChangeBarForConfigItemChange = true;
-
-		
-		//needed to refresh display changing
-			MyEditItem.RefreshContent();
-			MyEditItem.SetAllTabs();
-		}
 		#endregion
 
+		private void tbChgID_TextChanged(object sender, EventArgs e)
+		{
+			MyEditItem.SaveContents();
+			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+			// if the changeID changed, then reset the change bar override
+			// B2021-029: don't change changeid if the config & text box are both empty
+			if (sc.Step_ChangeID != tbChgID.Text && sc.Step_ChangeID != null && tbChgID.Text != "")
+			{
+				sc.Step_ChangeID = tbChgID.Text;
+				sc.Step_CBOverride = null;
+			}
+		}
 		#region WCNTRN format
 		// The following supports the Wolf Creek Training format/Responsibility data
 		// off of the High Level Step
@@ -1010,39 +969,6 @@ namespace Volian.Controls.Library
 			sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
 			MyEditItem.ChangeBarForConfigItemChange = true;
 		}
-
-        private void cbInitialLine_CheckedChanged(object sender, EventArgs e)
-        {
-			if (_Initalizing) return;
-			MyEditItem.SaveContents();
-			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-			if (sc == null) return;
-			MyEditItem.ChangeBarForConfigItemChange = false;
-			sc.Step_DisableInitialLine = cbInitialLine.Checked;
-			MyEditItem.ChangeBarForConfigItemChange = true;
-
-			//needed to refresh display changing
-			MyEditItem.RefreshContent();
-			MyEditItem.SetAllTabs();
-
-		}
-
-		//B2025-010 PROMS -Fixed issues updating Changeid
-		// Changed to a Save button instead of onTextChanged
-		// Also was issue where sometimes would lave last character / digit (not allowing the change id to be completely removed)
-		private void btnSaveChangeID_Click(object sender, EventArgs e)
-		{
-			MyEditItem.SaveContents();
-			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-			// if the changeID changed, then reset the change bar override
-			// B2021-029: don't change changeid if the config & text box are both empty
-			if (sc.Step_ChangeID != tbChgID.Text && (!string.IsNullOrEmpty(sc.Step_ChangeID) || !string.IsNullOrEmpty(tbChgID.Text)))
-			{
-				sc.Step_ChangeID = tbChgID.Text;
-				sc.Step_CBOverride = null;
-			}
-		}
-
 		//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
 		//{
 		//	// User left Atlernate Continuous Action Text field.  If text changed, then prompt

PROMS/Volian.Controls.Library/DisplayTags.resx

@@ -121,6 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>132</value>
+    <value>36</value>
   </metadata>
 </root>

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

@@ -28,507 +28,488 @@ 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.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" +
+			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" +
             "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, 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" +
+			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" +
             "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, 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" +
+			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" +
             "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";
-            // 
-            // 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);
+			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);
 
 		}
 
@@ -554,6 +535,5 @@ 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,31 +27,7 @@ namespace Volian.Controls.Library
 			set 
 			{
 				if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
-				//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 (value == null)			// Insert a transition
 				{
 					if (MyRTB == null) return;
 					if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return;
@@ -139,13 +115,19 @@ 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)
 		{
-			CurTrans = args.MyLinkText.MyTransitionInfo;
+			//if (_MyRTB.MyLinkText == null)
+			//  CurTrans = null;
+			//else
+			//{
+			//  StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
+				CurTrans = args.MyLinkText.MyTransitionInfo;
+			//}
 		}
 		private ItemInfo _CurrentItemProcedure;		// the selected item's procedure
 		private ItemInfo _CurrentToProcedure;		// the 'to' location's procedure (may be same as _CurrentItemProcedure)
@@ -156,12 +138,6 @@ 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()
@@ -261,7 +237,7 @@ namespace Volian.Controls.Library
 				if (selitm != null && selitm.MyContent.Type >= 20000)
 				{
 					
-					if (_DoingRange && CurTrans != null)
+					if (_DoingRange)
 					{
 						tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1);
 					}
@@ -962,17 +938,6 @@ 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}
@@ -1124,18 +1089,6 @@ 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))
@@ -1417,13 +1370,6 @@ 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
@@ -1543,34 +1489,8 @@ namespace Volian.Controls.Library
 				btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
 			}
 		}
-
-		//CSM-C2024-026 Evaluate the transitions panel
-		//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
-		//If checkbox is checked to enable holding an item,
-		//then store the currently selected item
-		//if checkbox becomes unchecked then clear item.
-		private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e)
-        {
-			if (cbHoldProcSet.Checked)
-			{
-				VETreeNode vt = tvTran.SelectedNode as VETreeNode;
-				ItemInfo selii = vt.VEObject as ItemInfo;
-				if (selii != null)
-				{
-					HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
-					HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
-					HeldLink_CurItemFrom = selii;
-				}
-			}
-			else
-			{
-				HeldLinkText = "";
-				HeldLink_CurItemFrom = null;
-				HeldLink_TranFmtIndx = 0;
-			}
-        }
-    }
-    public class TransItem
+	}
+	public class TransItem
 	{
 		private string _ItemDescription;
 

PROMS/Volian.Controls.Library/DisplayTransition.resx

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

PROMS/Volian.Controls.Library/EditItem.cs

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

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

@@ -279,24 +279,18 @@ 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);
@@ -311,16 +305,12 @@ 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});
@@ -576,9 +566,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/FormatUtility.cs

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

PROMS/Volian.Controls.Library/StepPanel.cs

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

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -11,7 +11,6 @@ using System.Text.RegularExpressions;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
-using System.Linq;
 
 namespace Volian.Controls.Library
 {
@@ -486,8 +485,6 @@ namespace Volian.Controls.Library
 		public void RefreshDisplay(bool activeMode)
 		{
 			if (IsExperimenting) return;
-			if (IsDisposed) return;
-
 			ActiveMode = activeMode;
 			OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
 			//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");
@@ -1284,9 +1281,9 @@ namespace Volian.Controls.Library
 			}
 			selectedRtfSB.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 " + myFont.FontFamily.Name + @";}"); //}\f0\fs" + this.Font.SizeInPoints * 2 + @" " + myDisplayTextElement.Text + @"}}";
             if (!isFixed)
-                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}");  // C2017-036 get best available proportional font for symbols
+                selectedRtfSB.Append(@"{\f1\fnil\fcharset0 " + Volian.Base.Library.vlnFont.ProportionalSymbolFont + @";}}{\colortbl ;\red255\green0\blue0;}"); // C2017-036 get best available proportional font for symbols
             else
-				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}");  // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
+				selectedRtfSB.Append(@"{\f1\fnil\fcharset0 FreeMono;}}{\colortbl ;\red255\green0\blue0;}");  // FreeMono is now used for the edit screen only.  VESymbFix and Consolas are used for printing
 			selectedRtfSB.Append("\r\n");
 			// use styles to construct rtf commands to insert into next line (where \b, etc is)
 			// B2015-134 Hanging Indent with Hard Returns was not being saved- removed \sl-240\slmult0
@@ -1405,7 +1402,7 @@ namespace Volian.Controls.Library
 			linkValue = linkValue.Replace("\\u916?", "\\f1\\u916?\\f0 ");
 			linkValue = linkValue.Replace(@"{", @"\{");
 			linkValue = linkValue.Replace(@"}", @"\}");
-			SelectedRtf = @"{\rtf1\ansi" + FontTable + @"{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}\v" + FontSize + @" <START]\v0\cf1 " + linkValue + @"\cf0\v " + linkUrl + @"[END>\v0 }";
+			SelectedRtf = @"{\rtf1\ansi" + FontTable + @"{\colortbl ;\red255\green0\blue0;}\v" + FontSize + @" <START]\v0\cf1 " + linkValue + @"\cf0\v " + linkUrl + @"[END>\v0 }";
 			this.SelectionLength = 0;
 			this.SelectionStart = position;
 			FindAllLinks();
@@ -2856,10 +2853,7 @@ namespace Volian.Controls.Library
 			return false;
 		}
 
-		//CSM B2023-095/U2022-004 When Copy/Pasting Symbols, some of the symbols paste in an incorrect font
-		//   Changed this to put in the unicode code for any symbols outside the normal ascii range
-		// if supplied convertunicode flag is true
-		public string GetPasteText(bool PasteNoReturnsSetting, IDataObject myDO, bool convertunicode = false)
+		public string GetPasteText(bool PasteNoReturnsSetting, IDataObject myDO)
 		{
 			// B2021-0039: symbols not pasting correctly from ctrl-v:
 			//	get base list of valid symbols, use base format if MyItemInfo is null.  Use symbols from
@@ -2875,31 +2869,40 @@ namespace Volian.Controls.Library
 			ptext = ptext.TrimEnd("\r\n\t ".ToCharArray());
 			if (PasteNoReturnsSetting) ptext = ptext.Replace("\r\n", " ");
 
-            StringBuilder sb = new StringBuilder();
+			StringBuilder sb = new StringBuilder();
+			bool didCharReplace = false;
 			bool hasBadChar = false;
-			foreach (char c in ptext)
-            {
-				if ((c > 0x7e))
+			for (int i = 0; i < ptext.Length; i++)
+			{
+				didCharReplace = false;
+				string sym = string.Format(@"{0}", Convert.ToInt32(ptext[i]));
+				if ((ptext[i] > 0x7e))
 				{
 					// is this an allowable symbol/character:
-					if (allowableSymbols.Any(x => x == $@"{(short)c}"))
-					{
-						if (convertunicode)
-							sb.Append($"\\u{(short) c}?");
-						else
-							sb.Append(c);
+					for (int j = 0; j < sl.Count; j++)
+				{
+						if (sym == allowableSymbols[j])
+						{
+							sb = sb.Append((char)(Convert.ToInt32(allowableSymbols[j])));
+							didCharReplace = true;
+							break;
+						}
 					}
-					else
+					// if not allowable, put in a "?" and give a message to user (below)
+					if (!didCharReplace)
 					{
+						sb = sb.Append("?");
+					didCharReplace = true;
 						hasBadChar = true;
-						sb.Append("?");
-					}
 				}
-				else
-					sb.Append(c);
-            }
-            ptext = sb.ToString();
-            ptext = ptext.Replace("\u2013", "-"); // Replace EN Dash with hyphen
+				if (!didCharReplace)
+					sb = sb.Append(ptext[i]);
+			}
+				if (!didCharReplace)
+					sb = sb.Append(ptext[i]);
+			}
+			ptext = sb.ToString();
+			ptext = ptext.Replace("\u2013", "-"); // Replace EN Dash with hyphen
 			ptext = ptext.Replace("\u2014", "-"); // Replace EM Dash with hyphen
 			ptext = ptext.Replace("\u2011", "-"); // Replace non-breaking hyphen with hyphen
 			ptext = ptext.Replace("\u2572", "\\"); // Replace backslash symbol with backslash character

PROMS/Volian.Controls.Library/StepTabRibbon.cs

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

PROMS/Volian.Print.Library/PDFChronologyReport.cs

@@ -308,7 +308,7 @@ namespace Volian.Print.Library
 				h.Font = f3;
 				string actionWhat = (cai.ActionWhat == "Added" && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.ChangeBarDate ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
+					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
 				else
 					h.Add(actionWhat);
 				if (cai.DTS > maxDTS)
@@ -409,7 +409,7 @@ namespace Volian.Print.Library
 						else if (cai.Type > 20099)		// B2020-054: Always put out 'Equation' (removed checking for null text)
 							txt = "Equation";
 						else
-							txt = ItemInfo.ConvertToDisplayText(cai.Text).Replace("Go to \u25cf", "Go to ?");
+							txt = ItemInfo.ConvertToDisplayText(cai.Text);
 						if (MyProc.MyDocVersion.MultiUnitCount > 1)
 						{
 							System.Xml.XmlNode nd;
@@ -1465,7 +1465,7 @@ namespace Volian.Print.Library
 				//				h.Add(cai.ActionWhen > MyProc.DTS ? cai.ActionWhat : "Original");
 				string actionWhat = ((cai.ActionWhat == "Added" || cai.ActionWhat == "Changed") && cai.DTS <= MyProc.ChangeBarDate) ? "Original" : cai.ActionWhat;	//(cai.ActionWhat == "Added" && cai.DTS <= MyProc.DTS) ? "Original" : cai.ActionWhat != "Changed" ? cai.ActionWhat : cai.DTS <= maxDTS ? "Restored" : cai.DTS > MyProc.DTS ? cai.ActionWhat : "Original";
 				if (actionWhat == "Deleted" || actionWhat == "Restored")
-					h.Add(actionWhat + "\r\n" + (cai.ActionWhen < cai.DTS ? cai.DTS.ToString("M/dd/yyyy") : cai.ActionWhen.ToString()));
+					h.Add(actionWhat + "\r\n" + cai.ActionWhen.ToString());
 				else
 					h.Add(actionWhat);
 				c = new PdfPCell(h);
@@ -1570,7 +1570,7 @@ namespace Volian.Print.Library
 						else if (cai.Type > 20099)
 							txt = "Equation";
 						else
-							txt = ItemInfo.ConvertToDisplayText(cai.Text).Replace("Go to \u25cf", "Go to ?");
+							txt = ItemInfo.ConvertToDisplayText(cai.Text);
 						// Add Parent/Child information if applicable
 						// We were doing this for the Chronology report so I added the same logic here for the Summary report
 						if (MyProc.MyDocVersion.MultiUnitCount > 1)

PROMS/Volian.Print.Library/PDFReport.cs

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

PROMS/Volian.Print.Library/PromsPrinter.cs

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

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -226,8 +226,6 @@ 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;
 						}
@@ -275,8 +273,6 @@ 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;
@@ -3785,12 +3781,7 @@ 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
-                    {
-						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);
-					}
+						mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, itemInfo.MyTab.CleanText, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
 					PartsLeft.Add(mytab);
 					if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro);
 				}
@@ -5501,53 +5492,24 @@ 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.IsInCautionOrNote)
+			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
 			{
-				float adjLastBlankLineInNoteCautionWarning = 0;
-				// Get the box information for the Note, Caution, or Warning
-				ItemInfo tifo = (MyItemInfo.IsCaution || MyItemInfo.IsNote) ? MyItemInfo : MyItemInfo.ParentNoteOrCaution;
-				int typ = ((int)tifo.MyContent.Type) % 10000;
-				int? bxIndx = tifo.ActiveFormat.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
-				if (bxIndx != null)
+				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null))    // there are no sub-steps, see if any parents have next
 				{
-					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
 					{
-						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 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;
 				}
+				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;
 
@@ -5830,7 +5792,6 @@ 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)
 			{
@@ -5840,8 +5801,7 @@ 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
-					adjmentAfterBoxedNoteCautionTab = (float) (bx.AdjSpAftTab ?? 0); // F2024-078 save the adjustment of the space (line) after the Note/Caution tab
+						xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2));	// xoff starts as left margin
 				}
 				else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote))	// C2014-009
 					xoff = XOffset + (para.Width / 2) - (hdrWidth / 2);
@@ -5876,7 +5836,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) + adjmentAfterBoxedNoteCautionTab; // F2024-078 add adjustment to the space after the Note/Caution tab
+			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0);
 		}
 		private float AdjustToCharPosition(float position, float? CPI)
 		{
@@ -6887,13 +6847,7 @@ namespace Volian.Print.Library
 			}
 			else if (itemInfo.IsSection)
 			{
-				// B2023-074 The itemInfo we are processing is a section (number and title). Change maxRNO to zero to getting the width.
-				//           The Width is used when printing the section number and title (when the check box on the properties page is checked)
-				//           and is assumemed the section is a single column section (maxRNO = 0) and uses the format variable WidSTablePrint
-				//           which holds the widths for then the section has one column, two column, or three column.
-				//           For printing section numbers and titles like this, we always want to accomodate for lone section title text.
-				//           So the initial width should always be set to the one column width value so that it can spane across the page.
-				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, 0);
+				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO);
 				float adjwidths = 0;
 				adjwidths = AdjustMetaWidth(itemInfo, formatInfo, adjwidths, false);
 				Width += (adjwidths + _WidthAdjust);