Merge pull request 'B2024-089 Loic to clean up transitioning to a section that does not have a section number. Also added and updated comments.' (#455) from B2024-089 into Development

Looks good to me.
Merging to Development - Ready for QA.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

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

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

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

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

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

PROMS/VEPROMS User Interface/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,6 +1285,23 @@ 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;
@@ -1421,23 +1438,6 @@ 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,7 +231,6 @@ namespace VEPROMS
 			cbxOpenAfterCreate2.Visible = oneProcedure;
 			cbxOpenAfterCreate2.Checked = false;
 			cbxOverwritePDF2.Visible = oneProcedure;
-			cbxOverwritePDF2.Checked = true;
 			gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode;
 			swtbtnGeneratePlacekeeper.Value = false;
 			cbxGenerateConActSum.Checked = false;
@@ -1096,6 +1095,15 @@ 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();
 		}
 
@@ -1193,16 +1201,47 @@ 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 initSelDate =(txbDate.Text != null && txbDate.Text.Length != 0)? Convert.ToDateTime(txbDate.Text) : DateTime.Today;
-			calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
+			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;
+				calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate;
+			}
 		}
-
 		private void txbRevDate_Leave(object sender, EventArgs e)
 		{
 			if (_Initializing) return;
@@ -1375,6 +1414,7 @@ namespace VEPROMS
 				_NewRevForAllProcs = null;
 		}
 
+
 		//private void cbxDebug_CheckedChanged(object sender, EventArgs e)
 		//{
 		//  cbxCmpPRMSpfd.Visible = cbxDebug.Checked;

PROMS/VEPROMS User Interface/ROBuild.Sql

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

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

@@ -163,6 +163,12 @@
     <Compile Include="dlgCheckedOutProcedure.designer.cs">
       <DependentUpon>dlgCheckedOutProcedure.cs</DependentUpon>
     </Compile>
+    <Compile Include="dlgCheckOpenTabs.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="dlgCheckOpenTabs.Designer.cs">
+      <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
+    </Compile>
     <Compile Include="DlgCloseTabsOrExit.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -324,6 +330,9 @@
       <SubType>Designer</SubType>
       <DependentUpon>AboutVEPROMS.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="dlgCheckOpenTabs.resx">
+      <DependentUpon>dlgCheckOpenTabs.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DlgCloseTabsOrExit.resx">
       <DependentUpon>DlgCloseTabsOrExit.cs</DependentUpon>
     </EmbeddedResource>
@@ -626,4 +635,4 @@
   <PropertyGroup>
     <PreBuildEvent>cmd /c "$(ProjectDir)FixRev.bat"</PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs

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

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs

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

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.resx

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

PROMS/VEPROMS User Interface/dlgExportImport.cs

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

PROMS/VEPROMS User Interface/frmBatchRefresh.Designer.cs

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

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

@@ -11,6 +11,7 @@ using Volian.Controls.Library;
 using DevComponents.DotNetBar;
 using JR.Utils.GUI.Forms;
 using Volian.Controls.Library;
+using System.Linq;
 
 namespace VEPROMS
 {
@@ -1799,6 +1800,21 @@ namespace VEPROMS
 				}
 			}
 
+			//B2024-074 If only deleting annotations from an individual procedure, verify can check out procedure.
+			string msgpi = string.Empty;
+			foreach (ProcedureInfo pi in pil)
+			{
+				//LINQ used for 1st check of if statement
+				//basically check if procedure was already part of a docVersionsFolder
+				//before checking if procedure was checked out already
+				//to avoid duplicate messages for checked out procedures
+				if (!dvil.Any(x => x.Procedures.Any(y => y.ItemID == pi.ItemID)) && !MySessionInfo.CanCheckOutItem(pi.ItemID, CheckOutType.Procedure, ref msgpi))
+				{
+					sbDocVersions.AppendLine(msgpi);
+					cancelledOut = true;
+				}
+			}
+
 			if (cancelledOut)
 			{
 				StringBuilder sb = new StringBuilder();

PROMS/VEPROMS User Interface/frmPDFStatusForm.cs

@@ -295,7 +295,10 @@ namespace VEPROMS
 				}
 
 			}
-			while (!MyPromsPrinter.MergeNotIncluded && _PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes);
+			// 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);
 			
 			
 			if (_PdfFile == null)

PROMS/VEPROMS User Interface/frmSysOptions.cs

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

PROMS/VEPROMS User Interface/frmSysOptions.resx

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

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1654,6 +1654,10 @@ namespace VEPROMS
 			// B2017-214 added a null reference check
 			// B2010-071 Since we cannot tell if the user click on the X in Word or the X in PROMS, ask if the current tab
 			//           should be closed or if we should exit PROMS or just Cancel to continue working
+			if (tc._MyDisplayTabItems.Count < 1) // If all thabs are closed in the editor will indicate that in the database.
+			{
+				VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+			}
 			if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
 			{
 				// B2019-071 dialog to ask user if we are to close one tab or exit
@@ -1670,16 +1674,38 @@ namespace VEPROMS
 					return;
 				}
 
-				string stk = Volian.Base.Library.vlnStackTrace.StackToString();
+				string stk = Volian.Base.Library.vlnStackTrace.StackToString(); 
 
 				if (!stk.Contains("Exception"))
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
+					if (_WeAreExitingPROMS)
+					{
+						string DisplayTabID = "";
+						int pos;
+						int TabItemID;
+						string DisplayTabName = "";
+						int cnt = 0;
+						// Deactivate previous procedure tab state by user
+						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+						// Save current procedure tab state
+						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+						{
+							cnt++;
+							DisplayTabID = pgTab.Key;
+							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+							DisplayTabName = pgTab.Value.ToString();
+							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
+						}
+					}
+
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
+
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2320,6 +2346,48 @@ 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;
+					}
+				}
+			}
 		}
 
 		void tc_RefreshEnhancedDocument(object sender, ItemSelectedChangedEventArgs args)

PROMS/VEPROMS User Interface/frmVersionsProperties.cs

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

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

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

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

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

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

@@ -4251,6 +4251,13 @@ namespace VEPROMS.CSLA.Library
 				if (tbformat.Contains("{!.+?}"))
 					tstr = tbformat.Replace("{!.+?}", " "); // Comanche Peak Indented Paragraph
 				_MyTab.Text = tstr;
+				//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+				if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
+				{
+					if (tstr.StartsWith(" "))
+						tstr = tstr.Substring(1);
+					tstr = FormatStepData.TabData.MacroEditTag + tstr;
+				}
 				_MyTab.CleanText = tstr;
 				return;
 			}
@@ -4341,25 +4348,73 @@ namespace VEPROMS.CSLA.Library
 						incSub = (ord + 1).ToString();
 						if (MyParent.MyTab.CleanText.Trim().EndsWith(")"))
 						{
-							_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub;
+							//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+							string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub;
+							if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
+							{
+								if (tstr.StartsWith(" "))
+									tstr = tstr.Substring(1);
+								tstr = FormatStepData.TabData.MacroEditTag + tstr;
+							}
+							else if (IsInitialLineDisabled && tstr.StartsWith("_"))
+								tstr = tstr.Substring(1);
+
+							_MyTab.CleanText = tstr;
 							_MyTab.Text = _MyTab.CleanText;
 							return;
 						}
 						if (MyParent.MyTab.CleanText.Contains(ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB))
 						{
-							_MyTab.CleanText = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
+							//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+							string tstr = MyParent.MyTab.CleanText.Trim() + "." + incSub + " ";
+							if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tstr.StartsWith("_"))
+							{
+								if (tstr.StartsWith(" "))
+									tstr = tstr.Substring(1);
+								tstr = FormatStepData.TabData.MacroEditTag + tstr;
+							}
+							else if(IsInitialLineDisabled && tstr.StartsWith("_"))
+								tstr = tstr.Substring(1);
+
+							_MyTab.CleanText = tstr;
 							_MyTab.Text = _MyTab.CleanText;
 							return;
 						}
 						string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
-						_MyTab.CleanText = tmprnotab.TrimStart();
-						_MyTab.Text = tmprnotab.TrimStart();
+						//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+						tmprnotab = tmprnotab.TrimStart();
+						if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_"))
+						{
+							if (tmprnotab.StartsWith(" "))
+								tmprnotab = tmprnotab.Substring(1);
+							tmprnotab = FormatStepData.TabData.MacroEditTag + tmprnotab;
+						}
+						else if (IsInitialLineDisabled && tmprnotab.StartsWith("_"))
+							tmprnotab = tmprnotab.Substring(1);
+
+						_MyTab.CleanText = tmprnotab;
+						_MyTab.Text = tmprnotab;
 						return;
 					}
 					if ((((ItemInfo)ActiveParent).IsHigh && FormatStepData.NumberHighLevel) || ((!((ItemInfo)ActiveParent).IsHigh) && ((tbformat == null || tbformat == "") && (RNOLevel <= ColumnMode))))
 					{
 						_MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText;
 						_MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text;
+						//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
+						if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !_MyTab.CleanText.StartsWith("_"))
+						{
+							if (_MyTab.CleanText.StartsWith(" "))
+								_MyTab.CleanText = _MyTab.CleanText.Substring(1);
+							_MyTab.CleanText = FormatStepData.TabData.MacroEditTag + _MyTab.CleanText;
+						}
+						if (IsInitialLineDisabled && _MyTab.CleanText.StartsWith("_"))
+						{
+							_MyTab.CleanText = _MyTab.CleanText.Substring(1);
+						}
+						if (IsInitialLineDisabled && _MyTab.Text.StartsWith("_"))
+						{
+							_MyTab.Text = _MyTab.Text.Substring(1);
+						}
 						_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize ?? 0;
 						if (((ItemInfo)ActiveParent).MyTab.Offset != 0) _MyTab.Offset = ((ItemInfo)ActiveParent).MyTab.Offset;
 						if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
@@ -4716,6 +4771,15 @@ 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);
+					cltext = FormatStepData.TabData.MacroEditTag + cltext;
+				}
 			}
 		macroindx = tbformat.IndexOf("{!diamond1}");
 			if (macroindx > -1)	//i found it
@@ -5520,15 +5584,32 @@ namespace VEPROMS.CSLA.Library
 					}
 					if (count <= macro.Grouping) addToList = false;
 				}
+
+				//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
+				if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
+					addToList = false;
+
 				if (addToList) tmp.Add(macro);
 			}
 			if (tmp.Count > 0) _MyMacros = tmp;
 		}
-		#endregion
-		#region UseSmartTemplate
 
-		// TemplateIndex is for Calvert only:
-		private int _TemplateIndex = -2;  // -2 not set; -1 not a template
+		//CSM F2024 - 080: For South Texas - check if initial line is disabled for this step
+		public bool IsInitialLineDisabled
+		{
+			get
+			{
+				if (!IsStep) return false;
+				StepConfig sc = MyConfig as StepConfig;
+				return sc.Step_DisableInitialLine;
+			}
+        }
+
+        #endregion
+        #region UseSmartTemplate
+
+        // TemplateIndex is for Calvert only:
+        private int _TemplateIndex = -2;  // -2 not set; -1 not a template
 		public int TemplateIndex
 		{
 			get
@@ -8004,6 +8085,171 @@ 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 DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
+		{
+			try
+			{
+				DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
+																								  //ItemInfo.AddList(tmp);
+																								  //tmp.AddEvents();
+				return tmp;
+			}
+			catch (Exception ex)
+			{
+				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+			}
+		}
+		private DataTable dt = new DataTable();
+		private DataTable DataPortal_Fetch(DisplayTabs criteria)
+		{
+			
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabData";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						da.Fill(dt);
+						cn.Close();
+						da.Dispose();
+						return dt;
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+						throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+					}
+
+				}			
+			}
+
+		}
+		//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//{
+		//	try
+		//	{
+		//		//DisplayTabs tmp = 
+		//		DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
+		//																											  //ItemInfo.AddList(tmp);
+		//																											  //tmp.AddEvents();
+		//		//return tmp;
+		//	}
+		//	catch (Exception ex)
+		//	{
+		//		throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
+		//	}
+		//}
+		//private DataTable dt = new DataTable();
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		//{
+
+		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+		//	{
+		//		using (SqlCommand cm = cn.CreateCommand())
+		//		{
+		//			try
+		//			{
+		//				cm.CommandType = CommandType.StoredProcedure;
+		//				cm.CommandText = "AddDisplayTabState";
+		//				cm.CommandTimeout = Database.DefaultTimeout;
+		//				cm.Parameters.AddWithValue("@ItemID", ItemID);
+		//				cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+		//				cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+		//				cm.ExecuteNonQuery();
+		//				//SqlDataAdapter da = new SqlDataAdapter(cm);
+		//				//da.Fill(dt);
+		//				//cn.Close();
+		//				//da.Dispose();
+		//				//return dt; // fix
+		//			}
+		//			catch (Exception ex)
+		//			{
+		//				//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
+		//				throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
+		//			}
+
+		//		}
+		//	}
+
+		//}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+
+			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,7 +951,10 @@ 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.
-			if (!pasteItem.IsHigh && !pasteItem.IsCaution && !pasteItem.IsNote) return;
+			// 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;
 
 			// 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.
@@ -974,6 +977,12 @@ 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
@@ -1867,6 +1876,10 @@ namespace VEPROMS.CSLA.Library
 			if (IsCaution) enhType = 20006;
 			return enhType;
 		}
+
+		// B2024-075: Paste Before/After with Enhanced Documents is creating situation
+		//where Background item is linked to Source but Source is not linked to Background
+		//When Fixing the linking, need to not create a duplicate link if one already exists
 		public void DoCreateLinksEnhancedSingleItem(ItemInfo enhii, int enhtype)
 		{
 			// Link the 2 items, srcII & enhii:
@@ -1884,12 +1897,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					StepConfig sc = enhii.MyConfig as StepConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsSection)
@@ -1907,12 +1923,15 @@ namespace VEPROMS.CSLA.Library
 				using (Item ei = Item.Get(enhii.ItemID))
 				{
 					SectionConfig sc = enhii.MyConfig as SectionConfig;
-					sc.AddEnhancedDocument(0, this.ItemID);
-					sc.SaveEnhancedDocuments();
-					ei.MyContent.Text = DisplayText;
-					ei.MyContent.Config = sc.ToString();
-					ei.Save();
-					enhii.RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(0, this.ItemID);
+						sc.SaveEnhancedDocuments();
+						ei.MyContent.Text = DisplayText;
+						ei.MyContent.Config = sc.ToString();
+						ei.Save();
+						enhii.RefreshConfig();
+					}
 				}
 			}
 			else if (IsProcedure)
@@ -1933,16 +1952,66 @@ namespace VEPROMS.CSLA.Library
                 using (Item ii = this.Get())
                 {
                     ProcedureConfig sc = this.MyConfig as ProcedureConfig;
-                    sc.AddEnhancedDocument(enhtype, enhii.ItemID);
-                    sc.SaveEnhancedDocuments();
-                    ii.MyContent.Config = sc.ToString();
-                    ii.Save();
-                    RefreshConfig();
+					if (!sc.MyEnhancedDocuments.Exists(x => x.Type == 0))
+					{
+						sc.AddEnhancedDocument(enhtype, enhii.ItemID);
+						sc.SaveEnhancedDocuments();
+						ii.MyContent.Config = sc.ToString();
+						ii.Save();
+						RefreshConfig();
+					}
                 }
 			}
 		}
 		#endregion
 		#region DataPortal
+		// C2017-031:  Support for paste/replace an enhanced step
+		private void DataPortal_Fetch(PastingPartEnhancedCriteria criteria)
+		{
+			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
+			try
+			{
+				using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+				{
+					Csla.ApplicationContext.LocalContext["cn"] = cn;
+					using (SqlCommand cm = cn.CreateCommand())
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.Parameters.AddWithValue("@StartItemID", criteria.StartItemID);  // copy children
+						cm.Parameters.AddWithValue("@ItemID", criteria.ItemID);            //copy to
+						cm.Parameters.AddWithValue("@Type", criteria.Type);
+						cm.Parameters.AddWithValue("@DTS", criteria.DTS);
+						cm.Parameters.AddWithValue("@UserID", criteria.UserID);
+						SqlParameter param_ContentID = new SqlParameter("@NewItemID", SqlDbType.Int);
+						param_ContentID.Direction = ParameterDirection.Output;
+						cm.Parameters.Add(param_ContentID);
+						cm.CommandText = "PasteItemEnhancedReplace";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
+						{
+							if (!dr.Read())
+							{
+								_ErrorMessage = "No Record Found";
+								return;
+							}
+							ReadData(dr);
+						}
+					}
+					// removing of item only needed for local data portal
+					if (Csla.ApplicationContext.ExecutionLocation == Csla.ApplicationContext.ExecutionLocations.Client)
+						Csla.ApplicationContext.LocalContext.Remove("cn");
+				}
+			}
+			catch (Exception ex)
+			{
+				if (!ex.Message.Contains("This step has been deleted") && !ex.Message.Contains("This current step has been deleted in another session"))
+				{
+					if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemInfo.DataPortal_Fetch", ex);
+				}
+				_ErrorMessage = ex.Message;
+				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
+			}
+		}
 		private void DataPortal_Fetch(PastingPartCriteria criteria)
 		{
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ItemInfo.DataPortal_Fetch", GetHashCode());
@@ -2064,9 +2133,72 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("ItemInfo.DataPortal_Fetch", ex);
 			}
 		}
+	#endregion
+	#region PastingPartEnhancedCriteria
+	// C2017-031:  Support for paste/replace an enhanced step
+	[Serializable()]
+	public class PastingPartEnhancedCriteria
+	{
+		#region Properties
+		private int _StartItemID;
+		public int StartItemID
+		{
+			get { return _StartItemID; }
+			set { _StartItemID = value; }
+		}
+		private int _ItemID;            // paste relative to this itemid
+		public int ItemID
+		{
+			get { return _ItemID; }
+			set { _ItemID = value; }
+		}
+		private EAddpingPart _AddType;
+		public EAddpingPart AddType
+		{
+			get { return _AddType; }
+			set { _AddType = value; }
+		}
+		private int? _FromType = null;
+		public int? FromType
+		{
+			get { return _FromType; }
+			set { _FromType = value; }
+		}
+		private int? _Type = null;
+		public int? Type
+		{
+			get { return _Type; }
+			set { _Type = value; }
+		}
+		private DateTime _DTS;
+		public DateTime DTS
+		{
+			get { return _DTS; }
+			set { _DTS = value; }
+		}
+		private string _UserID;
+		public string UserID
+		{
+			get { return _UserID; }
+			set { _UserID = value; }
+		}
+			#endregion
+			#region Constructor
+			public PastingPartEnhancedCriteria(int startItemid, int itemID, EAddpingPart addType, int? type, int? fromType, DateTime dts, string userID)
+			{
+				_StartItemID = startItemid;
+				_ItemID = itemID;
+				_AddType = addType;
+				_Type = type;
+				_FromType = fromType;
+				_DTS = dts;
+				_UserID = userID;
+			}
 		#endregion
-		#region PastingPartCriteria
-		[Serializable()]
+	}
+	#endregion
+	#region PastingPartCriteria
+	[Serializable()]
 		public class PastingPartCriteria
 		{
 			#region Properties
@@ -2355,6 +2487,14 @@ namespace VEPROMS.CSLA.Library
 			_MyPrevious = null; // Reset list so that the next line gets a new list
 			if (MyPrevious != null) MyPrevious.RefreshNextItems(); // Update List for new value
 		}
+		// C2017-031:  Support for paste/replace an enhanced step
+		internal static ItemInfo CopyPasteReplaceEnhancedItemInfoFetch(int copyStartID, ItemInfo itemInfo)
+		{
+			ItemInfo tmp = null;
+			tmp = DataPortal.Fetch<StepInfo>(new ItemInfo.PastingPartEnhancedCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID));
+			AddToCache(tmp);
+			return tmp;
+		}
 		internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType)
 		{
 			ItemInfo tmp = null;
@@ -2516,8 +2656,16 @@ namespace VEPROMS.CSLA.Library
 			ItemInfo newItemInfo = null;
 			try
 			{
-				newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); //itemInfo.ItemID, itemInfo.MyContent.Type, itemInfo.MyContent.Type);
-				if (newItemInfo == null) return null;
+				// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
+				if (itemInfo.IsEnhancedStep)
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+					if (newItemInfo == null) return null;
+				}
+				else
+				{
+					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+				}
 			}
 			catch (Exception ex1)
 			{

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

@@ -156,32 +156,38 @@ namespace VEPROMS.CSLA.Library
 				SessionInfoList sil = DataPortal.Fetch<SessionInfoList>(new SessionInfoList.CanCheckOutItemCriteria(objectID, objectType));
 				if (sil.Count == 0)
 					return true;
-        if (objectType == CheckOutType.Session)
-        {
-          if (sil.Count == 1)
-          {
-            OwnerInfoList oil = OwnerInfoList.GetBySessionID(sil[0].SessionID);
-            if (oil.Count == 0)
-              return true;
-            else
-            {
-              message = "Export Procedure Set and Import Procedure Set are not available because you have open procedures or documents";
-              return false;
-            }
-          }
-          else
-          {
-            message = "Export Procedure Set and Import Procedure Set are not available because there are other sessions open in the database";
-            return false;
-          }
-        }
+				if (objectType == CheckOutType.Session)
+				{
+					if (sil.Count == 1)
+					{
+						OwnerInfoList oil = OwnerInfoList.GetBySessionID(sil[0].SessionID);
+						if (oil.Count == 0)
+							return true;
+						else
+						{
+							message = "Export Procedure Set and Import Procedure Set are not available because you have open procedures or documents";
+							return false;
+						}
+					}
+					else
+					{
+						message = "Export Procedure Set and Import Procedure Set are not available because there are other sessions open in the database";
+						return false;
+					}
+				}
 				bool rv = true;
 				// C2015-022 part of separate windows logic, check the processID instead of the sessionID
 				foreach (SessionInfo si in sil)
 				{
 					if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Procedure)
 					{
-						message = string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(objectID).MyProcedure.DisplayNumber, si.UserID);
+						//B2024-074 If no Number for Procedure, Display Title
+						ProcedureInfo tmpproc = ItemInfo.Get(objectID).MyProcedure;
+						string name = tmpproc.DisplayNumber;
+						if (string.IsNullOrEmpty(name))
+						{ name = tmpproc.DisplayText; }
+
+						message = string.Format("The procedure {0} is already checked out to {1}", name, si.UserID);
 						rv = rv && false;
 					}
 					else if (si.ProcessID != this.ProcessID && objectType == CheckOutType.Document)
@@ -195,8 +201,16 @@ namespace VEPROMS.CSLA.Library
 						OwnerInfo oi = OwnerInfo.GetBySessionIDandVersionID(si.SessionID, objectID);
 						if (oi == null)
 							message = message + string.Format("The working draft is already checked out to {0}", si.UserID) + Environment.NewLine;
-						else if(oi.OwnerType == 0)
-							message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
+						else if (oi.OwnerType == 0)
+						{
+							//B2024-074 If no Number for Procedure, Display Title
+							ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
+							string name = tmpproc.DisplayNumber;
+							if (string.IsNullOrEmpty(name))
+							{ name = tmpproc.DisplayText; }
+
+							message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
+						}
 						else if (oi.OwnerType == 1)
 							message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 						else if (oi.OwnerType == 2)
@@ -211,7 +225,15 @@ namespace VEPROMS.CSLA.Library
 						if (oi != null)
 						{
 							if (oi.OwnerType == 0)
-								message = message + string.Format("The procedure {0} is already checked out to {1}", ItemInfo.Get(oi.OwnerItemID).MyProcedure.DisplayNumber, si.UserID) + Environment.NewLine;
+							{
+								//B2024-074 If no Number for Procedure, Display Title
+								ProcedureInfo tmpproc = ItemInfo.Get(oi.OwnerItemID).MyProcedure;
+								string name = tmpproc.DisplayNumber;
+								if (string.IsNullOrEmpty(name))
+								{ name = tmpproc.DisplayText; }
+
+								message = message + string.Format("The procedure {0} is already checked out to {1}", name, si.UserID) + Environment.NewLine;
+							}
 							else if (oi.OwnerType == 1)
 								message = message + string.Format("The document {0} is already checked out to {1}", DocumentInfo.Get(oi.OwnerItemID).DocumentEntries[0].MyContent.Text, si.UserID) + Environment.NewLine;
 							else if (oi.OwnerType == 2)

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

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

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

@@ -3175,6 +3175,17 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ChangeFontUpperCaseIinArial, "@ChangeFontUpperCaseIinArial");
 			}
 		}
+
+		// F2024-080 South Texas
+		// Used to show if "Initial Line Disable" checkbox should show in the DisplayTab
+		private LazyLoad<bool> _ShowInitialLineDisable;
+		public bool ShowInitialLineDisable
+		{
+			get
+			{
+				return LazyLoad(ref _ShowInitialLineDisable, "@ShowInitialLineDisable");
+			}
+		}
 	}
 	#endregion - StepSectionData
 	#region TextTypeValue
@@ -6396,7 +6407,7 @@ public StepData Equation		// equation has a parent of embedded object.
 		}
 		public TransData(XmlNode xmlNode) : base(xmlNode) { }
 
-		// a character that is placed before and after the title that's in the transition text
+		// a character that is placed before and after the procedure title that's in the transition text
 		private LazyLoad<string> _DelimiterForTransitionTitle;
 		public string DelimiterForTransitionTitle
 		{
@@ -6673,7 +6684,9 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
-		// holdover from 16bit, used to define whether transitions are range (types 2 & 3). this is used in the logic for transitions with page numbers
+		// Holdover from 16bit, used to define whether transitions are range (types 2 & 3).
+		// This is used in the logic for transitions with page numbers. This gets defined as "Type" in the code for the transition class.
+		// NOTE: the TransType you see in the code is actually the index into the list of transition definitions for given format. 
 		private LazyLoad<int?> _Type;
 		public int? Type
 		{

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

@@ -1132,6 +1132,91 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Item.Add", ex);
 			}
 		}
+		public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "DeactivateStateDisplayTabTmp";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
+		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName, string UserID, int order)
+		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "AddDisplayTabState";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@ItemID", itemID);
+						cm.Parameters.AddWithValue("@displayTabID", displayTabID);
+						cm.Parameters.AddWithValue("@displayTabName", displayTabName);
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						cm.Parameters.AddWithValue("@order", order);
+						cm.ExecuteNonQuery();
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.AddDisplayTabsState", ex);
+						throw new DbCslaException("ItemExt.AddDisplayTabsState", ex);
+					}
+				}
+			}
+		}
+		public static DataTable GetDisplayTabs(string UserID) //, string displayTabID, string displayTabName)
+														   //public static void DeactivateStateDisplayTabTmp(string UserID)
+		{
+			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
+			{
+				using (SqlCommand cm = cn.CreateCommand())
+				{
+					try
+					{
+						cm.CommandType = CommandType.StoredProcedure;
+						cm.CommandText = "GetDisplayTabdata";
+						cm.CommandTimeout = Database.DefaultTimeout;
+						cm.Parameters.AddWithValue("@UserID", UserID);
+						//cm.ExecuteNonQuery();						
+						SqlDataAdapter da = new SqlDataAdapter(cm);
+						//da.Fill(dt);
+						//cn.Close();
+						//da.Dispose();
+						//return dt; // fix
+
+						SqlDataReader reader = cm.ExecuteReader();
+						DataTable dt = new DataTable();
+						dt.Load(reader);
+						return dt;
+
+					}
+					catch (Exception ex)
+					{
+						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DeactivateStateDisplayTabTmp", ex);
+						throw new DbCslaException("ItemExt.DeactivateStateDisplayTabTmp", ex);
+					}
+
+				}
+			}
+		}
 		[Transactional(TransactionalTypes.TransactionScope)]
 		protected override void DataPortal_Update()
 		{

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

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

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

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

PROMS/Volian.Controls.Library/AnnotationDetails.cs

@@ -277,17 +277,27 @@ namespace Volian.Controls.Library
 
 		private void btnRemoveAnnotation_Click(object sender, EventArgs e)
 		{
-			//using (Annotation annotation = CurrentAnnotation.Get())
-			//{
-			//				annotation.Delete();
-			_AnnotationSearch.LoadingList = true;
-			Annotation.DeleteAnnotation(CurrentAnnotation);
-			//				annotation.Save();
-			_AnnotationSearch.LoadingList = false;
-			CurrentAnnotation = null;
-			UpdateAnnotationGrid();
-			_AnnotationSearch.UpdateAnnotationSearchResults(); // B2019-004: update search results list when an annotation is removed.
-			//}
+			// CSM B2024-068 / B2024-069 - check if current annotation is not selected before removal of annotation
+			if (CurrentAnnotation != null)
+			{
+				//using (Annotation annotation = CurrentAnnotation.Get())
+				//{
+				//				annotation.Delete();
+				_AnnotationSearch.LoadingList = true;
+				Annotation.DeleteAnnotation(CurrentAnnotation);
+				//				annotation.Save();
+				_AnnotationSearch.LoadingList = false;
+				CurrentAnnotation = null;
+				UpdateAnnotationGrid();
+				_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)
@@ -674,12 +684,15 @@ namespace Volian.Controls.Library
 				{
 					using (Annotation annotation = CurrentAnnotation.Get())
 					{
-						annotation.RtfText = rtxbComment.Rtf;
-						annotation.SearchText = rtxbComment.Text;
-						annotation.MyAnnotationType = annotationType;
-						annotation.DTS = DateTime.Now;
-						annotation.UserID = Volian.Base.Library.VlnSettings.UserID;
-						annotation.Save();
+						if (annotation != null) // B2024-061 check for null reference
+						{
+							annotation.RtfText = rtxbComment.Rtf;
+							annotation.SearchText = rtxbComment.Text;
+							annotation.MyAnnotationType = annotationType;
+							annotation.DTS = DateTime.Now;
+							annotation.UserID = Volian.Base.Library.VlnSettings.UserID;
+							annotation.Save();
+						}
 					}
 				}
 			}

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

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

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

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

PROMS/Volian.Controls.Library/DisplayTabControl.cs

@@ -672,8 +672,10 @@ 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)
+					(pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded || isSec))   
 				{
 					EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID];
 					switch (pasteType)
@@ -710,7 +712,8 @@ namespace Volian.Controls.Library
 			}
 			else if (_MyDisplayTabItems.ContainsKey(key) && pasteType == ItemInfo.EAddpingPart.Replace)
 			{
-				CloseTabItem(_MyDisplayTabItems["Item - " + myItemInfo.ItemID.ToString()]); //Grab itemID and set to close open tab.
+				// 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.
 				return false; //B2017-179 PasteReplace will return null if was aborted
 			}
 			return false;

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
@@ -111,7 +111,7 @@ namespace Volian.Controls.Library
 			get { return tbFSHt.Text; }
 			set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); }
 		}
-	
+
 		#endregion
 		#region Constructor
 		public DisplayTags()
@@ -142,6 +142,8 @@ namespace Volian.Controls.Library
 			tbChgID.Enabled = false;
 			lblChgId.Visible = tbChgID.Visible = false;
 			CurItemInfo = null;
+			cbInitialLine.Visible = cbInitialLine.Enabled = false;
+
 		}
 		private bool StepOverRide()
 		{
@@ -553,6 +555,16 @@ namespace Volian.Controls.Library
 					}
 				}
 			}
+
+			//CSM F2024 - 080: For South Texas (HLP formats), enable the initial line checkbox if it is in the formats
+			//Also, they want disable being selected to impact substeps - so do not show toggle if selected on a parent step
+			cbInitialLine.Visible = cbInitialLine.Enabled = false;
+			if (CurItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(CurItemInfo.FormatStepData.TabData.MacroEditTag) && CurItemInfo.FormatStepData.TabData.MacroEditTag == "_" && CurItemInfo.FormatStepData.TabData.MacroList != null && CurItemInfo.FormatStepData.TabData.MacroList.Count > 0 && !(CurItemInfo.IsRNOPart && CurItemInfo.FormatStepData.TabData.MacroList[0].NotInRNO))
+			{
+				cbInitialLine.Visible = cbInitialLine.Enabled = true;
+				cbInitialLine.Checked = sc.Step_DisableInitialLine;
+			}
+
 			_Initalizing = false;
 		}
 		public void SetFigure(double wd, double wd2)
@@ -969,25 +981,42 @@ namespace Volian.Controls.Library
 			sc.Step_PreferredPagebreak = cbPrefPageBreak.Checked;
 			MyEditItem.ChangeBarForConfigItemChange = true;
 		}
-		//private void txbxAltConActSumText_Leave(object sender, EventArgs e)
-		//{
-		//	// User left Atlernate Continuous Action Text field.  If text changed, then prompt
-		//	// to see if save should occur.
-		//	StepConfig sc = CurItemInfo.MyConfig as StepConfig;
-		//	if (sc == null) return;
-		//	bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == "");
-		//	if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text)
-		//	{
-		//		if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-		//		{
-		//			MyEditItem.SaveContents();
-		//			sc.Step_AlternateContActSumText = txbxAltConActSumText.Text;	// this actually saves the config
-		//		}
-		//		else
-		//			txbxAltConActSumText.Text = sc.Step_AlternateContActSumText;
-		//	}
 
-		//}
+        private void cbInitialLine_CheckedChanged(object sender, EventArgs e)
+        {
+			if (_Initalizing) return;
+			MyEditItem.SaveContents();
+			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+			if (sc == null) return;
+			MyEditItem.ChangeBarForConfigItemChange = false;
+			sc.Step_DisableInitialLine = cbInitialLine.Checked;
+			MyEditItem.ChangeBarForConfigItemChange = true;
 
-	}
+			//needed to refresh display changing
+			MyEditItem.RefreshContent();
+			MyEditItem.SetAllTabs();
+
+		}
+
+        //private void txbxAltConActSumText_Leave(object sender, EventArgs e)
+        //{
+        //	// User left Atlernate Continuous Action Text field.  If text changed, then prompt
+        //	// to see if save should occur.
+        //	StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+        //	if (sc == null) return;
+        //	bool bothEmpty = (sc.Step_AlternateContActSumText == null || sc.Step_AlternateContActSumText == "") && (txbxAltConActSumText.Text == null || txbxAltConActSumText.Text == "");
+        //	if (!bothEmpty && sc.Step_AlternateContActSumText != txbxAltConActSumText.Text)
+        //	{
+        //		if (MessageBox.Show(this, "Do you want to save the Alternate Continuous Action Text?", "Confirm Save", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+        //		{
+        //			MyEditItem.SaveContents();
+        //			sc.Step_AlternateContActSumText = txbxAltConActSumText.Text;	// this actually saves the config
+        //		}
+        //		else
+        //			txbxAltConActSumText.Text = sc.Step_AlternateContActSumText;
+        //	}
+
+        //}
+
+    }
 }

PROMS/Volian.Controls.Library/EditItem.cs

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

PROMS/Volian.Controls.Library/ImageItem.cs

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

PROMS/Volian.Controls.Library/StepPanel.cs

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

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -485,6 +485,8 @@ namespace Volian.Controls.Library
 		public void RefreshDisplay(bool activeMode)
 		{
 			if (IsExperimenting) return;
+			if (IsDisposed) return;
+
 			ActiveMode = activeMode;
 			OnAdjustTableWidth(this, new StepRTBTableWidthEventArgs(true));
 			//Volian.Base.Library.HWndCounter.GetWindowHandlesForCurrentProcess(this.Handle, "RefreshDisplay 2");

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -337,8 +337,10 @@ namespace Volian.Controls.Library
 				else if (btn.Name.Contains("Unlink"))
 				{
 					// C2019=003: add a confirmation dialog before unlinking a step:
+					// B2024 - 075: Change made to pass in an EditTem instead of a ItemInfo
+					//so can refresh the UI
 					if (FlexibleMessageBox.Show(this, "Do you want to unlink this step?", "Confirm Enhanced Step Unlink", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-						MyEditItem.UnlinkEnhanced(MyEditItem.MyItemInfo);
+						MyEditItem.UnlinkEnhanced(MyEditItem);
 				}
 			}
 			else
@@ -1750,7 +1752,7 @@ namespace Volian.Controls.Library
 			// note in follow if statements, 'setting' == false when in enhanced document:
 			if (setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0))	// this step is in enhanced, but not linked // B2018-112 and is allowed to edit
 				allowDel = true;	// allow delete if not linked
-			btnCpyStp.Enabled = setting;
+			btnCpyStp.Enabled = MyUserInfo.IsAllowedToEdit(Mydvi); // C2017-031:  Support for paste/replace an enhanced step
 			//B20170-158 Allow a Unlinked Step to be pasted before or after a linked step.
 			StepTabPanel tmp = Parent as StepTabPanel;
 			//B2020-058: crash on null reference
@@ -1801,7 +1803,8 @@ namespace Volian.Controls.Library
 			btnPasteAfter.Enabled = btnCMPasteAfter.Enabled = enable;
 			//B20170-158 Don't allow a step to replace a linked step
 			//B2017-180:  The fix for B2017-158 also needed the 'HasEnhancedLinkedStep' to check if the copied step is a source step
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && !MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep;
+			// C2017-031:  Support for paste/replace an enhanced step, enable button
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && ((!MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep) || (MyItemInfo.IsEnhancedStep));
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -4110,9 +4113,19 @@ namespace Volian.Controls.Library
 			// F2021-009 display a message if pasting step will results in more sub-step levels than are defined in the format
 			ItemInfo.PasteStepIsWithinDefinedSubStepLevels(tmp.MyDisplayTabControl.MyCopyStep.ItemID, MyItemInfo, true);
 			EditItem oldEditItem = MyEditItem;
+			// C2017-031:  Support for paste/replace an enhanced step, if pasting an enhanced, remove its EditItem from the 'cache'.  A new EditItem gets created during paste.
+			if (MyEditItem != null && MyEditItem.MyItemInfo.IsEnhancedStep) MyEditItem.MyStepPanel._LookupEditItems.Remove(MyEditItem.MyItemInfo.ItemID);
 			MyEditItem = MyEditItem.PasteReplace(tmp.MyDisplayTabControl.MyCopyStep.ItemID);
 			if (MyEditItem == null) oldEditItem.IdentifyMe(false); // B2017-179 if null then we didn't do the replace but did position to the first transition that needs resolved
-			if (MyEditItem != null && MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, add Dispose of old EditItem if enhanced
+			if (MyEditItem != null && ((MyEditItem.MyItemInfo.ItemID != oldEditItem.MyItemInfo.ItemID) || MyEditItem.MyItemInfo.IsEnhancedStep))
+				oldEditItem.Dispose();
+			// C2017-031:  Support for paste/replace an enhanced step, refresh ItemInfo's in user interface caches.
+			if (MyEditItem.MyItemInfo.IsEnhancedStep)
+			{
+				MyEditItem.MyItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+				tmp.MyStepPanel.SelectedItemInfo = ItemInfo.Get(MyEditItem.MyItemInfo.ItemID);
+			}
 		}
 
 		private void btnPdfCreate_Click(object sender, EventArgs e)

PROMS/Volian.Controls.Library/vlnTreeView.cs

@@ -1740,10 +1740,13 @@ namespace Volian.Controls.Library
 							//		1) 'to' & 'from' both 'non', i.e. Neither can have enhanced config data (be source or enhanced)
 							//				can do Before/After/Replace
 							//		2) 'to' section is 'source' and 'from' section is 'non' (has no MyEnhancedDocuments)
-							//				can do Before/After - no links exist in pasted section.
-							//				cannot do Replace
+							//				can do Before/After - no links exist in pasted section so cannot do Replace
 							//		3) 'to' section is 'source' and 'from' section is same docversion 'source'
-							//				can do Before/After/Replace
+							//				can do Before/After (B2024-038 removes replace)
+							//		4) 'to' section is not 'source' and 'from' section is source
+							//				can do  Before/After but not replace - would have to manage
+							//				links for 'from' section (B2024-038 added this case)
+
 							SectionConfig secToCfg = iiPasteHere.MyConfig as SectionConfig;
 							SectionConfig secFromCfg = iiClipboard.MyConfig as SectionConfig;
 
@@ -1752,13 +1755,22 @@ namespace Volian.Controls.Library
 							bool secFromIsEnhanced = iiClipboard.IsEnhancedSection;
 							bool secFromIsSource = secFromCfg.MyEnhancedDocuments != null && secFromCfg.MyEnhancedDocuments.Count > 0 && secFromCfg.MyEnhancedDocuments[0].Type != 0;
 							bool secCanPaste = false;
-							if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true;	// 1)
-							else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource) 																		// 2)
+							if (!secToIsEnhanced && !secToIsSource && !secFromIsEnhanced && !secFromIsSource) secCanPaste = true;   // 1)
+							else if (secToIsSource && !secFromIsEnhanced && !secFromIsSource)                                                                       // 2)
 							{
 								secCanPaste = true;
 								okToReplace = false;
 							}
-							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID) secCanPaste = true;		// 3)
+							else if (secToIsSource && iiPasteHere.MyDocVersion.VersionID == iiClipboard.MyDocVersion.VersionID)
+							{
+								secCanPaste = true;     // 3)
+								okToReplace = false;
+							}
+							else if (!secToIsSource && secFromIsSource)
+							{
+								secCanPaste = true; // 4
+								okToReplace = false;
+							}
 							if (iiClipboard.IsRtfRaw) secCanPaste = okToReplace = false;   // never paste an equation.
 							if (secCanPaste) cm.MenuItems.Add("Paste Section Before", new EventHandler(mi_Click));
 							if (okToReplace && secCanPaste) cm.MenuItems.Add("Replace Existing Section", new EventHandler(mi_Click));

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -138,6 +138,15 @@ namespace Volian.Print.Library
 			get { return _Prefix; }
 			set { _Prefix = value; }
 		}
+
+		// B2024-062 Set to true when the procedure being printed has no content.
+		// When set to true, will prevent the "Try Again" dialog from appearing
+		// and simply exit the print function
+		private bool _EmptyProcedure = false;
+		public bool EmptyProcedure
+		{
+			get { return _EmptyProcedure; }
+		}
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		public event PromsPrinterStatusEvent StatusChanged;
 		internal void OnStatusChanged(object sender, PromsPrintStatusArgs args)
@@ -933,6 +942,9 @@ namespace Volian.Print.Library
 			{
 				MessageBox.Show("This procedure has no content and will not be printed.", "Empty Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information);
 				ProfileTimer.Pop(profileDepth);
+				// B2024-062 Added check for EmptyProcedure. This is to prevent the Try Again message 
+				// from appearing after the user clicks on the OK button from the Empty Procedure message
+				_EmptyProcedure = true;
 				return null;
 			}
 			OnStatusChanged(myProcedure.DisplayNumber, PromsPrinterStatusType.ProgressSetup, myProcedure.Sections.Count);