B2024-068-VCS-Deviation-Format

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

@@ -188,23 +188,23 @@ namespace ROEditor
 				lboxInUse.Visible = true;
 				lb_chkApplc.Visible = false;
 			}
-			if (editlevel == (uint)RecordType.GroupSchema) this.Text = "Subgroup Definition";
+			if (editlevel==(uint)RecordType.GroupSchema)this.Text = "Subgroup Definition";
 			FillInData(grptxt);
 		}
 
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
-		protected override void Dispose(bool disposing)
+		protected override void Dispose( bool disposing )
 		{
-			if (disposing)
+			if( disposing )
 			{
-				if (components != null)
+				if(components != null)
 				{
 					components.Dispose();
 				}
 			}
-			base.Dispose(disposing);
+			base.Dispose( disposing );
 		}
 		
 		private void FillInAvailable()
@@ -212,9 +212,9 @@ namespace ROEditor
 			ROField rof;
 			
 			// put the items in the AvailList box.
-			for (int i = 0; i < AvailList.Count; i++)
+			for (int i=0; i< AvailList.Count; i++)
 			{
-				rof = (ROField)AvailList[i];
+				rof = (ROField) AvailList[i];
 				if (rof.GetFieldname != null)   // DO YET: Why null?
 					this.lboxAvail.Items.Add(rof.GetFieldname);
 			}
@@ -297,7 +297,7 @@ namespace ROEditor
 					else
 						parent = null;
 				}
-				if (menuitm != "")
+				if (menuitm !="")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
@@ -310,21 +310,21 @@ namespace ROEditor
 				this.lblRetVal.Visible = true;
 				VlnXmlElement parent;
 				parent = (VlnXmlElement) elem.ParentNode;
-				while (parent != null && (menuitm == "" || retval == ""))
+				while (parent != null && (menuitm == "" || retval==""))
 				{
 					// walk up tree to get parent and check for data there
 					if (menuitm == "") menuitm = parent.GetAttribute("MenuItem");
 					if (retval == "") retval = parent.GetAttribute("RetVal");
 					if (parent.Name != "RO_Root")
-						parent = (VlnXmlElement)parent.ParentNode;
+						parent = (VlnXmlElement) parent.ParentNode;
 					else
 						parent = null;
 				}
-				if (menuitm != "")
+				if (menuitm!="")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
-				if (retval != "")
+				if (retval!="")
 					this.tbRetVal.Text = CvtFldToUserFld(retval);
 				else
 					this.tbRetVal.Text = "";
@@ -344,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;
@@ -1198,7 +1097,6 @@ namespace ROEditor
 				}
 			}
 			
-			string origname = CvtFldToUserFld(rof.GetFieldname);
 			uint ftype = rof.GetFieldType;
 			if (ftype == (uint)FieldTypes.FrmtSingleTxt || ftype == (uint)FieldTypes.VariableTxt ||
 				ftype == (uint)FieldTypes.SingleTxt || ftype == (uint)FieldTypes.Table || 
@@ -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.cs

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

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

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
-        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.
@@ -1475,14 +1486,11 @@ namespace ctlXMLEditLib
 				FileInfo ifi = new FileInfo(fnamebox.Text);
 				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);
+					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/DlgPrintProcedure.Designer.cs

@@ -97,12 +97,12 @@ namespace VEPROMS
 			this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
 			this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
 			this.groupPag = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.cbxGenerateTimeCritActSum = new System.Windows.Forms.CheckBox();
 			this.expPrnSetting = new DevComponents.DotNetBar.ExpandablePanel();
 			this.ppGpDuplex = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.tbBlankPage = new DevComponents.DotNetBar.Controls.TextBoxX();
 			this.lblBlPg = new DevComponents.DotNetBar.LabelX();
 			this.swtbtnPDFdtPrefixSuffix = new DevComponents.DotNetBar.Controls.SwitchButton();
+			this.cbxGenerateTimeCritActSum = new System.Windows.Forms.CheckBox();
 			this.gpnlDebug.SuspendLayout();
 			this.grpDateSelector.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
@@ -1285,23 +1285,6 @@ namespace VEPROMS
 			this.groupPag.TabIndex = 111;
 			this.groupPag.Text = "Print using standard PROMS pagination rules by:";
 			// 
-			// cbxGenerateTimeCritActSum
-			// 
-			this.cbxGenerateTimeCritActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.cbxGenerateTimeCritActSum.AutoSize = true;
-			this.cbxGenerateTimeCritActSum.BackColor = System.Drawing.Color.Transparent;
-			this.cbxGenerateTimeCritActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.cbxGenerateTimeCritActSum.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.cbxGenerateTimeCritActSum.Location = new System.Drawing.Point(240, 273);
-			this.cbxGenerateTimeCritActSum.Margin = new System.Windows.Forms.Padding(2);
-			this.cbxGenerateTimeCritActSum.Name = "cbxGenerateTimeCritActSum";
-			this.cbxGenerateTimeCritActSum.Size = new System.Drawing.Size(294, 17);
-			this.cbxGenerateTimeCritActSum.TabIndex = 102;
-			this.cbxGenerateTimeCritActSum.Text = "Generate Time Critical Action Summary (hidden but used)";
-			this.cbxGenerateTimeCritActSum.UseVisualStyleBackColor = false;
-			this.cbxGenerateTimeCritActSum.Visible = false;
-			// 
 			// expPrnSetting
 			// 
 			this.expPrnSetting.CanvasColor = System.Drawing.SystemColors.Control;
@@ -1438,6 +1421,23 @@ namespace VEPROMS
 			this.swtbtnPDFdtPrefixSuffix.TabIndex = 111;
 			this.swtbtnPDFdtPrefixSuffix.ValueChanged += new System.EventHandler(this.swtbtnPDFdtPrefixSuffix_ValueChanged);
 			// 
+			// cbxGenerateTimeCritActSum
+			// 
+			this.cbxGenerateTimeCritActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.cbxGenerateTimeCritActSum.AutoSize = true;
+			this.cbxGenerateTimeCritActSum.BackColor = System.Drawing.Color.Transparent;
+			this.cbxGenerateTimeCritActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.cbxGenerateTimeCritActSum.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.cbxGenerateTimeCritActSum.Location = new System.Drawing.Point(240, 273);
+			this.cbxGenerateTimeCritActSum.Margin = new System.Windows.Forms.Padding(2);
+			this.cbxGenerateTimeCritActSum.Name = "cbxGenerateTimeCritActSum";
+			this.cbxGenerateTimeCritActSum.Size = new System.Drawing.Size(294, 17);
+			this.cbxGenerateTimeCritActSum.TabIndex = 102;
+			this.cbxGenerateTimeCritActSum.Text = "Generate Time Critical Action Summary (hidden but used)";
+			this.cbxGenerateTimeCritActSum.UseVisualStyleBackColor = false;
+			this.cbxGenerateTimeCritActSum.Visible = false;
+			// 
 			// DlgPrintProcedure
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

PROMS/VEPROMS User Interface/DlgPrintProcedure.cs

@@ -231,6 +231,7 @@ namespace VEPROMS
 			cbxOpenAfterCreate2.Visible = oneProcedure;
 			cbxOpenAfterCreate2.Checked = false;
 			cbxOverwritePDF2.Visible = oneProcedure;
+			cbxOverwritePDF2.Checked = true;
 			gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
 			swtbtnGeneratePlacekeeper.Value = false;
 			cbxGenerateConActSum.Checked = false;
@@ -1095,15 +1096,6 @@ namespace VEPROMS
 		}
 		private void btnCreatePDF_Click(object sender, EventArgs e)
 		{
-			// B2024-058  Add validation for Revision Date field of the Print dialog
-			if (txbRevDate.Visible)
-			{
-				if (!validateDate(txbRevDate))
-				{
-					//txbRevDate.Focus();
-					return;
-				}
-			}
 			DoCreatePDF();
 		}
 
@@ -1201,47 +1193,16 @@ namespace VEPROMS
 			if (_Initializing) return;
 			ppGpbxUserSpecTxt.Enabled = ppCmbxChgBarTxtType.SelectedIndex == (int)PrintChangeBarText.UserDef;
 		}
-		// B2024-058  Add validation for Revision Date field of the Print dialog
-		private bool validateDate(TextBox txtDate)
-		{
-			DateTime dDate;
-			if (!(txtDate.Text == ""))
-			{
-
-				if (DateTime.TryParse(txtDate.Text, out dDate))
-				{
-					return true;
-				}
-				else
-				{
-					string txtDate2 = txtDate.Text;
-					string message = String.Format("Date {0} in wrong format" + System.Environment.NewLine + "Correct the revision date.", txtDate2);
-					string txtTitle = "Invalid Format";
-					MessageBox.Show(message, txtTitle);
-					return false;
-				}
-			}
-			return true;
-		}
-
 		private void txbRevDate_Enter(object sender, EventArgs e)
 		{
 			txbDate = txbRevDate;
 			grpDateSelector.Text = "Select Revision Date";
 			grpDateSelector.Visible = calDateSelector.Visible = true;
 			//C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date
-			DateTime dDate;
-			// B2024-058  Add validation for Revision Date field of the Print dialog
-			if (!validateDate(txbDate))
-			{
-				txbRevDate.Focus();
-			}
-			else
-			{
-				DateTime initSelDate = (txbDate.Text != null && txbDate.Text.Length != 0) ? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
+			DateTime initSelDate =(txbDate.Text != null && txbDate.Text.Length != 0)? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
 			calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
 		}
-		}
+
 		private void txbRevDate_Leave(object sender, EventArgs e)
 		{
 			if (_Initializing) return;
@@ -1414,7 +1375,6 @@ namespace VEPROMS
 				_NewRevForAllProcs = null;
 		}
 
-
 		//private void cbxDebug_CheckedChanged(object sender, EventArgs e)
 		//{
 		//  cbxCmpPRMSpfd.Visible = cbxDebug.Checked;

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>

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

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

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

@@ -139,7 +139,7 @@
 			// 
 			this.myTV.CheckBoxes = true;
 			this.myTV.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.myTV.Location = new System.Drawing.Point(0, 230);
+			this.myTV.Location = new System.Drawing.Point(0, 184);
 			this.myTV.Name = "myTV";
 			this.myTV.Size = new System.Drawing.Size(291, 310);
 			this.myTV.TabIndex = 4;
@@ -165,7 +165,7 @@
 			this.splitContainer3.Panel2.BackColor = System.Drawing.SystemColors.Control;
 			this.splitContainer3.Panel2.Controls.Add(this.panelEx4);
 			this.splitContainer3.Size = new System.Drawing.Size(1177, 586);
-            this.splitContainer3.SplitterDistance = 525;
+			this.splitContainer3.SplitterDistance = 526;
 			this.splitContainer3.TabIndex = 2;
 			// 
 			// panelEx3
@@ -179,7 +179,7 @@
 			this.panelEx3.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.panelEx3.Location = new System.Drawing.Point(688, 0);
 			this.panelEx3.Name = "panelEx3";
-            this.panelEx3.Size = new System.Drawing.Size(489, 525);
+			this.panelEx3.Size = new System.Drawing.Size(489, 526);
 			this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -198,7 +198,7 @@
 			this.txtResults.Multiline = true;
 			this.txtResults.Name = "txtResults";
 			this.txtResults.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtResults.Size = new System.Drawing.Size(489, 473);
+			this.txtResults.Size = new System.Drawing.Size(489, 474);
 			this.txtResults.TabIndex = 4;
 			// 
 			// panel1
@@ -272,7 +272,7 @@
 			this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 			this.expandableSplitter2.Location = new System.Drawing.Point(682, 0);
 			this.expandableSplitter2.Name = "expandableSplitter2";
-            this.expandableSplitter2.Size = new System.Drawing.Size(6, 525);
+			this.expandableSplitter2.Size = new System.Drawing.Size(6, 526);
 			this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
 			this.expandableSplitter2.TabIndex = 38;
 			this.expandableSplitter2.TabStop = false;
@@ -290,7 +290,7 @@
 			this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left;
 			this.panelEx2.Location = new System.Drawing.Point(391, 0);
 			this.panelEx2.Name = "panelEx2";
-            this.panelEx2.Size = new System.Drawing.Size(291, 525);
+			this.panelEx2.Size = new System.Drawing.Size(291, 526);
 			this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -310,7 +310,7 @@
 			this.txtProcess.Multiline = true;
 			this.txtProcess.Name = "txtProcess";
 			this.txtProcess.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtProcess.Size = new System.Drawing.Size(291, 375);
+			this.txtProcess.Size = new System.Drawing.Size(291, 376);
 			this.txtProcess.TabIndex = 5;
 			// 
 			// pbProcess
@@ -340,7 +340,7 @@
 			this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
 			this.panel3.Location = new System.Drawing.Point(0, 23);
 			this.panel3.Name = "panel3";
-            this.panel3.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+			this.panel3.Padding = new System.Windows.Forms.Padding(6);
 			this.panel3.Size = new System.Drawing.Size(291, 79);
 			this.panel3.TabIndex = 2;
 			// 
@@ -353,7 +353,7 @@
 			this.pnlLater.Enabled = false;
 			this.pnlLater.Location = new System.Drawing.Point(6, 23);
 			this.pnlLater.Name = "pnlLater";
-            this.pnlLater.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+			this.pnlLater.Padding = new System.Windows.Forms.Padding(6);
 			this.pnlLater.Size = new System.Drawing.Size(279, 37);
 			this.pnlLater.TabIndex = 3;
 			// 
@@ -437,7 +437,7 @@
 			this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 			this.expandableSplitter1.Location = new System.Drawing.Point(385, 0);
 			this.expandableSplitter1.Name = "expandableSplitter1";
-            this.expandableSplitter1.Size = new System.Drawing.Size(6, 525);
+			this.expandableSplitter1.Size = new System.Drawing.Size(6, 526);
 			this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
 			this.expandableSplitter1.TabIndex = 4;
 			this.expandableSplitter1.TabStop = false;
@@ -451,7 +451,7 @@
 			this.panelEx1.Dock = System.Windows.Forms.DockStyle.Left;
 			this.panelEx1.Location = new System.Drawing.Point(0, 0);
 			this.panelEx1.Name = "panelEx1";
-            this.panelEx1.Size = new System.Drawing.Size(385, 525);
+			this.panelEx1.Size = new System.Drawing.Size(385, 526);
 			this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@@ -484,8 +484,8 @@
             this.sideNavItmExit});
 			this.sideNav1.Location = new System.Drawing.Point(0, 0);
 			this.sideNav1.Name = "sideNav1";
-            this.sideNav1.Padding = new System.Windows.Forms.Padding(1, 1, 1, 1);
-            this.sideNav1.Size = new System.Drawing.Size(385, 525);
+			this.sideNav1.Padding = new System.Windows.Forms.Padding(1);
+			this.sideNav1.Size = new System.Drawing.Size(385, 526);
 			this.sideNav1.TabIndex = 3;
 			this.sideNav1.Text = "sideNav1";
 			// 
@@ -498,10 +498,9 @@
 			this.sideNavPanel4.Controls.Add(this.myTVdel);
 			this.sideNavPanel4.Controls.Add(this.btnDeleteItems);
 			this.sideNavPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.sideNavPanel4.Location = new System.Drawing.Point(81, 31);
-            this.sideNavPanel4.MinimumSize = new System.Drawing.Size(0, 493);
+			this.sideNavPanel4.Location = new System.Drawing.Point(80, 31);
 			this.sideNavPanel4.Name = "sideNavPanel4";
-            this.sideNavPanel4.Size = new System.Drawing.Size(300, 493);
+			this.sideNavPanel4.Size = new System.Drawing.Size(300, 494);
 			this.sideNavPanel4.TabIndex = 27;
 			// 
 			// swDeleteFolder
@@ -514,7 +513,7 @@
 			this.swDeleteFolder.Name = "swDeleteFolder";
 			this.swDeleteFolder.Size = new System.Drawing.Size(69, 22);
 			this.swDeleteFolder.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
+			this.superTooltip1.SetSuperTooltip(this.swDeleteFolder, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("swDeleteFolder.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 150)));
 			this.swDeleteFolder.SwitchClickTogglesValue = true;
 			this.swDeleteFolder.TabIndex = 39;
 			this.swDeleteFolder.ValueChanged += new System.EventHandler(this.swDeleteFolder_ValueChanged);
@@ -530,7 +529,7 @@
 			this.labelX13.Location = new System.Drawing.Point(85, 42);
 			this.labelX13.Name = "labelX13";
 			this.labelX13.Size = new System.Drawing.Size(168, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 140)));
+			this.superTooltip1.SetSuperTooltip(this.labelX13, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Folders", "", resources.GetString("labelX13.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(350, 175)));
 			this.labelX13.TabIndex = 38;
 			this.labelX13.Text = "Delete Folders";
 			// 
@@ -544,7 +543,7 @@
 			this.swDeleteAnnotations.Name = "swDeleteAnnotations";
 			this.swDeleteAnnotations.Size = new System.Drawing.Size(69, 22);
 			this.swDeleteAnnotations.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
+			this.superTooltip1.SetSuperTooltip(this.swDeleteAnnotations, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("swDeleteAnnotations.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(265, 175)));
 			this.swDeleteAnnotations.SwitchClickTogglesValue = true;
 			this.swDeleteAnnotations.TabIndex = 37;
 			this.swDeleteAnnotations.Value = true;
@@ -562,7 +561,7 @@
 			this.labelX14.Location = new System.Drawing.Point(85, 14);
 			this.labelX14.Name = "labelX14";
 			this.labelX14.Size = new System.Drawing.Size(186, 22);
-            this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 155)));
+			this.superTooltip1.SetSuperTooltip(this.labelX14, new DevComponents.DotNetBar.SuperTooltipInfo("Delete Annotations", "", resources.GetString("labelX14.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 175)));
 			this.labelX14.TabIndex = 36;
 			this.labelX14.Text = "Delete Annotations";
 			// 
@@ -570,7 +569,7 @@
 			// 
 			this.myTVdel.CheckBoxes = true;
 			this.myTVdel.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.myTVdel.Location = new System.Drawing.Point(0, 126);
+			this.myTVdel.Location = new System.Drawing.Point(0, 127);
 			this.myTVdel.Name = "myTVdel";
 			this.myTVdel.Size = new System.Drawing.Size(300, 367);
 			this.myTVdel.TabIndex = 34;
@@ -607,9 +606,8 @@
 			this.sideNavPanel3.Controls.Add(this.btnFixLinks);
 			this.sideNavPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.sideNavPanel3.Location = new System.Drawing.Point(89, 31);
-            this.sideNavPanel3.MinimumSize = new System.Drawing.Size(0, 540);
 			this.sideNavPanel3.Name = "sideNavPanel3";
-            this.sideNavPanel3.Size = new System.Drawing.Size(291, 540);
+			this.sideNavPanel3.Size = new System.Drawing.Size(291, 494);
 			this.sideNavPanel3.TabIndex = 10;
 			this.sideNavPanel3.Visible = false;
 			// 
@@ -649,7 +647,7 @@
 			this.warningBox5.CloseButtonVisible = false;
 			this.warningBox5.Image = ((System.Drawing.Image)(resources.GetObject("warningBox5.Image")));
 			this.warningBox5.Location = new System.Drawing.Point(17, 145);
-            this.warningBox5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox5.Margin = new System.Windows.Forms.Padding(4);
 			this.warningBox5.Name = "warningBox5";
 			this.warningBox5.OptionsButtonVisible = false;
 			this.warningBox5.Size = new System.Drawing.Size(262, 32);
@@ -733,7 +731,7 @@
 			this.warningBox1.CloseButtonVisible = false;
 			this.warningBox1.Image = ((System.Drawing.Image)(resources.GetObject("warningBox1.Image")));
 			this.warningBox1.Location = new System.Drawing.Point(17, 181);
-            this.warningBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox1.Margin = new System.Windows.Forms.Padding(4);
 			this.warningBox1.Name = "warningBox1";
 			this.warningBox1.OptionsButtonVisible = false;
 			this.warningBox1.Size = new System.Drawing.Size(262, 43);
@@ -782,7 +780,7 @@
 			this.warningBox3.CloseButtonVisible = false;
 			this.warningBox3.Image = ((System.Drawing.Image)(resources.GetObject("warningBox3.Image")));
 			this.warningBox3.Location = new System.Drawing.Point(17, 207);
-            this.warningBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox3.Margin = new System.Windows.Forms.Padding(4);
 			this.warningBox3.Name = "warningBox3";
 			this.warningBox3.OptionsButtonVisible = false;
 			this.warningBox3.Size = new System.Drawing.Size(264, 32);
@@ -986,7 +984,7 @@
 			this.warningBox4.CloseButtonVisible = false;
 			this.warningBox4.Image = ((System.Drawing.Image)(resources.GetObject("warningBox4.Image")));
 			this.warningBox4.Location = new System.Drawing.Point(12, 264);
-            this.warningBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox4.Margin = new System.Windows.Forms.Padding(4);
 			this.warningBox4.Name = "warningBox4";
 			this.warningBox4.OptionsButtonVisible = false;
 			this.warningBox4.Size = new System.Drawing.Size(264, 32);
@@ -999,7 +997,7 @@
 			this.warningBox2.CloseButtonVisible = false;
 			this.warningBox2.Image = ((System.Drawing.Image)(resources.GetObject("warningBox2.Image")));
 			this.warningBox2.Location = new System.Drawing.Point(12, 302);
-            this.warningBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+			this.warningBox2.Margin = new System.Windows.Forms.Padding(4);
 			this.warningBox2.Name = "warningBox2";
 			this.warningBox2.OptionsButtonVisible = false;
 			this.warningBox2.Size = new System.Drawing.Size(264, 43);
@@ -1275,7 +1273,7 @@
 			this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.panelEx4.Location = new System.Drawing.Point(0, 0);
 			this.panelEx4.Name = "panelEx4";
-            this.panelEx4.Size = new System.Drawing.Size(1177, 57);
+			this.panelEx4.Size = new System.Drawing.Size(1177, 56);
 			this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center;
 			this.panelEx4.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
 			this.panelEx4.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -11,7 +11,6 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Controls.Library;
-using System.Linq;
 
 namespace VEPROMS
 {
@@ -178,8 +177,6 @@ namespace VEPROMS
 			myDocVersions.Clear();
 			FolderInfo fi = FolderInfo.GetTop();
 
-			fi.RefreshChildFolders();
-
 			if (fi.ChildFolderCount > 0)
 			{
 				TreeNode tn = new TreeNode(fi.Name);
@@ -235,7 +232,7 @@ namespace VEPROMS
 				loadedWorkingDraft = true;
 			}
 
-			if (tn.Parent != null && !loadedWorkingDraft && fi.FolderDocVersionCount == 0)
+			if (tn.Parent != null && !loadedWorkingDraft)
 			{
 				tn.Remove();
 			}
@@ -483,14 +480,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 +534,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 +550,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 +578,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 +1102,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());
@@ -1806,21 +1799,6 @@ namespace VEPROMS
 				}
 			}
 
-			//B2024-074 If only deleting annotations from an individual procedure, verify can check out procedure.
-			string msgpi = string.Empty;
-			foreach (ProcedureInfo pi in pil)
-			{
-				//LINQ used for 1st check of if statement
-				//basically check if procedure was already part of a docVersionsFolder
-				//before checking if procedure was checked out already
-				//to avoid duplicate messages for checked out procedures
-				if (!dvil.Any(x => x.Procedures.Any(y => y.ItemID == pi.ItemID)) && !MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgpi))
-				{
-					sbDocVersions.AppendLine(msgpi);
-					cancelledOut = true;
-				}
-			}
-
 			if (cancelledOut)
 			{
 				StringBuilder sb = new StringBuilder();

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

@@ -183,19 +183,19 @@ It is recommended that this be done during off hours.
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="warningBox5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/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/frmPDFStatusForm.cs

@@ -295,10 +295,7 @@ namespace VEPROMS
 				}
 
 			}
-			// B2024-062 Added check for EmptyProcedure.  We don't need to show the Try Again message if the procedure
-			// is empty, as it would be just be a waste of time for the user.
-			while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && !MyPromsPrinter.EmptyProcedure &&
-			MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
+			while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
 			
 			
 			if (_PdfFile == null)

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,7 +1380,6 @@ namespace VEPROMS
 				_SectionConfig.Section_OriginalSteps = ppCbDefaultStepSection.Checked ? "Y" : "N";
 			}
 		}
-	
 		private void ppBtnConvertToDocX_Click(object sender, EventArgs e)
 		{
 			// Get Document as file
@@ -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,9 +142,6 @@ 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:
 

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

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

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

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

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

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,18 +6,11 @@ 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
 {
 	public enum E_FieldToEdit { StepText, Text, Number, PSI };
-	public enum ReplaceWords
-	{
-		Inherit = 0,
-		Show = 1,
-		DoNotShow = 2
-	}
 	public class DisplayText
 	{
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,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;
-		}
-		// C2019-025 c2025-010 Ability-to-Toggle-Replace-Words
-		private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
-		{
-			StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
-			int setting = sc.Step_ShwRplWdsIndex;
-			switch (setting)
-			{
-				case (int)ReplaceWords.DoNotShow:
-					return false;
-					break;
-				case (int)ReplaceWords.Show:
-					return true;
-					break;
-				case (int)ReplaceWords.Inherit:
-					//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
 		{
@@ -403,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
@@ -1236,10 +1165,7 @@ 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)
 						{
 							if (ct.TransitionID == recid)
@@ -1249,7 +1175,6 @@ namespace VEPROMS.CSLA.Library
 							}
 						}
 					}
-					}
 					else
 					{
 						int sp = odte.Link.IndexOf(" "); 
@@ -1731,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)
 			{
@@ -2172,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).
@@ -2233,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|^)";
@@ -2260,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;
@@ -2552,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;
@@ -2645,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,10 +2767,6 @@ namespace VEPROMS.CSLA.Library
 				return _SearchDVPath;
 			}
 		}
-        //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
-        //Create cleaned version of variable for use in DisplaySearch
-        public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
-
 		internal string _SearchPath;
 		public string SearchPath
 		{
@@ -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,27 +5520,10 @@ namespace VEPROMS.CSLA.Library
 					}
 					if (count <= macro.Grouping) addToList = false;
 				}
-
-				//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
-				if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
-					addToList = false;
-
 				if (addToList) tmp.Add(macro);
 			}
 			if (tmp.Count > 0) _MyMacros = tmp;
 		}
-
-		//CSM F2024 - 080: For South Texas - check if initial line is disabled for this step
-		public bool IsInitialLineDisabled
-		{
-			get
-			{
-				if (!IsStep) return false;
-				StepConfig sc = MyConfig as StepConfig;
-				return sc.Step_DisableInitialLine;
-			}
-        }
-
 		#endregion
 		#region UseSmartTemplate
 
@@ -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
 		{
@@ -8406,81 +8004,6 @@ namespace VEPROMS.CSLA.Library
 			MyContent.Config = _ProcedureConfig.ToString();
 		}
 		#endregion
-		public class DisplayTabs
-		{
-			private int _ItemID;
-			public int ItemID
-			{
-				get { return _ItemID; }
-				set { _ItemID = value; }
-
-			}
-			private string _DisplayTabID;
-			public string DisplayTabID
-			{
-				get { return _DisplayTabID; }
-				set { _DisplayTabID = value; }
-			}
-			private string _DisplayTabName;
-			public string DisplayTabName
-			{
-				get { return _DisplayTabName; }
-				set { _DisplayTabName = value; }
-			}
-
-			public SafeDataReader Dr { get; }
-
-			public DisplayTabs()
-			{
-
-			}
-
-			public DisplayTabs(int itemID, String displayTabID, String displayTabName)
-			{
-				_ItemID = itemID;
-				_DisplayTabID = displayTabID;
-				_DisplayTabName = displayTabName;
-			}
-
-			public DisplayTabs(SafeDataReader dr)
-			{
-				Dr = dr;
-			}
-		}
-
-		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
-		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
-		{
-
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "AddDisplayTabState";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						cm.Parameters.AddWithValue("@ItemID", itemID);
-						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
-						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
-						cm.ExecuteNonQuery();
-						//SqlDataAdapter da = new SqlDataAdapter(cm);
-						//da.Fill(dt);
-						//cn.Close();
-						//da.Dispose();
-						//return dt; // fix
-					}
-					catch (Exception ex)
-					{
-						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
-						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
-					}
-
-				}
-			}
-
-		}
 	}
 	#endregion
 	#region SectionInfo

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

@@ -951,10 +951,7 @@ namespace VEPROMS.CSLA.Library
 			// it is pasted into a section without enhanced data, then clear it.
  
 			// config data can only be on hls/notes/cautions for pasted steps.
-			// B2024-059: clear links on a source section.  When a paste occurs, the section is copied with the links but not
-			//		new section is created in the enhanced document, so the links point to the original section (copied).  These
-			//		need to be removed.
-			if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote && !pasteItem.IsSection) return;
+			if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote) return;
 
 			// See if the pasted step's section is enhanced with enhanced steps, and if not, clear it
 			//  Also, if pasting into a source section, don't clear (B2017-225), the 'isSourceSection' portion of the code.
@@ -977,12 +974,6 @@ namespace VEPROMS.CSLA.Library
 				// of the pasted step.
 				if (pasteItem.HasEnhancedLinkedStep) pasteItem.RemoveEnhancedFromConfig(); 
 			}
-			// B2024-059: clear links on a source section
-			if (isSourceSection)
-			{
-				EnhancedDocuments seleds = pasteItem.GetMyEnhancedDocuments();
-				foreach (EnhancedDocument ed in seleds) pasteItem.DoUnlinkEnhanced(pasteItem, ed.Type, true);
-			}
 		}
 		#endregion
 		#region Insert Child
@@ -1876,10 +1867,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,8 +1884,6 @@ 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;
@@ -1907,7 +1892,6 @@ namespace VEPROMS.CSLA.Library
 					enhii.RefreshConfig();
 				}
 			}
-			}
 			else if (IsSection)
 			{
 				using (Item ii = this.Get())
@@ -1923,8 +1907,6 @@ 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;
@@ -1933,7 +1915,6 @@ namespace VEPROMS.CSLA.Library
 					enhii.RefreshConfig();
 				}
 			}
-			}
 			else if (IsProcedure)
 			{
                 // To fix B2017-268 the order of the following 2 'usings' had to be changed and the
@@ -1952,8 +1933,6 @@ 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();
@@ -1962,56 +1941,8 @@ namespace VEPROMS.CSLA.Library
                 }
 			}
 		}
-		}
 		#endregion
 		#region DataPortal
-		// C2017-031:  Support for paste/replace an enhanced step
-		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
-		{
-			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
-			try
-			{
-				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-				{
-					Csla.ApplicationContext.LocalContext["cn"] = cn;
-					using (SqlCommand cm = cn.CreateCommand())
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
-						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
-						cm.Parameters.AddWithValue("@Type", criteria.Type);
-						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
-						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
-						SqlParameter param_ContentID = new SqlParameter("@NewItemID", SqlDbType.Int);
-						param_ContentID.Direction = ParameterDirection.Output;
-						cm.Parameters.Add(param_ContentID);
-						cm.CommandText = "PasteItemEnhancedReplace";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
-						{
-							if (!dr.Read())
-							{
-								_ErrorMessage = "No Record Found";
-								return;
-							}
-							ReadData(dr);
-						}
-					}
-					// removing of item only needed for local data portal
-					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
-						Csla.ApplicationContext.LocalContext.Remove("cn");
-				}
-			}
-			catch (Exception ex)
-			{
-				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
-				{
-					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
-				}
-				_ErrorMessage = ex.Message;
-				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
-			}
-		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2134,69 +2065,6 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		#endregion
-	#region PastingPartEnhancedCriteria
-	// C2017-031:  Support for paste/replace an enhanced step
-	[Serializable()]
-	public class PastingPartEnhancedCriteria
-	{
-		#region Properties
-		private int _StartItemID;
-		public int StartItemID
-		{
-			get { return _StartItemID; }
-			set { _StartItemID = value; }
-		}
-		private int _ItemID;            // paste relative to this itemid
-		public int ItemID
-		{
-			get { return _ItemID; }
-			set { _ItemID = value; }
-		}
-		private EAddpingPart _AddType;
-		public EAddpingPart AddType
-		{
-			get { return _AddType; }
-			set { _AddType = value; }
-		}
-		private int? _FromType = null;
-		public int? FromType
-		{
-			get { return _FromType; }
-			set { _FromType = value; }
-		}
-		private int? _Type = null;
-		public int? Type
-		{
-			get { return _Type; }
-			set { _Type = value; }
-		}
-		private DateTime _DTS;
-		public DateTime DTS
-		{
-			get { return _DTS; }
-			set { _DTS = value; }
-		}
-		private string _UserID;
-		public string UserID
-		{
-			get { return _UserID; }
-			set { _UserID = value; }
-		}
-			#endregion
-			#region Constructor
-			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
-			{
-				_StartItemID = startItemid;
-				_ItemID = itemID;
-				_AddType = addType;
-				_Type = type;
-				_FromType = fromType;
-				_DTS = dts;
-				_UserID = userID;
-			}
-		#endregion
-	}
-	#endregion
 		#region PastingPartCriteria
 		[Serializable()]
 		public class PastingPartCriteria
@@ -2487,14 +2355,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,99 +2510,15 @@ 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
 			{
-					// 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);
+				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
 				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")
@@ -2760,7 +2536,7 @@ namespace VEPROMS.CSLA.Library
 				ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
 				using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
 				ItemInfo.PasteSetChangeId(newItemInfo, chgid);
-					if (!copyItemInfo.HasEnhancedLinkedStep && !itemInfo.HasEnhancedLinkedStep) ItemInfo.PasteClearEnhanced(newItemInfo);
+				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
@@ -2809,9 +2585,9 @@ namespace VEPROMS.CSLA.Library
           if (ex.Message.Contains("has External Transitions and has no next step")
 						|| ex.Message.Contains("has External Transitions to Procedure")
 						|| ex.Message.Contains("has External Transitions to it's children")
-							|| ex.Message.Contains("This step has been deleted"))
+            || ex.Message.Contains("This step has been deleted")
+            )
             throw ex;
-
 					FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
           return itemInfo;
         }
@@ -2819,7 +2595,6 @@ namespace VEPROMS.CSLA.Library
           return itemInfo;
 			}
 		}
-		}
 		#endregion
     private static bool HandleSqlExceptionOnCopy(Exception ex)
     {

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

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

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

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

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

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

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

@@ -276,9 +276,6 @@ namespace Volian.Controls.Library
 		}
 
 		private void btnRemoveAnnotation_Click(object sender, EventArgs e)
-		{
-			// CSM B2024-068 / B2024-069 - check if current annotation is not selected before removal of annotation
-			if (CurrentAnnotation != null)
 		{
 			//using (Annotation annotation = CurrentAnnotation.Get())
 			//{
@@ -292,13 +289,6 @@ namespace Volian.Controls.Library
 			_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
 			//}
 		}
-			else
-			{
-				FlexibleMessageBox.Show("You Must Select an Annotation To Remove", "Annotation Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
-				return;
-			}
-
-		}
 
 		private void btnSaveAnnotation_Click(object sender, EventArgs e)
 		{
@@ -683,8 +673,6 @@ namespace Volian.Controls.Library
 				else
 				{
 					using (Annotation annotation = CurrentAnnotation.Get())
-					{
-						if (annotation != null) // B2024-061 check for null reference
 					{
 						annotation.RtfText = rtxbComment.Rtf;
 						annotation.SearchText = rtxbComment.Text;
@@ -695,7 +683,6 @@ namespace Volian.Controls.Library
 					}
 				}
 			}
-			}
 			AnnotationDirty = false;
 			UpdateAnnotationGrid();
 			AnnotationTypeInfoList.Reset();		// B2018-135: refresh annotation type list to update when annotations are used.

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

@@ -503,7 +503,7 @@ namespace Volian.Controls.Library
 			this.cbxSortBySetpointID.Size = new System.Drawing.Size(121, 23);
 			this.cbxSortBySetpointID.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 			this.cbxSortBySetpointID.TabIndex = 11;
-			this.cbxSortBySetpointID.Text = "Sort By Setpoint ID";
+			this.cbxSortBySetpointID.Text = "Sort By Sepoint ID";
 			this.cbxSortBySetpointID.Visible = false;
 			// 
 			// DisplayReports
@@ -511,8 +511,8 @@ namespace Volian.Controls.Library
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.Controls.Add(this.btnPrintReport);
-			this.Controls.Add(this.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,9 +805,17 @@ 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);
+				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

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

@@ -672,10 +672,8 @@ namespace Volian.Controls.Library
 			if (_MyDisplayTabItems.ContainsKey(key) && pasteType != ItemInfo.EAddpingPart.Replace) // If procedure page open use it unless replace
 			{
 				DisplayTabItem pg = _MyDisplayTabItems[key];
-				// B2024-038: if section, refresh the editor even if the section is not expanded.
-				bool isSec = myItemInfo.IsSection;
 				if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) &&
-					(pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded || isSec))   
+					pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded)
 				{
 					EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID];
 					switch (pasteType)
@@ -712,8 +710,7 @@ namespace Volian.Controls.Library
 			}
 			else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace)
 			{
-				// B2024-038: changed tab key to procedure (was item, which caused crash if section)
-				CloseTabItem(_MyDisplayTabItems["Item - " + proc.ItemID.ToString()]); //Grab itemID and set to close open tab.
+				CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
 				return false; //B2017-179 PasteReplace will return null if was aborted
 			}
 			return false;

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

@@ -33,10 +33,7 @@ namespace Volian.Controls.Library
 			this.cbPageBreak = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbCAS = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cmbCheckoff = new DevComponents.DotNetBar.Controls.ComboBoxEx();
-            this.cmbShwRplWds = new DevComponents.DotNetBar.Controls.ComboBoxEx();
 			this.groupPanelCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
-            this.cbInitialLine = new DevComponents.DotNetBar.Controls.CheckBoxX();
-            this.groupPanelcmbShwRplWds = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.groupPanelChgBar = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.tbChgID = new System.Windows.Forms.TextBox();
 			this.lblChgId = new System.Windows.Forms.Label();
@@ -62,10 +59,8 @@ namespace Volian.Controls.Library
 			this.tbFSWd = new System.Windows.Forms.TextBox();
 			this.lblFSHt = new System.Windows.Forms.Label();
 			this.lblFSWidth = new System.Windows.Forms.Label();
-            this.btnSaveChangeID = new System.Windows.Forms.Button();
 			this.groupPanelPaginate.SuspendLayout();
 			this.groupPanelCheckoff.SuspendLayout();
-            this.groupPanelcmbShwRplWds.SuspendLayout();
 			this.groupPanelChgBar.SuspendLayout();
 			this.groupPanelChgStepType.SuspendLayout();
 			this.groupPanelIncludeOn.SuspendLayout();
@@ -83,7 +78,7 @@ namespace Volian.Controls.Library
 			this.groupPanelPaginate.Controls.Add(this.cbPageBreak);
 			this.groupPanelPaginate.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelPaginate.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelPaginate.Location = new System.Drawing.Point(0, 425);
+			this.groupPanelPaginate.Location = new System.Drawing.Point(0, 330);
 			this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2);
 			this.groupPanelPaginate.Name = "groupPanelPaginate";
 			this.groupPanelPaginate.Size = new System.Drawing.Size(202, 58);
@@ -188,28 +183,6 @@ namespace Volian.Controls.Library
 			this.cmbCheckoff.WatermarkText = "select signoff / checkoff";
 			this.cmbCheckoff.SelectedIndexChanged += new System.EventHandler(this.cmbCheckoff_SelectedIndexChanged);
 			// 
-            // cmbShwRplWds
-            // 
-            this.cmbShwRplWds.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbShwRplWds.DisplayMember = "Text";
-            this.cmbShwRplWds.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
-            this.cmbShwRplWds.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbShwRplWds.FormattingEnabled = true;
-            this.cmbShwRplWds.ItemHeight = 17;
-            this.cmbShwRplWds.Items.AddRange(new object[] {
-            "Inherit from Section",
-            "Show replace words",
-            "Do not show replace words"});
-            this.cmbShwRplWds.Location = new System.Drawing.Point(3, 17);
-            this.cmbShwRplWds.Margin = new System.Windows.Forms.Padding(2);
-            this.cmbShwRplWds.Name = "cmbShwRplWds";
-            this.cmbShwRplWds.Size = new System.Drawing.Size(194, 23);
-            this.cmbShwRplWds.TabIndex = 0;
-            this.cmbShwRplWds.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cmbShwRplWds.WatermarkText = "Show Replace Words";
-            this.cmbShwRplWds.SelectedIndexChanged += new System.EventHandler(this.cmbShwRplWds_SelectedIndexChanged);
-            // 
 			// groupPanelCheckoff
 			// 
 			this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
@@ -217,10 +190,10 @@ namespace Volian.Controls.Library
 			this.groupPanelCheckoff.Controls.Add(this.cmbCheckoff);
 			this.groupPanelCheckoff.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelCheckoff.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 231);
+			this.groupPanelCheckoff.Location = new System.Drawing.Point(0, 145);
 			this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2);
 			this.groupPanelCheckoff.Name = "groupPanelCheckoff";
-            this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 86);
+			this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 77);
 			// 
 			// 
 			// 
@@ -253,82 +226,18 @@ namespace Volian.Controls.Library
 			this.groupPanelCheckoff.Text = "Signoff / Checkoff";
 			this.groupPanelCheckoff.VisibleChanged += new System.EventHandler(this.groupPanelCheckoff_VisibleChanged);
 			// 
-            // cbInitialLine
-            // 
-            this.cbInitialLine.AutoSize = true;
-            this.cbInitialLine.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.cbInitialLine.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.cbInitialLine.Location = new System.Drawing.Point(3, 44);
-            this.cbInitialLine.Margin = new System.Windows.Forms.Padding(2);
-            this.cbInitialLine.Name = "cbInitialLine";
-            this.cbInitialLine.Size = new System.Drawing.Size(112, 15);
-            this.superTooltipTags.SetSuperTooltip(this.cbInitialLine, new DevComponents.DotNetBar.SuperTooltipInfo("Manual Page Break", "", "When set, starts this step at the top of a page.\r\n\r\nkeyboard command: <Ctrl><Ente" +
-            "r>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.cbInitialLine.TabIndex = 1;
-            this.cbInitialLine.Text = "Disable Initial Line";
-            this.cbInitialLine.Visible = false;
-            this.cbInitialLine.CheckedChanged += new System.EventHandler(this.cbInitialLine_CheckedChanged);
-            // 
-            // groupPanelcmbShwRplWds
-            // 
-            this.groupPanelcmbShwRplWds.CanvasColor = System.Drawing.SystemColors.Control;
-            this.groupPanelcmbShwRplWds.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-            this.groupPanelcmbShwRplWds.Controls.Add(this.cbInitialLine);
-            this.groupPanelcmbShwRplWds.Controls.Add(this.cmbShwRplWds);
-            this.groupPanelcmbShwRplWds.DisabledBackColor = System.Drawing.Color.Empty;
-            this.groupPanelcmbShwRplWds.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelcmbShwRplWds.Location = new System.Drawing.Point(0, 145);
-            this.groupPanelcmbShwRplWds.Margin = new System.Windows.Forms.Padding(2);
-            this.groupPanelcmbShwRplWds.Name = "groupPanelcmbShwRplWds";
-            this.groupPanelcmbShwRplWds.Size = new System.Drawing.Size(202, 86);
-            // 
-            // 
-            // 
-            this.groupPanelcmbShwRplWds.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-            this.groupPanelcmbShwRplWds.Style.BackColorGradientAngle = 90;
-            this.groupPanelcmbShwRplWds.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-            this.groupPanelcmbShwRplWds.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-            this.groupPanelcmbShwRplWds.Style.BorderBottomWidth = 1;
-            this.groupPanelcmbShwRplWds.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.groupPanelcmbShwRplWds.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-            this.groupPanelcmbShwRplWds.Style.BorderLeftWidth = 1;
-            this.groupPanelcmbShwRplWds.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-            this.groupPanelcmbShwRplWds.Style.BorderRightWidth = 1;
-            this.groupPanelcmbShwRplWds.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-            this.groupPanelcmbShwRplWds.Style.BorderTopWidth = 1;
-            this.groupPanelcmbShwRplWds.Style.CornerDiameter = 4;
-            this.groupPanelcmbShwRplWds.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-            this.groupPanelcmbShwRplWds.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-            this.groupPanelcmbShwRplWds.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.groupPanelcmbShwRplWds.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-            // 
-            // 
-            // 
-            this.groupPanelcmbShwRplWds.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.groupPanelcmbShwRplWds.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.groupPanelcmbShwRplWds.TabIndex = 8;
-            this.groupPanelcmbShwRplWds.Text = "Show Replace Words";
-            this.groupPanelcmbShwRplWds.VisibleChanged += new System.EventHandler(this.groupPanelcmbShwRplWds_VisibleChanged);
-            // 
 			// groupPanelChgBar
 			// 
 			this.groupPanelChgBar.BackColor = System.Drawing.Color.Transparent;
 			this.groupPanelChgBar.CanvasColor = System.Drawing.SystemColors.Control;
 			this.groupPanelChgBar.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-            this.groupPanelChgBar.Controls.Add(this.btnSaveChangeID);
 			this.groupPanelChgBar.Controls.Add(this.tbChgID);
 			this.groupPanelChgBar.Controls.Add(this.lblChgId);
 			this.groupPanelChgBar.Controls.Add(this.rbChgBarOff);
 			this.groupPanelChgBar.Controls.Add(this.rbChgBarOn);
 			this.groupPanelChgBar.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelChgBar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelChgBar.Location = new System.Drawing.Point(0, 317);
+			this.groupPanelChgBar.Location = new System.Drawing.Point(0, 222);
 			this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2);
 			this.groupPanelChgBar.Name = "groupPanelChgBar";
 			this.groupPanelChgBar.Size = new System.Drawing.Size(202, 108);
@@ -371,6 +280,7 @@ namespace Volian.Controls.Library
 			this.tbChgID.Name = "tbChgID";
 			this.tbChgID.Size = new System.Drawing.Size(81, 20);
 			this.tbChgID.TabIndex = 4;
+			this.tbChgID.TextChanged += new System.EventHandler(this.tbChgID_TextChanged);
 			// 
 			// lblChgId
 			// 
@@ -570,7 +480,8 @@ namespace Volian.Controls.Library
 			this.cbTCAS.Margin = new System.Windows.Forms.Padding(2);
 			this.cbTCAS.Name = "cbTCAS";
 			this.cbTCAS.Size = new System.Drawing.Size(167, 15);
-            this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Time Critical Action Summary", "", "Include this in the Time Critical Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: <Shift" +
+            "><F7>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cbTCAS.TabIndex = 3;
 			this.cbTCAS.Text = "Time Critical Action Summary";
 			this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged);
@@ -587,7 +498,7 @@ namespace Volian.Controls.Library
 			this.groupPanelIncludeOn.Controls.Add(this.cbCAS);
 			this.groupPanelIncludeOn.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelIncludeOn.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 483);
+			this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 388);
 			this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2);
 			this.groupPanelIncludeOn.Name = "groupPanelIncludeOn";
 			this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 121);
@@ -630,7 +541,7 @@ namespace Volian.Controls.Library
 			this.groupPanelWcnTrnResp.Controls.Add(this.tbRespons);
 			this.groupPanelWcnTrnResp.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelWcnTrnResp.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 604);
+			this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 509);
 			this.groupPanelWcnTrnResp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
 			this.groupPanelWcnTrnResp.Name = "groupPanelWcnTrnResp";
 			this.groupPanelWcnTrnResp.Size = new System.Drawing.Size(202, 138);
@@ -689,7 +600,7 @@ namespace Volian.Controls.Library
 			this.groupPanelFigSize.Controls.Add(this.lblFSWidth);
 			this.groupPanelFigSize.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelFigSize.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelFigSize.Location = new System.Drawing.Point(0, 742);
+			this.groupPanelFigSize.Location = new System.Drawing.Point(0, 647);
 			this.groupPanelFigSize.Margin = new System.Windows.Forms.Padding(2);
 			this.groupPanelFigSize.Name = "groupPanelFigSize";
 			this.groupPanelFigSize.Size = new System.Drawing.Size(202, 135);
@@ -796,16 +707,6 @@ namespace Volian.Controls.Library
 			this.lblFSWidth.TabIndex = 0;
 			this.lblFSWidth.Text = "Width";
 			// 
-            // btnSaveChangeID
-            // 
-            this.btnSaveChangeID.Location = new System.Drawing.Point(86, 65);
-            this.btnSaveChangeID.Name = "btnSaveChangeID";
-            this.btnSaveChangeID.Size = new System.Drawing.Size(75, 23);
-            this.btnSaveChangeID.TabIndex = 5;
-            this.btnSaveChangeID.Text = "Save";
-            this.btnSaveChangeID.UseVisualStyleBackColor = true;
-            this.btnSaveChangeID.Click += new System.EventHandler(this.btnSaveChangeID_Click);
-            // 
 			// DisplayTags
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -816,7 +717,6 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.groupPanelPaginate);
 			this.Controls.Add(this.groupPanelChgBar);
 			this.Controls.Add(this.groupPanelCheckoff);
-            this.Controls.Add(this.groupPanelcmbShwRplWds);
 			this.Controls.Add(this.groupPanelChgStepType);
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplayTags";
@@ -824,8 +724,6 @@ namespace Volian.Controls.Library
 			this.groupPanelPaginate.ResumeLayout(false);
 			this.groupPanelPaginate.PerformLayout();
 			this.groupPanelCheckoff.ResumeLayout(false);
-            this.groupPanelcmbShwRplWds.ResumeLayout(false);
-            this.groupPanelcmbShwRplWds.PerformLayout();
 			this.groupPanelChgBar.ResumeLayout(false);
 			this.groupPanelChgBar.PerformLayout();
 			this.groupPanelChgStepType.ResumeLayout(false);
@@ -845,9 +743,7 @@ namespace Volian.Controls.Library
 
 		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelPaginate;
 		private DevComponents.DotNetBar.Controls.ComboBoxEx cmbCheckoff;
-        private DevComponents.DotNetBar.Controls.ComboBoxEx cmbShwRplWds;
 		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelCheckoff;
-		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelcmbShwRplWds;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPageBreak;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbCAS;
 		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelChgBar;
@@ -876,7 +772,5 @@ namespace Volian.Controls.Library
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPrefPageBreak;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeInTOC;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbTCAS;
-        private DevComponents.DotNetBar.Controls.CheckBoxX cbInitialLine;
-        private System.Windows.Forms.Button btnSaveChangeID;
 	}
 }

PROMS/Volian.Controls.Library/DisplayTags.cs

@@ -103,7 +103,7 @@ namespace Volian.Controls.Library
 		public string TbFSwd
 		{
 			get	{return tbFSWd.Text;}
-			set { tbFSWd.Text = value; tbFSWd.Refresh(); } //  trBarFS.Value = Convert.ToInt32(value);
+			set { tbFSWd.Text = value; tbFSWd.Refresh(); trBarFS.Value = Convert.ToInt32(value); }
 		}
 
 		public string TbFSht
@@ -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.
-
 			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

@@ -30,26 +30,25 @@ namespace Volian.Controls.Library
 		{
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
 			this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
-            this.cbHoldProcSet = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.btnTranCancel = new DevComponents.DotNetBar.ButtonX();
 			this.btnTranSave = new DevComponents.DotNetBar.ButtonX();
 			this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.listBoxTranFmt = new System.Windows.Forms.ListBox();
 			this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel();
-            this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
 			this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.cbTranProcs = new System.Windows.Forms.ComboBox();
 			this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel();
 			this.cbTranSects = new System.Windows.Forms.ComboBox();
 			this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel();
-            this.tvTran = new Volian.Controls.Library.vlnTreeView3();
 			this.pnlTranStepBtns = new System.Windows.Forms.Panel();
 			this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
 			this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX();
 			this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX();
 			this.btnUp1 = new DevComponents.DotNetBar.ButtonX();
 			this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip();
+			this.tvTran = new Volian.Controls.Library.vlnTreeView3();
+			this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
 			this.groupPanelBtns.SuspendLayout();
 			this.groupPanelTranFmt.SuspendLayout();
 			this.groupPanelTransitionSets.SuspendLayout();
@@ -63,7 +62,6 @@ namespace Volian.Controls.Library
 			// 
 			this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
 			this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-            this.groupPanelBtns.Controls.Add(this.cbHoldProcSet);
 			this.groupPanelBtns.Controls.Add(this.cbPageNum);
 			this.groupPanelBtns.Controls.Add(this.btnTranCancel);
 			this.groupPanelBtns.Controls.Add(this.btnTranSave);
@@ -71,7 +69,7 @@ namespace Volian.Controls.Library
 			this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
 			this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
 			this.groupPanelBtns.Name = "groupPanelBtns";
-            this.groupPanelBtns.Size = new System.Drawing.Size(376, 82);
+			this.groupPanelBtns.Size = new System.Drawing.Size(376, 58);
 			// 
 			// 
 			// 
@@ -102,23 +100,6 @@ namespace Volian.Controls.Library
 			this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.groupPanelBtns.TabIndex = 25;
 			// 
-            // cbHoldProcSet
-            // 
-            this.cbHoldProcSet.BackColor = System.Drawing.Color.Transparent;
-            // 
-            // 
-            // 
-            this.cbHoldProcSet.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.cbHoldProcSet.Location = new System.Drawing.Point(0, 54);
-            this.cbHoldProcSet.Margin = new System.Windows.Forms.Padding(2);
-            this.cbHoldProcSet.Name = "cbHoldProcSet";
-            this.cbHoldProcSet.Size = new System.Drawing.Size(214, 15);
-            this.cbHoldProcSet.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.superToolTipDispTran.SetSuperTooltip(this.cbHoldProcSet, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbHoldProcSet.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.cbHoldProcSet.TabIndex = 27;
-            this.cbHoldProcSet.Text = "Hold Procedure Set / Procedure";
-            this.cbHoldProcSet.CheckedChanged += new System.EventHandler(this.cbHoldProcSet_CheckedChanged);
-            // 
 			// cbPageNum
 			// 
 			this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
@@ -127,7 +108,7 @@ namespace Volian.Controls.Library
 			// 
 			this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.cbPageNum.Location = new System.Drawing.Point(0, 35);
-            this.cbPageNum.Margin = new System.Windows.Forms.Padding(2);
+			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;
@@ -142,7 +123,7 @@ namespace Volian.Controls.Library
 			this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 			this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
 			this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
-            this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2);
+			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" +
@@ -173,7 +154,7 @@ namespace Volian.Controls.Library
 			this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
 			this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 82);
+			this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 58);
 			this.groupPanelTranFmt.Name = "groupPanelTranFmt";
 			this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
 			// 
@@ -227,7 +208,7 @@ namespace Volian.Controls.Library
 			this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
 			this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 223);
+			this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 199);
 			this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
 			this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
 			// 
@@ -261,18 +242,6 @@ namespace Volian.Controls.Library
 			this.groupPanelTransitionSets.TabIndex = 31;
 			this.groupPanelTransitionSets.Text = "Select Procedure Set";
 			// 
-            // vlnTreeComboSets
-            // 
-            this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
-            this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
-            this.vlnTreeComboSets.Name = "vlnTreeComboSets";
-            this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
-            this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.vlnTreeComboSets.TabIndex = 33;
-            this.vlnTreeComboSets.Value = null;
-            this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
-            // 
 			// groupPanelTransitionProcs
 			// 
 			this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
@@ -280,7 +249,7 @@ namespace Volian.Controls.Library
 			this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
 			this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 271);
+			this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 247);
 			this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
 			this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
 			// 
@@ -333,7 +302,7 @@ namespace Volian.Controls.Library
 			this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
 			this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 317);
+			this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 293);
 			this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
 			this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
 			// 
@@ -388,9 +357,9 @@ namespace Volian.Controls.Library
 			this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
 			this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty;
 			this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366);
+			this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 342);
 			this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
-            this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310);
+			this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334);
 			// 
 			// 
 			// 
@@ -422,17 +391,6 @@ namespace Volian.Controls.Library
 			this.groupPanelTranstionSteps.TabIndex = 34;
 			this.groupPanelTranstionSteps.Text = "Select Step";
 			// 
-            // tvTran
-            // 
-            this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tvTran.HideSelection = false;
-            this.tvTran.Location = new System.Drawing.Point(0, 46);
-            this.tvTran.Name = "tvTran";
-            this.tvTran.Size = new System.Drawing.Size(370, 243);
-            this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            this.tvTran.TabIndex = 31;
-            this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
-            // 
 			// pnlTranStepBtns
 			// 
 			this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
@@ -452,7 +410,7 @@ namespace Volian.Controls.Library
 			// 
 			this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.cbIncStepNum.Location = new System.Drawing.Point(8, 12);
-            this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2);
+			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;
@@ -507,6 +465,29 @@ namespace Volian.Controls.Library
 			this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
 			this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
 			// 
+			// tvTran
+			// 
+			this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tvTran.HideSelection = false;
+			this.tvTran.Location = new System.Drawing.Point(0, 46);
+			this.tvTran.Name = "tvTran";
+			this.tvTran.Size = new System.Drawing.Size(370, 267);
+			this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.tvTran.TabIndex = 31;
+			this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
+			// 
+			// vlnTreeComboSets
+			// 
+			this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
+			this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
+			this.vlnTreeComboSets.Name = "vlnTreeComboSets";
+			this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
+			this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+			this.vlnTreeComboSets.TabIndex = 33;
+			this.vlnTreeComboSets.Value = null;
+			this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
+			// 
 			// DisplayTransition
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -517,7 +498,7 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.groupPanelTransitionSets);
 			this.Controls.Add(this.groupPanelTranFmt);
 			this.Controls.Add(this.groupPanelBtns);
-            this.Margin = new System.Windows.Forms.Padding(2);
+			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);
@@ -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;
@@ -145,7 +121,13 @@ namespace Volian.Controls.Library
 		}
 		void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)
 		{
+			//if (_MyRTB.MyLinkText == null)
+			//  CurTrans = null;
+			//else
+			//{
+			//  StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
 				CurTrans = args.MyLinkText.MyTransitionInfo;
+			//}
 		}
 		private ItemInfo _CurrentItemProcedure;		// the selected item's procedure
 		private ItemInfo _CurrentToProcedure;		// the 'to' location's procedure (may be same as _CurrentItemProcedure)
@@ -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,32 +1489,6 @@ namespace Volian.Controls.Library
 				btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
 			}
 		}
-
-		//CSM-C2024-026 Evaluate the transitions panel
-		//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
-		//If checkbox is checked to enable holding an item,
-		//then store the currently selected item
-		//if checkbox becomes unchecked then clear item.
-		private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e)
-        {
-			if (cbHoldProcSet.Checked)
-			{
-				VETreeNode vt = tvTran.SelectedNode as VETreeNode;
-				ItemInfo selii = vt.VEObject as ItemInfo;
-				if (selii != null)
-				{
-					HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
-					HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
-					HeldLink_CurItemFrom = selii;
-				}
-			}
-			else
-			{
-				HeldLinkText = "";
-				HeldLink_CurItemFrom = null;
-				HeldLink_TranFmtIndx = 0;
-			}
-        }
 	}
 	public class TransItem
 	{

PROMS/Volian.Controls.Library/DisplayTransition.resx

@@ -112,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>