diff --git a/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs b/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs index 596231d2..022d7469 100644 --- a/PROMS/VEPROMS User Interface/Properties/Settings.Designer.cs +++ b/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")] diff --git a/PROMS/VEPROMS User Interface/Properties/Settings.settings b/PROMS/VEPROMS User Interface/Properties/Settings.settings index 0aa63f53..193c02ad 100644 --- a/PROMS/VEPROMS User Interface/Properties/Settings.settings +++ b/PROMS/VEPROMS User Interface/Properties/Settings.settings @@ -80,6 +80,11 @@ True + + + False + + False diff --git a/PROMS/VEPROMS User Interface/frmPSI.cs b/PROMS/VEPROMS User Interface/frmPSI.cs index f84bafbf..646a6166 100644 --- a/PROMS/VEPROMS User Interface/frmPSI.cs +++ b/PROMS/VEPROMS User Interface/frmPSI.cs @@ -69,7 +69,7 @@ namespace VEPROMS DisplayText dt = new DisplayText(val, new VE_Font("Arial", 10, E_Style.None, 12), false); StringBuilder sb = new StringBuilder(); sb.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 Arial;}"); - sb.Append(@"{\f1\fnil\fcharset0 Arial;}}{\colortbl ;\red255\green0\blue0;}"); //C2017-036 changed to just Arial because Microsoft removed Arial Unicode MS with Word16 + sb.Append(@"{\f1\fnil\fcharset0 Arial;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); //C2017-036 changed to just Arial because Microsoft removed Arial Unicode MS with Word16 sb.Append(@"\viewkind4\uc1\pard\sl-240\slmult0\fs" + (int)(this.Font.SizeInPoints*2) + " " + dt.StartText + @"}"); tb.Rtf = sb.ToString(); tb.Location = new Point((int)fld.x * 2, (int)fld.y * 2); diff --git a/PROMS/VEPROMS User Interface/frmSI.cs b/PROMS/VEPROMS User Interface/frmSI.cs index 2f409572..03c18c52 100644 --- a/PROMS/VEPROMS User Interface/frmSI.cs +++ b/PROMS/VEPROMS User Interface/frmSI.cs @@ -77,7 +77,7 @@ namespace VEPROMS DisplayText dt = new DisplayText(val, new VE_Font("Arial", 10, E_Style.None, 12), false); StringBuilder sb = new StringBuilder(); sb.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 Arial;}"); - sb.Append(@"{\f1\fnil\fcharset0 Arial;}}{\colortbl ;\red255\green0\blue0;}"); // C2017-036 Microsoft removed Arial Unicode MS with Word16 + sb.Append(@"{\f1\fnil\fcharset0 Arial;}}{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}"); // C2017-036 Microsoft removed Arial Unicode MS with Word16 sb.Append(@"\viewkind4\uc1\pard\sl-240\slmult0\fs" + (int)(this.Font.SizeInPoints*2) + " " + dt.StartText + @"}"); tb.Rtf = sb.ToString(); tb.Location = new Point((int)fld.x * 2, (int)fld.y * 2); diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs index 05b9b99a..89a0898a 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.Designer.cs +++ b/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; + } } diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index f3346895..1c8e0f40 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/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,14 @@ namespace VEPROMS _SectionConfig.Section_OriginalSteps = ppCbDefaultStepSection.Checked ? "Y" : "N"; } } - private void ppBtnConvertToDocX_Click(object sender, EventArgs e) + //private void ppCbShowRplWords_CheckedChanged(object sender, EventArgs e) + //{ + // if (!_Initializing) + // { + // _SectionConfig.Section_OriginalSteps = ppCbShowRplWords.Checked ? "Y" : "N"; + // } + //} + private void ppBtnConvertToDocX_Click(object sender, EventArgs e) { // Get Document as file ItemInfo ii = ItemInfo.Get(_SectionConfig.MySection.ItemID); @@ -1448,6 +1473,14 @@ namespace VEPROMS _SectionConfig.Section_DontIncludeDuplexFoldout = ppCbNoDuplexFoldout.Checked; } + 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) //{ // // Get the parent setting diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.resx b/PROMS/VEPROMS User Interface/frmSectionProperties.resx index 29543463..a08cb962 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.resx +++ b/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. + + 128, 18 + - If the format supports duplex Foldouts: + 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 diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index 30a76f3c..d3f354d7 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/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; } } diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs index 43d5e349..2998f100 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.cs +++ b/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 + } } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index fb8e90dd..0b4d1e64 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/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; diff --git a/PROMS/VEPROMS.CSLA.Library/.editorconfig b/PROMS/VEPROMS.CSLA.Library/.editorconfig new file mode 100644 index 00000000..2003cfff --- /dev/null +++ b/PROMS/VEPROMS.CSLA.Library/.editorconfig @@ -0,0 +1,117 @@ +# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\Git\Production\Repos\SourceCode\PROMS\VEPROMS.CSLA.Library\ codebase based on best match to current usage at 1/21/2025 +# You can modify the rules from these initially generated values to suit your own policies +# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference +[*.cs] + + +#Core editorconfig formatting - indentation + +#use hard tabs for indentation +indent_style = tab + +#Formatting - new line options + +#place catch statements on a new line +csharp_new_line_before_catch = true +#place else statements on a new line +csharp_new_line_before_else = true +#require finally statements to be on a new line after the closing brace +csharp_new_line_before_finally = true +#require braces to be on a new line for properties, methods, control_blocks, and types (also known as "Allman" style) +csharp_new_line_before_open_brace = properties, methods, control_blocks, types + +#Formatting - organize using options + +#do not place System.* using directives before other using directives +dotnet_sort_system_directives_first = false + +#Formatting - spacing options + +#require NO space between a cast and the value +csharp_space_after_cast = false +#require a space before the colon for bases or interfaces in a type declaration +csharp_space_after_colon_in_inheritance_clause = true +#require a space after a keyword in a control flow statement such as a for loop +csharp_space_after_keywords_in_control_flow_statements = true +#require a space before the colon for bases or interfaces in a type declaration +csharp_space_before_colon_in_inheritance_clause = true +#remove space within empty argument list parentheses +csharp_space_between_method_call_empty_parameter_list_parentheses = false +#remove space between method call name and opening parenthesis +csharp_space_between_method_call_name_and_opening_parenthesis = false +#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call +csharp_space_between_method_call_parameter_list_parentheses = false +#remove space within empty parameter list parentheses for a method declaration +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list. +csharp_space_between_method_declaration_parameter_list_parentheses = false + +#Formatting - wrapping options + +#leave code block on separate lines +csharp_preserve_single_line_blocks = false +#leave statements and member declarations on the same line +csharp_preserve_single_line_statements = true + +#Style - Code block preferences + +#prefer no curly braces if allowed +csharp_prefer_braces = false:suggestion + +#Style - expression bodied member options + +#prefer block bodies for accessors +csharp_style_expression_bodied_accessors = false:suggestion +#prefer block bodies for constructors +csharp_style_expression_bodied_constructors = false:suggestion +#prefer block bodies for methods +csharp_style_expression_bodied_methods = false:suggestion +#prefer block bodies for properties +csharp_style_expression_bodied_properties = false:suggestion + +#Style - expression level options + +#prefer out variables to be declared before the method call +csharp_style_inlined_variable_declaration = false:suggestion +#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them +dotnet_style_predefined_type_for_member_access = true:suggestion + +#Style - Expression-level preferences + +#prefer objects to not be initialized using object initializers +dotnet_style_object_initializer = false:suggestion + +#Style - implicit and explicit types + +#prefer explicit type over var in all cases, unless overridden by another code style rule +csharp_style_var_elsewhere = false:suggestion +#prefer explicit type over var to declare variables with built-in system types such as int +csharp_style_var_for_built_in_types = false:suggestion +#prefer explicit type over var when the type is already mentioned on the right-hand side of a declaration +csharp_style_var_when_type_is_apparent = false:suggestion + +#Style - language keyword and framework type options + +#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion + +#Style - modifier options + +#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods. +dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion + +#Style - Modifier preferences + +#when this rule is set to a list of modifiers, prefer the specified ordering. +csharp_preferred_modifier_order = public,private,internal,protected,static,virtual,override,readonly:suggestion + +#Style - qualification options + +#prefer events not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_event = false:suggestion +#prefer fields not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_field = false:suggestion +#prefer methods not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_method = false:suggestion +#prefer properties not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_property = false:suggestion diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs index a60f7dc5..004c33c7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/FormatConfig.cs +++ b/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.StringSerialize(this); + } + public override string ToString() + { + return MenuItem; + } + } + #endregion ShwRplWds #region StepData (list) [Serializable] [TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs index 2861d52e..dc6fe4dc 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs +++ b/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)] diff --git a/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs index 6cc65f87..106e79a2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/StepConfig.cs +++ b/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. diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 67c0602f..26f97491 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/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,60 @@ 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; + } + 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; + } + //int setting = sc.Step_ShwRplWdsIndex; + //if (setting == 3) return false; + //if (setting == 2) return true; + //if (setting == 1 || setting == 0) + //{ + // SectionConfig sc2 = _MyItemInfo.ActiveParent.MyConfig as SectionConfig; + // if (sc2.Section_ShwRplWords == "Y") + // { + // return true; + // } + // else + // { + // return false; + // } + //} + //return false; // if Step_ShwRplWdsIndex = 0 + } private Item _MyItem; private string EditText { @@ -357,9 +412,37 @@ namespace VEPROMS.CSLA.Library // But don't do ReplaceWords if the TurnOffReplaceWords format flag is set if (wordsShouldBeReplaced && !_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.TurnOffReplaceWords) { + //string stf = _MyItemInfo.SectionConfig.Section_ShwRplWords; + //ItemInfoList stf = _MyItemInfo.MyPrevious.Sections//SectionConfig.Section_ShwRplWords; + //_MyItemInfo.SectionConfig.Section_ShwRplWords; + //string str = _MyItemInfo.MyConfig.Section_ShwRplWords; + //epMode int profileDepth1 = ProfileTimer.Push(">>>> DoReplaceWords2"); - - text = DoReplaceWords2(text); + + 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 +2184,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 +2245,12 @@ 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 (Volian.Controls.Library.Properties.Settings.Default.cbShwRplWrdsColor) + //{ + // replaceWord = $@"\cf2{replaceWord}\cf0"; + // // with = $@"\cf2{with}\cf0 "; + //} + // 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 +2277,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 +2569,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 +2662,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; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 4b57bcbc..e43f4431 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -1654,6 +1654,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ProcAppl, "@ProcAppl"); } } + //private ShwRplWdsData _ShwRplWdsData; + //public ShwRplWdsData ShwRplWdsData + //{ + // get + // { + // return ShwRplWdsData == null ? ShwRplWdsData = new ShwRplWdsData(SelectSingleNode("ShwRplWdsData")) : ShwRplWdsData; + // } + //} } #endregion @@ -2173,6 +2181,72 @@ namespace VEPROMS.CSLA.Library } } } + //#region ShwRplWdsData + //[TypeConverter(typeof(ExpandableObjectConverter))] + //public class ShwRplWdsData : vlnFormatItem + //{ + // public ShwRplWdsData(XmlNode xmlNode) : base(xmlNode) { } + // private ShwRplWdsList _ShwRplWdsList = null; + // public ShwRplWdsList ShwRplWdsList + // { + // get + // { + // if (_ShwRplWdsList != null) return _ShwRplWdsList; + + // // Get a list of checkoffs that should be included: + // // if !UseCheckOffUCF (Baseall has it as false. User can change setting in UCF to true) + // // if !IgnoreUCF, i.e. use UCF changes, return original lists with only active items (Inactive = false) + // // if IgnoreUCF, return original lists with all items + // // if UseCheckOffUCF is true use the merged lists from current format and baseall.xml and + // // do the same processing for IgnoreUCF described above. + + // // UseCheckOffUCF is false or there is no FormatConfig (UCF) data: + // //FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); + // //if (!MyFormat.PlantFormat.FormatData.ProcData.CheckOffUCF || fc==null) + // //{ + // // _ShwRplWdsList = new ShwRplWdsList(SelectNodes("ShwRplWdsList/ShwRplWds"), MyFormat); + // // // B2019-100: If Ignoring the UCF data, just return the entire list. Also, return entire list if there is no UCF data (fc == null) + // // if (PlantFormat.IgnoreUCF || fc == null) return _ShwRplWdsList; + // // // If not ignoring UCF settings, only return those that are active + // // foreach (FormatConfig.ShwRplWds co in fc.PlantFormat.FormatData.ShwRplWdsList) + // // { + // // foreach (CheckOff coo in _ShwRplWdsList) + // // { + // // if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active) + // // { + // // _ShwRplWdsList.Remove(coo); + // // break; + // // } + // // } + // // } + // // return _ShwRplWdsList; + // //} + // // UseCheckOfffUCF is true: + // // merge the checkoff list from the current format and the checkoff list from the base format + // FormatConfig fc = PlantFormat.GetFormatConfig(MyFormat); + // _ShwRplWdsList = new ShwRplWdsList(SelectNodes("ShwRplWdsList/ShwRplWds"), MyFormat); + // ShwRplWdsList retlist2 = new ShwRplWdsList(SelectNodes("../ShwRplWdsList/ShwRplWds"), MyFormat); + // if (retlist2 != null && retlist2.Count > 0) foreach (ShwRplWds co in retlist2) _ShwRplWdsList.Add(co); + // if (PlantFormat.IgnoreUCF) return _ShwRplWdsList; + + // // if applying UCF, then remove those that are inactive: + // foreach (FormatConfig.ShwRplWds co in fc.PlantFormat.FormatData.ShwRplWdsList) + // { + // foreach (ShwRplWds coo in _ShwRplWdsList) + // { + // if ((int)coo.Index == Convert.ToInt32(co.Index) && !(bool)co.Active) + // { + // _ShwRplWdsList.Remove(coo); + // break; + // } + // } + // } + // return _ShwRplWdsList; + // } + // } + //} + //#endregion + #endregion #region CheckOff [TypeConverter(typeof(ExpandableObjectConverter))] @@ -2284,6 +2358,48 @@ namespace VEPROMS.CSLA.Library } } #endregion + #region ShwRplWds + public class ShwRplWds : vlnFormatItem, IVlnIndexedFormatItem + { + public ShwRplWds(XmlNode xmlNode) : base(xmlNode) { } + public ShwRplWds() : base() { } + private LazyLoad _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 _UIMark; + public int? UIMark + { + get + { + return LazyLoad(ref _UIMark, "@UIMark"); + } + } + + + //Descriptive text shown in the checkoff selection list + private LazyLoad _MenuItem; + public string MenuItem + { + get + { + return LazyLoad(ref _MenuItem, "@MenuItem"); + } + } + + public override string ToString() + { + return MenuItem; + } + } +#endregion #region CheckOffList [TypeConverter(typeof(vlnIndexedListConverter))] public class CheckOffList : vlnIndexedFormatList @@ -2300,6 +2416,20 @@ namespace VEPROMS.CSLA.Library } } } + //public class ShwRplWdsList : vlnIndexedFormatList + //{ + // public ShwRplWdsList(XmlNodeList xmlNodeList, IFormatOrFormatInfo myFormat) : base(xmlNodeList, myFormat) { } + // public override vlnIndexedFormatList InheritedList + // { + // get + // { + // IFormatOrFormatInfo parentFormat = MyFormat.MyIParent; + // if (parentFormat != null) + // return parentFormat.PlantFormat.FormatData.ProcData.ShwRplWds; + // return null; + // } + // } + //} #endregion #region CheckOffHeader [TypeConverter(typeof(ExpandableObjectConverter))] diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj index 36cf1765..7e894b7a 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj +++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj @@ -103,6 +103,9 @@ + + Properties\Settings.Designer.cs + @@ -386,6 +389,7 @@ + @@ -419,6 +423,7 @@ frmRofstLoadStatus.cs +