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

Good for testing phase

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

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

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

@@ -6,6 +6,7 @@ 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
@@ -46,6 +47,46 @@ namespace VEPROMS.CSLA.Library
 				return string.Empty;
 			}
 		}
+		private string ShwRplWords(ItemInfo _MyItemInfo)
+		{
+			//if (_Initalizing) return "N";
+			//_MyItemInfo.
+			SectionConfig sc = _MyItemInfo.MyConfig as SectionConfig;
+			if (sc == null) return "N";
+			return sc.Section_ShwRplWords;
+		}
+
+		// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+		private bool ShwRplWdsIndex(ItemInfo _MyItemInfo)
+		{
+			StepConfig sc = _MyItemInfo.MyConfig as StepConfig;
+			int setting = sc.Step_ShwRplWdsIndex;
+			switch (setting)
+			{
+				case 3:
+					return false;
+					break;
+				case 2:
+					return true;
+					break;
+				case 1:
+				case 0:
+					//SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig;
+					SectionConfig sc2 = _MyItemInfo.ActiveSection.MyConfig as SectionConfig;
+					if (sc2 == null || sc2.Section_ShwRplWords == "Y")
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+					break;
+				default:
+					return false;
+					break;
+			}
+		}
 		private Item _MyItem;
 		private string EditText
 		{
@@ -357,9 +398,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 +2167,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 +2228,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 +2255,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 +2547,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 +2640,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

@@ -8447,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/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>

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

@@ -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/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/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();

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;
@@ -258,6 +259,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 +300,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
@@ -532,7 +545,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.
@@ -794,6 +807,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,6 +881,26 @@ namespace Volian.Controls.Library
 			//  cnt.Save();
 			//}
 		}
+		// C2029-025 Show or hide replace words.  Can highlight replace words in editor.
+		private void cmbShwRplWds_SelectedIndexChanged(object sender, EventArgs e)  //  new  show replace words
+		{
+
+			// --------
+
+			if (_Initalizing) return;
+			MyEditItem.SaveContents();
+			StepConfig sc = CurItemInfo.MyConfig as StepConfig;
+			if (sc == null) return;
+			MyEditItem.ChangeBarForConfigItemChange = false;
+			//sc.Step_DisableInitialLine = cbInitialLine.Checked;
+			sc.Step_ShwRplWdsIndex = cmbShwRplWds.SelectedIndex;
+			MyEditItem.ChangeBarForConfigItemChange = true;
+
+		
+		//needed to refresh display changing
+			MyEditItem.RefreshContent();
+			MyEditItem.SetAllTabs();
+		}
 		#endregion
 
 		private void tbChgID_TextChanged(object sender, EventArgs e)

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

@@ -1284,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
@@ -1405,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();