C2019-025_Ability-to-Toggle-Replace-Words-3

good for testing phase

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

@@ -746,6 +746,7 @@ namespace ROEditor
 									break;
 								}
 							}
+							if (inusename == "u") found = true; //to handle unit designation
 							if (found == false)syntax(inusename+" invalid field name",strt,where);
 							// used to have procini def stuff here.
 							start=where+1;

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

@@ -504,7 +504,6 @@ namespace ROEditor
 			// if a specific RO was passed in. Load the xml tree from it to the root & then
 			// edit it through the ctlXmledit.
 			// from the input tbl string, get a table name.
-
 			ArrayList levelRecids = new ArrayList();
 			int itbl = System.Convert.ToInt32(specificro.Substring(0,4),16);
 			string stbl = System.Convert.ToString(itbl,10);
@@ -594,7 +593,6 @@ namespace ROEditor
 				return;
 			}
 			roTreeView.SelectedNode = trnd;
-
 		}
 
 		protected void roTreeView_AfterSelect (object sender, 
@@ -676,12 +674,14 @@ namespace ROEditor
 				//if Ctrl/Shift Key is held down
 				if (ROsSelectedforMultiMove == null)
 					ROsSelectedforMultiMove = new List<TreeNode>();
-
+				// B2021-094 added check that Control and Alt keys were not pressed with shift key
-				if ((Control.ModifierKeys & Keys.Shift) != 0)
+				//           if user does the <Ctrl><Shift><G> keystroke (Goto selected RO from step editor)
+				//           but only lifts up on the G key, it was dropping down into this code below
+				//           and getting a null reference error upon initial entry in to the RO Editor
+				if ((Control.ModifierKeys & Keys.Shift) != 0 && (Control.ModifierKeys & Keys.Control) == 0 && (Control.ModifierKeys & Keys.Alt) == 0)
 				{
 					//if shift is held down, clear existing nodes then add the range of nodes
 					roTreeView_ClearAllMultiSelect();
-
 					if (PreviousNode.Index < CurrentNode.Index)
 					{
 						//Traverse Down
@@ -1154,7 +1154,10 @@ namespace ROEditor
 				tbtnCancel.Enabled = true;
 				tbtnSave.Enabled = true;
 				tbtnRestore.Enabled = true;
-				tbtnSaveAs.Enabled = true;
+				if (newone == null)
+					{ tbtnSaveAs.Enabled = true; }
+				else
+					{ tbtnSaveAs.Enabled = false; }
 			}
 			menuROSave.Enabled = tbtnSave.Enabled;
 		}
@@ -1170,7 +1173,10 @@ namespace ROEditor
 
 			tbtnSave.Enabled = true;
 			tbtnRestore.Enabled = true;
-			tbtnSaveAs.Enabled = true;
+			if (newone == null)
+				{ tbtnSaveAs.Enabled = true; }
+			else
+				{ tbtnSaveAs.Enabled = false; }
 			tbtnCancel.Enabled = true;
 			menuROSave.Enabled = tbtnSave.Enabled;
 			//B2021-080 set the mysavexml flag to true to ensure the text change will be saved
@@ -2392,20 +2398,26 @@ namespace ROEditor
 		 */
 		private void menuRODelete_Click(object sender, System.EventArgs e)
 		{
-			bool success=false;
+			string msgstr = "It is recommended that you may wish to create a backup zip of your RO folder prior to performing deletions.\n\nAre you sure you wish to delete the selected RO/RO Group?";
-			XmlNode nd = (XmlNode) roTreeView.SelectedNode.Tag;
+
-			if (nd.ParentNode.Name == "RO_Root")
+			DialogResult AnswerYN = MessageBox.Show(msgstr, "Deleting ROs/RO Group", MessageBoxButtons.YesNo);
-				success = myrodb.RODB_DeleteGroup(nd,null,null);
+			if (AnswerYN == DialogResult.Yes)
-			else
-				success = myrodb.RODB_DeleteRO(nd);
-			if (success == true)
 			{
-				// remove from xml tree & the tree control
+				bool success = false;
-				XmlNode parent = nd.ParentNode;
+				XmlNode nd = (XmlNode)roTreeView.SelectedNode.Tag;
-				parent.RemoveChild(nd);	
+				if (nd.ParentNode.Name == "RO_Root")
-				updateRoListView(roTreeView.SelectedNode.Parent);
+					success = myrodb.RODB_DeleteGroup(nd, null, null);
-				roTreeView.SelectedNode.Remove();
+				else
-				roTreeView.Refresh();	
+					success = myrodb.RODB_DeleteRO(nd);
+				if (success == true)
+				{
+					// remove from xml tree & the tree control
+					XmlNode parent = nd.ParentNode;
+					parent.RemoveChild(nd);
+					updateRoListView(roTreeView.SelectedNode.Parent);
+					roTreeView.SelectedNode.Remove();
+					roTreeView.Refresh();
+				}
 			}
 		}
 
@@ -2616,7 +2628,6 @@ namespace ROEditor
 			success = ctlXMLEdit2.SaveData();
 			if (!success)
 			{
-				MessageBox.Show("Save Failed");
 				return false;
 			} 
 			VlnXmlElement myro;
@@ -2732,7 +2743,6 @@ namespace ROEditor
 			if (!success)
 			{
 				tbtnRestore.Enabled = false; // old data may not be around
-				MessageBox.Show("Save Failed");
 				return;
 			}
 			

PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs

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

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

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

PROMS/VEPROMS User Interface/Properties/Settings.settings

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

PROMS/VEPROMS User Interface/frmBatchRefresh.cs

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

PROMS/VEPROMS User Interface/frmBatchRefresh.resx

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

PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs

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

PROMS/VEPROMS User Interface/frmSectionProperties.cs

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

PROMS/VEPROMS User Interface/frmSectionProperties.resx

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

PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs

@@ -77,8 +77,10 @@ namespace VEPROMS
             this.btnReset = new DevComponents.DotNetBar.ButtonX();
             this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
             this.cbOTRemember = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbShwRplWrdsColor = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cbOTAutoOpen = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.gpOpenTabs = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.gpShwRplWords = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.gpSystemColor.SuspendLayout();
             this.panButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit();
@@ -95,6 +97,7 @@ namespace VEPROMS
             this.gpTransRangeColor.SuspendLayout();
             this.gpPropPageStyle.SuspendLayout();
             this.gpOpenTabs.SuspendLayout();
+            this.gpShwRplWords.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnCancel
@@ -301,6 +304,7 @@ namespace VEPROMS
             // tabControlPanel3
             // 
             this.tabControlPanel3.Controls.Add(this.gpOpenTabs);
+            this.tabControlPanel3.Controls.Add(this.gpShwRplWords);
             this.tabControlPanel3.Controls.Add(this.grPanUCFImpOpt);
             this.tabControlPanel3.Controls.Add(this.gpVisioPath);
             this.tabControlPanel3.Controls.Add(this.gpSeparateWindows);
@@ -1120,6 +1124,20 @@ namespace VEPROMS
             this.cbOTRemember.Text = "Remember Setting";
             this.cbOTRemember.CheckedChanged += new System.EventHandler(this.cbOTRemember_CheckedChanged);
             // 
+            // cbShwRplWrdsColor
+            //  
+            // 
+            this.cbShwRplWrdsColor.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbShwRplWrdsColor.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cbShwRplWrdsColor.Location = new System.Drawing.Point(8, 5);
+            this.cbShwRplWrdsColor.Margin = new System.Windows.Forms.Padding(2);
+            this.cbShwRplWrdsColor.Name = "cbShwRplWrdsColor";
+            this.cbShwRplWrdsColor.Size = new System.Drawing.Size(119, 19);
+            this.cbShwRplWrdsColor.TabIndex = 9;
+            this.cbShwRplWrdsColor.Text = "Color Replace Words";
+            this.cbShwRplWrdsColor.CheckedChanged += new System.EventHandler(this.cbShwRplWrdsColor_CheckedChanged);
+            //this.cbShwRplWrdsColor.Checked;
+            // 
             // cbOTAutoOpen
             // 
             // 
@@ -1179,6 +1197,48 @@ namespace VEPROMS
             this.gpOpenTabs.TabIndex = 13;
             this.gpOpenTabs.Text = "Open Tabs";
             // 
+            // gpShwRplWords
+            // 
+            this.gpShwRplWords.BackColor = System.Drawing.Color.Transparent;
+            this.gpShwRplWords.CanvasColor = System.Drawing.SystemColors.Control;
+            this.gpShwRplWords.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.gpShwRplWords.Controls.Add(this.cbShwRplWrdsColor);
+            this.gpShwRplWords.DisabledBackColor = System.Drawing.Color.Empty;
+            this.gpShwRplWords.Location = new System.Drawing.Point(462, 165);
+            this.gpShwRplWords.Margin = new System.Windows.Forms.Padding(2);
+            this.gpShwRplWords.Name = "gpShwRplWords";
+            this.gpShwRplWords.Size = new System.Drawing.Size(139, 72);
+            // 
+            // 
+            // 
+            this.gpShwRplWords.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.gpShwRplWords.Style.BackColorGradientAngle = 90;
+            this.gpShwRplWords.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.gpShwRplWords.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpShwRplWords.Style.BorderBottomWidth = 1;
+            this.gpShwRplWords.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.gpShwRplWords.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpShwRplWords.Style.BorderLeftWidth = 1;
+            this.gpShwRplWords.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpShwRplWords.Style.BorderRightWidth = 1;
+            this.gpShwRplWords.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.gpShwRplWords.Style.BorderTopWidth = 1;
+            this.gpShwRplWords.Style.CornerDiameter = 4;
+            this.gpShwRplWords.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.gpShwRplWords.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.gpShwRplWords.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.gpShwRplWords.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.gpShwRplWords.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.gpShwRplWords.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.gpShwRplWords.TabIndex = 13;
+            this.gpShwRplWords.Text = "Replace Words";
+            // 
             // frmSysOptions
             // 
             this.AcceptButton = this.btnOK;
@@ -1214,6 +1274,8 @@ namespace VEPROMS
             this.gpTransRangeColor.ResumeLayout(false);
             this.gpPropPageStyle.ResumeLayout(false);
             this.gpOpenTabs.ResumeLayout(false);
+            this.gpShwRplWords.ResumeLayout(false);
+           
             this.ResumeLayout(false);
 
 		}
@@ -1268,7 +1330,9 @@ namespace VEPROMS
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFLNotUsed;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbUCFIgnore;
         private DevComponents.DotNetBar.Controls.GroupPanel gpOpenTabs;
+        private DevComponents.DotNetBar.Controls.GroupPanel gpShwRplWords;        
         private DevComponents.DotNetBar.Controls.CheckBoxX cbOTRemember;
         private DevComponents.DotNetBar.Controls.CheckBoxX cbOTAutoOpen;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbShwRplWrdsColor;
     }
 }

PROMS/VEPROMS User Interface/frmSysOptions.cs

@@ -68,6 +68,7 @@ namespace VEPROMS
 			colorPickerButton1.SelectedColor = Settings.Default.TransitionRangeColor;
 			cbAnnotationPopup.Checked = Settings.Default.AutoPopUpAnnotations;
 			cbStepTypeToolTip.Checked = Settings.Default.StepTypeToolTip;
+			cbShwRplWrdsColor.Checked = Settings.Default.cbShwRplWrdsColor;
 			cbTVExpand.Checked = Settings.Default.SaveTreeviewExpanded;
 			cbPasteNoReturns.Checked = Settings.Default.PasteNoReturns;
 			cbPastePlainText.Checked = Settings.Default.PastePlainText;
@@ -180,6 +181,7 @@ namespace VEPROMS
 		private	Color ss_TransRangeColor;
 		private	bool ss_PopUPAnnotations;
 		private	bool ss_StepTypeToolTip;
+		private bool ss_cbShwRplWrdsColor;
 		private	bool ss_SaveTreeviewExpanded;
 		private	bool ss_PasteNoReturns;
 		private	bool ss_PastePlainText;
@@ -195,6 +197,8 @@ namespace VEPROMS
 			ss_TransRangeColor = Settings.Default.TransitionRangeColor;
 			ss_PopUPAnnotations = Settings.Default.AutoPopUpAnnotations;
 			ss_StepTypeToolTip = Settings.Default.StepTypeToolTip;
+
+			ss_cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			ss_SaveTreeviewExpanded = Settings.Default.SaveTreeviewExpanded;
 			ss_PasteNoReturns = Settings.Default.PasteNoReturns;
 			ss_PastePlainText = Settings.Default.PastePlainText;
@@ -211,6 +215,7 @@ namespace VEPROMS
 			Settings.Default.TransitionRangeColor = ss_TransRangeColor;
 			Settings.Default.AutoPopUpAnnotations = ss_PopUPAnnotations;
 			Settings.Default.StepTypeToolTip = ss_StepTypeToolTip;
+			Settings.Default.cbShwRplWrdsColor = ss_cbShwRplWrdsColor;
 			Settings.Default.SaveTreeviewExpanded = ss_SaveTreeviewExpanded;
 			Settings.Default.PasteNoReturns = ss_PasteNoReturns;
 			Settings.Default.PastePlainText = ss_PastePlainText;
@@ -344,10 +349,16 @@ namespace VEPROMS
 				Settings.Default.UCFImportOpt = 4;
 			}
 		}
-
+		private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
-        private void cbOTRemember_CheckedChanged(object sender, EventArgs e)
+		{
+			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbShwRplWrdsColor.Checked;
+		}
+		private void cbShwRplWrdsColor_CheckedChanged(object sender, EventArgs e)
         {
-			cbOTAutoOpen.Enabled = cbOTAutoOpen.Visible = cbOTRemember.Checked;
+			Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked;
-        }
+			VlnSettings.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked;
+			Properties.Settings.Default.cbShwRplWrdsColor = cbShwRplWrdsColor.Checked; // update setting value
+			Properties.Settings.Default.Save(); // save settings
+		}
     }
 }

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -524,6 +524,7 @@ namespace VEPROMS
 			this.Activated += new EventHandler(frmVEPROMS_Activated);
 
 			VlnSettings.StepTypeToolType = Settings.Default.StepTypeToolTip;
+			VlnSettings.cbShwRplWrdsColor = Settings.Default.cbShwRplWrdsColor;
 			displayLibDocs.PrintRequest += new DisplayLibDocEvent(displayLibDocs_PrintRequest);
 			ContentInfo.InfoChanged += new ContentInfoEvent(RefreshDisplayHistory);
 			AnnotationInfo.InfoChanged += new AnnotationInfoEvent(RefreshDisplayHistory);
@@ -816,6 +817,11 @@ namespace VEPROMS
 			set { frmVEPROMS._ErrorLogFileName = value; }
 		}
 
+		public static bool colorReplaceWords()
+		{
+			return Properties.Settings.Default.cbShwRplWrdsColor;
+		}
+
 		static bool ChangeLogFileName(string AppenderName, string NewFilename)
 		{
 			log4net.Repository.ILoggerRepository RootRep;
@@ -2385,6 +2391,16 @@ namespace VEPROMS
 						OpenItem(_Procedure);
 						// SelectedStepTabPanel needs to be set so the print buttons on the ribbon will work.
 						SelectedStepTabPanel = tc.MyEditItem.MyStepPanel.MyStepTabPanel;
+
+						//CSM B2024-090 - if last displaytab item,
+						//select the steptab panel for it
+						//and set the EditItem for Find/Replace
+						//otherwise will cause PROMS to crash if Find clicked before a Tab is given Focus
+						if ((DisPlayTabState.Rows.IndexOf(TabState) == DisPlayTabState.Rows.Count - 1))
+						{
+							SelectedStepTabPanel.Select();
+							dlgFindReplace.MyEditItem = tc.MyEditItem;
+						}
 					}
 				}
 			}

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

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

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

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

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

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

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

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

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

@@ -6,11 +6,18 @@ using System.Text.RegularExpressions;
 using System.Drawing;
 using Volian.Base.Library;
 using JR.Utils.GUI.Forms;
+//using VEPROMS.colorReplaceWords;
 
 // This was moved from volian.controls.library
 namespace VEPROMS.CSLA.Library
 {
 	public enum E_FieldToEdit { StepText, Text, Number, PSI };
+	public enum ReplaceWords
+	{
+		Inherit = 0,
+		Show = 1,
+		DoNotShow = 2
+	}
 	public class DisplayText
 	{
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
@@ -46,6 +53,45 @@ namespace VEPROMS.CSLA.Library
 				return string.Empty;
 			}
 		}
+		private string ShwRplWords(ItemInfo _MyItemInfo)
+		{
+			//if (_Initalizing) return "N";
+			//_MyItemInfo.
+			SectionConfig sc = _MyItemInfo.MyConfig as SectionConfig;
+			if (sc == null) return "N";
+			return sc.Section_ShwRplWords;
+		}
+		// C2019-025 c2025-010 Ability-to-Toggle-Replace-Words
+		private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
+		{
+			StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
+			int setting = sc.Step_ShwRplWdsIndex;
+			switch (setting)
+			{
+				case (int)ReplaceWords.DoNotShow:
+					return false;
+					break;
+				case (int)ReplaceWords.Show:
+					return true;
+					break;
+				case (int)ReplaceWords.Inherit:
+					//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
+					SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
+					if (sc2 == null || sc2.Section_ShwRplWords == "Y")
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+					break;
+				default:
+					return false;
+					break;
+			}
+		}
+
 		private Item _MyItem;
 		private string EditText
 		{
@@ -357,9 +403,34 @@ namespace VEPROMS.CSLA.Library
 			// But don't do ReplaceWords if the TurnOffReplaceWords format flag is set
 			if (wordsShouldBeReplaced && !_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.TurnOffReplaceWords)
 			{
+
 				int profileDepth1 = ProfileTimer.Push(">>>> DoReplaceWords2");
-				
+
-				text = DoReplaceWords2(text);
+					// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+				if (_MyItemInfo.IsSection)
+				{
+					string ShwRplWrds = ShwRplWords(_MyItemInfo);
+					if (ShwRplWrds == "Y")
+					{
+						text = DoReplaceWords2(text, epMode);
+					}
+				}
+				if (_MyItemInfo.IsStep)
+				{
+					bool ShwRplWrds = ShwRplWdsIndex(_MyItemInfo);
+					if (ShwRplWrds == true)
+					{
+						text = DoReplaceWords2(text, epMode);
+					}
+				}
+
+
+				if (_MyItemInfo.IsFolder || _MyItemInfo.IsProcedure)
+				{
+					text = DoReplaceWords2(text, epMode);
+				}
+
+
 				ProfileTimer.Pop(profileDepth1);
 			}
 			if (_MyItemInfo != null && ROsShouldBeAdjusted) // B2017-019 - added check for ROsShouldBeAdjusted so that these token are not "cooked" on property pages
@@ -2101,7 +2172,7 @@ namespace VEPROMS.CSLA.Library
 				return (bool) _ProcessReplaceWords; 
 			}
 		}
-		private string DoReplaceWords2(string Text)
+		private string DoReplaceWords2(string Text, E_EditPrintMode epMode)
 		{
 			if(!ProcessReplaceWords) return Text;
 			// F2021-053: BNPP Alarm - need ability to have super/sub scripts in the text of Alarm Tables (ROs).
@@ -2162,6 +2233,7 @@ namespace VEPROMS.CSLA.Library
 							// CASEINSENS: Do ReplaceWords for all words that match, regardless of case, and replace with the ReplaceWith string as is
 							//RegexOptions myOptions = (rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.CaseInsens ? RegexOptions.IgnoreCase & RegexOptions.Singleline : RegexOptions.None & RegexOptions.Singleline;
 							string replaceWord = Regex.Replace(rs.ReplaceWord, @"[[\]\\()]", @"\$0");
+
 							// if first or last character in replaceword is a non-word character, for example, ',', ')', or '.',
 							// don't use the \W, i.e. don't bother to look for a non-word character.
 							string wordMatchBeg = Regex.IsMatch(replaceWord.Substring(0, 1), @"\W") ? "" : @"(?<=\W|^)";
@@ -2188,7 +2260,7 @@ namespace VEPROMS.CSLA.Library
 			}
 			//ProfileTimer.Pop(profileDepth);
 			//int profileDepth5 = ProfileTimer.Push(">>>> DoReplaceWords2.ReplaceMatches");
-			Text = myMatches.ReplaceMatches();
+			Text = myMatches.ReplaceMatches(epMode);
 			//ProfileTimer.Pop(profileDepth5);
 			Text = Text.Replace(@"\xA0", @"\u160?"); //replace hard space
 			return Text;
@@ -2480,7 +2552,8 @@ namespace VEPROMS.CSLA.Library
 				if (str.Length == index && str == text.Substring(0, str.Length)) return true;
 			return false;
 		}
-		public string ReplaceMatches()
+		
+		public string ReplaceMatches(E_EditPrintMode epMode)
 		{
 			int offset = 0;
 			string text = _Text;
@@ -2572,6 +2645,11 @@ namespace VEPROMS.CSLA.Library
 								with = with.Replace(@"\ul ", "");
 								with = with.Replace(@"\ulnone ", "");
 							}
+							//if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
+							if (Properties.Settings.Default.cbShwRplWrdsColor && !(epMode == E_EditPrintMode.Print))
+							{
+								with = $@"\cf2{with}\cf0 ";
+							}
 
 							text = text.Substring(0, offset + foundMatch.MyMatch.Index) + with + text.Substring(offset + foundMatch.MyMatch.Index + foundMatch.MyMatch.Length);
 							//offset += foundMatch.MyWord.ReplaceWith.Length - foundMatch.MyMatch.Length;

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

@@ -11,6 +11,7 @@ using System.Xml;
 using System.Drawing;
 using System.Text.RegularExpressions;
 using Volian.Base.Library;
+using System.Linq;
 
 namespace VEPROMS.CSLA.Library
 {
@@ -402,6 +403,99 @@ namespace VEPROMS.CSLA.Library
 			return tmpForLink;
 		}
 
+		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+		// This will be used to simulate the non-high level part of a tab
+		// for case where sorting and all other fields match
+		// Note: This is cut down to improve the sort's performance
+		// but congruent to Volian.Print.Library.PDFReport-> BuildStepTab(ItemInfo item)
+		public string BuildStepTab()
+		{
+			StringBuilder sret = new StringBuilder();
+			ItemInfo pitem = this;
+
+			while (!pitem.IsSection && !pitem.IsHigh)
+            {
+                using (StepInfo stpinfo = StepInfo.Get(pitem.ItemID))
+                {
+                    string thisTab = stpinfo.MyTab.CleanText;
+
+                    string typeName = stpinfo.FormatStepData.StepEditData.TypeMenu.MenuItem;
+
+                    if (!string.IsNullOrEmpty(thisTab))
+                    {
+                        thisTab = thisTab.Trim();
+                    }
+
+                    // if the tab is null or
+                    // if the the tab is not a letter or number OR
+                    // the tab is an AND or OR type and is the letter "o"
+                    // then reset the tab an empty string so that the type name along with the count of that type 
+                    // (ex. "AND 2", "OR 3")
+                    if (string.IsNullOrEmpty(thisTab) || (thisTab != string.Empty && (!(char.IsLetterOrDigit(thisTab[0])) || ((pitem.IsAnd || pitem.IsOr || pitem.IsCaution || pitem.IsNote) && thisTab.Contains("o")))))
+                    {
+                        thisTab = string.Empty;
+                    }
+
+                    if (pitem.IsRNOPart)
+                    {
+                        if (string.IsNullOrEmpty(thisTab))
+                        {
+                            sret.Insert(0, "RNO.");
+                        }
+                        else
+                        {
+                            thisTab = thisTab.Trim();
+
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            {
+                                thisTab += ".";
+                            }
+
+                            sret.Insert(0, "RNO." + thisTab);
+                        }
+                    }
+                    else if (pitem.IsCaution || pitem.IsNote)
+                    {
+                        // add the Caution or Note count to the tab (ex "Caution 1", "Note 2")
+                        if (string.IsNullOrEmpty(thisTab))
+                        {
+                            sret.Append("{" + typeName + " " + pitem.Ordinal.ToString() + "}");
+                        }
+                        else
+                        {
+                            thisTab = thisTab.Trim(" ".ToCharArray());
+                            sret.Append(thisTab + " " + pitem.Ordinal.ToString() + sret);
+                        }
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(thisTab))
+                        {
+                            thisTab = thisTab.Trim(" ".ToCharArray());
+
+                            if (!thisTab.EndsWith(".") && !thisTab.EndsWith(")"))
+                            {
+                                thisTab += ".";
+                            }
+                        }
+                        else
+                        {
+                            thisTab = "{" + typeName + " " + pitem.Ordinal.ToString() + "}.";
+                        }
+
+                        sret.Insert(0, thisTab);
+                    }
+                }
+
+                pitem = pitem.ActiveParent as ItemInfo;
+
+                if (pitem == null)
+                    break;
+            }
+
+            return sret.ToString().Trim(" .)".ToCharArray());
+		}
+
 		public void SetHeader(VE_Font myFont, string myText)
 		{
 			_MyHeader = new MetaTag(myFont);
@@ -619,12 +713,14 @@ namespace VEPROMS.CSLA.Library
 		{
 			TranCheckCount = 0;
 			TranFixCount = 0;
+			TranCantFixCount = 0;
 			TranConvertCount = 0;// B2018-002 - Invalid Transitions - Initialize Transition Conversion Count
 		}
 
 		public static int TranCheckCount = 0;
 		public static int TranFixCount = 0;
 		public static int TranConvertCount = 0;// B2018-002 - Invalid Transitions - Declare Transition Conversion Count
+		public static int TranCantFixCount = 0;
 		internal static TransitionInfoList TransitionsToDisconnected;
 		internal static TransitionInfoList TransitionsToNonEditable;
 
@@ -731,6 +827,15 @@ namespace VEPROMS.CSLA.Library
 								content.Save();
 							}
 						}
+						else if (newText.Contains("<CTID=-"))
+						{
+							//CSM C2024-028 - Bad Transition Link - Make an annotation					
+							using (Item itm = Item.Get(itemInfo.ItemID))
+							{
+								TranCantFixCount++;
+								Annotation.MakeAnnotation(itm, AnnotationType.GetByNameOrCreate("Bad Transition Link"), "", $"Invalid Transition Link: ({ItemInfo.ConvertToDisplayText(newValue)})", null);
+							}
+						}
 					}
 				}
 			}
@@ -2752,6 +2857,29 @@ namespace VEPROMS.CSLA.Library
 		}
 		#endregion UnlinkEnhanced
 		#region Search
+
+		//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+		//Create cleaned version of variable for use in DisplaySearch
+		//This is the Function that does the cleaning
+		public string CleanSearchString(string value)
+		{
+			// \u000C = PageBreak
+			// \u0009 = Tab
+			// \u160? = Hard Space
+			// \u0007 = Bell (Separates Parent Path and Child Path)
+			// \u0011 - Separates DisplayNumber & DisplayText of Step
+
+			if (value == null)
+				return null;
+
+			string tmp = value.Replace("\a", "\\").Replace("\u0007", "\\");
+			tmp = tmp.Replace("\u000C", " ").Replace("\u0009", " ").Replace(@"\u160?", " ").Replace("\u0011", " ");
+
+			if (tmp.StartsWith("\\"))
+				tmp = tmp.Substring(1);
+			return tmp;
+		}
+
 		internal string _SearchDVPath;
 		public string SearchDVPath
 		{
@@ -2767,7 +2895,11 @@ namespace VEPROMS.CSLA.Library
 				return _SearchDVPath;
 			}
 		}
-		internal string _SearchPath;
+        //CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+        //Create cleaned version of variable for use in DisplaySearch
+        public string SearchDVPath_clean => CleanSearchString(SearchDVPath);
+
+        internal string _SearchPath;
 		public string SearchPath
 		{
 			get
@@ -2790,6 +2922,10 @@ namespace VEPROMS.CSLA.Library
 				return _SearchPath;
 			}
 		}
+		//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+		//Create cleaned version of variable for use in DisplaySearch
+		public string SearchPath_clean => CleanSearchString(SearchPath);
+
 		public string ShortSearchPath
 		{
 			get 
@@ -2800,6 +2936,9 @@ namespace VEPROMS.CSLA.Library
 				return dtext;
 			}
 		}
+		//CSM C2024-025 Removing the strange tall box characters that appear in the search results tree
+		//Create cleaned version of variable for use in DisplaySearch
+		public string ShortSearchPath_clean => CleanSearchString(ShortSearchPath);
 
 		// B2021-076: Proms search results are not presented in order when printed to PDF
 		internal string _SearchDefaultSort;
@@ -3100,6 +3239,24 @@ namespace VEPROMS.CSLA.Library
 			//get { return ConvertToDisplayText(MyContent.Number); }
 		}
 
+		//CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+		//Get Numeric part of HLS Tab
+		//Used for Certain sorting situations
+		//If no numeric part then use 999 (will be at end of that level of the sort if there are other items with numbered HLS)
+		public int NumericSortNumber
+		{
+			get
+			{
+				string numericpart = null;
+				if (MyHLS != null)
+					numericpart = new string(MyHLS?.MyTab?.CleanTextNoSymbols.TakeWhile(Char.IsDigit).ToArray());
+				if (!string.IsNullOrEmpty(numericpart) && numericpart.All(char.IsNumber))
+					return int.Parse(numericpart);
+				else
+					return 999;
+			}
+		}
+
 		// for step designators (a redefined caution type used in Comanche Peak with the SameRowAsParentMultiLines format flag)
 		// we what to allow for a hard return to allow for multiple designator lines - jsj 5/21/2015
 		public static string ConvertToMulitLineStepDesignatorDisplayText(string txt)
@@ -4252,7 +4409,7 @@ namespace VEPROMS.CSLA.Library
 					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 (!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);
@@ -4350,7 +4507,7 @@ namespace VEPROMS.CSLA.Library
 						{
 							//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 (!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);
@@ -4367,7 +4524,7 @@ namespace VEPROMS.CSLA.Library
 						{
 							//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 (!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);
@@ -4383,7 +4540,7 @@ namespace VEPROMS.CSLA.Library
 						string tmprnotab = MyParent.MyTab.CleanText.Substring(0, MyParent.MyTab.CleanText.IndexOf(".") + 1) + incSub;
 						//CSM F2024 - 080: For South Texas - if format contains initial line and it is not disabled, show an initial line
 						tmprnotab = tmprnotab.TrimStart();
-						if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled && !tmprnotab.StartsWith("_"))
+						if (!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);
@@ -4401,7 +4558,7 @@ namespace VEPROMS.CSLA.Library
 						_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 (!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);
@@ -4749,7 +4906,7 @@ namespace VEPROMS.CSLA.Library
 					//           Note could have modified logic for clock macro (above) but older logic uses the IdentEdit setting
 					//           for CAS (Continuous Action Summary steps) that have a circle printed around the step number
 					//           this is the least impact of current code/formats
-					if (!string.IsNullOrEmpty(FormatStepData.TabData.MacroEditTag))
+					if (!string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag))
 					{
 						int eidx = tbformat.IndexOf("}", macroindx);
 						if (eidx > -1)
@@ -4772,12 +4929,14 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 				//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)
+				else if (macroindx == -1 && !string.IsNullOrEmpty(FormatStepData?.TabData?.MacroEditTag) && FormatStepData.TabData.MacroList != null && FormatStepData.TabData.MacroList.Count > 0 && !(this.IsRNOPart && FormatStepData.TabData.MacroList[0].NotInRNO) && !IsInitialLineDisabled)
 				{
 					if (cltext == null)
 						cltext = tbformat;
 					if (cltext.StartsWith(" "))
 						cltext = cltext.Substring(1);
+					if (tbformat.StartsWith(" "))
+						tbformat = tbformat.Substring(1);
 					cltext = FormatStepData.TabData.MacroEditTag + cltext;
 				}
 			}
@@ -5586,7 +5745,7 @@ namespace VEPROMS.CSLA.Library
 				}
 
 				//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)
+				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);
@@ -6103,6 +6262,168 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
 			}
 		}
+
+        //CSM B2021-043 Step numbering is out of order in RO usage report if RO values exist on steps 10 or higher.
+        // Found various inconsistencies in the reports so adding this to manually sort
+		//instead of binding the sort to 1 or 2 individual fields
+        public List<ItemInfo> SortedList(bool sortbyFoundRoid = false)
+		{
+			List<ItemInfo> tmp = new List<ItemInfo>(this);
+			if (sortbyFoundRoid)
+			{
+				// Priority of Sorting order:
+				// 1. FoundRoid (by Referenced Object ID)
+				// 2. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
+				// 3. Keep in order of the Procedures within the set
+				// 4. Keep in the order of the Section within the Procedure
+				// 5. NumericSortNumber - numeric part of the HLS if there is one
+				// 6. Substep Tab - will sort as a string since combined numbers/text
+				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
+				{
+					int cmp = 0;
+					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
+					switch (FoundROID_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 10000000;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 10000000;
+							break;
+						default:
+							break;
+					}
+
+					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
+					switch (DVPath_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 1000000;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 1000000;
+							break;
+						default:
+							break;
+					}
+
+					if (x.MyProcedure != null && y.MyProcedure != null)
+					{
+						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 100000);
+					}
+
+					if (x.ActiveSection != null && y.ActiveSection != null)
+					{
+						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
+					}
+
+					cmp += x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 10;
+
+					if (cmp == 0)
+					{
+						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
+						switch (StepTab_cmp)
+						{
+							case int result when result < 0:
+								cmp -= 1;
+								break;
+							case int result when result == 0:
+								break;
+							case int result when result > 0:
+								cmp += 1;
+								break;
+							default:
+								break;
+						}
+					}
+
+					return cmp;
+				});
+			}
+            else 
+			{
+				// Priority of Sorting order:
+				// 1. SearchDVPath_clean (Which Procedure Set it is in - I.E. EOPs, Background, SAMGs, etc...)
+				// 2. Keep in order of the Procedures within the set
+				// 3. Keep in the order of the Section within the Procedure
+				// 4. NumericSortNumber - numeric part of the HLS if there is one
+				// 5. Substep Tab - will sort as a string since combined numbers/text
+				// 6. FoundRoid (by Referenced Object ID)
+				tmp.Sort(comparison: delegate (ItemInfo x, ItemInfo y)
+				{
+					int cmp = 0;
+
+					int DVPath_cmp = x.SearchDVPath_clean.CompareTo(y.SearchDVPath_clean);
+					switch (DVPath_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 10000000;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 10000000;
+							break;
+						default:
+							break;
+					}
+
+					if (x.MyProcedure != null && y.MyProcedure != null)
+					{
+						cmp += (x.MyProcedure.Ordinal.CompareTo(y.MyProcedure.Ordinal) * 1000000);
+					}
+
+					if (x.ActiveSection != null && y.ActiveSection != null)
+					{
+						cmp += (x.ActiveSection.Ordinal.CompareTo(y.ActiveSection.Ordinal) * 100000);
+					}
+
+					cmp += (x.NumericSortNumber.CompareTo(y.NumericSortNumber) * 100);
+
+					if (cmp == 0)
+					{
+						int StepTab_cmp = (x.BuildStepTab()).CompareTo(y.BuildStepTab());
+						switch (StepTab_cmp)
+						{
+							case int result when result < 0:
+								cmp -= 10;
+								break;
+							case int result when result == 0:
+								break;
+							case int result when result > 0:
+								cmp += 10;
+								break;
+							default:
+								break;
+						}
+					}
+
+					int FoundROID_cmp = x.FoundROID.CompareTo(y.FoundROID);
+					switch (FoundROID_cmp)
+					{
+						case int result when result < 0:
+							cmp -= 1;
+							break;
+						case int result when result == 0:
+							break;
+						case int result when result > 0:
+							cmp += 1;
+							break;
+						default:
+							break;
+					}
+
+					return cmp;
+				});
+			}
+
+			return tmp;
+        }
+
 		[Serializable()]
 		private class MoveItemCriteria
 		{
@@ -7278,11 +7599,11 @@ namespace VEPROMS.CSLA.Library
 			}
 			this.RaiseListChangedEvents = true;
 		}
-		#endregion
+        #endregion
-	}
+    }
-	#endregion
+    #endregion
-	#region new class TransitionLookup
+    #region new class TransitionLookup
-	public delegate ProcedureInfo TransitionLookupEvent(object sender, TransitionLookupEventArgs args);
+    public delegate ProcedureInfo TransitionLookupEvent(object sender, TransitionLookupEventArgs args);
 	public class TransitionLookupEventArgs
 	{
 		private int _ProcID;
@@ -8126,97 +8447,7 @@ namespace VEPROMS.CSLA.Library
 				Dr = dr;
 			}
 		}
-		public static DataTable GetDisplayTabs(int itemID) //, string displayTabID, string displayTabName)
-		{
-			try
-			{
-				DataTable tmp = DataPortal.Fetch<DataTable>(new DisplayTabs(itemID, "", "")); //, displayTabID, displayTabName));
-																								  //ItemInfo.AddList(tmp);
-																								  //tmp.AddEvents();
-				return tmp;
-			}
-			catch (Exception ex)
-			{
-				throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
-			}
-		}
-		private DataTable dt = new DataTable();
-		private DataTable DataPortal_Fetch(DisplayTabs criteria)
-		{
-			
-			using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-			{
-				using (SqlCommand cm = cn.CreateCommand())
-				{
-					try
-					{
-						cm.CommandType = CommandType.StoredProcedure;
-						cm.CommandText = "GetDisplayTabData";
-						cm.CommandTimeout = Database.DefaultTimeout;
-						SqlDataAdapter da = new SqlDataAdapter(cm);
-						da.Fill(dt);
-						cn.Close();
-						da.Dispose();
-						return dt;
-					}
-					catch (Exception ex)
-					{
-						//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
-						throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
-					}
 
-				}			
-			}
-
-		}
-		//public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
-		//{
-		//	try
-		//	{
-		//		//DisplayTabs tmp = 
-		//		DataPortal.Fetch<DisplayTabs>(new DisplayTabs(itemID, displayTabID, displayTabName)); //, displayTabID, displayTabName));
-		//																											  //ItemInfo.AddList(tmp);
-		//																											  //tmp.AddEvents();
-		//		//return tmp;
-		//	}
-		//	catch (Exception ex)
-		//	{
-		//		throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
-		//	}
-		//}
-		//private DataTable dt = new DataTable();
-		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
-		//{
-
-		//	using (SqlConnection cn = Database.VEPROMS_SqlConnection)
-		//	{
-		//		using (SqlCommand cm = cn.CreateCommand())
-		//		{
-		//			try
-		//			{
-		//				cm.CommandType = CommandType.StoredProcedure;
-		//				cm.CommandText = "AddDisplayTabState";
-		//				cm.CommandTimeout = Database.DefaultTimeout;
-		//				cm.Parameters.AddWithValue("@ItemID", ItemID);
-		//				cm.Parameters.AddWithValue("@displayTabID", displayTabID);
-		//				cm.Parameters.AddWithValue("@displayTabName", displayTabName);
-		//				cm.ExecuteNonQuery();
-		//				//SqlDataAdapter da = new SqlDataAdapter(cm);
-		//				//da.Fill(dt);
-		//				//cn.Close();
-		//				//da.Dispose();
-		//				//return dt; // fix
-		//			}
-		//			catch (Exception ex)
-		//			{
-		//				//if (_MyLog.IsErrorEnabled) _MyLog.Error("ItemExt.DataPortal_Fetch", ex);
-		//				throw new DbCslaException("ItemExt.DataPortal_Fetch", ex);
-		//			}
-
-		//		}
-		//	}
-
-		//}
 		public static void AddDisplayTabsState(int itemID, string displayTabID, string displayTabName)
 		//private void DataPortal_Fetch(int itemID, string displayTabID, string displayTabName)
 		{

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

@@ -2650,97 +2650,174 @@ namespace VEPROMS.CSLA.Library
 			firstTrans = false;
 			if (!CanDeleteObject())
 				throw new System.Security.SecurityException("User not authorized to remove a Item");
-			// B2016-009 check source and desintation types and display message box if needed
+			// B2016-009 check source and destination types and display message box if needed
 			// C2022-017 moved the CheckSourceDestinationType call to  btnPasteReplace_Click in StepTabRibbon
 			// B2023-101 Handle Paste Replace when procedure to be replaced has Incoming Transitions, i.e. do a separate try/catch for this case
 			ItemInfo newItemInfo = null;
-			try
+			using (ItemInfo copyItemInfo = ItemInfo.Get(copyStartID))
 			{
-				// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
+				try
-				if (itemInfo.IsEnhancedStep)
 				{
-					newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+					// C2017-031:  Support for paste/replace an enhanced step, if this is replacing enhanced, do a specific query
-					if (newItemInfo == null) return null;
+					if (itemInfo.IsEnhancedStep)
+					{
+						newItemInfo = ItemInfo.CopyPasteReplaceEnhancedItemInfoFetch(copyStartID, itemInfo);
+						if (newItemInfo == null) return null;
+					}
+					//C2025-003 Enhanced Copy/Paste Upgrade - Added support for paste/replace on a master step
+					else if (itemInfo.HasEnhancedLinkedStep || copyItemInfo.HasEnhancedLinkedStep)
+					{
+						DialogResult rslt = DialogResult.No;
+
+						SectionConfig secCfg = itemInfo.ActiveSection.MyConfig as SectionConfig;
+						if (copyItemInfo.HasEnhancedLinkedStep && secCfg.MyEnhancedDocuments.Count > 0)
+							rslt = FlexibleMessageBox.Show("The step you are copying contains linked background documents." +
+									"\r\n\r\nDo you also wish to make a copy of the background documents?",
+									"Paste background documents", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+
+						//unlink and remove any background documents attached to where you are copying to
+						//and then delete them
+						//if selected want to replace BG step (DialogResult.Yes)
+						if (itemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
+						{
+							foreach (EnhancedDocument ed in itemInfo.GetMyEnhancedDocuments())
+							{
+								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
+								{
+									exEnh.DoUnlinkEnhanced(exEnh, 0, false);
+									DeleteItemAndChildren(exEnh);
+								}
+
+							}
+						}
+
+						//do copy/paste replace of the master step
+						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo);
+						if (newItemInfo == null) return null;
+
+						//copy any background documents
+						//if selected want to replace BG step (DialogResult.Yes)
+						if (copyItemInfo.HasEnhancedLinkedStep && rslt == DialogResult.Yes)
+						{
+							foreach (EnhancedDocument ed in copyItemInfo.GetMyEnhancedDocuments())
+							{
+								using (ItemInfo exEnh = newItemInfo.DoAddMissingEnhancedItems(ed.Type))
+								{
+									PasteReplace(exEnh, ed.ItemID, chgid, ref firstTrans);
+								}
+
+							}
+						}
+						else if (rslt == DialogResult.No)
+						{
+							//if selected didn't want to copy BG documents (DialogResult.No)
+							//need to unlink BG doc from old removed content (what was pasted over top of)
+							//re-link BG document to new paste replace master doc
+							//this should also auto update the text of the main linked item
+							//to match the new master doc wording
+
+							//get original BG documents
+							EnhancedDocuments orig_eds = itemInfo.GetMyEnhancedDocuments();
+
+							//remove link from pre-existing BG docs
+							foreach (EnhancedDocument ed in orig_eds)
+							{
+								using (ItemInfo exEnh = ItemInfo.Get(ed.ItemID))
+									{ exEnh.DoUnlinkEnhanced(exEnh, 0, false); }
+							}
+
+							//remove link from steps just copied
+							ItemInfo.PasteClearEnhanced(newItemInfo);
+
+							//re-link pre-existing BG docs to newly replaced master step
+							foreach (EnhancedDocument ed in orig_eds)
+							{
+								using (ItemInfo orig_ed_item = ItemInfo.Get(ed.ItemID))
+									{ newItemInfo.DoCreateLinksEnhancedSingleItem(orig_ed_item, ed.Type); }
+							}
+
+						}
+					}
+					else
+					{
+						newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+					}
 				}
-				else
+				catch (Exception ex1)
 				{
-					newItemInfo = ItemInfo.CopyPasteReplaceItemInfoFetch(copyStartID, itemInfo); if (newItemInfo == null) return null;
+					if (ex1.Message.Contains("has External Transitions and has no next step")
-				}
-			}
-			catch (Exception ex1)
-			{
-				if (ex1.Message.Contains("has External Transitions and has no next step")
 						|| ex1.Message.Contains("has External Transitions to Procedure")
 						|| ex1.Message.Contains("has External Transitions to it's children"))
 
-				{
+					{
-					FlexibleMessageBox.Show("This procedure has external transition references to it that must be resolved before doing the Paste/Replace.\r\nRight Click on the procedure and select the Incoming Transitions menu option to find these references and resolve them.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+						FlexibleMessageBox.Show("This procedure has external transition references to it that must be resolved before doing the Paste/Replace.\r\nRight Click on the procedure and select the Incoming Transitions menu option to find these references and resolve them.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-					return null;
+						return null;
+					}
 				}
-			}
+				try
-			try
+				{
-			{
+					// Delete business objects, including remove from tree
-				// Delete business objects, including remove from tree
+					ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
-				ItemInfo.DeleteItemInfoAndChildren(itemInfo.ItemID); // Dispose ItemInfo and Children
+					using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
-				using (Item item = Get(newItemInfo.ItemID)) ItemInfo.Refresh(item);
+					ItemInfo.PasteSetChangeId(newItemInfo, chgid);
-				ItemInfo.PasteSetChangeId(newItemInfo, chgid);
+					if (!copyItemInfo.HasEnhancedLinkedStep && !itemInfo.HasEnhancedLinkedStep) ItemInfo.PasteClearEnhanced(newItemInfo);
-				ItemInfo.PasteClearEnhanced(newItemInfo);
+					if (newItemInfo.NextItem != null) using (Item item = newItemInfo.NextItem.Get()) ItemInfo.Refresh(item);
-				if (newItemInfo.NextItem != null) using (Item item = newItemInfo.NextItem.Get()) ItemInfo.Refresh(item);
+					newItemInfo.RefreshNextItems();
-				newItemInfo.RefreshNextItems();
+					// if inserting after a caution or note, refreshes tabs.  This will adjust bullets
-				// if inserting after a caution or note, refreshes tabs.  This will adjust bullets
+					// of any previous cautions or notes.
-				// of any previous cautions or notes.
+					if (newItemInfo.IsCaution || newItemInfo.IsNote) newItemInfo.ResetOrdinal();
-				if (newItemInfo.IsCaution || newItemInfo.IsNote) newItemInfo.ResetOrdinal();
+					newItemInfo.UpdateTransitionText();
-				newItemInfo.UpdateTransitionText();
+					newItemInfo.UpdateROText();
-				newItemInfo.UpdateROText();
+					newItemInfo.UpdatePastedStepTransitionText();
-				newItemInfo.UpdatePastedStepTransitionText();
 
-				// Add to tree
+					// Add to tree
-				if (newItemInfo.NextItem != null)
+					if (newItemInfo.NextItem != null)
-				{
-					using (ItemInfo itm = ItemInfo.GetNonCached(newItemInfo.NextItem.ItemID))
 					{
-						itm.OnNewSiblingBefore(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Before));
+						using (ItemInfo itm = ItemInfo.GetNonCached(newItemInfo.NextItem.ItemID))
+						{
+							itm.OnNewSiblingBefore(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Before));
+						}
 					}
-				}
+					else if (newItemInfo.PreviousID != null)
-				else if (newItemInfo.PreviousID != null)
-				{
-					using (ItemInfo itm2 = ItemInfo.GetNonCached((int)newItemInfo.PreviousID))
 					{
-						itm2.OnNewSiblingAfter(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.After));
+						using (ItemInfo itm2 = ItemInfo.GetNonCached((int)newItemInfo.PreviousID))
+						{
+							itm2.OnNewSiblingAfter(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.After));
+						}
 					}
+					else
+					{
+						// B2024-045, 049 and 050: if not a single procedure replace, update user interface by using the 'OnNewChild'. Single 
+						//	procedure's MyParent is null because its parent is a working draft (docversion) since MyParent's type is iteminfo.
+						//	For the single procedure case, the user interface code in vlntreeview will update the tree.
+						if (newItemInfo.MyParent != null)
+							newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
+					}
+					return newItemInfo;
 				}
-				else
+				catch (Exception ex)
 				{
-					// B2024-045, 049 and 050: if not a single procedure replace, update user interface by using the 'OnNewChild'. Single 
+					ItemInfo iii = itemInfo.HandleSqlExceptionOnDelete(ex);
-					//	procedure's MyParent is null because its parent is a working draft (docversion) since MyParent's type is iteminfo.
+					if (iii == itemInfo) return null;// If self returned then return null
-					//	For the single procedure case, the user interface code in vlntreeview will update the tree.
+					if (iii != null)
-					if (newItemInfo.MyParent != null)
+					{
-						newItemInfo.MyParent.OnNewChild(new ItemInfoInsertEventArgs(newItemInfo, ItemInfo.EAddpingPart.Child));
+						firstTrans = true; // B2017-179 set the firstTrans to true and return the itminfo of the first transition location that needs resolved
+						return iii;
+					}
+					if (!HandleSqlExceptionOnCopy(ex))
+					{
+						if (ex.Message.Contains("has External Transitions and has no next step")
+							|| ex.Message.Contains("has External Transitions to Procedure")
+							|| ex.Message.Contains("has External Transitions to it's children")
+							|| ex.Message.Contains("This step has been deleted"))
+								throw ex;
+
+						FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+						return itemInfo;
+					}
+					else
+					  return itemInfo;
 				}
-				return newItemInfo;
-			}
-			catch (Exception ex)
-			{
-				ItemInfo iii = itemInfo.HandleSqlExceptionOnDelete(ex);
-				if (iii == itemInfo) return null;// If self returned then return null
-				if (iii != null)
-				{
-					firstTrans = true; // B2017-179 set the firstTrans to true and return the itminfo of the first transition location that needs resolved
-					return iii;
-				}
-        if (!HandleSqlExceptionOnCopy(ex))
-        {
-          if (ex.Message.Contains("has External Transitions and has no next step")
-						|| ex.Message.Contains("has External Transitions to Procedure")
-						|| ex.Message.Contains("has External Transitions to it's children")
-            || ex.Message.Contains("This step has been deleted")
-            )
-            throw ex;
-					FlexibleMessageBox.Show("Details were written to the Error Log.", "Paste Replace Failed", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
-          return itemInfo;
-        }
-        else
-          return itemInfo;
 			}
 		}
 		#endregion

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

@@ -2173,6 +2173,7 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 	}
+
 	#endregion
 	#region CheckOff
 	[TypeConverter(typeof(ExpandableObjectConverter))]
@@ -2284,6 +2285,49 @@ namespace VEPROMS.CSLA.Library
 		}
 	}
 	#endregion
+	#region ShwRplWds
+	// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+	public class ShwRplWds : vlnFormatItem, IVlnIndexedFormatItem
+	{
+		public ShwRplWds(XmlNode xmlNode) : base(xmlNode) { }
+		public ShwRplWds() : base() { }
+		private LazyLoad<int?> _Index;
+		public int? Index
+		{
+			get
+			{
+				return LazyLoad(ref _Index, "@Index");
+			}
+		}
+
+		// User Interface Mark (UIMark) is the deimal number of an ASCII character that is desplayed in the step editor
+		// to indicate the selected checkoff
+		private LazyLoad<int?> _UIMark;
+		public int? UIMark
+		{
+			get
+			{
+				return LazyLoad(ref _UIMark, "@UIMark");
+			}
+		}
+
+
+		//Descriptive text shown in the checkoff selection list
+		private LazyLoad<string> _MenuItem;
+		public string MenuItem
+		{
+			get
+			{
+				return LazyLoad(ref _MenuItem, "@MenuItem");
+			}
+		}
+
+		public override string ToString()
+		{
+			return MenuItem;
+		}
+	}
+#endregion
 	#region CheckOffList
 	[TypeConverter(typeof(vlnIndexedListConverter<CheckOffList, CheckOff>))]
 	public class CheckOffList : vlnIndexedFormatList<CheckOff>
@@ -6213,6 +6257,36 @@ public StepData Equation		// equation has a parent of embedded object.
 			}
 		}
 
+		// F2024-078 adjusts the the spacing before the Note/Caution tab - the space betwee the top of the box and the tab text
+		private LazyLoad<float?> _AdjSpB4Tab;
+		public float? AdjSpB4Tab
+		{
+			get
+			{
+				return LazyLoad(ref _AdjSpB4Tab, "@AdjSpB4Tab");
+			}
+		}
+
+		// F2024-078 adjusts the the spacing after the Note/Caution tab - the space betwee the tab text and the first line of of Note/Caution text
+		private LazyLoad<float?> _AdjSpAftTab;
+		public float? AdjSpAftTab
+		{
+			get
+			{
+				return LazyLoad(ref _AdjSpAftTab, "@AdjSpAftTab");
+			}
+		}
+
+		// F2024-078 adjusts the the spacing after the last line of Note/Caution text - between the last line of text and the bottom of the box
+		private LazyLoad<float?> _AdjLastBlnkLn;
+		public float? AdjLastBlnkLn
+		{
+			get
+			{
+				return LazyLoad(ref _AdjLastBlnkLn, "@AdjLastBlnkLn");
+			}
+		}
+
 		// this will adjust the line spacing when an extra thick line is used for a box, so that the text below the box doesn't hit up against the bottom of the box
 		private LazyLoad<bool> _ThickDouble;    // F2021-026: Barakah single column 2 thick double lines around Warnings
 		public bool ThickDouble

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

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

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

@@ -48,7 +48,6 @@ namespace VEPROMS.CSLA.Library
 			catch (Exception ex)
 			{
 				Database.LogException("UserSettings_GetData", ex);
-				throw new DbCslaException("UserSettings_GetData", ex);
 			}
 
 		}

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

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

PROMS/Volian.Base.Library/RtfTools.cs

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

PROMS/Volian.Base.Library/VlnSettings.cs

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

PROMS/Volian.Controls.Library/DisplayApplicability.cs

@@ -236,7 +236,11 @@ namespace Volian.Controls.Library
 			else
 			{
 				StringBuilder sb = new StringBuilder();
-				sb.AppendLine("Changing the applicability for this step will invalidate a transition in the following steps...");
+				string tmpwrd = MyItemInfo.IsSection ? "section" : "step";
+				sb.AppendLine($"The applicability for this {tmpwrd} cannot be changed due to transition links.");
+				sb.AppendLine("Applicability settings will return to original settings when OK is selected.");
+				sb.AppendLine($"Changing the applicability for this {tmpwrd} will invalidate a transition in the following steps...");
+
 				sb.AppendLine();
 				// B2021-149: if step, put out line for every invalidTrans, if procedure only put out those that are external
 				//	determine this by looking strings for source and target (to), if procedure level and internal the target starts

PROMS/Volian.Controls.Library/DisplayRO.cs

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

PROMS/Volian.Controls.Library/DisplayReports.cs

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

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -66,7 +66,7 @@ namespace Volian.Controls.Library
 		private Color saveGrpPanSearchResults;
 		private ItemInfoList _SearchResults;
 
-		private string _DisplayMember = "SearchPath";
+		private string _DisplayMember = "SearchPath_clean";
 		private bool _OpenDocFromSearch;
 		private ROFSTLookup _MyROFSTLookup;
 		private bool _LoadingList = false;
@@ -1745,7 +1745,7 @@ namespace Volian.Controls.Library
 			}
 
 			// B2021-076: Proms search results are not presented in order when printed to PDF
-			if (_DisplayMember == "SearchPath" || _DisplayMember == "ShortSearchPath")
+			if (_DisplayMember == "SearchPath_clean" || _DisplayMember == "ShortSearchPath_clean")
 			{
 				cbSorted.Checked = false;
 				cbSorted.Enabled = false;
@@ -1880,10 +1880,10 @@ namespace Volian.Controls.Library
 			switch (cmbResultsStyle.Text)
 			{
 				case "Document Path":
-					_DisplayMember = "SearchDVPath";
+					_DisplayMember = "SearchDVPath_clean";
 					break;
 				case "Step Path":
-					_DisplayMember = "ShortSearchPath";
+					_DisplayMember = "ShortSearchPath_clean";
 					break;
 				case "Annotation Text":
 					_DisplayMember = "SearchAnnotationText";
@@ -1892,7 +1892,7 @@ namespace Volian.Controls.Library
 					_DisplayMember = "DisplayText";
 					break;
 				default:
-					_DisplayMember = "SearchPath";
+					_DisplayMember = "SearchPath_clean";
 					break;
 			}
 			DisplayResults();

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

@@ -33,8 +33,10 @@ namespace Volian.Controls.Library
             this.cbPageBreak = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cbCAS = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.cmbCheckoff = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+            this.cmbShwRplWds = new DevComponents.DotNetBar.Controls.ComboBoxEx();
             this.groupPanelCheckoff = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.cbInitialLine = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.groupPanelcmbShwRplWds = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.groupPanelChgBar = new DevComponents.DotNetBar.Controls.GroupPanel();
             this.tbChgID = new System.Windows.Forms.TextBox();
             this.lblChgId = new System.Windows.Forms.Label();
@@ -60,8 +62,10 @@ namespace Volian.Controls.Library
             this.tbFSWd = new System.Windows.Forms.TextBox();
             this.lblFSHt = new System.Windows.Forms.Label();
             this.lblFSWidth = new System.Windows.Forms.Label();
+            this.btnSaveChangeID = new System.Windows.Forms.Button();
             this.groupPanelPaginate.SuspendLayout();
             this.groupPanelCheckoff.SuspendLayout();
+            this.groupPanelcmbShwRplWds.SuspendLayout();
             this.groupPanelChgBar.SuspendLayout();
             this.groupPanelChgStepType.SuspendLayout();
             this.groupPanelIncludeOn.SuspendLayout();
@@ -79,7 +83,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, 339);
+            this.groupPanelPaginate.Location = new System.Drawing.Point(0, 425);
             this.groupPanelPaginate.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelPaginate.Name = "groupPanelPaginate";
             this.groupPanelPaginate.Size = new System.Drawing.Size(202, 58);
@@ -184,15 +188,36 @@ namespace Volian.Controls.Library
             this.cmbCheckoff.WatermarkText = "select signoff / checkoff";
             this.cmbCheckoff.SelectedIndexChanged += new System.EventHandler(this.cmbCheckoff_SelectedIndexChanged);
             // 
+            // cmbShwRplWds
+            // 
+            this.cmbShwRplWds.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbShwRplWds.DisplayMember = "Text";
+            this.cmbShwRplWds.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.cmbShwRplWds.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbShwRplWds.FormattingEnabled = true;
+            this.cmbShwRplWds.ItemHeight = 17;
+            this.cmbShwRplWds.Items.AddRange(new object[] {
+            "Inherit from Section",
+            "Show replace words",
+            "Do not show replace words"});
+            this.cmbShwRplWds.Location = new System.Drawing.Point(3, 17);
+            this.cmbShwRplWds.Margin = new System.Windows.Forms.Padding(2);
+            this.cmbShwRplWds.Name = "cmbShwRplWds";
+            this.cmbShwRplWds.Size = new System.Drawing.Size(194, 23);
+            this.cmbShwRplWds.TabIndex = 0;
+            this.cmbShwRplWds.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.cmbShwRplWds.WatermarkText = "Show Replace Words";
+            this.cmbShwRplWds.SelectedIndexChanged += new System.EventHandler(this.cmbShwRplWds_SelectedIndexChanged);
+            // 
             // groupPanelCheckoff
             // 
             this.groupPanelCheckoff.CanvasColor = System.Drawing.SystemColors.Control;
             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.Location = new System.Drawing.Point(0, 231);
             this.groupPanelCheckoff.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelCheckoff.Name = "groupPanelCheckoff";
             this.groupPanelCheckoff.Size = new System.Drawing.Size(202, 86);
@@ -247,18 +272,63 @@ namespace Volian.Controls.Library
             this.cbInitialLine.Visible = false;
             this.cbInitialLine.CheckedChanged += new System.EventHandler(this.cbInitialLine_CheckedChanged);
             // 
+            // groupPanelcmbShwRplWds
+            // 
+            this.groupPanelcmbShwRplWds.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelcmbShwRplWds.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelcmbShwRplWds.Controls.Add(this.cbInitialLine);
+            this.groupPanelcmbShwRplWds.Controls.Add(this.cmbShwRplWds);
+            this.groupPanelcmbShwRplWds.DisabledBackColor = System.Drawing.Color.Empty;
+            this.groupPanelcmbShwRplWds.Dock = System.Windows.Forms.DockStyle.Top;
+            this.groupPanelcmbShwRplWds.Location = new System.Drawing.Point(0, 145);
+            this.groupPanelcmbShwRplWds.Margin = new System.Windows.Forms.Padding(2);
+            this.groupPanelcmbShwRplWds.Name = "groupPanelcmbShwRplWds";
+            this.groupPanelcmbShwRplWds.Size = new System.Drawing.Size(202, 86);
+            // 
+            // 
+            // 
+            this.groupPanelcmbShwRplWds.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelcmbShwRplWds.Style.BackColorGradientAngle = 90;
+            this.groupPanelcmbShwRplWds.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelcmbShwRplWds.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelcmbShwRplWds.Style.BorderBottomWidth = 1;
+            this.groupPanelcmbShwRplWds.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelcmbShwRplWds.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelcmbShwRplWds.Style.BorderLeftWidth = 1;
+            this.groupPanelcmbShwRplWds.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelcmbShwRplWds.Style.BorderRightWidth = 1;
+            this.groupPanelcmbShwRplWds.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelcmbShwRplWds.Style.BorderTopWidth = 1;
+            this.groupPanelcmbShwRplWds.Style.CornerDiameter = 4;
+            this.groupPanelcmbShwRplWds.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelcmbShwRplWds.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelcmbShwRplWds.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelcmbShwRplWds.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            // 
+            // 
+            // 
+            this.groupPanelcmbShwRplWds.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.groupPanelcmbShwRplWds.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelcmbShwRplWds.TabIndex = 8;
+            this.groupPanelcmbShwRplWds.Text = "Show Replace Words";
+            this.groupPanelcmbShwRplWds.VisibleChanged += new System.EventHandler(this.groupPanelcmbShwRplWds_VisibleChanged);
+            // 
             // groupPanelChgBar
             // 
             this.groupPanelChgBar.BackColor = System.Drawing.Color.Transparent;
             this.groupPanelChgBar.CanvasColor = System.Drawing.SystemColors.Control;
             this.groupPanelChgBar.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelChgBar.Controls.Add(this.btnSaveChangeID);
             this.groupPanelChgBar.Controls.Add(this.tbChgID);
             this.groupPanelChgBar.Controls.Add(this.lblChgId);
             this.groupPanelChgBar.Controls.Add(this.rbChgBarOff);
             this.groupPanelChgBar.Controls.Add(this.rbChgBarOn);
             this.groupPanelChgBar.DisabledBackColor = System.Drawing.Color.Empty;
             this.groupPanelChgBar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupPanelChgBar.Location = new System.Drawing.Point(0, 231);
+            this.groupPanelChgBar.Location = new System.Drawing.Point(0, 317);
             this.groupPanelChgBar.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelChgBar.Name = "groupPanelChgBar";
             this.groupPanelChgBar.Size = new System.Drawing.Size(202, 108);
@@ -301,7 +371,6 @@ namespace Volian.Controls.Library
             this.tbChgID.Name = "tbChgID";
             this.tbChgID.Size = new System.Drawing.Size(81, 20);
             this.tbChgID.TabIndex = 4;
-            this.tbChgID.TextChanged += new System.EventHandler(this.tbChgID_TextChanged);
             // 
             // lblChgId
             // 
@@ -501,8 +570,7 @@ namespace Volian.Controls.Library
             this.cbTCAS.Margin = new System.Windows.Forms.Padding(2);
             this.cbTCAS.Name = "cbTCAS";
             this.cbTCAS.Size = new System.Drawing.Size(167, 15);
-            this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Continuous Action Summary", "", "Include this in the Continuous Action Summary section\r\n\r\nkeyboard command: <Shift" +
+            this.superTooltipTags.SetSuperTooltip(this.cbTCAS, new DevComponents.DotNetBar.SuperTooltipInfo("Time Critical Action Summary", "", "Include this in the Time Critical Action Summary section", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-            "><F7>", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
             this.cbTCAS.TabIndex = 3;
             this.cbTCAS.Text = "Time Critical Action Summary";
             this.cbTCAS.CheckedChanged += new System.EventHandler(this.cbTCAS_CheckedChanged);
@@ -519,7 +587,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, 397);
+            this.groupPanelIncludeOn.Location = new System.Drawing.Point(0, 483);
             this.groupPanelIncludeOn.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelIncludeOn.Name = "groupPanelIncludeOn";
             this.groupPanelIncludeOn.Size = new System.Drawing.Size(202, 121);
@@ -562,7 +630,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, 518);
+            this.groupPanelWcnTrnResp.Location = new System.Drawing.Point(0, 604);
             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);
@@ -621,7 +689,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, 656);
+            this.groupPanelFigSize.Location = new System.Drawing.Point(0, 742);
             this.groupPanelFigSize.Margin = new System.Windows.Forms.Padding(2);
             this.groupPanelFigSize.Name = "groupPanelFigSize";
             this.groupPanelFigSize.Size = new System.Drawing.Size(202, 135);
@@ -728,6 +796,16 @@ namespace Volian.Controls.Library
             this.lblFSWidth.TabIndex = 0;
             this.lblFSWidth.Text = "Width";
             // 
+            // btnSaveChangeID
+            // 
+            this.btnSaveChangeID.Location = new System.Drawing.Point(86, 65);
+            this.btnSaveChangeID.Name = "btnSaveChangeID";
+            this.btnSaveChangeID.Size = new System.Drawing.Size(75, 23);
+            this.btnSaveChangeID.TabIndex = 5;
+            this.btnSaveChangeID.Text = "Save";
+            this.btnSaveChangeID.UseVisualStyleBackColor = true;
+            this.btnSaveChangeID.Click += new System.EventHandler(this.btnSaveChangeID_Click);
+            // 
             // DisplayTags
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -738,6 +816,7 @@ namespace Volian.Controls.Library
             this.Controls.Add(this.groupPanelPaginate);
             this.Controls.Add(this.groupPanelChgBar);
             this.Controls.Add(this.groupPanelCheckoff);
+            this.Controls.Add(this.groupPanelcmbShwRplWds);
             this.Controls.Add(this.groupPanelChgStepType);
             this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "DisplayTags";
@@ -745,7 +824,8 @@ namespace Volian.Controls.Library
             this.groupPanelPaginate.ResumeLayout(false);
             this.groupPanelPaginate.PerformLayout();
             this.groupPanelCheckoff.ResumeLayout(false);
-            this.groupPanelCheckoff.PerformLayout();
+            this.groupPanelcmbShwRplWds.ResumeLayout(false);
+            this.groupPanelcmbShwRplWds.PerformLayout();
             this.groupPanelChgBar.ResumeLayout(false);
             this.groupPanelChgBar.PerformLayout();
             this.groupPanelChgStepType.ResumeLayout(false);
@@ -765,7 +845,9 @@ namespace Volian.Controls.Library
 
 		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelPaginate;
 		private DevComponents.DotNetBar.Controls.ComboBoxEx cmbCheckoff;
-		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelCheckoff;
+        private DevComponents.DotNetBar.Controls.ComboBoxEx cmbShwRplWds;
+        private DevComponents.DotNetBar.Controls.GroupPanel groupPanelCheckoff;
+		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelcmbShwRplWds;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPageBreak;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbCAS;
 		private DevComponents.DotNetBar.Controls.GroupPanel groupPanelChgBar;
@@ -795,5 +877,6 @@ namespace Volian.Controls.Library
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncludeInTOC;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbTCAS;
         private DevComponents.DotNetBar.Controls.CheckBoxX cbInitialLine;
+        private System.Windows.Forms.Button btnSaveChangeID;
     }
 }

PROMS/Volian.Controls.Library/DisplayTags.cs

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

PROMS/Volian.Controls.Library/DisplayTags.resx

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

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

@@ -28,488 +28,507 @@ namespace Volian.Controls.Library
 		/// </summary>
 		private void InitializeComponent()
 		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplayTransition));
-			this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.groupPanelBtns = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbHoldProcSet = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.btnTranCancel = new DevComponents.DotNetBar.ButtonX();
+            this.cbPageNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.btnTranSave = new DevComponents.DotNetBar.ButtonX();
+            this.btnTranCancel = new DevComponents.DotNetBar.ButtonX();
-			this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.btnTranSave = new DevComponents.DotNetBar.ButtonX();
-			this.listBoxTranFmt = new System.Windows.Forms.ListBox();
+            this.groupPanelTranFmt = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.listBoxTranFmt = new System.Windows.Forms.ListBox();
-			this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.groupPanelTransitionSets = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.cbTranProcs = new System.Windows.Forms.ComboBox();
+            this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
-			this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.groupPanelTransitionProcs = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.cbTranSects = new System.Windows.Forms.ComboBox();
+            this.cbTranProcs = new System.Windows.Forms.ComboBox();
-			this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel();
+            this.groupPanelTransitionSect = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.pnlTranStepBtns = new System.Windows.Forms.Panel();
+            this.cbTranSects = new System.Windows.Forms.ComboBox();
-			this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.groupPanelTranstionSteps = new DevComponents.DotNetBar.Controls.GroupPanel();
-			this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX();
+            this.tvTran = new Volian.Controls.Library.vlnTreeView3();
-			this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX();
+            this.pnlTranStepBtns = new System.Windows.Forms.Panel();
-			this.btnUp1 = new DevComponents.DotNetBar.ButtonX();
+            this.cbIncStepNum = new DevComponents.DotNetBar.Controls.CheckBoxX();
-			this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip();
+            this.lblxTranRangeTip = new DevComponents.DotNetBar.LabelX();
-			this.tvTran = new Volian.Controls.Library.vlnTreeView3();
+            this.btnTranRangeClear = new DevComponents.DotNetBar.ButtonX();
-			this.vlnTreeComboSets = new Volian.Controls.Library.vlnTreeCombo();
+            this.btnUp1 = new DevComponents.DotNetBar.ButtonX();
-			this.groupPanelBtns.SuspendLayout();
+            this.superToolTipDispTran = new DevComponents.DotNetBar.SuperTooltip();
-			this.groupPanelTranFmt.SuspendLayout();
+            this.groupPanelBtns.SuspendLayout();
-			this.groupPanelTransitionSets.SuspendLayout();
+            this.groupPanelTranFmt.SuspendLayout();
-			this.groupPanelTransitionProcs.SuspendLayout();
+            this.groupPanelTransitionSets.SuspendLayout();
-			this.groupPanelTransitionSect.SuspendLayout();
+            this.groupPanelTransitionProcs.SuspendLayout();
-			this.groupPanelTranstionSteps.SuspendLayout();
+            this.groupPanelTransitionSect.SuspendLayout();
-			this.pnlTranStepBtns.SuspendLayout();
+            this.groupPanelTranstionSteps.SuspendLayout();
-			this.SuspendLayout();
+            this.pnlTranStepBtns.SuspendLayout();
-			// 
+            this.SuspendLayout();
-			// groupPanelBtns
+            // 
-			// 
+            // groupPanelBtns
-			this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
+            // 
-			this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelBtns.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelBtns.Controls.Add(this.cbPageNum);
+            this.groupPanelBtns.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelBtns.Controls.Add(this.btnTranCancel);
+            this.groupPanelBtns.Controls.Add(this.cbHoldProcSet);
-			this.groupPanelBtns.Controls.Add(this.btnTranSave);
+            this.groupPanelBtns.Controls.Add(this.cbPageNum);
-			this.groupPanelBtns.DisabledBackColor = System.Drawing.Color.Empty;
+            this.groupPanelBtns.Controls.Add(this.btnTranCancel);
-			this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
+            this.groupPanelBtns.Controls.Add(this.btnTranSave);
-			this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
+            this.groupPanelBtns.DisabledBackColor = System.Drawing.Color.Empty;
-			this.groupPanelBtns.Name = "groupPanelBtns";
+            this.groupPanelBtns.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelBtns.Size = new System.Drawing.Size(376, 58);
+            this.groupPanelBtns.Location = new System.Drawing.Point(0, 0);
-			// 
+            this.groupPanelBtns.Name = "groupPanelBtns";
-			// 
+            this.groupPanelBtns.Size = new System.Drawing.Size(376, 82);
-			// 
+            // 
-			this.groupPanelBtns.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            // 
-			this.groupPanelBtns.Style.BackColorGradientAngle = 90;
+            // 
-			this.groupPanelBtns.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelBtns.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelBtns.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BackColorGradientAngle = 90;
-			this.groupPanelBtns.Style.BorderBottomWidth = 1;
+            this.groupPanelBtns.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelBtns.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelBtns.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderBottomWidth = 1;
-			this.groupPanelBtns.Style.BorderLeftWidth = 1;
+            this.groupPanelBtns.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelBtns.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderRightWidth = 1;
+            this.groupPanelBtns.Style.BorderLeftWidth = 1;
-			this.groupPanelBtns.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelBtns.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.BorderTopWidth = 1;
+            this.groupPanelBtns.Style.BorderRightWidth = 1;
-			this.groupPanelBtns.Style.CornerDiameter = 4;
+            this.groupPanelBtns.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelBtns.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelBtns.Style.BorderTopWidth = 1;
-			this.groupPanelBtns.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelBtns.Style.CornerDiameter = 4;
-			this.groupPanelBtns.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelBtns.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelBtns.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.groupPanelBtns.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			// 
+            this.groupPanelBtns.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			// 
+            this.groupPanelBtns.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
+            // 
-			this.groupPanelBtns.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
-			// 
+            // 
-			// 
+            this.groupPanelBtns.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
+            // 
-			this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
-			this.groupPanelBtns.TabIndex = 25;
+            // 
-			// 
+            this.groupPanelBtns.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// cbPageNum
+            this.groupPanelBtns.TabIndex = 25;
-			// 
+            // 
-			this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
+            // cbHoldProcSet
-			// 
+            // 
-			// 
+            this.cbHoldProcSet.BackColor = System.Drawing.Color.Transparent;
-			// 
+            // 
-			this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
-			this.cbPageNum.Location = new System.Drawing.Point(0, 35);
+            // 
-			this.cbPageNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cbHoldProcSet.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbPageNum.Name = "cbPageNum";
+            this.cbHoldProcSet.Location = new System.Drawing.Point(0, 54);
-			this.cbPageNum.Size = new System.Drawing.Size(126, 15);
+            this.cbHoldProcSet.Margin = new System.Windows.Forms.Padding(2);
-			this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbHoldProcSet.Name = "cbHoldProcSet";
-			this.cbPageNum.TabIndex = 26;
+            this.cbHoldProcSet.Size = new System.Drawing.Size(214, 15);
-			this.cbPageNum.Text = "Include Page Number";
+            this.cbHoldProcSet.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-			this.cbPageNum.CheckedChanged += new System.EventHandler(this.cbPageNum_CheckedChanged);
+            this.superToolTipDispTran.SetSuperTooltip(this.cbHoldProcSet, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbHoldProcSet.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			// 
+            this.cbHoldProcSet.TabIndex = 27;
-			// btnTranCancel
+            this.cbHoldProcSet.Text = "Hold Procedure Set / Procedure";
-			// 
+            this.cbHoldProcSet.CheckedChanged += new System.EventHandler(this.cbHoldProcSet_CheckedChanged);
-			this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            // 
-			this.btnTranCancel.AutoSize = true;
+            // cbPageNum
-			this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            // 
-			this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.cbPageNum.BackColor = System.Drawing.Color.Transparent;
-			this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
+            // 
-			this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            // 
-			this.btnTranCancel.Name = "btnTranCancel";
+            // 
-			this.btnTranCancel.Size = new System.Drawing.Size(88, 36);
+            this.cbPageNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" +
+            this.cbPageNum.Location = new System.Drawing.Point(0, 35);
+            this.cbPageNum.Margin = new System.Windows.Forms.Padding(2);
+            this.cbPageNum.Name = "cbPageNum";
+            this.cbPageNum.Size = new System.Drawing.Size(126, 15);
+            this.cbPageNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbPageNum.TabIndex = 26;
+            this.cbPageNum.Text = "Include Page Number";
+            this.cbPageNum.CheckedChanged += new System.EventHandler(this.cbPageNum_CheckedChanged);
+            // 
+            // btnTranCancel
+            // 
+            this.btnTranCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnTranCancel.AutoSize = true;
+            this.btnTranCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnTranCancel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnTranCancel.Location = new System.Drawing.Point(282, 0);
+            this.btnTranCancel.Margin = new System.Windows.Forms.Padding(2);
+            this.btnTranCancel.Name = "btnTranCancel";
+            this.btnTranCancel.Size = new System.Drawing.Size(88, 36);
+            this.superToolTipDispTran.SetSuperTooltip(this.btnTranCancel, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This restores transition selections to the default if a transition would be inser" +
             "ted, or the original transition if one had been selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnTranCancel.TabIndex = 25;
+            this.btnTranCancel.TabIndex = 25;
-			this.btnTranCancel.Text = "Cancel";
+            this.btnTranCancel.Text = "Cancel";
-			this.btnTranCancel.Click += new System.EventHandler(this.btnTranCancel_Click);
+            this.btnTranCancel.Click += new System.EventHandler(this.btnTranCancel_Click);
-			// 
+            // 
-			// btnTranSave
+            // btnTranSave
-			// 
+            // 
-			this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnTranSave.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnTranSave.AutoSize = true;
+            this.btnTranSave.AutoSize = true;
-			this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnTranSave.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnTranSave.Dock = System.Windows.Forms.DockStyle.Left;
-			this.btnTranSave.Location = new System.Drawing.Point(0, 0);
+            this.btnTranSave.Location = new System.Drawing.Point(0, 0);
-			this.btnTranSave.Name = "btnTranSave";
+            this.btnTranSave.Name = "btnTranSave";
-			this.btnTranSave.Size = new System.Drawing.Size(103, 36);
+            this.btnTranSave.Size = new System.Drawing.Size(103, 36);
-			this.superToolTipDispTran.SetSuperTooltip(this.btnTranSave, new DevComponents.DotNetBar.SuperTooltipInfo("Save Transition", "", "- This will place the selected Transition at the cursor position.\r\n- This will re" +
+            this.superToolTipDispTran.SetSuperTooltip(this.btnTranSave, new DevComponents.DotNetBar.SuperTooltipInfo("Save Transition", "", "- This will place the selected Transition at the cursor position.\r\n- This will re" +
             "place a Transition with the selected Transition.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnTranSave.TabIndex = 24;
+            this.btnTranSave.TabIndex = 24;
-			this.btnTranSave.Text = "Save Transition";
+            this.btnTranSave.Text = "Save Transition";
-			this.btnTranSave.Click += new System.EventHandler(this.btnTranSave_Click);
+            this.btnTranSave.Click += new System.EventHandler(this.btnTranSave_Click);
-			// 
+            // 
-			// groupPanelTranFmt
+            // groupPanelTranFmt
-			// 
+            // 
-			this.groupPanelTranFmt.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelTranFmt.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelTranFmt.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
+            this.groupPanelTranFmt.Controls.Add(this.listBoxTranFmt);
-			this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty;
+            this.groupPanelTranFmt.DisabledBackColor = System.Drawing.Color.Empty;
-			this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
+            this.groupPanelTranFmt.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 58);
+            this.groupPanelTranFmt.Location = new System.Drawing.Point(0, 82);
-			this.groupPanelTranFmt.Name = "groupPanelTranFmt";
+            this.groupPanelTranFmt.Name = "groupPanelTranFmt";
-			this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
+            this.groupPanelTranFmt.Size = new System.Drawing.Size(376, 141);
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.groupPanelTranFmt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTranFmt.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTranFmt.Style.BackColorGradientAngle = 90;
+            this.groupPanelTranFmt.Style.BackColorGradientAngle = 90;
-			this.groupPanelTranFmt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTranFmt.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTranFmt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderBottomWidth = 1;
+            this.groupPanelTranFmt.Style.BorderBottomWidth = 1;
-			this.groupPanelTranFmt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTranFmt.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTranFmt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderLeftWidth = 1;
+            this.groupPanelTranFmt.Style.BorderLeftWidth = 1;
-			this.groupPanelTranFmt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderRightWidth = 1;
+            this.groupPanelTranFmt.Style.BorderRightWidth = 1;
-			this.groupPanelTranFmt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranFmt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranFmt.Style.BorderTopWidth = 1;
+            this.groupPanelTranFmt.Style.BorderTopWidth = 1;
-			this.groupPanelTranFmt.Style.CornerDiameter = 4;
+            this.groupPanelTranFmt.Style.CornerDiameter = 4;
-			this.groupPanelTranFmt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTranFmt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTranFmt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTranFmt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTranFmt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTranFmt.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTranFmt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.groupPanelTranFmt.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.groupPanelTranFmt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTranFmt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.groupPanelTranFmt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTranFmt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTranFmt.TabIndex = 27;
+            this.groupPanelTranFmt.TabIndex = 27;
-			this.groupPanelTranFmt.Text = "Select Format";
+            this.groupPanelTranFmt.Text = "Select Format";
-			// 
+            // 
-			// listBoxTranFmt
+            // listBoxTranFmt
-			// 
+            // 
-			this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.listBoxTranFmt.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.listBoxTranFmt.FormattingEnabled = true;
+            this.listBoxTranFmt.FormattingEnabled = true;
-			this.listBoxTranFmt.HorizontalScrollbar = true;
+            this.listBoxTranFmt.HorizontalScrollbar = true;
-			this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0);
+            this.listBoxTranFmt.Location = new System.Drawing.Point(0, 0);
-			this.listBoxTranFmt.Name = "listBoxTranFmt";
+            this.listBoxTranFmt.Name = "listBoxTranFmt";
-			this.listBoxTranFmt.Size = new System.Drawing.Size(370, 120);
+            this.listBoxTranFmt.Size = new System.Drawing.Size(370, 120);
-			this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected.  This also defines how the transitio" +
+            this.superToolTipDispTran.SetSuperTooltip(this.listBoxTranFmt, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This is where transition types are selected.  This also defines how the transitio" +
             "n will look in the text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.listBoxTranFmt.TabIndex = 13;
+            this.listBoxTranFmt.TabIndex = 13;
-			this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click);
+            this.listBoxTranFmt.SelectedIndexChanged += new System.EventHandler(this.listBoxTranFmt_Click);
-			// 
+            // 
-			// groupPanelTransitionSets
+            // groupPanelTransitionSets
-			// 
+            // 
-			this.groupPanelTransitionSets.CanvasColor = System.Drawing.SystemColors.Control;
+            this.groupPanelTransitionSets.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.groupPanelTransitionSets.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
+            this.groupPanelTransitionSets.Controls.Add(this.vlnTreeComboSets);
-			this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty;
+            this.groupPanelTransitionSets.DisabledBackColor = System.Drawing.Color.Empty;
-			this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
+            this.groupPanelTransitionSets.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 199);
+            this.groupPanelTransitionSets.Location = new System.Drawing.Point(0, 223);
-			this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
+            this.groupPanelTransitionSets.Name = "groupPanelTransitionSets";
-			this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
+            this.groupPanelTransitionSets.Size = new System.Drawing.Size(376, 48);
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.groupPanelTransitionSets.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTransitionSets.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTransitionSets.Style.BackColorGradientAngle = 90;
+            this.groupPanelTransitionSets.Style.BackColorGradientAngle = 90;
-			this.groupPanelTransitionSets.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTransitionSets.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTransitionSets.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderBottomWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderBottomWidth = 1;
-			this.groupPanelTransitionSets.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTransitionSets.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			this.groupPanelTransitionSets.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderLeftWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderLeftWidth = 1;
-			this.groupPanelTransitionSets.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderRightWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderRightWidth = 1;
-			this.groupPanelTransitionSets.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSets.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSets.Style.BorderTopWidth = 1;
+            this.groupPanelTransitionSets.Style.BorderTopWidth = 1;
-			this.groupPanelTransitionSets.Style.CornerDiameter = 4;
+            this.groupPanelTransitionSets.Style.CornerDiameter = 4;
-			this.groupPanelTransitionSets.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTransitionSets.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTransitionSets.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTransitionSets.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			this.groupPanelTransitionSets.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTransitionSets.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			this.groupPanelTransitionSets.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.groupPanelTransitionSets.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.groupPanelTransitionSets.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionSets.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			// 
+            // 
-			// 
+            // 
-			// 
+            // 
-			this.groupPanelTransitionSets.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionSets.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.groupPanelTransitionSets.TabIndex = 31;
+            this.groupPanelTransitionSets.TabIndex = 31;
-			this.groupPanelTransitionSets.Text = "Select Procedure Set";
+            this.groupPanelTransitionSets.Text = "Select Procedure Set";
-			// 
+            // 
-			// groupPanelTransitionProcs
+            // vlnTreeComboSets
-			// 
+            // 
-			this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
+            this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
-			this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
+            this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
-			this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty;
+            this.vlnTreeComboSets.Name = "vlnTreeComboSets";
-			this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
+            this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
-			this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 247);
+            this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
+            this.vlnTreeComboSets.TabIndex = 33;
-			this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
+            this.vlnTreeComboSets.Value = null;
-			// 
+            this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
-			// 
+            // 
-			// 
+            // groupPanelTransitionProcs
-			this.groupPanelTransitionProcs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            // 
-			this.groupPanelTransitionProcs.Style.BackColorGradientAngle = 90;
+            this.groupPanelTransitionProcs.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTransitionProcs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTransitionProcs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelTransitionProcs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Controls.Add(this.cbTranProcs);
-			this.groupPanelTransitionProcs.Style.BorderBottomWidth = 1;
+            this.groupPanelTransitionProcs.DisabledBackColor = System.Drawing.Color.Empty;
-			this.groupPanelTransitionProcs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTransitionProcs.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTransitionProcs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Location = new System.Drawing.Point(0, 271);
-			this.groupPanelTransitionProcs.Style.BorderLeftWidth = 1;
+            this.groupPanelTransitionProcs.Name = "groupPanelTransitionProcs";
-			this.groupPanelTransitionProcs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionProcs.Size = new System.Drawing.Size(376, 46);
-			this.groupPanelTransitionProcs.Style.BorderRightWidth = 1;
+            // 
-			this.groupPanelTransitionProcs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            // 
-			this.groupPanelTransitionProcs.Style.BorderTopWidth = 1;
+            // 
-			this.groupPanelTransitionProcs.Style.CornerDiameter = 4;
+            this.groupPanelTransitionProcs.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTransitionProcs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTransitionProcs.Style.BackColorGradientAngle = 90;
-			this.groupPanelTransitionProcs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTransitionProcs.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTransitionProcs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTransitionProcs.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionProcs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.groupPanelTransitionProcs.Style.BorderBottomWidth = 1;
-			// 
+            this.groupPanelTransitionProcs.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			// 
+            this.groupPanelTransitionProcs.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTransitionProcs.Style.BorderLeftWidth = 1;
-			this.groupPanelTransitionProcs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionProcs.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTransitionProcs.Style.BorderRightWidth = 1;
-			// 
+            this.groupPanelTransitionProcs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTransitionProcs.Style.BorderTopWidth = 1;
-			this.groupPanelTransitionProcs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionProcs.Style.CornerDiameter = 4;
-			this.groupPanelTransitionProcs.TabIndex = 32;
+            this.groupPanelTransitionProcs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTransitionProcs.Text = "Select Procedure";
+            this.groupPanelTransitionProcs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			// 
+            this.groupPanelTransitionProcs.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			// cbTranProcs
+            this.groupPanelTransitionProcs.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
+            // 
-			this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill;
+            // 
-			this.cbTranProcs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            // 
-			this.cbTranProcs.FormattingEnabled = true;
+            this.groupPanelTransitionProcs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbTranProcs.Location = new System.Drawing.Point(0, 0);
+            // 
-			this.cbTranProcs.Name = "cbTranProcs";
+            // 
-			this.cbTranProcs.Size = new System.Drawing.Size(370, 21);
+            // 
-			this.superToolTipDispTran.SetSuperTooltip(this.cbTranProcs, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranProcs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.groupPanelTransitionProcs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbTranProcs.TabIndex = 14;
+            this.groupPanelTransitionProcs.TabIndex = 32;
-			this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged);
+            this.groupPanelTransitionProcs.Text = "Select Procedure";
-			// 
+            // 
-			// groupPanelTransitionSect
+            // cbTranProcs
-			// 
+            // 
-			this.groupPanelTransitionSect.CanvasColor = System.Drawing.SystemColors.Control;
+            this.cbTranProcs.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.cbTranProcs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
+            this.cbTranProcs.FormattingEnabled = true;
-			this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty;
+            this.cbTranProcs.Location = new System.Drawing.Point(0, 0);
-			this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
+            this.cbTranProcs.Name = "cbTranProcs";
-			this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 293);
+            this.cbTranProcs.Size = new System.Drawing.Size(370, 21);
-			this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
+            this.superToolTipDispTran.SetSuperTooltip(this.cbTranProcs, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranProcs.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
+            this.cbTranProcs.TabIndex = 14;
-			// 
+            this.cbTranProcs.SelectedIndexChanged += new System.EventHandler(this.cbTranProcs_SelectedIndexChanged);
-			// 
+            // 
-			// 
+            // groupPanelTransitionSect
-			this.groupPanelTransitionSect.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            // 
-			this.groupPanelTransitionSect.Style.BackColorGradientAngle = 90;
+            this.groupPanelTransitionSect.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTransitionSect.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTransitionSect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelTransitionSect.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Controls.Add(this.cbTranSects);
-			this.groupPanelTransitionSect.Style.BorderBottomWidth = 1;
+            this.groupPanelTransitionSect.DisabledBackColor = System.Drawing.Color.Empty;
-			this.groupPanelTransitionSect.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTransitionSect.Dock = System.Windows.Forms.DockStyle.Top;
-			this.groupPanelTransitionSect.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Location = new System.Drawing.Point(0, 317);
-			this.groupPanelTransitionSect.Style.BorderLeftWidth = 1;
+            this.groupPanelTransitionSect.Name = "groupPanelTransitionSect";
-			this.groupPanelTransitionSect.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTransitionSect.Size = new System.Drawing.Size(376, 49);
-			this.groupPanelTransitionSect.Style.BorderRightWidth = 1;
+            // 
-			this.groupPanelTransitionSect.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            // 
-			this.groupPanelTransitionSect.Style.BorderTopWidth = 1;
+            // 
-			this.groupPanelTransitionSect.Style.CornerDiameter = 4;
+            this.groupPanelTransitionSect.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTransitionSect.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTransitionSect.Style.BackColorGradientAngle = 90;
-			this.groupPanelTransitionSect.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTransitionSect.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTransitionSect.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTransitionSect.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTransitionSect.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.groupPanelTransitionSect.Style.BorderBottomWidth = 1;
-			// 
+            this.groupPanelTransitionSect.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			// 
+            this.groupPanelTransitionSect.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTransitionSect.Style.BorderLeftWidth = 1;
-			this.groupPanelTransitionSect.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionSect.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTransitionSect.Style.BorderRightWidth = 1;
-			// 
+            this.groupPanelTransitionSect.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTransitionSect.Style.BorderTopWidth = 1;
-			this.groupPanelTransitionSect.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTransitionSect.Style.CornerDiameter = 4;
-			this.groupPanelTransitionSect.TabIndex = 33;
+            this.groupPanelTransitionSect.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTransitionSect.Text = "Select Section";
+            this.groupPanelTransitionSect.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			// 
+            this.groupPanelTransitionSect.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			// cbTranSects
+            this.groupPanelTransitionSect.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
+            // 
-			this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill;
+            // 
-			this.cbTranSects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            // 
-			this.cbTranSects.FormattingEnabled = true;
+            this.groupPanelTransitionSect.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbTranSects.Location = new System.Drawing.Point(0, 0);
+            // 
-			this.cbTranSects.Name = "cbTranSects";
+            // 
-			this.cbTranSects.Size = new System.Drawing.Size(370, 21);
+            // 
-			this.superToolTipDispTran.SetSuperTooltip(this.cbTranSects, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranSects.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.groupPanelTransitionSect.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.cbTranSects.TabIndex = 20;
+            this.groupPanelTransitionSect.TabIndex = 33;
-			this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
+            this.groupPanelTransitionSect.Text = "Select Section";
-			this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
+            // 
-			// 
+            // cbTranSects
-			// groupPanelTranstionSteps
+            // 
-			// 
+            this.cbTranSects.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.groupPanelTranstionSteps.CanvasColor = System.Drawing.SystemColors.Control;
+            this.cbTranSects.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.groupPanelTranstionSteps.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.cbTranSects.FormattingEnabled = true;
-			this.groupPanelTranstionSteps.Controls.Add(this.tvTran);
+            this.cbTranSects.Location = new System.Drawing.Point(0, 0);
-			this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
+            this.cbTranSects.Name = "cbTranSects";
-			this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty;
+            this.cbTranSects.Size = new System.Drawing.Size(370, 21);
-			this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.superToolTipDispTran.SetSuperTooltip(this.cbTranSects, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("cbTranSects.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 342);
+            this.cbTranSects.TabIndex = 20;
-			this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
+            this.cbTranSects.SelectedIndexChanged += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
-			this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 334);
+            this.cbTranSects.Click += new System.EventHandler(this.cbTranSects_SelectedIndexChanged);
-			// 
+            // 
-			// 
+            // groupPanelTranstionSteps
-			// 
+            // 
-			this.groupPanelTranstionSteps.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.groupPanelTranstionSteps.CanvasColor = System.Drawing.SystemColors.Control;
-			this.groupPanelTranstionSteps.Style.BackColorGradientAngle = 90;
+            this.groupPanelTranstionSteps.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
-			this.groupPanelTranstionSteps.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.groupPanelTranstionSteps.Controls.Add(this.tvTran);
-			this.groupPanelTranstionSteps.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Controls.Add(this.pnlTranStepBtns);
-			this.groupPanelTranstionSteps.Style.BorderBottomWidth = 1;
+            this.groupPanelTranstionSteps.DisabledBackColor = System.Drawing.Color.Empty;
-			this.groupPanelTranstionSteps.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.groupPanelTranstionSteps.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.groupPanelTranstionSteps.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Location = new System.Drawing.Point(0, 366);
-			this.groupPanelTranstionSteps.Style.BorderLeftWidth = 1;
+            this.groupPanelTranstionSteps.Name = "groupPanelTranstionSteps";
-			this.groupPanelTranstionSteps.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.groupPanelTranstionSteps.Size = new System.Drawing.Size(376, 310);
-			this.groupPanelTranstionSteps.Style.BorderRightWidth = 1;
+            // 
-			this.groupPanelTranstionSteps.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            // 
-			this.groupPanelTranstionSteps.Style.BorderTopWidth = 1;
+            // 
-			this.groupPanelTranstionSteps.Style.CornerDiameter = 4;
+            this.groupPanelTranstionSteps.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
-			this.groupPanelTranstionSteps.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.groupPanelTranstionSteps.Style.BackColorGradientAngle = 90;
-			this.groupPanelTranstionSteps.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.groupPanelTranstionSteps.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
-			this.groupPanelTranstionSteps.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.groupPanelTranstionSteps.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			this.groupPanelTranstionSteps.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            this.groupPanelTranstionSteps.Style.BorderBottomWidth = 1;
-			// 
+            this.groupPanelTranstionSteps.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-			// 
+            this.groupPanelTranstionSteps.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTranstionSteps.Style.BorderLeftWidth = 1;
-			this.groupPanelTranstionSteps.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTranstionSteps.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTranstionSteps.Style.BorderRightWidth = 1;
-			// 
+            this.groupPanelTranstionSteps.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
-			// 
+            this.groupPanelTranstionSteps.Style.BorderTopWidth = 1;
-			this.groupPanelTranstionSteps.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.groupPanelTranstionSteps.Style.CornerDiameter = 4;
-			this.groupPanelTranstionSteps.TabIndex = 34;
+            this.groupPanelTranstionSteps.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
-			this.groupPanelTranstionSteps.Text = "Select Step";
+            this.groupPanelTranstionSteps.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
-			// 
+            this.groupPanelTranstionSteps.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-			// pnlTranStepBtns
+            this.groupPanelTranstionSteps.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
-			// 
+            // 
-			this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
+            // 
-			this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip);
+            // 
-			this.pnlTranStepBtns.Controls.Add(this.btnTranRangeClear);
+            this.groupPanelTranstionSteps.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.pnlTranStepBtns.Controls.Add(this.btnUp1);
+            // 
-			this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top;
+            // 
-			this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0);
+            // 
-			this.pnlTranStepBtns.Name = "pnlTranStepBtns";
+            this.groupPanelTranstionSteps.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-			this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46);
+            this.groupPanelTranstionSteps.TabIndex = 34;
-			this.pnlTranStepBtns.TabIndex = 30;
+            this.groupPanelTranstionSteps.Text = "Select Step";
-			// 
+            // 
-			// cbIncStepNum
+            // tvTran
-			// 
+            // 
-			// 
+            this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
-			// 
+            this.tvTran.HideSelection = false;
-			// 
+            this.tvTran.Location = new System.Drawing.Point(0, 46);
-			this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tvTran.Name = "tvTran";
-			this.cbIncStepNum.Location = new System.Drawing.Point(8, 12);
+            this.tvTran.Size = new System.Drawing.Size(370, 243);
-			this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.cbIncStepNum.Name = "cbIncStepNum";
+            this.tvTran.TabIndex = 31;
-			this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
+            this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
-			this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
-			this.cbIncStepNum.TabIndex = 0;
+            // pnlTranStepBtns
-			this.cbIncStepNum.Text = "Include Step Number";
+            // 
-			this.cbIncStepNum.CheckedChanged += new System.EventHandler(this.cbIncStepNum_CheckedChanged);
+            this.pnlTranStepBtns.Controls.Add(this.cbIncStepNum);
-			// 
+            this.pnlTranStepBtns.Controls.Add(this.lblxTranRangeTip);
-			// lblxTranRangeTip
+            this.pnlTranStepBtns.Controls.Add(this.btnTranRangeClear);
-			// 
+            this.pnlTranStepBtns.Controls.Add(this.btnUp1);
-			// 
+            this.pnlTranStepBtns.Dock = System.Windows.Forms.DockStyle.Top;
-			// 
+            this.pnlTranStepBtns.Location = new System.Drawing.Point(0, 0);
-			// 
+            this.pnlTranStepBtns.Name = "pnlTranStepBtns";
-			this.lblxTranRangeTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.pnlTranStepBtns.Size = new System.Drawing.Size(370, 46);
-			this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pnlTranStepBtns.TabIndex = 30;
-			this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            // 
-			this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0);
+            // cbIncStepNum
-			this.lblxTranRangeTip.Name = "lblxTranRangeTip";
+            // 
-			this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46);
+            // 
-			this.superToolTipDispTran.SetSuperTooltip(this.lblxTranRangeTip, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "For range transitions, shows which selection, first or second, that the next sele" +
+            // 
+            // 
+            this.cbIncStepNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbIncStepNum.Location = new System.Drawing.Point(8, 12);
+            this.cbIncStepNum.Margin = new System.Windows.Forms.Padding(2);
+            this.cbIncStepNum.Name = "cbIncStepNum";
+            this.cbIncStepNum.Size = new System.Drawing.Size(126, 19);
+            this.cbIncStepNum.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbIncStepNum.TabIndex = 0;
+            this.cbIncStepNum.Text = "Include Step Number";
+            this.cbIncStepNum.CheckedChanged += new System.EventHandler(this.cbIncStepNum_CheckedChanged);
+            // 
+            // lblxTranRangeTip
+            // 
+            // 
+            // 
+            // 
+            this.lblxTranRangeTip.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lblxTranRangeTip.Dock = System.Windows.Forms.DockStyle.Right;
+            this.lblxTranRangeTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblxTranRangeTip.Location = new System.Drawing.Point(265, 0);
+            this.lblxTranRangeTip.Name = "lblxTranRangeTip";
+            this.lblxTranRangeTip.Size = new System.Drawing.Size(105, 46);
+            this.superToolTipDispTran.SetSuperTooltip(this.lblxTranRangeTip, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "For range transitions, shows which selection, first or second, that the next sele" +
             "ction will be.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.lblxTranRangeTip.TabIndex = 33;
+            this.lblxTranRangeTip.TabIndex = 33;
-			this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range";
+            this.lblxTranRangeTip.Text = "Select First \r\nTransition\r\nfor Range";
-			// 
+            // 
-			// btnTranRangeClear
+            // btnTranRangeClear
-			// 
+            // 
-			this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnTranRangeClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnTranRangeClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btnTranRangeClear.Dock = System.Windows.Forms.DockStyle.Left;
-			this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0);
+            this.btnTranRangeClear.Location = new System.Drawing.Point(0, 0);
-			this.btnTranRangeClear.Name = "btnTranRangeClear";
+            this.btnTranRangeClear.Name = "btnTranRangeClear";
-			this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46);
+            this.btnTranRangeClear.Size = new System.Drawing.Size(58, 46);
-			this.superToolTipDispTran.SetSuperTooltip(this.btnTranRangeClear, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This clears the Range selection in the tree view", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.superToolTipDispTran.SetSuperTooltip(this.btnTranRangeClear, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This clears the Range selection in the tree view", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnTranRangeClear.TabIndex = 31;
+            this.btnTranRangeClear.TabIndex = 31;
-			this.btnTranRangeClear.Text = "Clear Range Selection";
+            this.btnTranRangeClear.Text = "Clear Range Selection";
-			this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click);
+            this.btnTranRangeClear.Click += new System.EventHandler(this.btnTranRangeClear_Click);
-			// 
+            // 
-			// btnUp1
+            // btnUp1
-			// 
+            // 
-			this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnUp1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-			this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnUp1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-			this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS;
+            this.btnUp1.Image = global::Volian.Controls.Library.Properties.Resources.GoToParentFolderHS;
-			this.btnUp1.Location = new System.Drawing.Point(210, 0);
+            this.btnUp1.Location = new System.Drawing.Point(210, 0);
-			this.btnUp1.Name = "btnUp1";
+            this.btnUp1.Name = "btnUp1";
-			this.btnUp1.Size = new System.Drawing.Size(43, 46);
+            this.btnUp1.Size = new System.Drawing.Size(43, 46);
-			this.superToolTipDispTran.SetSuperTooltip(this.btnUp1, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This will display the tree for selecting the transition one level higher than cur" +
+            this.superToolTipDispTran.SetSuperTooltip(this.btnUp1, new DevComponents.DotNetBar.SuperTooltipInfo("", "", "This will display the tree for selecting the transition one level higher than cur" +
             "rently shown. If already showing High Level Steps, this button has no effect.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
-			this.btnUp1.TabIndex = 30;
+            this.btnUp1.TabIndex = 30;
-			this.btnUp1.Visible = false;
+            this.btnUp1.Visible = false;
-			// 
+            // 
-			// superToolTipDispTran
+            // superToolTipDispTran
-			// 
+            // 
-			this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
+            this.superToolTipDispTran.DefaultTooltipSettings = new DevComponents.DotNetBar.SuperTooltipInfo("", "", "", null, null, DevComponents.DotNetBar.eTooltipColor.Gray);
-			this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+            this.superToolTipDispTran.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
-			// 
+            // 
-			// tvTran
+            // DisplayTransition
-			// 
+            // 
-			this.tvTran.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.tvTran.HideSelection = false;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.tvTran.Location = new System.Drawing.Point(0, 46);
+            this.Controls.Add(this.groupPanelTranstionSteps);
-			this.tvTran.Name = "tvTran";
+            this.Controls.Add(this.groupPanelTransitionSect);
-			this.tvTran.Size = new System.Drawing.Size(370, 267);
+            this.Controls.Add(this.groupPanelTransitionProcs);
-			this.superToolTipDispTran.SetSuperTooltip(this.tvTran, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("tvTran.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.Controls.Add(this.groupPanelTransitionSets);
-			this.tvTran.TabIndex = 31;
+            this.Controls.Add(this.groupPanelTranFmt);
-			this.tvTran.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tvTran_AfterSelect);
+            this.Controls.Add(this.groupPanelBtns);
-			// 
+            this.Margin = new System.Windows.Forms.Padding(2);
-			// vlnTreeComboSets
+            this.Name = "DisplayTransition";
-			// 
+            this.Size = new System.Drawing.Size(376, 676);
-			this.vlnTreeComboSets.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupPanelBtns.ResumeLayout(false);
-			this.vlnTreeComboSets.Location = new System.Drawing.Point(0, 0);
+            this.groupPanelBtns.PerformLayout();
-			this.vlnTreeComboSets.Margin = new System.Windows.Forms.Padding(4);
+            this.groupPanelTranFmt.ResumeLayout(false);
-			this.vlnTreeComboSets.Name = "vlnTreeComboSets";
+            this.groupPanelTransitionSets.ResumeLayout(false);
-			this.vlnTreeComboSets.Size = new System.Drawing.Size(370, 21);
+            this.groupPanelTransitionProcs.ResumeLayout(false);
-			this.superToolTipDispTran.SetSuperTooltip(this.vlnTreeComboSets, new DevComponents.DotNetBar.SuperTooltipInfo("", "", resources.GetString("vlnTreeComboSets.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
+            this.groupPanelTransitionSect.ResumeLayout(false);
-			this.vlnTreeComboSets.TabIndex = 33;
+            this.groupPanelTranstionSteps.ResumeLayout(false);
-			this.vlnTreeComboSets.Value = null;
+            this.pnlTranStepBtns.ResumeLayout(false);
-			this.vlnTreeComboSets.FinishEditing += new AT.STO.UI.Win.DropDownValueChangedEventHandler(this.DropDown_FinishEditing);
+            this.ResumeLayout(false);
-			// 
-			// DisplayTransition
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.groupPanelTranstionSteps);
-			this.Controls.Add(this.groupPanelTransitionSect);
-			this.Controls.Add(this.groupPanelTransitionProcs);
-			this.Controls.Add(this.groupPanelTransitionSets);
-			this.Controls.Add(this.groupPanelTranFmt);
-			this.Controls.Add(this.groupPanelBtns);
-			this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-			this.Name = "DisplayTransition";
-			this.Size = new System.Drawing.Size(376, 676);
-			this.groupPanelBtns.ResumeLayout(false);
-			this.groupPanelBtns.PerformLayout();
-			this.groupPanelTranFmt.ResumeLayout(false);
-			this.groupPanelTransitionSets.ResumeLayout(false);
-			this.groupPanelTransitionProcs.ResumeLayout(false);
-			this.groupPanelTransitionSect.ResumeLayout(false);
-			this.groupPanelTranstionSteps.ResumeLayout(false);
-			this.pnlTranStepBtns.ResumeLayout(false);
-			this.ResumeLayout(false);
 
 		}
 
@@ -535,5 +554,6 @@ namespace Volian.Controls.Library
 		private DevComponents.DotNetBar.SuperTooltip superToolTipDispTran;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbIncStepNum;
 		private DevComponents.DotNetBar.Controls.CheckBoxX cbPageNum;
-	}
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbHoldProcSet;
+    }
 }

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -27,7 +27,31 @@ namespace Volian.Controls.Library
 			set 
 			{
 				if (DesignMode || !Visible) return; // B2019-043 need to check if we are just saving changes to the user interface
-				if (value == null)			// Insert a transition
+				//CSM-C2024-026 Evaluate the transitions panel
+				//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+				//HeldLinkText will store if a transition was manually selected 
+				//to override defaulting the listboxes to the current step / selected transition
+				if (HeldLinkText != "" && value != null)
+                {
+					//handle case where is held text and click on an already existing transition so cannot save one on top of the other.
+					_CurTrans = value;
+					btnTranSave.Enabled = false;
+					btnTranCancel.Enabled = true;
+					return;
+				}
+				else if (HeldLinkText != "" && MyRTB.MyItemInfo.ActiveFormat.Name == HeldLink_CurItemFrom.ActiveFormat.Name)
+                {
+					//this else if will handle case of defaulting to held transition instead of what has been clicked on
+					//Note that if format is not the same, it will ignore the held item
+					//This is because if different format, then options / selections may be different so will need to refresh the lists
+					if (_CurTrans == value && _CurItemFrom == HeldLink_CurItemFrom) return;
+					_CurItemFrom = HeldLink_CurItemFrom;
+					_TranFmtIndx = HeldLink_TranFmtIndx;
+					bool isenh = MyRTB != null && HeldLink_CurItemFrom != null && HeldLink_CurItemFrom.IsEnhancedStep;
+					btnTranSave.Enabled = !isenh && UserInfo.CanEdit(MyUserInfo, Mydvi) && (value == null); //Can Insert Transitions
+					btnTranCancel.Enabled = true;
+				}
+				else if (value == null)			// Insert a transition
 				{
 					if (MyRTB == null) return;
 					if (_CurTrans == value && _CurItemFrom == MyRTB.MyItemInfo) return;
@@ -115,19 +139,13 @@ namespace Volian.Controls.Library
 				_MyRTB.LinkChanged += new StepRTBLinkEvent(_MyRTB_LinkChanged);
 				if (_MyRTB.MyLinkText == null)
 				{
-					CurTrans = null;
+						CurTrans = null;
 				}
-			}
+            }
 		}
 		void _MyRTB_LinkChanged(object sender, StepPanelLinkEventArgs args)
 		{
-			//if (_MyRTB.MyLinkText == null)
+			CurTrans = args.MyLinkText.MyTransitionInfo;
-			//  CurTrans = null;
-			//else
-			//{
-			//  StepPanelLinkEventArgs tmp = new StepPanelLinkEventArgs(null, e);
-				CurTrans = args.MyLinkText.MyTransitionInfo;
-			//}
 		}
 		private ItemInfo _CurrentItemProcedure;		// the selected item's procedure
 		private ItemInfo _CurrentToProcedure;		// the 'to' location's procedure (may be same as _CurrentItemProcedure)
@@ -138,6 +156,12 @@ namespace Volian.Controls.Library
 		private Color _OrigGroupPanelProcs;
 		private Color _OrigGroupPanelSects;
 		private Color _OrigGroupPanelSteps;
+		//CSM-C2024-026 Evaluate the transitions panel
+		//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+		public string HeldLinkText { get; protected set; } = "";  //will hold link text to stay on
+		public int HeldLink_TranFmtIndx { get; protected set; } = 0; //this will hold transition format that was selected on held item
+		public ItemInfo HeldLink_CurItemFrom { get; protected set; } //this will hold item that transitioning from
+
 		#endregion
 		#region Constructors
 		public DisplayTransition()
@@ -237,7 +261,7 @@ namespace Volian.Controls.Library
 				if (selitm != null && selitm.MyContent.Type >= 20000)
 				{
 					
-					if (_DoingRange)
+					if (_DoingRange && CurTrans != null)
 					{
 						tvInitHiliteRange(); //rangeSameLevel, stpitm, rngitm, (i1 < i2) ? i2 : i1);
 					}
@@ -938,6 +962,17 @@ namespace Volian.Controls.Library
 				}
 				_InitializingTrans = false;
 				SaveCancelEnabling();
+
+				//CSM-C2024-026 Evaluate the transitions panel
+				//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+				//If checkbox is checked to enable holding an item,
+				//then store the first step in the currently selected item
+				if (cbHoldProcSet.Checked && secitm.Steps != null && secitm.Steps.Count > 0)
+				{
+					HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, secitm.Steps[0].ItemID);
+					HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
+					HeldLink_CurItemFrom = secitm.Steps[0];
+				}
 			}
 		}
 		// B2024-016 Hide the step tree when the transition definition does not include a step number {First Step}
@@ -1089,6 +1124,18 @@ namespace Volian.Controls.Library
 				return;
 			}
 			SaveCancelEnabling();
+
+			//CSM-C2024-026 Evaluate the transitions panel
+			//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+			//If checkbox is checked to enable holding an item,
+			//then store the currently selected item
+			if (cbHoldProcSet.Checked)
+			{
+				HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
+				HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
+				HeldLink_CurItemFrom = selii;
+			}
+
 			if (_DoingRange)
 			{
 				if (_RangeNode1 == null || (_RangeNode1 != null && _RangeNode2 != null))
@@ -1370,6 +1417,13 @@ namespace Volian.Controls.Library
 				_MyLog.InfoFormat("ItemID {0}, LinkText '{1}'", MyRTB.MyItemInfo.ItemID, linkText);
 			int sel = MyRTB.SelectionStart + MyRTB.SelectionLength;
 			MyRTB.Select(sel, 0);// Move cursor to end of LINK
+
+			//CSM-C2024-026 Evaluate the transitions panel
+			//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+			//After save a transition, set the Linktext / tab to go back to the held transition
+			//if none then this will refresh it to the currently selected item as it did before this csm
+			MyRTB.MyLinkText = HeldLinkText;
+
 			MyRTB.Focus();
 		}
 		#endregion
@@ -1489,8 +1543,34 @@ namespace Volian.Controls.Library
 				btnTranSave.Enabled = UserInfo.CanEdit(MyUserInfo, Mydvi); //Can Insert Transitons
 			}
 		}
-	}
+
-	public class TransItem
+		//CSM-C2024-026 Evaluate the transitions panel
+		//Create a way to keep it from reverting the transition display panel to the currently selected item/transition.
+		//If checkbox is checked to enable holding an item,
+		//then store the currently selected item
+		//if checkbox becomes unchecked then clear item.
+		private void cbHoldProcSet_CheckedChanged(object sender, EventArgs e)
+        {
+			if (cbHoldProcSet.Checked)
+			{
+				VETreeNode vt = tvTran.SelectedNode as VETreeNode;
+				ItemInfo selii = vt.VEObject as ItemInfo;
+				if (selii != null)
+				{
+					HeldLinkText = string.Format("#Link:Transition:{0} <NewID> {1}", listBoxTranFmt.SelectedIndex, selii.ItemID);
+					HeldLink_TranFmtIndx = listBoxTranFmt.SelectedIndex;
+					HeldLink_CurItemFrom = selii;
+				}
+			}
+			else
+			{
+				HeldLinkText = "";
+				HeldLink_CurItemFrom = null;
+				HeldLink_TranFmtIndx = 0;
+			}
+        }
+    }
+    public class TransItem
 	{
 		private string _ItemDescription;
 

PROMS/Volian.Controls.Library/DisplayTransition.resx

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

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

@@ -279,18 +279,24 @@ namespace Volian.Controls.Library
 			// 
 			// btnCmCut
 			// 
+			this.btnCmCut.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmCut.Image = global::Volian.Controls.Library.Properties.Resources.Cut_Image;
 			this.btnCmCut.Name = "btnCmCut";
 			this.btnCmCut.Text = "Cut";
 			this.btnCmCut.Click += new System.EventHandler(this.btnCmCut_Click);
 			// 
 			// btnCmCopy
 			// 
+			this.btnCmCopy.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmCopy.Image = global::Volian.Controls.Library.Properties.Resources.Copy_Image;
 			this.btnCmCopy.Name = "btnCmCopy";
 			this.btnCmCopy.Text = "Copy";
 			this.btnCmCopy.Click += new System.EventHandler(this.btnCmCopy_Click);
 			// 
 			// btnCmPaste
 			// 
+			this.btnCmPaste.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmPaste.Image = global::Volian.Controls.Library.Properties.Resources.PasteSmall_Image;
 			this.btnCmPaste.Name = "btnCmPaste";
 			this.btnCmPaste.Text = "Paste";
 			this.btnCmPaste.Click += new System.EventHandler(this.btnCmPaste_Click);
@@ -305,12 +311,16 @@ namespace Volian.Controls.Library
 			// 
 			// btnCmHardSp
 			// 
+			this.btnCmHardSp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmHardSp.Image = global::Volian.Controls.Library.Properties.Resources.HardSpace_Image;
 			this.btnCmHardSp.Name = "btnCmHardSp";
 			this.btnCmHardSp.Text = "Hard Space";
 			this.btnCmHardSp.Click += new System.EventHandler(this.btnCmHardSp_Click);
 			// 
 			// btnCmSymbol
 			// 
+			this.btnCmSymbol.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.btnCmSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image;
 			this.btnCmSymbol.Name = "btnCmSymbol";
 			this.btnCmSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.galSymbols});
@@ -566,9 +576,9 @@ namespace Volian.Controls.Library
 
 		}
 
-		#endregion
+        #endregion
 
-		private DevComponents.DotNetBar.ButtonX btnReplace;
+        private DevComponents.DotNetBar.ButtonX btnReplace;
 		private DevComponents.DotNetBar.ButtonX btnFndRplDone;
 		private DevComponents.DotNetBar.ButtonX btnFindNext;
 		private DevComponents.DotNetBar.Controls.ComboBoxEx cmboReplaceText;

PROMS/Volian.Controls.Library/FormatUtility.cs

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

PROMS/Volian.Controls.Library/StepRTB.cs

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

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1376,7 +1376,9 @@ namespace Volian.Controls.Library
 		public static String GetDefaultKeyValue(String key)
 		{
 			object xxx = null;
-			return Registry.GetValue(key, "", xxx).ToString();
+			// fixed null reference error - appeared only while debugged - for user was handled via Try/Catch and ignored
+			object gtval = Registry.GetValue(key, "", xxx);
+			return (string)((gtval != null) ? gtval.ToString() : gtval);
 		}
 		private EditItem FindStepAfter(string types, int contenttype)
 		{
@@ -1804,7 +1806,7 @@ namespace Volian.Controls.Library
 			//B20170-158 Don't allow a step to replace a linked step
 			//B2017-180:  The fix for B2017-158 also needed the 'HasEnhancedLinkedStep' to check if the copied step is a source step
 			// C2017-031:  Support for paste/replace an enhanced step, enable button
-			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable && ((!MyItemInfo.IsEnhancedStep && !MyItemInfo.HasEnhancedLinkedStep) || (MyItemInfo.IsEnhancedStep));
+			btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = enable;
 		}
 		private void SetPasteButtonEnabled()
     {
@@ -1864,25 +1866,6 @@ namespace Volian.Controls.Library
 					if (stepToCfg.MyEnhancedDocuments != null && stepToCfg.MyEnhancedDocuments.Count > 0 && stepToCfg.MyEnhancedDocuments[0].Type != 0) toSourceHasEnhancedLinks = true;
 				}
 			}
-			// enhanced: if 'from' step is not enhanced, only allow paste before/after
-			if (MyItemInfo.IsHigh && !MyItemInfo.IsEnhancedStep)
-			{
-				stepToCfg = MyItemInfo.MyConfig as StepConfig;
-				if (stepToCfg.MyEnhancedDocuments != null && stepToCfg.MyEnhancedDocuments.Count > 0 && stepToCfg.MyEnhancedDocuments[0].Type != 0)
-				{
-					// Current selected step is source (i.e. has enhanced links to enhanced steps)
-					// check if 'from' step is non.  If so, allow paste before/after but not replace
-					if (tmp.MyDisplayTabControl.MyCopyStep.IsHigh)
-					{
-						StepConfig fromCfg = tmp.MyDisplayTabControl.MyCopyStep.MyConfig as StepConfig;
-						if (fromCfg != null && (fromCfg.MyEnhancedDocuments==null || fromCfg.MyEnhancedDocuments.Count==0))
-						{
-							btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = false;
-							return;
-						}
-					}
-				}
-			}
       //copy item is high level step
 			// Allow a High Level step to be pasted to a sub-step, but not to a table, figure, section or procedure type
       if (tmp.MyDisplayTabControl.MyCopyStep.IsHigh && (MyItemInfo.IsTable || MyItemInfo.IsFigure || MyItemInfo.IsSection || MyItemInfo.IsProcedure))
@@ -1985,6 +1968,9 @@ namespace Volian.Controls.Library
 				case "Cont. Act\r\nSummary":
 					btnCASCreate_Click(sender, e);
 					break;
+				case "Time Crit\r\nSummary":
+					btnTCASCreate_Click(sender, e);
+					break;
 			}
 			MyItemInfo.MyProcedure.ProcedureConfig.SelectedSlave = 0; // unselect the unit (child)
 		}
@@ -1999,6 +1985,9 @@ namespace Volian.Controls.Library
 			btnCASCreate.SubItems.Clear();
 			btnCASCreate.Tag = null;
 			btnCASCreate.Click -= new System.EventHandler(btnCASCreate_Click);
+			btnTCASCreate.SubItems.Clear();
+			btnTCASCreate.Tag = null;
+			btnTCASCreate.Click -= new System.EventHandler(btnTCASCreate_Click);
 			btnReviewCreatePDF.SubItems.Clear();
 			btnReviewCreatePDF.Tag = null;
 			btnReviewCreatePDF.Click -= new System.EventHandler(btnPdfCreate_Click);
@@ -2025,6 +2014,9 @@ namespace Volian.Controls.Library
 				btnCASCreate.SubItems.Add(btn);
 				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
 				btn.Enabled = procAppl;
+				btnTCASCreate.SubItems.Add(btn);
+				btn = MakeSubMenuButton(s, k, miMultiUnit_Click);
+				btn.Enabled = procAppl;
 				btnReviewPdfQuickCreate.SubItems.Add(btn);
 			}
 			btnPdfCreate.AutoExpandOnClick = true;
@@ -2032,6 +2024,7 @@ namespace Volian.Controls.Library
 			btnReviewCreatePDF.AutoExpandOnClick = true;
 			btnReviewPdfQuickCreate.AutoExpandOnClick = true;
 			btnCASCreate.AutoExpandOnClick = true;
+			btnTCASCreate.AutoExpandOnClick = true;
 		}
 		private DevComponents.DotNetBar.ButtonItem MakeSubMenuButton(string s, object tag, EventHandler ehandler)
 		{
@@ -2871,12 +2864,19 @@ namespace Volian.Controls.Library
 					tmpForLink = ItemInfo.ReplaceLinkWithNewID(tmpForLink);
 					myRtb.SelectedRtf = tmpForLink;
 					// Fix for B2014-071: if link, save after paste so that goto's don't crash (grid & step run through this code)
-					if (tmpForLink.Contains("<NewID>")) _MyStepRTB.OnDoSaveContents(this, new EventArgs());	
+					if (tmpForLink.Contains("<NewID>")) _MyStepRTB.OnDoSaveContents(this, new EventArgs());
 				}
 
 			}
 			else if (myDO.GetDataPresent(DataFormats.Text))
-				myRtb.SelectedText = _MyStepRTB.GetPasteText(PasteNoReturnsSetting, myDO);
+            {
+				//CSM B2023-095/U2022-004 When Copy/Pasting Symbols, some of the symbols paste in an incorrect font
+				//   Changed this to put in the unicode code for any symbols outside the normal ascii range
+				//   Also need to input as an RTF so that correct font is used with these
+				//   and unicode is converted to actual text
+				string clipboardtext = _MyStepRTB.GetPasteText(PasteNoReturnsSetting, myDO, true);
+				myRtb.SelectedRtf = _MyStepRTB.RtfPrefixForSymbols + clipboardtext + @"}";
+			}
 			if (myRtb.SelectionLength == 0 && myRtb is StepRTB) myRtb.SelectionFont = (myRtb as StepRTB).MyStyleFont.WindowsFont;
 			_PastePlainTextOvrRide = false;
 			_PasteStepTextOvrRide = false;
@@ -3122,7 +3122,13 @@ namespace Volian.Controls.Library
 			// a referenced object, bring up ReferencedObject Editor (for now, just put up a message box.
 			if (_MyStepRTB.MyLinkText != null && _MyStepRTB.MyLinkText.IndexOf("Transition") > -1)
 			{
-				_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(_MyStepRTB.MyLinkText));
+				// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
+				//           Needed to clear the selection of the link or it will be used the next time
+				//           <Shift><Ctrl><G> is used
+				string lnkText = _MyStepRTB.MyLinkText; // save the transition link information
+				_MyStepRTB.SetSelection(0, 0); // Clear the selection of the transition link
+											   // note _MyStepRTB.DeselectAll() did not work all the time
+				_MyEditItem.MyStepPanel.OnLinkClicked(sender, new StepPanelLinkEventArgs(lnkText));
 			}
 			else
 			{
@@ -3145,7 +3151,12 @@ namespace Volian.Controls.Library
 				}
 				else
 				{
-					LinkText lt = new LinkText(_MyStepRTB.MyLinkText);
+					LinkText lt = new LinkText(_MyStepRTB.MyLinkText); // save the RO link information
+					// B2021-094 fix for <Shift><Ctrl><G> key stroke for GoTo Transition or RO link
+					//           Needed to clear the selection of the link or it will be used the next time
+					//           <Shift><Ctrl><G> is used
+					_MyStepRTB.SetSelection(0, 0); // clear the selection of the RO link
+												   // note _MyStepRTB.DeselectAll() did not work all the time
 					//B2023-104 If we could not get the MyRoUsageInfo then we have a bad RO Link. Tell user to re-link the RO
 					if (lt.MyRoUsageInfo != null)
 					{
@@ -3785,7 +3796,7 @@ namespace Volian.Controls.Library
       ProcedureInfo.RefreshTransitions(MyItemInfo.MyProcedure as ProcedureInfo);
       this.Cursor = Cursors.Default;
 			// B2018-002 - Invalid Transitions - Display Transition Refresh Statistics
-			FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			FlexibleMessageBox.Show(this, string.Format("Checked {0} transitions, modified {1} transitions, converted to text {2} transitions, {3} transitions unable to be fixed (Annotation: Bad Transition Link)", ProcedureInfo.TranCheckCount, ProcedureInfo.TranFixCount, ProcedureInfo.TranConvertCount, ProcedureInfo.TranCantFixCount), "Results of Refresh Transitions", MessageBoxButtons.OK, MessageBoxIcon.Information);
     }
     private void btnRefObjRefresh_Click(object sender, System.EventArgs e)
     {

PROMS/Volian.Print.Library/PDFChronologyReport.cs

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

PROMS/Volian.Print.Library/PDFReport.cs

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

PROMS/Volian.Print.Library/PromsPrinter.cs

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

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -226,6 +226,8 @@ namespace Volian.Print.Library
 									else
 										yoff += vlnPrintObject.SixLinesPerInch;
 								}
+								if (box.MyBox != null)
+									yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
 							}
 							bxIndex = bxIndx;
 						}
@@ -273,6 +275,8 @@ namespace Volian.Print.Library
 								box.YOffset = yoff + ((ln - 1) * vlnPrintObject.SixLinesPerInch);
 								if (childItemInfo.FormatStepData.OneLineBeforeTab) ln++;
 								yoff += ln * vlnPrintObject.SixLinesPerInch;
+								if (box.MyBox != null)
+									yoff += (float)(box.MyBox.AdjSpB4Tab ?? 0); // F2024-078 adjust space above the Note/Caution box tab
 							}
 						}
 						bxIndex = bxIndx;
@@ -3781,7 +3785,12 @@ namespace Volian.Print.Library
 					else if (itemInfo.MyTab.AltPrintTab != null)
 						mytab = new vlnTab(cb, this, itemInfo.MyTab.AltPrintTab, itemInfo.MyTab.AltPrintTab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
 					else
-						mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, itemInfo.MyTab.CleanText, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
+                    {
+						string clntxt = itemInfo.MyTab.CleanText;
+						if (!string.IsNullOrEmpty(itemInfo.FormatStepData?.TabData?.MacroEditTag) && itemInfo.FormatStepData.TabData.MacroEditTag == "_" && clntxt.StartsWith("_"))
+								clntxt = clntxt.Substring(1);
+						mytab = new vlnTab(cb, this, itemInfo.MyTab.Text, clntxt, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
+					}
 					PartsLeft.Add(mytab);
 					if (mytab.MyMacro != null) PartsLeft.Add(mytab.MyMacro);
 				}
@@ -5492,24 +5501,53 @@ namespace Volian.Print.Library
 			//		code looks up parents to see if they have next before returning a 0 (no blank line)
 			// B2022-042: double Caution followed by Critical Step missing bullet
 			// F2022-010: substeps in multiple notes, cautions, warning print differently
-			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
+			if (MyItemInfo.IsInCautionOrNote)
 			{
-				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null))    // there are no sub-steps, see if any parents have next
+				float adjLastBlankLineInNoteCautionWarning = 0;
+				// Get the box information for the Note, Caution, or Warning
+				ItemInfo tifo = (MyItemInfo.IsCaution || MyItemInfo.IsNote) ? MyItemInfo : MyItemInfo.ParentNoteOrCaution;
+				int typ = ((int)tifo.MyContent.Type) % 10000;
+				int? bxIndx = tifo.ActiveFormat.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
+				if (bxIndx != null)
 				{
-					ItemInfo par = MyItemInfo.MyParent;
+					Box bx = tifo.ActiveFormat.PlantFormat.FormatData.BoxList[(int)bxIndx];
-					while (par.IsInCautionOrNote)        // while in the caution or note, see if there is anything below this item
+					// F2024-078 save the adjustment of the last blank line - this value will be added to the SixLinesPerInch value (a blank line)
-					{
+					adjLastBlankLineInNoteCautionWarning = (float)(bx.AdjLastBlnkLn ?? 0); 
-						// if there is no next item, or content types are different, go up to see if the parent has any next item.  If note
+				}
-						//	keep going up tree, otherwise there is a next so don't return 0, i.e. continue on with code to determine
+				//}
-						//	whether there is a blank line
+				//			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote))
-						if ((par.NextItem == null) || (par.MyContent.Type != par.NextItem.MyContent.Type)) par = par.MyParent;
+				// F2024-078 added check for adjustment of the last blank line in the Note/Caution box
-						else break;
+				if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn || adjLastBlankLineInNoteCautionWarning != 0)
-					}
+				{
-					if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type)) return 0;
+					if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null))    // there are no sub-steps, see if any parents have next
+					{
+						ItemInfo par = MyItemInfo.MyParent;
+						while (par.IsInCautionOrNote)        // while in the caution or note, see if there is anything below this item
+						{
+							// if there is no next item, or content types are different, go up to see if the parent has any next item.  If note
+							//	keep going up tree, otherwise there is a next so don't return 0, i.e. continue on with code to determine
+							//	whether there is a blank line
+							if ((par.NextItem == null) || (par.MyContent.Type != par.NextItem.MyContent.Type)) par = par.MyParent;
+							else break;
+						}
+						if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type))
+						{
+							if (adjLastBlankLineInNoteCautionWarning != 0)
+								return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning; // F2024-078 adjust the size of the last blank line of Note/Caution box
+							else
+								return 0; // no blank line after last text line of Note/Caution/Warning
+						}
+					}
+					if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type)
+					{
+						if (adjLastBlankLineInNoteCautionWarning != 0)
+							return SixLinesPerInch + adjLastBlankLineInNoteCautionWarning;
+						else
+							return 0; // no blank line after last text line of Note/Caution/Warning
+					}
 				}
-				if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type) return 0;
 			}
-			if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;
+				if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch;
 			// B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. Added a format flag so as not to affect other plants. 
 			if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.StepPrintData != null && MyItemInfo.FormatStepData.StepPrintData.BlankAfterSubWithSub && MyItemInfo.NextItem != null && MyItemInfo.HasChildren && MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0) return SixLinesPerInch;
 
@@ -5792,6 +5830,7 @@ namespace Volian.Print.Library
 			float hdrWidth = (itemInfo.MyHeader.CleanText == null) ? 0 : itemInfo.MyHeader.CleanText.Length * 6;
 			int typ = ((int)itemInfo.MyContent.Type) % 10000;
 			int? bxIndx = formatInfo.PlantFormat.FormatData.StepDataList[typ].StepLayoutData.STBoxindex;
+			float adjmentAfterBoxedNoteCautionTab = 0; // F2024-078 used to save the adjustment of the space after the Note/Caution tab
 
 			if (itemInfo.MyHeader.Justify == System.Drawing.ContentAlignment.MiddleCenter)
 			{
@@ -5801,7 +5840,8 @@ namespace Volian.Print.Library
 					if (bx.TabPos > 0)
 						xoff += (float)bx.TabPos;							// xoff starts as left margin
 					else
-						xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2));	// xoff starts as left margin
+						xoff += (float)((bx.TxtStart + _MyBoxLeftAdj + XOffsetBox + (bx.TxtWidth / 2)) - (hdrWidth / 2));   // xoff starts as left margin
+					adjmentAfterBoxedNoteCautionTab = (float) (bx.AdjSpAftTab ?? 0); // F2024-078 save the adjustment of the space (line) after the Note/Caution tab
 				}
 				else if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsInRNO && (itemInfo.IsCaution || itemInfo.IsNote))	// C2014-009
 					xoff = XOffset + (para.Width / 2) - (hdrWidth / 2);
@@ -5836,7 +5876,7 @@ namespace Volian.Print.Library
 			// F2022-121 added SpecialStepsFoldoutKeepWhiteSpace flag to allow for all of the other special foldout formatting, but 
 			//           not compress the page - this need to handle explicit OR and AND sub-steps to ensure there are blank lines before and after
 			//           the separator text.
-			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0);
+			return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.SpecialStepsFoldout && MyItemInfo.MyDocStyle.SpecialStepsFoldoutKeepWhiteSpace) || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? bSpaceIn ? SixLinesPerInch : 0 : 0) + adjmentAfterBoxedNoteCautionTab; // F2024-078 add adjustment to the space after the Note/Caution tab
 		}
 		private float AdjustToCharPosition(float position, float? CPI)
 		{
@@ -6847,7 +6887,13 @@ namespace Volian.Print.Library
 			}
 			else if (itemInfo.IsSection)
 			{
-				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, maxRNO);
+				// B2023-074 The itemInfo we are processing is a section (number and title). Change maxRNO to zero to getting the width.
+				//           The Width is used when printing the section number and title (when the check box on the properties page is checked)
+				//           and is assumemed the section is a single column section (maxRNO = 0) and uses the format variable WidSTablePrint
+				//           which holds the widths for then the section has one column, two column, or three column.
+				//           For printing section numbers and titles like this, we always want to accomodate for lone section title text.
+				//           So the initial width should always be set to the one column width value so that it can spane across the page.
+				Width = ToInt(formatInfo.MyStepSectionLayoutData.WidSTablePrint, 0);
 				float adjwidths = 0;
 				adjwidths = AdjustMetaWidth(itemInfo, formatInfo, adjwidths, false);
 				Width += (adjwidths + _WidthAdjust);