Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

C2022-015 moved the change bar on/off switch to change bar text grouping

Browse Source
This commit is contained in:
John Jenko 2022-07-15 15:30:10 +00:00
parent d7187b4f81
commit 38072a30f9
2 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs generated
View File

@ -42,6 +42,7 @@ namespace VEPROMS
this.txbRevDate = new DevComponents.DotNetBar.Controls.TextBoxX();
this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX();
this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox();
this.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.cbxOverwritePDF2 = new System.Windows.Forms.CheckBox();
this.txbRevNum = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblReviewDate = new DevComponents.DotNetBar.LabelX();
@ -83,6 +84,7 @@ namespace VEPROMS
this.btnMergePDFs = new DevComponents.DotNetBar.ButtonX();
this.cbxRemoveManualPgBrk = new System.Windows.Forms.CheckBox();
this.cbxAssignRevToAllMergedPrcs = new System.Windows.Forms.CheckBox();
this.cbxAlmPtTxt = new System.Windows.Forms.CheckBox();
this.cbxGenerateConActSum = new System.Windows.Forms.CheckBox();
this.ppGpbxUserSpecCB = new DevComponents.DotNetBar.Controls.GroupPanel();
this.lblCbTxtType = new System.Windows.Forms.Label();
@ -100,17 +102,15 @@ namespace VEPROMS
this.tbBlankPage = new DevComponents.DotNetBar.Controls.TextBoxX();
this.lblBlPg = new DevComponents.DotNetBar.LabelX();
this.swtbtnPDFdtPrefixSuffix = new DevComponents.DotNetBar.Controls.SwitchButton();
this.cbxAlmPtTxt = new System.Windows.Forms.CheckBox();
this.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components);
this.gpnlDebug.SuspendLayout();
this.grpDateSelector.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
this.ppGpbxUserSpecTxt.SuspendLayout();
this.ppGpbxUserSpecCB.SuspendLayout();
this.panelEx2.SuspendLayout();
this.groupPag.SuspendLayout();
this.expPrnSetting.SuspendLayout();
this.ppGpDuplex.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit();
this.SuspendLayout();
//
// btnPdfLocation
@ -379,6 +379,10 @@ namespace VEPROMS
this.cbxOpenAfterCreate2.Text = "View PDF After Create";
this.cbxOpenAfterCreate2.UseVisualStyleBackColor = false;
//
// docVersionConfigBindingSource
//
this.docVersionConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.DocVersionConfig);
//
// cbxOverwritePDF2
//
this.cbxOverwritePDF2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -716,7 +720,7 @@ namespace VEPROMS
//
this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.labelX5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelX5.Location = new System.Drawing.Point(92, 186);
this.labelX5.Location = new System.Drawing.Point(81, 12);
this.labelX5.Name = "labelX5";
this.labelX5.Size = new System.Drawing.Size(152, 23);
this.superTooltip1.SetSuperTooltip(this.labelX5, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bars", "", "A change bar will be printed for each step editor text that has been modified sin" +
@ -734,7 +738,7 @@ namespace VEPROMS
this.ppGpbxUserSpecTxt.Controls.Add(this.ppTxbxChangeBarUserMsgOne);
this.ppGpbxUserSpecTxt.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUserSpecTxt.Enabled = false;
this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(204, 31);
this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(204, 67);
this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt";
this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(174, 85);
@ -822,7 +826,7 @@ namespace VEPROMS
this.ppCmbxChgBarTxtType.Enabled = false;
this.ppCmbxChgBarTxtType.FormattingEnabled = true;
this.ppCmbxChgBarTxtType.ItemHeight = 17;
this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(3, 64);
this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(3, 100);
this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2);
this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType";
this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(185, 23);
@ -839,14 +843,14 @@ namespace VEPROMS
this.cbxOvrrideDefChgBars.BackColor = System.Drawing.Color.Transparent;
this.cbxOvrrideDefChgBars.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxOvrrideDefChgBars.ForeColor = System.Drawing.SystemColors.ControlText;
this.cbxOvrrideDefChgBars.Location = new System.Drawing.Point(5, 6);
this.cbxOvrrideDefChgBars.Location = new System.Drawing.Point(5, 43);
this.cbxOvrrideDefChgBars.Margin = new System.Windows.Forms.Padding(2);
this.cbxOvrrideDefChgBars.Name = "cbxOvrrideDefChgBars";
this.cbxOvrrideDefChgBars.Size = new System.Drawing.Size(221, 20);
this.superTooltip1.SetSuperTooltip(this.cbxOvrrideDefChgBars, new DevComponents.DotNetBar.SuperTooltipInfo("Override Change Bar Text Type", "", "Override the information that is printed next to each change bar (step editor sec" +
"tions only)", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbxOvrrideDefChgBars.Size = new System.Drawing.Size(262, 20);
this.superTooltip1.SetSuperTooltip(this.cbxOvrrideDefChgBars, new DevComponents.DotNetBar.SuperTooltipInfo("Override Default Change Bar Text Type", "", "Override the format default of the information that is printed next to each chang" +
"e bar (step editor sections only)", null, null, DevComponents.DotNetBar.eTooltipColor.Gray));
this.cbxOvrrideDefChgBars.TabIndex = 79;
this.cbxOvrrideDefChgBars.Text = "Overwrite Change Bar Text Type";
this.cbxOvrrideDefChgBars.Text = "Override Default Change Bar Text Type";
this.cbxOvrrideDefChgBars.UseVisualStyleBackColor = false;
this.cbxOvrrideDefChgBars.CheckStateChanged += new System.EventHandler(this.cbxOvrrideDefChgBars_CheckStateChanged);
//
@ -981,6 +985,23 @@ namespace VEPROMS
this.cbxAssignRevToAllMergedPrcs.Visible = false;
this.cbxAssignRevToAllMergedPrcs.CheckedChanged += new System.EventHandler(this.cbxAssignRevToAllMergedPrcs_CheckedChanged);
//
// cbxAlmPtTxt
//
this.cbxAlmPtTxt.AutoSize = true;
this.cbxAlmPtTxt.BackColor = System.Drawing.Color.Transparent;
this.cbxAlmPtTxt.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true));
this.cbxAlmPtTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxAlmPtTxt.ForeColor = System.Drawing.SystemColors.ControlText;
this.cbxAlmPtTxt.Location = new System.Drawing.Point(14, 403);
this.cbxAlmPtTxt.Margin = new System.Windows.Forms.Padding(2);
this.cbxAlmPtTxt.Name = "cbxAlmPtTxt";
this.cbxAlmPtTxt.Size = new System.Drawing.Size(324, 20);
this.superTooltip1.SetSuperTooltip(this.cbxAlmPtTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Alarm Point List Text", "", resources.GetString("cbxAlmPtTxt.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 130)));
this.cbxAlmPtTxt.TabIndex = 113;
this.cbxAlmPtTxt.Text = "Generate Alarm Point List Text (Merge PDFs only)";
this.cbxAlmPtTxt.UseVisualStyleBackColor = false;
this.cbxAlmPtTxt.Visible = false;
//
// cbxGenerateConActSum
//
this.cbxGenerateConActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -1009,12 +1030,13 @@ namespace VEPROMS
this.ppGpbxUserSpecCB.Controls.Add(this.ppCmbxChgBarTxtType);
this.ppGpbxUserSpecCB.Controls.Add(this.lblCbTxtType);
this.ppGpbxUserSpecCB.Controls.Add(this.cbxOvrrideDefChgBars);
this.ppGpbxUserSpecCB.Controls.Add(this.labelX5);
this.ppGpbxUserSpecCB.Controls.Add(this.swtbtnChgBar);
this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpbxUserSpecCB.Enabled = false;
this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(19, 316);
this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(9, 285);
this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2);
this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB";
this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(386, 148);
this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(391, 177);
//
//
//
@ -1050,7 +1072,7 @@ namespace VEPROMS
//
this.lblCbTxtType.AutoSize = true;
this.lblCbTxtType.Enabled = false;
this.lblCbTxtType.Location = new System.Drawing.Point(2, 43);
this.lblCbTxtType.Location = new System.Drawing.Point(2, 79);
this.lblCbTxtType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblCbTxtType.Name = "lblCbTxtType";
this.lblCbTxtType.Size = new System.Drawing.Size(72, 16);
@ -1064,7 +1086,7 @@ namespace VEPROMS
//
//
this.swtbtnChgBar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.swtbtnChgBar.Location = new System.Drawing.Point(19, 186);
this.swtbtnChgBar.Location = new System.Drawing.Point(8, 12);
this.swtbtnChgBar.Name = "swtbtnChgBar";
this.swtbtnChgBar.Size = new System.Drawing.Size(66, 22);
this.swtbtnChgBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@ -1169,7 +1191,7 @@ namespace VEPROMS
this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
this.expandableSplitter1.Location = new System.Drawing.Point(604, 0);
this.expandableSplitter1.Name = "expandableSplitter1";
this.expandableSplitter1.Size = new System.Drawing.Size(6, 472);
this.expandableSplitter1.Size = new System.Drawing.Size(6, 473);
this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007;
this.expandableSplitter1.TabIndex = 107;
this.expandableSplitter1.TabStop = false;
@ -1209,7 +1231,7 @@ namespace VEPROMS
this.panelEx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelEx2.Location = new System.Drawing.Point(0, 0);
this.panelEx2.Name = "panelEx2";
this.panelEx2.Size = new System.Drawing.Size(604, 472);
this.panelEx2.Size = new System.Drawing.Size(604, 473);
this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -1270,11 +1292,9 @@ namespace VEPROMS
this.expPrnSetting.Controls.Add(this.labelX4);
this.expPrnSetting.Controls.Add(this.swtbtnPDFdtPrefixSuffix);
this.expPrnSetting.Controls.Add(this.ppGpbxUserSpecCB);
this.expPrnSetting.Controls.Add(this.labelX5);
this.expPrnSetting.Controls.Add(this.cbxWaterMark);
this.expPrnSetting.Controls.Add(this.lblWaterMarkOvrd);
this.expPrnSetting.Controls.Add(this.lblGeneratePlacekeeper);
this.expPrnSetting.Controls.Add(this.swtbtnChgBar);
this.expPrnSetting.Controls.Add(this.swtbtnWaterMark);
this.expPrnSetting.Controls.Add(this.lblWatermarkS);
this.expPrnSetting.Controls.Add(this.swtbtnGeneratePlacekeeper);
@ -1289,7 +1309,7 @@ namespace VEPROMS
this.expPrnSetting.HideControlsWhenCollapsed = true;
this.expPrnSetting.Location = new System.Drawing.Point(610, 0);
this.expPrnSetting.Name = "expPrnSetting";
this.expPrnSetting.Size = new System.Drawing.Size(411, 472);
this.expPrnSetting.Size = new System.Drawing.Size(411, 473);
this.expPrnSetting.Style.Alignment = System.Drawing.StringAlignment.Center;
this.expPrnSetting.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.expPrnSetting.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -1319,10 +1339,10 @@ namespace VEPROMS
this.ppGpDuplex.Controls.Add(this.tbBlankPage);
this.ppGpDuplex.Controls.Add(this.lblBlPg);
this.ppGpDuplex.DisabledBackColor = System.Drawing.Color.Empty;
this.ppGpDuplex.Location = new System.Drawing.Point(19, 219);
this.ppGpDuplex.Location = new System.Drawing.Point(9, 188);
this.ppGpDuplex.Margin = new System.Windows.Forms.Padding(2);
this.ppGpDuplex.Name = "ppGpDuplex";
this.ppGpDuplex.Size = new System.Drawing.Size(386, 85);
this.ppGpDuplex.Size = new System.Drawing.Size(396, 85);
//
//
//
@ -1399,33 +1419,12 @@ namespace VEPROMS
this.swtbtnPDFdtPrefixSuffix.TabIndex = 111;
this.swtbtnPDFdtPrefixSuffix.ValueChanged += new System.EventHandler(this.swtbtnPDFdtPrefixSuffix_ValueChanged);
//
// cbxAlmPtTxt
//
this.cbxAlmPtTxt.AutoSize = true;
this.cbxAlmPtTxt.BackColor = System.Drawing.Color.Transparent;
this.cbxAlmPtTxt.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true));
this.cbxAlmPtTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbxAlmPtTxt.ForeColor = System.Drawing.SystemColors.ControlText;
this.cbxAlmPtTxt.Location = new System.Drawing.Point(14, 403);
this.cbxAlmPtTxt.Margin = new System.Windows.Forms.Padding(2);
this.cbxAlmPtTxt.Name = "cbxAlmPtTxt";
this.cbxAlmPtTxt.Size = new System.Drawing.Size(324, 20);
this.superTooltip1.SetSuperTooltip(this.cbxAlmPtTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Generate Alarm Point List Text", "", resources.GetString("cbxAlmPtTxt.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 130)));
this.cbxAlmPtTxt.TabIndex = 113;
this.cbxAlmPtTxt.Text = "Generate Alarm Point List Text (Merge PDFs only)";
this.cbxAlmPtTxt.UseVisualStyleBackColor = false;
this.cbxAlmPtTxt.Visible = false;
//
// docVersionConfigBindingSource
//
this.docVersionConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.DocVersionConfig);
//
// DlgPrintProcedure
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(1021, 472);
this.ClientSize = new System.Drawing.Size(1021, 473);
this.Controls.Add(this.panelEx2);
this.Controls.Add(this.expandableSplitter1);
this.Controls.Add(this.expPrnSetting);
@ -1443,6 +1442,7 @@ namespace VEPROMS
this.gpnlDebug.PerformLayout();
this.grpDateSelector.ResumeLayout(false);
this.grpDateSelector.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit();
this.ppGpbxUserSpecTxt.ResumeLayout(false);
this.ppGpbxUserSpecTxt.PerformLayout();
this.ppGpbxUserSpecCB.ResumeLayout(false);
@ -1453,7 +1453,6 @@ namespace VEPROMS
this.groupPag.PerformLayout();
this.expPrnSetting.ResumeLayout(false);
this.ppGpDuplex.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit();
this.ResumeLayout(false);
}

12
PROMS/VEPROMS User Interface/DlgPrintProcedure.cs
View File

@ -570,18 +570,24 @@ namespace VEPROMS
private void swtbtnChgBar_ValueChanged(object sender, EventArgs e)
{
// C2019-031 - disable the override change bar grouping when default change bar is set to format default or no change bar
ppGpbxUserSpecCB.Enabled = false; // disable the override change bar grouping
cbxOvrrideDefChgBars.Checked = false; // uncheck the override change bar check box inside the grouping
cbxOvrrideDefChgBars.Enabled = swtbtnChgBar.Value; // C2022-015 enable if Change Bars are turned on
if (swtbtnChgBar.Value)
{
switch (_DocVersionConfig.Print_ChangeBar)
{
case PrintChangeBar.WithUserSpecified:
cbxOvrrideDefChgBars.Enabled = true; // change bar text is pre-selected in procedure set properties, allow user to change change bar text
cbxOvrrideDefChgBars.Checked = true;
ppGpbxUserSpecCB.Enabled = true;
break;
case PrintChangeBar.SelectBeforePrinting:
ppGpbxUserSpecCB.Enabled = true;
cbxOvrrideDefChgBars.Enabled = true; // allow user to select change bar text every time procedure is printed
break;
case PrintChangeBar.Without:
case PrintChangeBar.WithDefault:
cbxOvrrideDefChgBars.Enabled = false; // printing with format default change bars - don't allow override
cbxOvrrideDefChgBars.Checked = false;
break;
}
}