diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 7c1b1e33..05b6812e 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -42,7 +42,6 @@ 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 +82,7 @@ namespace VEPROMS this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.btnMergePDFs = new DevComponents.DotNetBar.ButtonX(); this.cbxRemoveManualPgBrk = new System.Windows.Forms.CheckBox(); + this.cbxAssignRevToAllMergedPrcs = 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,15 +100,17 @@ 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 @@ -175,7 +177,7 @@ namespace VEPROMS this.cbxMetaFile.AutoSize = true; this.cbxMetaFile.BackColor = System.Drawing.Color.Transparent; this.cbxMetaFile.Location = new System.Drawing.Point(8, 51); - this.cbxMetaFile.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxMetaFile.Margin = new System.Windows.Forms.Padding(2); this.cbxMetaFile.Name = "cbxMetaFile"; this.cbxMetaFile.Size = new System.Drawing.Size(104, 17); this.superTooltip1.SetSuperTooltip(this.cbxMetaFile, new DevComponents.DotNetBar.SuperTooltipInfo("Debug Baseline Testing", "", "Generates a DebugMeta text file in the PDF Location folder. It contains detailed" + @@ -189,7 +191,7 @@ namespace VEPROMS this.cbxDebugText.AutoSize = true; this.cbxDebugText.BackColor = System.Drawing.Color.Transparent; this.cbxDebugText.Location = new System.Drawing.Point(8, 30); - this.cbxDebugText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxDebugText.Margin = new System.Windows.Forms.Padding(2); this.cbxDebugText.Name = "cbxDebugText"; this.cbxDebugText.Size = new System.Drawing.Size(47, 17); this.superTooltip1.SetSuperTooltip(this.cbxDebugText, new DevComponents.DotNetBar.SuperTooltipInfo("Debug Text", "", "Will generate DebugText text file in the PDF Location folder. It will contain ge" + @@ -203,7 +205,7 @@ namespace VEPROMS this.cbxDebugPagination.AutoSize = true; this.cbxDebugPagination.BackColor = System.Drawing.Color.Transparent; this.cbxDebugPagination.Location = new System.Drawing.Point(9, 7); - this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(2); this.cbxDebugPagination.Name = "cbxDebugPagination"; this.cbxDebugPagination.Size = new System.Drawing.Size(76, 17); this.superTooltip1.SetSuperTooltip(this.cbxDebugPagination, new DevComponents.DotNetBar.SuperTooltipInfo("Debug Pagination", "", "Generates a DebugPagination text file in the PDF Location folder. It contains de" + @@ -279,7 +281,7 @@ namespace VEPROMS this.calDateSelector.ContainerControlProcessDialogKey = true; this.calDateSelector.DisplayMonth = new System.DateTime(2010, 8, 1, 0, 0, 0, 0); this.calDateSelector.Location = new System.Drawing.Point(10, 2); - this.calDateSelector.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.calDateSelector.Margin = new System.Windows.Forms.Padding(2); this.calDateSelector.Name = "calDateSelector"; // // @@ -304,7 +306,7 @@ namespace VEPROMS // // this.pbPDFsStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.pbPDFsStatus.Location = new System.Drawing.Point(14, 314); + this.pbPDFsStatus.Location = new System.Drawing.Point(14, 295); this.pbPDFsStatus.Name = "pbPDFsStatus"; this.pbPDFsStatus.Size = new System.Drawing.Size(575, 23); this.pbPDFsStatus.TabIndex = 87; @@ -319,7 +321,7 @@ namespace VEPROMS this.txbReviewDate.Border.Class = "TextBoxBorder"; this.txbReviewDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbReviewDate.Location = new System.Drawing.Point(115, 153); - this.txbReviewDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txbReviewDate.Margin = new System.Windows.Forms.Padding(2); this.txbReviewDate.Name = "txbReviewDate"; this.txbReviewDate.Size = new System.Drawing.Size(91, 20); this.superTooltip1.SetSuperTooltip(this.txbReviewDate, new DevComponents.DotNetBar.SuperTooltipInfo("Review Date", "", resources.GetString("txbReviewDate.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(203, 140))); @@ -335,7 +337,7 @@ namespace VEPROMS this.txbRevDate.Border.Class = "TextBoxBorder"; this.txbRevDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbRevDate.Location = new System.Drawing.Point(115, 120); - this.txbRevDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txbRevDate.Margin = new System.Windows.Forms.Padding(2); this.txbRevDate.Name = "txbRevDate"; this.txbRevDate.Size = new System.Drawing.Size(91, 20); this.superTooltip1.SetSuperTooltip(this.txbRevDate, new DevComponents.DotNetBar.SuperTooltipInfo("Revision Date", "", resources.GetString("txbRevDate.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(203, 140))); @@ -353,7 +355,7 @@ namespace VEPROMS this.txbPDFLocation.Border.Class = "TextBoxBorder"; this.txbPDFLocation.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbPDFLocation.Location = new System.Drawing.Point(30, 28); - this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(2); this.txbPDFLocation.Name = "txbPDFLocation"; this.txbPDFLocation.Size = new System.Drawing.Size(529, 20); this.superTooltip1.SetSuperTooltip(this.txbPDFLocation, new DevComponents.DotNetBar.SuperTooltipInfo("PDF Location", "", resources.GetString("txbPDFLocation.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(260, 180))); @@ -377,10 +379,6 @@ 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))); @@ -407,7 +405,7 @@ namespace VEPROMS this.txbRevNum.Border.Class = "TextBoxBorder"; this.txbRevNum.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbRevNum.Location = new System.Drawing.Point(115, 88); - this.txbRevNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txbRevNum.Margin = new System.Windows.Forms.Padding(2); this.txbRevNum.Name = "txbRevNum"; this.txbRevNum.Size = new System.Drawing.Size(91, 20); this.superTooltip1.SetSuperTooltip(this.txbRevNum, new DevComponents.DotNetBar.SuperTooltipInfo("Revision Number", "", resources.GetString("txbRevNum.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(203, 130))); @@ -423,7 +421,7 @@ namespace VEPROMS this.lblReviewDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblReviewDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblReviewDate.Location = new System.Drawing.Point(8, 152); - this.lblReviewDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblReviewDate.Margin = new System.Windows.Forms.Padding(2); this.lblReviewDate.Name = "lblReviewDate"; this.lblReviewDate.Size = new System.Drawing.Size(103, 19); this.lblReviewDate.TabIndex = 72; @@ -439,7 +437,7 @@ namespace VEPROMS this.lblRevDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblRevDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblRevDate.Location = new System.Drawing.Point(8, 119); - this.lblRevDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblRevDate.Margin = new System.Windows.Forms.Padding(2); this.lblRevDate.Name = "lblRevDate"; this.lblRevDate.Size = new System.Drawing.Size(103, 19); this.lblRevDate.TabIndex = 71; @@ -455,7 +453,7 @@ namespace VEPROMS this.lblRevNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblRevNum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblRevNum.Location = new System.Drawing.Point(-2, 87); - this.lblRevNum.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblRevNum.Margin = new System.Windows.Forms.Padding(2); this.lblRevNum.Name = "lblRevNum"; this.lblRevNum.Size = new System.Drawing.Size(113, 19); this.lblRevNum.TabIndex = 70; @@ -502,7 +500,7 @@ namespace VEPROMS this.lblPDFLoc.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPDFLoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblPDFLoc.Location = new System.Drawing.Point(2, 8); - this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(2); this.lblPDFLoc.Name = "lblPDFLoc"; this.lblPDFLoc.Size = new System.Drawing.Size(86, 19); this.lblPDFLoc.TabIndex = 4; @@ -517,7 +515,7 @@ namespace VEPROMS this.lblMultiunitPdfLocation.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblMultiunitPdfLocation.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblMultiunitPdfLocation.Location = new System.Drawing.Point(8, 180); - this.lblMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(2); this.lblMultiunitPdfLocation.Name = "lblMultiunitPdfLocation"; this.lblMultiunitPdfLocation.Size = new System.Drawing.Size(156, 19); this.lblMultiunitPdfLocation.TabIndex = 108; @@ -539,7 +537,7 @@ namespace VEPROMS this.muLocText, this.muLocID}); this.cbxMultiunitPdfLocation.Location = new System.Drawing.Point(44, 203); - this.cbxMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(2); this.cbxMultiunitPdfLocation.Name = "cbxMultiunitPdfLocation"; this.cbxMultiunitPdfLocation.Size = new System.Drawing.Size(319, 20); this.superTooltip1.SetSuperTooltip(this.cbxMultiunitPdfLocation, new DevComponents.DotNetBar.SuperTooltipInfo("Multi Unit PDF Location", "", "A sub folder will be created in the PDF Location based on the selection from this" + @@ -602,18 +600,21 @@ namespace VEPROMS this.cbxWaterMark.Visible = false; this.cbxWaterMark.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxWaterMark.WatermarkText = "select watermark option"; - this.lblWatermarkS.Text = "Watermark"; // // lblWaterMarkOvrd // - this.lblWaterMarkOvrd.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblWaterMarkOvrd.BackColor = System.Drawing.Color.Transparent; - this.lblWaterMarkOvrd.Font = new System.Drawing.Font("Microsoft Sans Serif",7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + // + // + // + this.lblWaterMarkOvrd.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblWaterMarkOvrd.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblWaterMarkOvrd.Location = new System.Drawing.Point(181, 67); this.lblWaterMarkOvrd.Margin = new System.Windows.Forms.Padding(2); this.lblWaterMarkOvrd.Name = "lblWaterMarkOvrd"; this.lblWaterMarkOvrd.Size = new System.Drawing.Size(180, 23); - this.superTooltip1.SetSuperTooltip(this.lblWaterMarkOvrd, new DevComponents.DotNetBar.SuperTooltipInfo("Watermark Overrides", "", "Shows Watermark and Watermark colors as overwridden from Procedure Specific Information (PSI).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(130, 100))); + this.superTooltip1.SetSuperTooltip(this.lblWaterMarkOvrd, new DevComponents.DotNetBar.SuperTooltipInfo("Watermark Overrides", "", "Shows Watermark and Watermark colors as overwridden from Procedure Specific Infor" + + "mation (PSI).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(130, 100))); this.lblWaterMarkOvrd.TabIndex = 106; this.lblWaterMarkOvrd.Text = "Watermark"; this.lblWaterMarkOvrd.Visible = false; @@ -624,7 +625,7 @@ namespace VEPROMS this.btnCreatePDF.BackColor = System.Drawing.SystemColors.Control; this.btnCreatePDF.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCreatePDF.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCreatePDF.Location = new System.Drawing.Point(14, 410); + this.btnCreatePDF.Location = new System.Drawing.Point(13, 427); this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); this.btnCreatePDF.Name = "btnCreatePDF"; this.btnCreatePDF.Size = new System.Drawing.Size(133, 37); @@ -642,7 +643,7 @@ namespace VEPROMS this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(474, 410); + this.btnCancel.Location = new System.Drawing.Point(473, 427); this.btnCancel.Margin = new System.Windows.Forms.Padding(2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(122, 37); @@ -661,7 +662,7 @@ namespace VEPROMS this.cbxDebug.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); this.cbxDebug.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxDebug.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxDebug.Location = new System.Drawing.Point(14, 382); + this.cbxDebug.Location = new System.Drawing.Point(14, 379); this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); this.cbxDebug.Name = "cbxDebug"; this.cbxDebug.Size = new System.Drawing.Size(104, 20); @@ -680,7 +681,7 @@ namespace VEPROMS this.cbxOrPgBrk.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxOrPgBrk.ForeColor = System.Drawing.SystemColors.ControlText; this.cbxOrPgBrk.Location = new System.Drawing.Point(79, 254); - this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(2); this.cbxOrPgBrk.Name = "cbxOrPgBrk"; this.cbxOrPgBrk.Size = new System.Drawing.Size(167, 19); this.cbxOrPgBrk.TabIndex = 99; @@ -734,7 +735,7 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.DisabledBackColor = System.Drawing.Color.Empty; this.ppGpbxUserSpecTxt.Enabled = false; this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(204, 31); - this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2); this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt"; this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(174, 85); // @@ -784,7 +785,7 @@ namespace VEPROMS // this.ppTxbxChangeBarUserMsgTwo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_UserCBMess2", true)); this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(89, 38); - this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(2); this.ppTxbxChangeBarUserMsgTwo.Multiline = false; this.ppTxbxChangeBarUserMsgTwo.Name = "ppTxbxChangeBarUserMsgTwo"; this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(44, 20); @@ -805,7 +806,7 @@ namespace VEPROMS // this.ppTxbxChangeBarUserMsgOne.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_UserCBMess1", true)); this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(89, 9); - this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(2); this.ppTxbxChangeBarUserMsgOne.Multiline = false; this.ppTxbxChangeBarUserMsgOne.Name = "ppTxbxChangeBarUserMsgOne"; this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(44, 20); @@ -822,7 +823,7 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.FormattingEnabled = true; this.ppCmbxChgBarTxtType.ItemHeight = 17; this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(3, 64); - this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2); this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType"; this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(185, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxChgBarTxtType, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bar Text Type", "", "Select the type of information that is printed next to each change bar (step edit" + @@ -839,7 +840,7 @@ namespace VEPROMS 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.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + 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" + @@ -936,7 +937,7 @@ namespace VEPROMS this.btnMergePDFs.BackColor = System.Drawing.SystemColors.Control; this.btnMergePDFs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnMergePDFs.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnMergePDFs.Location = new System.Drawing.Point(162, 410); + this.btnMergePDFs.Location = new System.Drawing.Point(161, 427); this.btnMergePDFs.Margin = new System.Windows.Forms.Padding(2); this.btnMergePDFs.Name = "btnMergePDFs"; this.btnMergePDFs.Size = new System.Drawing.Size(133, 37); @@ -952,7 +953,7 @@ namespace VEPROMS this.cbxRemoveManualPgBrk.BackColor = System.Drawing.Color.Transparent; this.cbxRemoveManualPgBrk.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxRemoveManualPgBrk.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxRemoveManualPgBrk.Location = new System.Drawing.Point(2, 18); + this.cbxRemoveManualPgBrk.Location = new System.Drawing.Point(2, 26); this.cbxRemoveManualPgBrk.Margin = new System.Windows.Forms.Padding(2); this.cbxRemoveManualPgBrk.Name = "cbxRemoveManualPgBrk"; this.cbxRemoveManualPgBrk.Size = new System.Drawing.Size(218, 20); @@ -961,6 +962,25 @@ namespace VEPROMS this.cbxRemoveManualPgBrk.Text = "Removing Manual Page Breaks"; this.cbxRemoveManualPgBrk.UseVisualStyleBackColor = false; // + // cbxAssignRevToAllMergedPrcs + // + this.cbxAssignRevToAllMergedPrcs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbxAssignRevToAllMergedPrcs.AutoSize = true; + this.cbxAssignRevToAllMergedPrcs.BackColor = System.Drawing.Color.Transparent; + this.cbxAssignRevToAllMergedPrcs.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysViewPDFAfterCreate", true)); + this.cbxAssignRevToAllMergedPrcs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxAssignRevToAllMergedPrcs.Location = new System.Drawing.Point(210, 87); + this.cbxAssignRevToAllMergedPrcs.Margin = new System.Windows.Forms.Padding(2); + this.cbxAssignRevToAllMergedPrcs.Name = "cbxAssignRevToAllMergedPrcs"; + this.cbxAssignRevToAllMergedPrcs.Size = new System.Drawing.Size(262, 20); + this.superTooltip1.SetSuperTooltip(this.cbxAssignRevToAllMergedPrcs, new DevComponents.DotNetBar.SuperTooltipInfo("Set Rev Number on Printed Procedures", "", "PROMS will automatically set the revisoin number to all of the procedure that are" + + " being printed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbxAssignRevToAllMergedPrcs.TabIndex = 112; + this.cbxAssignRevToAllMergedPrcs.Text = "Set Rev Number on Printed Procedures"; + this.cbxAssignRevToAllMergedPrcs.UseVisualStyleBackColor = false; + this.cbxAssignRevToAllMergedPrcs.Visible = false; + this.cbxAssignRevToAllMergedPrcs.CheckedChanged += new System.EventHandler(this.cbxAssignRevToAllMergedPrcs_CheckedChanged); + // // cbxGenerateConActSum // this.cbxGenerateConActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -991,7 +1011,7 @@ namespace VEPROMS this.ppGpbxUserSpecCB.Controls.Add(this.cbxOvrrideDefChgBars); this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty; this.ppGpbxUserSpecCB.Enabled = false; - this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(19, 304); + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(19, 316); this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(386, 148); @@ -1149,7 +1169,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, 461); + this.expandableSplitter1.Size = new System.Drawing.Size(6, 472); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 107; this.expandableSplitter1.TabStop = false; @@ -1158,6 +1178,8 @@ namespace VEPROMS // this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx2.Controls.Add(this.cbxAlmPtTxt); + this.panelEx2.Controls.Add(this.cbxAssignRevToAllMergedPrcs); this.panelEx2.Controls.Add(this.groupPag); this.panelEx2.Controls.Add(this.btnMergePDFs); this.panelEx2.Controls.Add(this.gpnlDebug); @@ -1187,7 +1209,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, 461); + this.panelEx2.Size = new System.Drawing.Size(604, 472); 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; @@ -1204,10 +1226,10 @@ namespace VEPROMS this.groupPag.Controls.Add(this.cbxRemoveManualPgBrk); this.groupPag.Controls.Add(this.cbxRemoveTrailing); this.groupPag.DisabledBackColor = System.Drawing.Color.Empty; - this.groupPag.Location = new System.Drawing.Point(161, 343); + this.groupPag.Location = new System.Drawing.Point(161, 332); this.groupPag.Margin = new System.Windows.Forms.Padding(2); this.groupPag.Name = "groupPag"; - this.groupPag.Size = new System.Drawing.Size(337, 58); + this.groupPag.Size = new System.Drawing.Size(337, 71); // // // @@ -1267,7 +1289,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, 461); + this.expPrnSetting.Size = new System.Drawing.Size(411, 472); 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; @@ -1297,7 +1319,7 @@ 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, 214); + this.ppGpDuplex.Location = new System.Drawing.Point(19, 219); this.ppGpDuplex.Margin = new System.Windows.Forms.Padding(2); this.ppGpDuplex.Name = "ppGpDuplex"; this.ppGpDuplex.Size = new System.Drawing.Size(386, 85); @@ -1377,18 +1399,39 @@ 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, 461); + this.ClientSize = new System.Drawing.Size(1021, 472); this.Controls.Add(this.panelEx2); this.Controls.Add(this.expandableSplitter1); this.Controls.Add(this.expPrnSetting); this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "DlgPrintProcedure"; @@ -1400,7 +1443,6 @@ 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); @@ -1411,6 +1453,7 @@ namespace VEPROMS this.groupPag.PerformLayout(); this.expPrnSetting.ResumeLayout(false); this.ppGpDuplex.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); this.ResumeLayout(false); } @@ -1487,5 +1530,7 @@ namespace VEPROMS private DevComponents.DotNetBar.ButtonX btnMergePDFs; private DevComponents.DotNetBar.Controls.GroupPanel groupPag; private System.Windows.Forms.CheckBox cbxRemoveManualPgBrk; + private System.Windows.Forms.CheckBox cbxAssignRevToAllMergedPrcs; + private System.Windows.Forms.CheckBox cbxAlmPtTxt; } } diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index b4f65f88..3e3fe222 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -214,7 +214,6 @@ namespace VEPROMS private void PrepForAllOrOne(bool oneProcedure) { txbPDFName.Visible = lblPDFFileName.Visible = oneProcedure; - txbRevNum.Visible = lblRevNum.Visible = oneProcedure; txbReviewDate.Visible = lblReviewDate.Visible = oneProcedure; txbRevDate.Visible = lblRevDate.Visible = oneProcedure; cbxOpenAfterCreate2.Visible = oneProcedure; @@ -226,7 +225,12 @@ namespace VEPROMS cbxGenerateConActSum.Checked = false; swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = oneProcedure && ((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper); - btnMergePDFs.Visible = !oneProcedure; + // C2021-062 make visable the check box to assign rev number for all procedures being printed + // also make visable the Rev Num entry field. + txbRevNum.Enabled = oneProcedure; + cbxAssignRevToAllMergedPrcs.Visible = btnMergePDFs.Visible = !oneProcedure; + // C2021-063 make the Generate Alarm Point List text checkbox visable in the format flag is set. + cbxAlmPtTxt.Visible = !oneProcedure && MyProcedure.ActiveFormat.PlantFormat.FormatData.PrintData.ChkBoxToGeneratePointListText; } private string _UnitNumber; public string UnitNumber @@ -406,7 +410,8 @@ namespace VEPROMS if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave; if (pc != null) { - RevNum = pc.Print_Rev; + //C2021-062 use the save rev number for all procedures if set, or just use the rev number in the current procedure config + RevNum = (_NewRevForAllProcs == null) ? pc.Print_Rev : _NewRevForAllProcs; RevDate = pc.Print_RevDate; //== null || pc.Print_RevDate=="" ? DateTime.Today : Convert.ToDateTime(pc.Print_RevDate); ReviewDate = pc.Print_ReviewDate; // == null ? DateTime.Today : Convert.ToDateTime(pc.Print_ReviewDate); //Now check the format flags to determine if/how the Rev string should be parsed. @@ -709,7 +714,6 @@ namespace VEPROMS string waterMarkTextOverride = ""; if (procConfig != null) waterMarkTextOverride = procConfig.GetValue("PSI", "WATERMARKOVERRIDE"); if (swtbtnWaterMark.Value && waterMarkTextOverride != null && waterMarkTextOverride != "") waterMarkText = waterMarkTextOverride; - // C2020-002 paper size is now set in the format files - default is Letter Volian.Print.Library.Rtf2Pdf.PaperSize = myProc.ActiveFormat.PlantFormat.FormatData.PDFPageSize.PaperSize; if (myProc.Sections != null) @@ -723,6 +727,8 @@ namespace VEPROMS { MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = SelectedSlave; SetupForProcedure(); + // C2021-062 save the entered Rev Number to all of the procedures that are being printed + if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs); pbPDFsStatus.TextVisible = true; pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); pbPDFsStatus.Value = i; @@ -759,6 +765,8 @@ namespace VEPROMS { MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = k; SetupForProcedure(); + // C2021-062 save the entered Rev Number to all of the procedures that are being printed + if (_NewRevForAllProcs != null) SaveRevNumToProcedureConfig(_NewRevForAllProcs); pbPDFsStatus.TextVisible = true; pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); pbPDFsStatus.Value = i; @@ -1187,13 +1195,24 @@ namespace VEPROMS txbDate.Text = e.Start.ToShortDateString(); } + string _NewRevForAllProcs = null; private void txbRevNum_Leave(object sender, EventArgs e) { if (_Initializing) return; + // C2021-062 save the current rev number to be used when printing all procedures or merging + if (cbxAssignRevToAllMergedPrcs.Checked && btnMergePDFs.Visible) + _NewRevForAllProcs = txbRevNum.Text; // C2021-062 we will save the rev number as we print each procedure during the print merge or print all procedures + else + SaveRevNumToProcedureConfig(txbRevNum.Text); + } + + // C2021-062 used to save rev number information when all procedures are printed or merged + private void SaveRevNumToProcedureConfig(string newrevnum) + { // save the RevNum to the procedure's config. ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig; if (pc == null) return; - pc.Print_Rev = txbRevNum.Text; + pc.Print_Rev = newrevnum; using (Item itm = Item.Get(MyProcedure.ItemID)) { itm.MyContent.Config = MyProcedure.MyConfig.ToString(); @@ -1254,8 +1273,8 @@ namespace VEPROMS PromsPrinter.MergedLandscapePages = null; // B2019-152: MergedLandscapePages has data set when creating separate pdfs (DoCreatePDF) DoCreatePDF(); // create indivitual pdfs if (_MergedPdfPath != null && _MergedPdfPath != PDFPath) PDFPath = _MergedPfd.Folder = _MergedPdfPath; - - if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages)) return; // merge them together. + // C2021-063 pass in whether to generate Alarm Point List text when a merge is done + if (!_MergedPfd.DoTheMerge(PromsPrinter.MergedLandscapePages,cbxAlmPtTxt.Checked)) return; // merge them together. // if the property to show the file after printing is set (on the version dialog), display it. Otherwise do a dialog to let user know it's done if (_DocVersionConfig.Print_MergedPdfsViewAfter) { @@ -1279,6 +1298,15 @@ namespace VEPROMS this.Close(); } + private void cbxAssignRevToAllMergedPrcs_CheckedChanged(object sender, EventArgs e) + { + txbRevNum.Enabled = cbxAssignRevToAllMergedPrcs.Checked; + if (cbxAssignRevToAllMergedPrcs.Checked) + _NewRevForAllProcs = txbRevNum.Text; + else + _NewRevForAllProcs = null; + } + //private void cbxDebug_CheckedChanged(object sender, EventArgs e) //{ // cbxCmpPRMSpfd.Visible = cbxDebug.Checked; diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index 3a1f8894..6efd6ee7 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx @@ -188,9 +188,14 @@ Note that the Add Prefix / Suffix to PDF File Name option will not be available. NOTE: If you find that manual page breaks and/or hard returns and spaces are needed for an acceptable output, please contact Volian so that we can improve the pagination logic. + + + When checked, a text file containing Alarm Point List information will be generated and displayed in NotePad when the Merge PDFs button is selected. + +The resulting Alarm Point List text can then be copied into the Alarm Point List section of the Alarm procedure. - 40 + 25