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

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

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

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

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

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

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

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

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

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

@@ -188,23 +188,23 @@ namespace ROEditor
 				lboxInUse.Visible = true;
 				lb_chkApplc.Visible = false;
 			}
-			if (editlevel==(uint)RecordType.GroupSchema)this.Text = "Subgroup Definition";
+			if (editlevel == (uint)RecordType.GroupSchema) this.Text = "Subgroup Definition";
 			FillInData(grptxt);
 		}
 
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
-		protected override void Dispose( bool disposing )
+		protected override void Dispose(bool disposing)
 		{
-			if( disposing )
+			if (disposing)
 			{
-				if(components != null)
+				if (components != null)
 				{
 					components.Dispose();
 				}
 			}
-			base.Dispose( disposing );
+			base.Dispose(disposing);
 		}
 
 		private void FillInAvailable()
@@ -212,9 +212,9 @@ namespace ROEditor
 			ROField rof;
 
 			// put the items in the AvailList box.
-			for (int i=0; i< AvailList.Count; i++)
+			for (int i = 0; i < AvailList.Count; i++)
 			{
-				rof = (ROField) AvailList[i];
+				rof = (ROField)AvailList[i];
 				if (rof.GetFieldname != null)   // DO YET: Why null?
 					this.lboxAvail.Items.Add(rof.GetFieldname);
 			}
@@ -297,7 +297,7 @@ namespace ROEditor
 					else
 						parent = null;
 				}
-				if (menuitm !="")
+				if (menuitm != "")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
@@ -310,21 +310,21 @@ namespace ROEditor
 				this.lblRetVal.Visible = true;
 				VlnXmlElement parent;
 				parent = (VlnXmlElement) elem.ParentNode;
-				while (parent != null && (menuitm == "" || retval==""))
+				while (parent != null && (menuitm == "" || retval == ""))
 				{
 					// walk up tree to get parent and check for data there
 					if (menuitm == "") menuitm = parent.GetAttribute("MenuItem");
 					if (retval == "") retval = parent.GetAttribute("RetVal");
 					if (parent.Name != "RO_Root")
-						parent = (VlnXmlElement) parent.ParentNode;
+						parent = (VlnXmlElement)parent.ParentNode;
 					else
 						parent = null;
 				}
-				if (menuitm!="")
+				if (menuitm != "")
 					this.tbMenuVal.Text = CvtFldToUserFld(menuitm);
 				else
 					this.tbMenuVal.Text = "";
-				if (retval!="")
+				if (retval != "")
 					this.tbRetVal.Text = CvtFldToUserFld(retval);
 				else
 					this.tbRetVal.Text = "";
@@ -344,24 +344,27 @@ namespace ROEditor
 
 			lboxAvail.GotFocus += new EventHandler(this.lboxAvail_GotFocus);
 
+			lboxInUse.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUse_MouseUp);
+			lboxInUseCB.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lboxInUseCB_MouseUp);
+
 			// save copies of local data, so if there is a change, we know we must save them.
-			origRetVal=this.tbRetVal.Text;
+			origRetVal = this.tbRetVal.Text;
-			origMenuItem=this.tbMenuVal.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;
@@ -1097,6 +1197,7 @@ namespace ROEditor
 				}
 			}
 
+			string origname = CvtFldToUserFld(rof.GetFieldname);
 			uint ftype = rof.GetFieldType;
 			if (ftype == (uint)FieldTypes.FrmtSingleTxt || ftype == (uint)FieldTypes.VariableTxt ||
 				ftype == (uint)FieldTypes.SingleTxt || ftype == (uint)FieldTypes.Table || 
@@ -1112,6 +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,28 @@ 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}>");
+				}
 			}
 			else 
 			{
@@ -1148,7 +1261,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 +1275,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 +1513,7 @@ namespace ROEditor
 			this.btnCancel.Size = new System.Drawing.Size(80, 24);
 			this.btnCancel.TabIndex = 10;
 			this.btnCancel.Text = "Cancel";
+
 			// 
 			// RODefFrm
 			// 
@@ -1419,6 +1536,71 @@ namespace ROEditor
 			this.PerformLayout();
 
 		}
+
+		//if User clicked save (DialogResult.OK) close the form
+		//if use did not click save, ask if they are sure they want to close the form
+		//only close if they say "Yes, they want to"
+		protected override void OnFormClosing(FormClosingEventArgs e)
+		{
+			if (this.DialogResult != System.Windows.Forms.DialogResult.OK && IsPendingChange() && !CloseCancel())
+			{
+				e.Cancel = true;
+			}
+		}
+
+		public static bool CloseCancel()
+		{
+			const string message = "Are you sure that you would like to cancel? Information may not be saved.";
+			const string caption = "Cancel";
+			var result = MessageBox.Show(message, caption,
+										 MessageBoxButtons.YesNo,
+										 MessageBoxIcon.Question);
+
+            return result == DialogResult.Yes;
+        }
+
+		//return true if a field has been modified
+		private bool IsPendingChange()
+		{
+			if (origRetVal != this.tbRetVal.Text)
+				return true;
+			
+			if (origMenuItem != this.tbMenuVal.Text)
+				return true;
+
+			// check if in use records have changed
+			string inuserecs = null;
+			ROField rof;
+			for (int i = 0; i < InUseList.Count; i++)
+			{
+				rof = (ROField)InUseList[i];
+				if (rof.GetFieldname != null)   //DO YET: why null?
+				{
+					inuserecs = inuserecs + rof.GetRecID;
+					if (i + 1 < InUseList.Count) inuserecs = inuserecs + " ";
+				}
+			}
+			if (inuserecs != origFieldsInUse)
+				return true;
+
+
+			//check if applicability fields have changed
+			string applicfieldrecs = null;
+			for (int i = 0; i < InUseApplcList.Count; i++)
+			{
+				rof = (ROField)InUseApplcList[i];
+				if (rof.GetFieldname != null)
+				{
+					applicfieldrecs = applicfieldrecs + rof.GetRecID;
+					if (i + 1 < InUseApplcList.Count) applicfieldrecs = applicfieldrecs + " ";
+				}
+			}
+			if (applicfieldrecs != origApplicFields)
+				return true;
+
+			//nothing has changed
+			return false;
+		}
 		#endregion
 	}
 }

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

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

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

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

PROMS/ReferencedObjects/LibSource/RODBInterface/RODBInterface.cs

@@ -336,10 +336,10 @@ namespace RODBInterface
 		public abstract bool RODB_GetChildData(VlnXmlElement node, bool CheckChildCount);
 		public abstract bool IsDuplicateAccPageID(VlnXmlElement ro, string newacc);
 		public abstract VlnXmlElement RODB_ReadRO(string tbl, string recid);
-		public abstract bool RODB_WriteRO(VlnXmlElement ro);
+		public abstract bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false);
 		public abstract bool RODB_InsertRO(VlnXmlElement ro);
 		public abstract ushort RODB_GetFieldType(VlnXmlElement elem, string TableName, string Fld);
-		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype);
+		public abstract ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false);
 		public abstract string RODB_GetSchemaPiece(string Recid, string table);
 		public abstract bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype);
 		public abstract bool RODB_WriteSchemaPiece(string Recid, string table, string schpiece);
@@ -2120,7 +2120,7 @@ namespace RODBInterface
 			return retele;
 		}
 
-		public override bool RODB_WriteRO(VlnXmlElement ro)
+		public override bool RODB_WriteRO(VlnXmlElement ro, bool movedRO = false)
 		{
 			bool success;
 			if (ro.Name == "vlnGroup")
@@ -2140,6 +2140,13 @@ namespace RODBInterface
 				string dt = string.Format("{0:yyyyMMddHHmmss}", System.DateTime.Now);
 				string xmlstr = GenerateXmlString(ro, false);
 				string strUpdate = "UPDATE " + ro.GetAttribute("Table") + " SET Info = '" + xmlstr + "'";
+				if (movedRO)
+				{
+					VlnXmlElement parent = (VlnXmlElement)ro.ParentNode;
+					ro.SetAttribute("ParentID", parent.GetAttribute("RecID"));
+					strUpdate += ", ParentID = '" + ro.GetAttribute("ParentID") + "'";
+				}
+				
 				strUpdate = strUpdate + ", ModDateTime = '" + dt + "', AccPageID = '" + wraccid + "' WHERE RecID='" + ro.GetAttribute("RecID") + "'";
 				try
 				{
@@ -2192,6 +2199,8 @@ namespace RODBInterface
 				ro.SetAttribute("HasChild", "False");
 				if (ro.HasAttribute("AccPageID"))
 				{
+					// Code is never reached, but this was noticed - this next line should likely be:
+					//    strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, AccPageID, ModDateTime, Info ) ";
 					strInsert = "INSERT INTO " + parent.GetAttribute("Table") + "( RecID, RecType, ParentID, ModDateTime, AccPageID, Info ) ";
 					strInsert = strInsert + " VALUES ('" + ro.GetAttribute("RecID") + "'," + (uint)RecordType.Group + ",'" + ro.GetAttribute("ParentID");
 					strInsert = strInsert + "','" + wraccid + "','" + dt + "','" + xmlstr + "');";
@@ -2294,11 +2303,16 @@ namespace RODBInterface
 		}
 
 		// For the given element's table, get all of the RO fields defined in this table.
-		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype)
+		public override ArrayList RODB_GetFields(VlnXmlElement elem, uint rtype, bool refresh = false)
 		{
 			string table = elem.GetAttribute("Table");
 			if (!FieldDefinitions.ContainsKey(table))
 				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			else if (refresh)
+			{
+				FieldDefinitions.Remove(table);
+				FieldDefinitions.Add(table, RODB_GetFieldsFromDB(elem));
+			}
 			return FieldDefinitions[table];
 		}
 		private Dictionary<string, ArrayList> _FieldDefinitions = null;
@@ -2391,7 +2405,7 @@ namespace RODBInterface
 				Info = null;
 			DBE.ReaderClose();
 			DBE.CommandDispose();
-			return Info.Replace("&apos;", "\'");
+			return Info?.Replace("&apos;", "\'");
 		}
 
 		public override bool RODB_NewSchemaPiece(string recid, string parentid, string table, string schpiece, uint rtype)
@@ -2666,8 +2680,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." +
+					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.";
+						$"\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 +2786,19 @@ namespace RODBInterface
 			return success;
 		}
 
+		//CSM-C2024-030
+		//Explain that Local is local to that table (and include Table name in wording displayed to user)
+		public string GetTopParentName(VlnXmlElement elem)
+		{
+		   VlnXmlElement nodetocheck = elem;
+		   while (nodetocheck.GetAttribute("ParentID") != "00000000" && nodetocheck.ParentNode != null)
+			{
+				nodetocheck = (VlnXmlElement) nodetocheck.ParentNode;
+			}
+
+			return nodetocheck.FirstChild.InnerText;
+		}
+
 		public override XmlSchema RODB_GetGroupSchema(VlnXmlElement elem)
 		{
 			XmlSchema myschema;

PROMS/ReferencedObjects/LibSource/RODBInterface/SqlRODB.cs

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

PROMS/ReferencedObjects/LibSource/VlnStatus/StatusMessageFrm.cs

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

PROMS/VEPROMS User Interface/PROMSFixes.Sql

@@ -23798,7 +23798,7 @@ BEGIN TRY -- Try Block
 		--then remove the link from the copy
 		--if original item was not linked, update new items to not be linked
 		DECLARE @xconfig XML = (Select cast(config as xml) xconfig from Contents where ContentID = @ContentID);
-		IF @xconfig.exist('//Enhanced[1]') = 0
+		IF ISNULL(@xconfig.exist('//Enhanced[1]'),0) = 0
 		BEGIN
 		  UPDATE Contents SET Config = dbo.vefn_RemoveEnhanced(Contents.Config)
 		    Where ContentID in (Select ContentID FROM vefn_ChildItems(@NewItemID))
@@ -23904,12 +23904,201 @@ GO
 IF (@@Error = 0) PRINT 'Procedure Creation: [PasteItemReplace] Succeeded'
 ELSE PRINT 'Procedure Creation: [PasteItemReplace] Error on Creation'
 GO
+-- SP: AddDisplayTabState
+
+
+SET QUOTED_IDENTIFIER ON
+GO
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[AddDisplayTabState]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [AddDisplayTabState];
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 9/18/2024
+-- Description:	Save current open tab state in PROMS editor.
+-- =============================================
+CREATE PROCEDURE [dbo].[AddDisplayTabState]
+(
+	@ItemID int,
+	@DisplayTabID varchar(30),
+	@DisplayTabName varchar(100),
+	@userID varchar(100),
+	@order int
+)
+
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
+
+	-- Remove all records
+	-- DELETE FROM [dbo].[DisplayTabTmp];
+
+		-- Record current tab information
+	INSERT INTO [dbo].[DisplayTabTmp] (itemid,DisplayTabID,DisplayTabName,userid,active, taborder)
+	VALUES (@ItemID,@DisplayTabID,@DisplayTabName,@userID, 1, @order)
+END
+GO
+
+-- SP: GetDisplayTabdata
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[GetDisplayTabdata]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [GetDisplayTabdata];
+GO
+/****** Object:  StoredProcedure [dbo].[GetDisplayTabdata]    Script Date: 10/3/2024 11:29:44 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 09/18/2024
+-- Description:	retrieve PROMS edit tab saved state.
+-- =============================================
+CREATE PROCEDURE [dbo].[GetDisplayTabdata]
+(
+	@UserID varchar(100)
+)
+
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+  SET NOCOUNT ON;
+
+  SELECT [ItemID]
+      ,[DisplayTabID]
+      ,[DisplayTabName]
+      ,[UpdateDate]
+      ,[UserID]
+      ,[taborder]
+  FROM [dbo].[DisplayTabTmp]
+  WHERE UserID = @UserID AND Active = 1
+  order by taborder
+END
+GO
+-- SP: DeactivateStateDisplayTabTmp
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[DeactivateStateDisplayTabTmp]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [DeactivateStateDisplayTabTmp];
+GO
+/****** Object:  StoredProcedure [dbo].[DeactivateStateDisplayTabTmp]    Script Date: 10/3/2024 11:30:53 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Paul Larsen
+-- Create date: 10/1/2024
+-- Description:	Set PROMES Edit window tabs state inactive.
+-- =============================================
+CREATE procedure [dbo].[DeactivateStateDisplayTabTmp]
+(
+	@UserID varchar(100)
+)
+
+AS
+UPDATE [dbo].[DisplayTabTmp]
+SET Active = 0 
+WHERE UserID = @UserID
+GO
+-- Table: DisplayTabTmp
+                -- If DisplayTabTmp table already exists then don't drop and recreate it
+                IF Not Exists(SELECT * FROM sys.objects Where name = 'DisplayTabTmp' AND type in (N'U'))
+                Begin
+                                SET ANSI_NULLS ON
+                                SET QUOTED_IDENTIFIER ON
+                                                -- =============================================
+                                                -- Author:                            Paul Larsen
+                                                -- Create date: 9/30/2024
+                                                -- Description:    Table to hold tab state in PROMS editor.
+                                                -- =============================================
+                                /****** Object:  Table [dbo].[DisplayTabTmp]    Script Date: 10/3/2024 11:22:00 AM ******/
+
+                                CREATE TABLE [dbo].[DisplayTabTmp](
+                                                [ID] [int] IDENTITY(1,1) NOT NULL,
+                                                [ItemID] [int] NOT NULL,
+                                                [DisplayTabID] [nvarchar](100) NOT NULL,
+                                                [DisplayTabName] [nchar](100) NOT NULL,
+                                                [UpdateDate] [datetime] NOT NULL,
+                                                [UserID] [nchar](100) NOT NULL,
+                                                [Active] [bit] NOT NULL,
+                                                [taborder] [int] NOT NULL
+                                ) ON [PRIMARY]
+                                
+                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  CONSTRAINT [DF_DisplayTabTmp_UpdateDate]  DEFAULT (getdate()) FOR [UpdateDate]
+                                
+                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  CONSTRAINT [DF_DisplayTabTmp_Active]  DEFAULT ((1)) FOR [Active]
+                                
+                                ALTER TABLE [dbo].[DisplayTabTmp] ADD  DEFAULT ((0)) FOR [taborder]
+                                
+                End        
+GO
 /*
 ==========================================================================================================
  End: C2017-031: SQL to allow copy/replace enhanced step
 ==========================================================================================================
 */
 
+---The following RememberOpenTabs/AlwaysOpenTabs columns were added for Remeber Open Tabs.
+--- RememberOpenTabs = Do not prompt User when PROMS opens
+--- AutoOpenTabs = OpenTabs when PROMS opens - Default to On
+IF NOT EXISTS(SELECT *
+          FROM   INFORMATION_SCHEMA.COLUMNS
+          WHERE  TABLE_NAME = 'Users'
+                 AND COLUMN_NAME = 'RememberOpenTabs') 
+ALTER TABLE Users ADD RememberOpenTabs bit NOT NULL DEFAULT(0);
+go
+-- Display the status
+IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for RememberOpenTabs'
+ELSE PRINT 'Altered table [Users] Error on Alter for RememberOpenTabs'
+go
+
+IF NOT EXISTS(SELECT *
+          FROM   INFORMATION_SCHEMA.COLUMNS
+          WHERE  TABLE_NAME = 'Users'
+                 AND COLUMN_NAME = 'AutoOpenTabs') 
+ALTER TABLE Users ADD AutoOpenTabs bit NOT NULL DEFAULT(1);
+go
+-- Display the status
+IF (@@Error = 0) PRINT 'Altered table [Users] Succeeded for AutoOpenTabs'
+ELSE PRINT 'Altered table [Users] Error on Alter for AutoOpenTabs'
+go
+
+/****** Object:  StoredProcedure [dbo].[vesp_UpdateUserSettings]    Script Date: 10/24/2024 11:29:44 AM ******/
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_UpdateUserSettings]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1)
+	DROP PROCEDURE [vesp_UpdateUserSettings];
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- =============================================
+-- Author:		Matthew Schill
+-- Create date: 10/24/2024
+-- Description:	Update User Settings
+-- =============================================
+CREATE PROCEDURE [dbo].[vesp_UpdateUserSettings]
+
+(
+	@UID varchar(100),
+	@Remember bit = null,
+	@AutoOpen bit = null
+)
+WITH EXECUTE AS OWNER
+AS
+   UPDATE Users SET 
+     RememberOpenTabs = ISNULL(@Remember,RememberOpenTabs),
+	 AutoOpenTabs = ISNULL(@AutoOpen,AutoOpenTabs)
+	WHERE UserID =@UID
+
+	RETURN
+GO
+
+IF (@@Error = 0) PRINT 'Running vesp_UpdateUserSettings Succeeded'
+ELSE PRINT 'Running vesp_UpdateUserSettings Failed to Execute'
+GO
+
 /*
   ---------------------------------------------------------------------------
   |                       ADD New Code Before this Block                    |
@@ -23943,8 +24132,8 @@ BEGIN TRY -- Try Block
 	DECLARE @RevDate varchar(255)
 	DECLARE @RevDescription varchar(255)
 
-	set @RevDate = '09/26/2024 11:24'
+	set @RevDate = '10/28/2024 11:24'
-	set @RevDescription = 'SQL to allow copy/replace enhanced step.'
+	set @RevDescription = 'Add the ability for PROMS to remember the procedure tabs that were open when you closed PROMS'
 
 	Select  cast(@RevDate as datetime) RevDate, @RevDescription  RevDescription
 	PRINT 'SQL Code Revision ' + @RevDate + ' - ' + @RevDescription

PROMS/VEPROMS User Interface/ROBuild.Sql

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

PROMS/VEPROMS User Interface/VEPROMS_UI.csproj

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

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.Designer.cs

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

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.cs

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

PROMS/VEPROMS User Interface/dlgCheckOpenTabs.resx

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

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

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

PROMS/VEPROMS User Interface/frmSysOptions.cs

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

PROMS/VEPROMS User Interface/frmSysOptions.resx

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

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -1654,6 +1654,10 @@ namespace VEPROMS
 			// B2017-214 added a null reference check
 			// B2010-071 Since we cannot tell if the user click on the X in Word or the X in PROMS, ask if the current tab
 			//           should be closed or if we should exit PROMS or just Cancel to continue working
+			if (tc._MyDisplayTabItems.Count < 1) // If all thabs are closed in the editor will indicate that in the database.
+			{
+				VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+			}
 			if (!_WeAreExitingPROMS && !ClosingWithError && tc.SelectedDisplayTabItem != null && tc._MyDisplayTabItems.Count > 0)
 			{
 				// B2019-071 dialog to ask user if we are to close one tab or exit
@@ -1676,10 +1680,32 @@ namespace VEPROMS
 				{
 					// B2018-091 Allow PROMS to close if only MSWord sections have been opened.
 					// B2019-071 we will now close one or all of the tabs (even step editor ones)
+					if (_WeAreExitingPROMS)
+					{
+						string DisplayTabID = "";
+						int pos;
+						int TabItemID;
+						string DisplayTabName = "";
+						int cnt = 0;
+						// Deactivate previous procedure tab state by user
+						VEPROMS.CSLA.Library.Item.DeactivateStateDisplayTabTmp(MySessionInfo.UserID);
+						// Save current procedure tab state
+						foreach (KeyValuePair<string, DisplayTabItem> pgTab in tc._MyDisplayTabItems)
+						{
+							cnt++;
+							DisplayTabID = pgTab.Key;
+							TabItemID = Int32.Parse(DisplayTabID.Substring(DisplayTabID.IndexOf("Item - ") + 7));
+							DisplayTabName = pgTab.Value.ToString();
+							//tc.SelectedDisplayTabItem.MyStepTabPanel.ToString()
+							VEPROMS.CSLA.Library.Item.AddDisplayTabsState(TabItemID, DisplayTabID, DisplayTabName, MySessionInfo.UserID, cnt);
+						}
+					}
+
 					int n = tc._MyDisplayTabItems.Count;
 
 					while (n-- > 0 && tc._MyDisplayTabItems.Count > 0)
 					{
+
 						tc.CloseTabItem(tc.SelectedDisplayTabItem);
 
 						// B2019-071 close just the current tab and continue working
@@ -2320,6 +2346,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.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,7 +1165,10 @@ namespace VEPROMS.CSLA.Library
 					{
 						int sp = odte.Link.IndexOf(" ") + 1;   // get past tran type
 						string srecid = odte.Link.Substring(sp, odte.Link.IndexOf(" ", sp) - sp);
-						recid = System.Convert.ToInt32(srecid);
+
+						//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
+						if (int.TryParse(srecid, out recid))
+						{
 							foreach (ContentTransition ct in itm.MyContent.ContentTransitions)
 							{
 								if (ct.TransitionID == recid)
@@ -1175,6 +1178,7 @@ namespace VEPROMS.CSLA.Library
 								}
 							}
 						}
+					}
 					else
 					{
 						int sp = odte.Link.IndexOf(" "); 
@@ -1656,7 +1660,15 @@ namespace VEPROMS.CSLA.Library
 		private string FixTransition(string link, string text)
 		{
 			if (link.IndexOf("<NewID>") != -1) return text;
-			int transitionID = Convert.ToInt32(link.Split(" ".ToCharArray())[1]);
+
+			//CSM B2024-078 - when a bad transition link / does not contain a number, simply return the text as-is
+			int transitionID;
+			string[] splt_link = link.Split(' ');
+			if (splt_link.Length < 2 || !int.TryParse(splt_link[1], out transitionID))
+			{
+				return text;
+			}
+
 			// Find the transition
 			if (_MyItemInfo.MyContent.ContentTransitionCount <= 0)
 			{

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

@@ -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();
+						//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
-						_MyTab.Text = tmprnotab.TrimStart();
+						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,10 +5584,27 @@ namespace VEPROMS.CSLA.Library
 					}
 					if (count <= macro.Grouping) addToList = false;
 				}
+
+				//CSM F2024 - 080: For South Texas - if initial line is disabled for this step, do not add the macro
+				if (macro.Name.ToUpper() == "CHECKOFF" && ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.ShowInitialLineDisable && !string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroEditTag == "_" && IsInitialLineDisabled)
+					addToList = false;
+
 				if (addToList) tmp.Add(macro);
 			}
 			if (tmp.Count > 0) _MyMacros = tmp;
 		}
+
+		//CSM F2024 - 080: For South Texas - check if initial line is disabled for this step
+		public bool IsInitialLineDisabled
+		{
+			get
+			{
+				if (!IsStep) return false;
+				StepConfig sc = MyConfig as StepConfig;
+				return sc.Step_DisableInitialLine;
+			}
+        }
+
         #endregion
         #region UseSmartTemplate
 
@@ -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/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

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

@@ -511,8 +511,8 @@ namespace Volian.Controls.Library
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.Controls.Add(this.btnPrintReport);
-			this.Controls.Add(this.xpSetToReport);
 			this.Controls.Add(this.xpSelROs);
+			this.Controls.Add(this.xpSetToReport);
 			this.Controls.Add(this.tctrlReports);
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplayReports";

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

@@ -658,7 +658,7 @@ namespace Volian.Controls.Library
 			this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
 			this.cmboTreeROs.TabIndex = 1;
 			this.cmboTreeROs.ThemeAware = true;
-			this.cmboTreeROs.WatermarkText = "Select an RO to seach";
+			this.cmboTreeROs.WatermarkText = "Select an RO to search";
 			this.cmboTreeROs.SelectedIndexChanged += new System.EventHandler(this.cmboTreeROs_SelectedIndexChanged);
 			// 
 			// tabROSearch

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

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

PROMS/Volian.Controls.Library/DisplayTags.cs

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