diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 2d5da0b4..31cb9204 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -92,6 +92,9 @@ namespace VEPROMS this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.expPrnSetting = new DevComponents.DotNetBar.ExpandablePanel(); + this.ppGpDuplex = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tbBlankPage = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.lblBlPg = new DevComponents.DotNetBar.LabelX(); this.swtbtnPDFdtPrefixSuffix = new DevComponents.DotNetBar.Controls.SwitchButton(); this.gpnlDebug.SuspendLayout(); this.grpDateSelector.SuspendLayout(); @@ -100,6 +103,7 @@ namespace VEPROMS this.ppGpbxUserSpecCB.SuspendLayout(); this.panelEx2.SuspendLayout(); this.expPrnSetting.SuspendLayout(); + this.ppGpDuplex.SuspendLayout(); this.SuspendLayout(); // // btnPdfLocation @@ -108,9 +112,10 @@ namespace VEPROMS this.btnPdfLocation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnPdfLocation.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnPdfLocation.Image = ((System.Drawing.Image)(resources.GetObject("btnPdfLocation.Image"))); - this.btnPdfLocation.Location = new System.Drawing.Point(575, 29); + this.btnPdfLocation.Location = new System.Drawing.Point(767, 36); + this.btnPdfLocation.Margin = new System.Windows.Forms.Padding(4); this.btnPdfLocation.Name = "btnPdfLocation"; - this.btnPdfLocation.Size = new System.Drawing.Size(20, 19); + this.btnPdfLocation.Size = new System.Drawing.Size(27, 23); this.btnPdfLocation.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnPdfLocation, new DevComponents.DotNetBar.SuperTooltipInfo("PDF Location Change Button", "", "This button will display a dialog allowing you to navigate to the location to pla" + "ce the PDF for this print session.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -126,10 +131,10 @@ namespace VEPROMS this.gpnlDebug.Controls.Add(this.cbxDebugText); this.gpnlDebug.Controls.Add(this.cbxDebugPagination); this.gpnlDebug.DisabledBackColor = System.Drawing.Color.Empty; - this.gpnlDebug.Location = new System.Drawing.Point(440, 126); - this.gpnlDebug.Margin = new System.Windows.Forms.Padding(2); + this.gpnlDebug.Location = new System.Drawing.Point(587, 155); + this.gpnlDebug.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpnlDebug.Name = "gpnlDebug"; - this.gpnlDebug.Size = new System.Drawing.Size(119, 97); + this.gpnlDebug.Size = new System.Drawing.Size(159, 119); // // // @@ -165,10 +170,10 @@ 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); + this.cbxMetaFile.Location = new System.Drawing.Point(11, 63); + this.cbxMetaFile.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxMetaFile.Name = "cbxMetaFile"; - this.cbxMetaFile.Size = new System.Drawing.Size(104, 17); + this.cbxMetaFile.Size = new System.Drawing.Size(135, 21); 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" + " information of the text being printed.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxMetaFile.TabIndex = 1; @@ -179,10 +184,10 @@ 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); + this.cbxDebugText.Location = new System.Drawing.Point(11, 37); + this.cbxDebugText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxDebugText.Name = "cbxDebugText"; - this.cbxDebugText.Size = new System.Drawing.Size(47, 17); + this.cbxDebugText.Size = new System.Drawing.Size(57, 21); 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" + "neral debug information generated while printing.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxDebugText.TabIndex = 1; @@ -193,10 +198,10 @@ 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); + this.cbxDebugPagination.Location = new System.Drawing.Point(12, 9); + this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxDebugPagination.Name = "cbxDebugPagination"; - this.cbxDebugPagination.Size = new System.Drawing.Size(76, 17); + this.cbxDebugPagination.Size = new System.Drawing.Size(97, 21); this.superTooltip1.SetSuperTooltip(this.cbxDebugPagination, new DevComponents.DotNetBar.SuperTooltipInfo("Debug Pagination", "", "Generates a DebugPagination text file in the PDF Location folder. It contains de" + "tailed pagination information.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxDebugPagination.TabIndex = 0; @@ -210,10 +215,10 @@ namespace VEPROMS this.grpDateSelector.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpDateSelector.Controls.Add(this.calDateSelector); this.grpDateSelector.DisabledBackColor = System.Drawing.Color.Empty; - this.grpDateSelector.Location = new System.Drawing.Point(235, 92); - this.grpDateSelector.Margin = new System.Windows.Forms.Padding(2); + this.grpDateSelector.Location = new System.Drawing.Point(313, 113); + this.grpDateSelector.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.grpDateSelector.Name = "grpDateSelector"; - this.grpDateSelector.Size = new System.Drawing.Size(195, 154); + this.grpDateSelector.Size = new System.Drawing.Size(260, 190); // // // @@ -269,8 +274,8 @@ namespace VEPROMS this.calDateSelector.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; 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); + this.calDateSelector.Location = new System.Drawing.Point(13, 2); + this.calDateSelector.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.calDateSelector.Name = "calDateSelector"; // // @@ -294,9 +299,10 @@ namespace VEPROMS // // this.pbPDFsStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.pbPDFsStatus.Location = new System.Drawing.Point(11, 294); + this.pbPDFsStatus.Location = new System.Drawing.Point(27, 436); + this.pbPDFsStatus.Margin = new System.Windows.Forms.Padding(4); this.pbPDFsStatus.Name = "pbPDFsStatus"; - this.pbPDFsStatus.Size = new System.Drawing.Size(575, 23); + this.pbPDFsStatus.Size = new System.Drawing.Size(767, 28); this.pbPDFsStatus.TabIndex = 87; this.pbPDFsStatus.Text = "Procedures Converted to PDF"; this.pbPDFsStatus.Visible = false; @@ -308,10 +314,10 @@ 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); + this.txbReviewDate.Location = new System.Drawing.Point(153, 188); + this.txbReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbReviewDate.Name = "txbReviewDate"; - this.txbReviewDate.Size = new System.Drawing.Size(91, 20); + this.txbReviewDate.Size = new System.Drawing.Size(121, 22); 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))); this.txbReviewDate.TabIndex = 83; this.txbReviewDate.Enter += new System.EventHandler(this.txbReviewDate_Enter); @@ -324,10 +330,10 @@ 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); + this.txbRevDate.Location = new System.Drawing.Point(153, 148); + this.txbRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbRevDate.Name = "txbRevDate"; - this.txbRevDate.Size = new System.Drawing.Size(91, 20); + this.txbRevDate.Size = new System.Drawing.Size(121, 22); 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))); this.txbRevDate.TabIndex = 82; this.txbRevDate.Enter += new System.EventHandler(this.txbRevDate_Enter); @@ -342,10 +348,10 @@ 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); + this.txbPDFLocation.Location = new System.Drawing.Point(40, 34); + this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbPDFLocation.Name = "txbPDFLocation"; - this.txbPDFLocation.Size = new System.Drawing.Size(529, 20); + this.txbPDFLocation.Size = new System.Drawing.Size(705, 22); 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))); this.txbPDFLocation.TabIndex = 81; this.txbPDFLocation.WatermarkText = "PDF Location"; @@ -358,10 +364,10 @@ namespace VEPROMS this.cbxOpenAfterCreate2.BackColor = System.Drawing.Color.Transparent; this.cbxOpenAfterCreate2.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysViewPDFAfterCreate", true)); this.cbxOpenAfterCreate2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(440, 92); - this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(2); + this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(596, 113); + this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOpenAfterCreate2.Name = "cbxOpenAfterCreate2"; - this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(159, 20); + this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(202, 24); this.superTooltip1.SetSuperTooltip(this.cbxOpenAfterCreate2, new DevComponents.DotNetBar.SuperTooltipInfo("View PDF After Create", "", "PROMS will automatically open the created PDF in your PDF reader/viewer.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxOpenAfterCreate2.TabIndex = 80; this.cbxOpenAfterCreate2.Text = "View PDF After Create"; @@ -379,10 +385,10 @@ namespace VEPROMS this.cbxOverwritePDF2.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); this.cbxOverwritePDF2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxOverwritePDF2.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxOverwritePDF2.Location = new System.Drawing.Point(440, 61); - this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(2); + this.cbxOverwritePDF2.Location = new System.Drawing.Point(597, 75); + this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; - this.cbxOverwritePDF2.Size = new System.Drawing.Size(138, 20); + this.cbxOverwritePDF2.Size = new System.Drawing.Size(174, 24); this.superTooltip1.SetSuperTooltip(this.cbxOverwritePDF2, new DevComponents.DotNetBar.SuperTooltipInfo("Overwrite PDF File", "", "PROMS will automatically replace an existing PDF file of the same name at this PD" + "F Location", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(160, 80))); this.cbxOverwritePDF2.TabIndex = 79; @@ -396,10 +402,10 @@ 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); + this.txbRevNum.Location = new System.Drawing.Point(153, 108); + this.txbRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbRevNum.Name = "txbRevNum"; - this.txbRevNum.Size = new System.Drawing.Size(91, 20); + this.txbRevNum.Size = new System.Drawing.Size(121, 22); 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))); this.txbRevNum.TabIndex = 73; this.txbRevNum.Leave += new System.EventHandler(this.txbRevNum_Leave); @@ -412,10 +418,10 @@ 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); + this.lblReviewDate.Location = new System.Drawing.Point(11, 187); + this.lblReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblReviewDate.Name = "lblReviewDate"; - this.lblReviewDate.Size = new System.Drawing.Size(103, 19); + this.lblReviewDate.Size = new System.Drawing.Size(137, 23); this.lblReviewDate.TabIndex = 72; this.lblReviewDate.Text = "Review Date"; this.lblReviewDate.TextAlignment = System.Drawing.StringAlignment.Far; @@ -428,10 +434,10 @@ 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); + this.lblRevDate.Location = new System.Drawing.Point(11, 146); + this.lblRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblRevDate.Name = "lblRevDate"; - this.lblRevDate.Size = new System.Drawing.Size(103, 19); + this.lblRevDate.Size = new System.Drawing.Size(137, 23); this.lblRevDate.TabIndex = 71; this.lblRevDate.Text = "Revision Date"; this.lblRevDate.TextAlignment = System.Drawing.StringAlignment.Far; @@ -444,10 +450,10 @@ 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); + this.lblRevNum.Location = new System.Drawing.Point(-3, 107); + this.lblRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblRevNum.Name = "lblRevNum"; - this.lblRevNum.Size = new System.Drawing.Size(113, 19); + this.lblRevNum.Size = new System.Drawing.Size(151, 23); this.lblRevNum.TabIndex = 70; this.lblRevNum.Text = "Revision Number"; this.lblRevNum.TextAlignment = System.Drawing.StringAlignment.Far; @@ -461,9 +467,10 @@ namespace VEPROMS // this.txbPDFName.Border.Class = "TextBoxBorder"; this.txbPDFName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbPDFName.Location = new System.Drawing.Point(116, 61); + this.txbPDFName.Location = new System.Drawing.Point(155, 75); + this.txbPDFName.Margin = new System.Windows.Forms.Padding(4); this.txbPDFName.Name = "txbPDFName"; - this.txbPDFName.Size = new System.Drawing.Size(314, 20); + this.txbPDFName.Size = new System.Drawing.Size(419, 22); this.superTooltip1.SetSuperTooltip(this.txbPDFName, new DevComponents.DotNetBar.SuperTooltipInfo("PDF Name", "", "By default, PROMS uses the procedure number to make up the PDF file name. The na" + "me can be changed, for this print session, prior to generating the PDF.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 105))); this.txbPDFName.TabIndex = 8; @@ -476,9 +483,10 @@ namespace VEPROMS // this.lblPDFFileName.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPDFFileName.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPDFFileName.Location = new System.Drawing.Point(11, 58); + this.lblPDFFileName.Location = new System.Drawing.Point(15, 71); + this.lblPDFFileName.Margin = new System.Windows.Forms.Padding(4); this.lblPDFFileName.Name = "lblPDFFileName"; - this.lblPDFFileName.Size = new System.Drawing.Size(100, 19); + this.lblPDFFileName.Size = new System.Drawing.Size(133, 23); this.lblPDFFileName.TabIndex = 7; this.lblPDFFileName.Text = "PDF Name"; this.lblPDFFileName.TextAlignment = System.Drawing.StringAlignment.Far; @@ -491,10 +499,10 @@ 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); + this.lblPDFLoc.Location = new System.Drawing.Point(3, 10); + this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblPDFLoc.Name = "lblPDFLoc"; - this.lblPDFLoc.Size = new System.Drawing.Size(86, 19); + this.lblPDFLoc.Size = new System.Drawing.Size(115, 23); this.lblPDFLoc.TabIndex = 4; this.lblPDFLoc.Text = "PDF Location"; // @@ -506,10 +514,10 @@ 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); + this.lblMultiunitPdfLocation.Location = new System.Drawing.Point(11, 222); + this.lblMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblMultiunitPdfLocation.Name = "lblMultiunitPdfLocation"; - this.lblMultiunitPdfLocation.Size = new System.Drawing.Size(156, 19); + this.lblMultiunitPdfLocation.Size = new System.Drawing.Size(208, 23); this.lblMultiunitPdfLocation.TabIndex = 108; this.lblMultiunitPdfLocation.Text = "Multi Unit PDF Location"; this.lblMultiunitPdfLocation.Visible = false; @@ -528,10 +536,10 @@ namespace VEPROMS this.muLocNumber, this.muLocText, this.muLocID}); - this.cbxMultiunitPdfLocation.Location = new System.Drawing.Point(44, 203); - this.cbxMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(2); + this.cbxMultiunitPdfLocation.Location = new System.Drawing.Point(59, 250); + this.cbxMultiunitPdfLocation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxMultiunitPdfLocation.Name = "cbxMultiunitPdfLocation"; - this.cbxMultiunitPdfLocation.Size = new System.Drawing.Size(319, 20); + this.cbxMultiunitPdfLocation.Size = new System.Drawing.Size(424, 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" + " drop down list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxMultiunitPdfLocation.TabIndex = 107; @@ -567,10 +575,10 @@ namespace VEPROMS // this.lblWatermarkS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblWatermarkS.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblWatermarkS.Location = new System.Drawing.Point(93, 96); - this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(2); + this.lblWatermarkS.Location = new System.Drawing.Point(124, 82); + this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblWatermarkS.Name = "lblWatermarkS"; - this.lblWatermarkS.Size = new System.Drawing.Size(79, 23); + this.lblWatermarkS.Size = new System.Drawing.Size(105, 28); this.superTooltip1.SetSuperTooltip(this.lblWatermarkS, new DevComponents.DotNetBar.SuperTooltipInfo("Watermark", "", "Prints the selected watermark on each page of the generated PDF.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(115, 79))); this.lblWatermarkS.TabIndex = 106; this.lblWatermarkS.Text = "Watermark"; @@ -582,11 +590,11 @@ namespace VEPROMS this.cbxWaterMark.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.cbxWaterMark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbxWaterMark.FormattingEnabled = true; - this.cbxWaterMark.ItemHeight = 17; - this.cbxWaterMark.Location = new System.Drawing.Point(181, 99); - this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(2); + this.cbxWaterMark.ItemHeight = 21; + this.cbxWaterMark.Location = new System.Drawing.Point(241, 86); + this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxWaterMark.Name = "cbxWaterMark"; - this.cbxWaterMark.Size = new System.Drawing.Size(157, 23); + this.cbxWaterMark.Size = new System.Drawing.Size(208, 27); this.superTooltip1.SetSuperTooltip(this.cbxWaterMark, new DevComponents.DotNetBar.SuperTooltipInfo("Watermark", "", "Select the watermark text that will be printed on each page of the PDF.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxWaterMark.TabIndex = 87; this.cbxWaterMark.Visible = false; @@ -599,10 +607,10 @@ 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(5, 350); - this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); + this.btnCreatePDF.Location = new System.Drawing.Point(19, 505); + this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCreatePDF.Name = "btnCreatePDF"; - this.btnCreatePDF.Size = new System.Drawing.Size(133, 37); + this.btnCreatePDF.Size = new System.Drawing.Size(177, 46); this.btnCreatePDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnCreatePDF, new DevComponents.DotNetBar.SuperTooltipInfo("Create PDF", "", "Generate a PDF of the selected procedure.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnCreatePDF.TabIndex = 1; @@ -617,10 +625,10 @@ 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(465, 350); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2); + this.btnCancel.Location = new System.Drawing.Point(632, 505); + this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(122, 37); + this.btnCancel.Size = new System.Drawing.Size(163, 46); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.superTooltip1.SetSuperTooltip(this.btnCancel, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "Exit the Create PDF dialog without doing anything.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnCancel.TabIndex = 2; @@ -636,10 +644,10 @@ 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(5, 322); - this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); + this.cbxDebug.Location = new System.Drawing.Point(19, 470); + this.cbxDebug.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxDebug.Name = "cbxDebug"; - this.cbxDebug.Size = new System.Drawing.Size(104, 20); + this.cbxDebug.Size = new System.Drawing.Size(127, 24); this.superTooltip1.SetSuperTooltip(this.cbxDebug, new DevComponents.DotNetBar.SuperTooltipInfo("Overlay PDF", "", resources.GetString("cbxDebug.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 130))); this.cbxDebug.TabIndex = 98; this.cbxDebug.Text = "Overlay PDF"; @@ -654,10 +662,10 @@ namespace VEPROMS this.cbxOrPgBrk.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); 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); + this.cbxOrPgBrk.Location = new System.Drawing.Point(128, 313); + this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOrPgBrk.Name = "cbxOrPgBrk"; - this.cbxOrPgBrk.Size = new System.Drawing.Size(167, 19); + this.cbxOrPgBrk.Size = new System.Drawing.Size(200, 22); this.cbxOrPgBrk.TabIndex = 99; this.cbxOrPgBrk.Text = "Use Original Page Breaks"; this.cbxOrPgBrk.UseVisualStyleBackColor = false; @@ -673,10 +681,10 @@ namespace VEPROMS this.cbxRemoveManualPageBreaks.BackColor = System.Drawing.Color.Transparent; this.cbxRemoveManualPageBreaks.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxRemoveManualPageBreaks.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(138, 322); - this.cbxRemoveManualPageBreaks.Margin = new System.Windows.Forms.Padding(2); + this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(196, 470); + this.cbxRemoveManualPageBreaks.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxRemoveManualPageBreaks.Name = "cbxRemoveManualPageBreaks"; - this.cbxRemoveManualPageBreaks.Size = new System.Drawing.Size(350, 20); + this.cbxRemoveManualPageBreaks.Size = new System.Drawing.Size(434, 24); this.superTooltip1.SetSuperTooltip(this.cbxRemoveManualPageBreaks, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Hard Returns and Manual Page Break", "", resources.GetString("cbxRemoveManualPageBreaks.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(280, 170))); this.cbxRemoveManualPageBreaks.TabIndex = 101; this.cbxRemoveManualPageBreaks.Text = "Remove Trailing Hard Returns && Manual Page Breaks"; @@ -690,9 +698,10 @@ 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, 216); + this.labelX5.Location = new System.Drawing.Point(123, 229); + this.labelX5.Margin = new System.Windows.Forms.Padding(4); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(152, 23); + this.labelX5.Size = new System.Drawing.Size(203, 28); 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" + "ce the last PROMS Approval.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80))); this.labelX5.TabIndex = 110; @@ -708,10 +717,10 @@ 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.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(272, 38); + this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt"; - this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(174, 85); + this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(232, 105); // // // @@ -748,42 +757,40 @@ namespace VEPROMS // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(34, 11); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(45, 14); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(59, 16); + this.label14.Size = new System.Drawing.Size(73, 20); this.label14.TabIndex = 4; this.label14.Text = "Line one"; // // ppTxbxChangeBarUserMsgTwo // 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); + this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(119, 47); + this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgTwo.Multiline = false; this.ppTxbxChangeBarUserMsgTwo.Name = "ppTxbxChangeBarUserMsgTwo"; - this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(57, 24); this.ppTxbxChangeBarUserMsgTwo.TabIndex = 2; this.ppTxbxChangeBarUserMsgTwo.Text = ""; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(37, 41); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Location = new System.Drawing.Point(49, 50); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(56, 16); + this.label15.Size = new System.Drawing.Size(72, 20); this.label15.TabIndex = 5; this.label15.Text = "Line two"; // // ppTxbxChangeBarUserMsgOne // 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); + this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(119, 11); + this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgOne.Multiline = false; this.ppTxbxChangeBarUserMsgOne.Name = "ppTxbxChangeBarUserMsgOne"; - this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(57, 24); this.ppTxbxChangeBarUserMsgOne.TabIndex = 1; this.ppTxbxChangeBarUserMsgOne.Text = ""; // @@ -795,11 +802,11 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarTxtType.Enabled = false; 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); + this.ppCmbxChgBarTxtType.ItemHeight = 21; + this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(4, 79); + this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType"; - this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(185, 23); + this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(245, 27); 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" + "or sections only).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.ppCmbxChgBarTxtType.TabIndex = 48; @@ -813,10 +820,10 @@ 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.Margin = new System.Windows.Forms.Padding(2); + this.cbxOvrrideDefChgBars.Location = new System.Drawing.Point(7, 7); + this.cbxOvrrideDefChgBars.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOvrrideDefChgBars.Name = "cbxOvrrideDefChgBars"; - this.cbxOvrrideDefChgBars.Size = new System.Drawing.Size(221, 20); + this.cbxOvrrideDefChgBars.Size = new System.Drawing.Size(275, 24); 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.TabIndex = 79; @@ -832,9 +839,10 @@ namespace VEPROMS // this.lblGeneratePlacekeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblGeneratePlacekeeper.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGeneratePlacekeeper.Location = new System.Drawing.Point(93, 184); + this.lblGeneratePlacekeeper.Location = new System.Drawing.Point(124, 189); + this.lblGeneratePlacekeeper.Margin = new System.Windows.Forms.Padding(4); this.lblGeneratePlacekeeper.Name = "lblGeneratePlacekeeper"; - this.lblGeneratePlacekeeper.Size = new System.Drawing.Size(152, 23); + this.lblGeneratePlacekeeper.Size = new System.Drawing.Size(203, 28); this.superTooltip1.SetSuperTooltip(this.lblGeneratePlacekeeper, new DevComponents.DotNetBar.SuperTooltipInfo("Generate PlaceKeeper", "", "PlaceKeeper information will be generated and displayed in Word. The contents of " + "which can be copied and pasted into a PROMS Word attachment.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 100))); this.lblGeneratePlacekeeper.TabIndex = 110; @@ -849,9 +857,10 @@ namespace VEPROMS // this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX3.Location = new System.Drawing.Point(93, 126); + this.labelX3.Location = new System.Drawing.Point(124, 118); + this.labelX3.Margin = new System.Windows.Forms.Padding(4); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(245, 23); + this.labelX3.Size = new System.Drawing.Size(327, 28); this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Show PROMS Version Number", "", "The PROMS Version number will print in the upper right corner of each page.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.labelX3.TabIndex = 110; this.labelX3.Text = "Show PROMS Version Number"; @@ -864,9 +873,10 @@ namespace VEPROMS // this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX2.Location = new System.Drawing.Point(93, 68); + this.labelX2.Location = new System.Drawing.Point(108, 12); + this.labelX2.Margin = new System.Windows.Forms.Padding(4); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(245, 23); + this.labelX2.Size = new System.Drawing.Size(327, 28); this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Add Blank Pages for Duplex Printing", "", "Blank pages will be inserted where needed (for the back side of a page) when gene" + "rating the PDF that prints information (Foldouts or Supplemental Info) on back p" + "ages.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -881,9 +891,10 @@ namespace VEPROMS // this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX1.Location = new System.Drawing.Point(93, 39); + this.labelX1.Location = new System.Drawing.Point(124, 48); + this.labelX1.Margin = new System.Windows.Forms.Padding(4); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(112, 23); + this.labelX1.Size = new System.Drawing.Size(149, 28); this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("PDF Links", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 125))); this.labelX1.TabIndex = 108; this.labelX1.Text = "PDF Links"; @@ -896,9 +907,10 @@ namespace VEPROMS // this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX4.Location = new System.Drawing.Point(93, 155); + this.labelX4.Location = new System.Drawing.Point(124, 154); + this.labelX4.Margin = new System.Windows.Forms.Padding(4); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(278, 23); + this.labelX4.Size = new System.Drawing.Size(371, 28); this.superTooltip1.SetSuperTooltip(this.labelX4, new DevComponents.DotNetBar.SuperTooltipInfo("Add Prefix / Suffix To PDF File Name", "", "The prefix and/or suffix defined on the Output tab of the Working Draft property " + "page will be added to the PDF file name. \r\n\r\nNote that the PDF Links option wil" + "l not be available.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 105))); @@ -913,10 +925,10 @@ namespace VEPROMS this.cbxGenerateConActSum.BackColor = System.Drawing.Color.Transparent; this.cbxGenerateConActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxGenerateConActSum.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxGenerateConActSum.Location = new System.Drawing.Point(243, 256); - this.cbxGenerateConActSum.Margin = new System.Windows.Forms.Padding(2); + this.cbxGenerateConActSum.Location = new System.Drawing.Point(323, 315); + this.cbxGenerateConActSum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxGenerateConActSum.Name = "cbxGenerateConActSum"; - this.cbxGenerateConActSum.Size = new System.Drawing.Size(284, 17); + this.cbxGenerateConActSum.Size = new System.Drawing.Size(379, 21); this.cbxGenerateConActSum.TabIndex = 102; this.cbxGenerateConActSum.Text = "Generate Contiuous Action Summary (hidden but used)"; this.cbxGenerateConActSum.UseVisualStyleBackColor = false; @@ -935,10 +947,10 @@ 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(20, 244); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(25, 374); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; - this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(386, 148); + this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(515, 182); // // // @@ -974,10 +986,9 @@ namespace VEPROMS // this.lblCbTxtType.AutoSize = true; this.lblCbTxtType.Enabled = false; - this.lblCbTxtType.Location = new System.Drawing.Point(2, 43); - this.lblCbTxtType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCbTxtType.Location = new System.Drawing.Point(3, 53); this.lblCbTxtType.Name = "lblCbTxtType"; - this.lblCbTxtType.Size = new System.Drawing.Size(72, 16); + this.lblCbTxtType.Size = new System.Drawing.Size(87, 20); this.lblCbTxtType.TabIndex = 8; this.lblCbTxtType.Text = "Text Type:"; this.lblCbTxtType.TextAlign = System.Drawing.ContentAlignment.BottomLeft; @@ -988,9 +999,10 @@ namespace VEPROMS // // this.swtbtnChgBar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnChgBar.Location = new System.Drawing.Point(19, 216); + this.swtbtnChgBar.Location = new System.Drawing.Point(25, 229); + this.swtbtnChgBar.Margin = new System.Windows.Forms.Padding(4); this.swtbtnChgBar.Name = "swtbtnChgBar"; - this.swtbtnChgBar.Size = new System.Drawing.Size(66, 22); + this.swtbtnChgBar.Size = new System.Drawing.Size(88, 27); this.swtbtnChgBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnChgBar.SwitchClickTogglesValue = true; this.swtbtnChgBar.TabIndex = 109; @@ -1002,9 +1014,10 @@ namespace VEPROMS // // this.swtbtnWaterMark.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnWaterMark.Location = new System.Drawing.Point(20, 97); + this.swtbtnWaterMark.Location = new System.Drawing.Point(27, 83); + this.swtbtnWaterMark.Margin = new System.Windows.Forms.Padding(4); this.swtbtnWaterMark.Name = "swtbtnWaterMark"; - this.swtbtnWaterMark.Size = new System.Drawing.Size(66, 22); + this.swtbtnWaterMark.Size = new System.Drawing.Size(88, 27); this.swtbtnWaterMark.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnWaterMark.SwitchClickTogglesValue = true; this.swtbtnWaterMark.TabIndex = 109; @@ -1016,9 +1029,10 @@ namespace VEPROMS // // this.swtbtnGeneratePlacekeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnGeneratePlacekeeper.Location = new System.Drawing.Point(20, 185); + this.swtbtnGeneratePlacekeeper.Location = new System.Drawing.Point(27, 191); + this.swtbtnGeneratePlacekeeper.Margin = new System.Windows.Forms.Padding(4); this.swtbtnGeneratePlacekeeper.Name = "swtbtnGeneratePlacekeeper"; - this.swtbtnGeneratePlacekeeper.Size = new System.Drawing.Size(66, 22); + this.swtbtnGeneratePlacekeeper.Size = new System.Drawing.Size(88, 27); this.swtbtnGeneratePlacekeeper.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnGeneratePlacekeeper.SwitchClickTogglesValue = true; this.swtbtnGeneratePlacekeeper.TabIndex = 109; @@ -1030,9 +1044,10 @@ namespace VEPROMS // // this.swtbtnPROMSVersion.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnPROMSVersion.Location = new System.Drawing.Point(20, 126); + this.swtbtnPROMSVersion.Location = new System.Drawing.Point(27, 118); + this.swtbtnPROMSVersion.Margin = new System.Windows.Forms.Padding(4); this.swtbtnPROMSVersion.Name = "swtbtnPROMSVersion"; - this.swtbtnPROMSVersion.Size = new System.Drawing.Size(66, 22); + this.swtbtnPROMSVersion.Size = new System.Drawing.Size(88, 27); this.swtbtnPROMSVersion.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnPROMSVersion.SwitchClickTogglesValue = true; this.swtbtnPROMSVersion.TabIndex = 109; @@ -1043,12 +1058,14 @@ namespace VEPROMS // // this.swtbtnBlankPgsForDuplex.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnBlankPgsForDuplex.Location = new System.Drawing.Point(20, 68); + this.swtbtnBlankPgsForDuplex.Location = new System.Drawing.Point(11, 12); + this.swtbtnBlankPgsForDuplex.Margin = new System.Windows.Forms.Padding(4); this.swtbtnBlankPgsForDuplex.Name = "swtbtnBlankPgsForDuplex"; - this.swtbtnBlankPgsForDuplex.Size = new System.Drawing.Size(66, 22); + this.swtbtnBlankPgsForDuplex.Size = new System.Drawing.Size(88, 27); this.swtbtnBlankPgsForDuplex.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnBlankPgsForDuplex.SwitchClickTogglesValue = true; this.swtbtnBlankPgsForDuplex.TabIndex = 109; + this.swtbtnBlankPgsForDuplex.ValueChanged += new System.EventHandler(this.swtbtnBlankPgsForDuplex_ValueChanged); // // swtbtnPDFLinks // @@ -1056,9 +1073,10 @@ namespace VEPROMS // // this.swtbtnPDFLinks.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnPDFLinks.Location = new System.Drawing.Point(20, 39); + this.swtbtnPDFLinks.Location = new System.Drawing.Point(27, 48); + this.swtbtnPDFLinks.Margin = new System.Windows.Forms.Padding(4); this.swtbtnPDFLinks.Name = "swtbtnPDFLinks"; - this.swtbtnPDFLinks.Size = new System.Drawing.Size(66, 22); + this.swtbtnPDFLinks.Size = new System.Drawing.Size(88, 27); this.swtbtnPDFLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnPDFLinks.SwitchClickTogglesValue = true; this.swtbtnPDFLinks.TabIndex = 107; @@ -1090,9 +1108,10 @@ namespace VEPROMS this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255))))); this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(604, 0); + this.expandableSplitter1.Location = new System.Drawing.Point(805, 0); + this.expandableSplitter1.Margin = new System.Windows.Forms.Padding(4); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(6, 402); + this.expandableSplitter1.Size = new System.Drawing.Size(8, 567); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 107; this.expandableSplitter1.TabStop = false; @@ -1128,8 +1147,9 @@ namespace VEPROMS this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty; this.panelEx2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx2.Location = new System.Drawing.Point(0, 0); + this.panelEx2.Margin = new System.Windows.Forms.Padding(4); this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(604, 402); + this.panelEx2.Size = new System.Drawing.Size(805, 567); 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; @@ -1144,6 +1164,7 @@ namespace VEPROMS this.expPrnSetting.CanvasColor = System.Drawing.SystemColors.Control; this.expPrnSetting.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.LeftToRight; this.expPrnSetting.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.expPrnSetting.Controls.Add(this.ppGpDuplex); this.expPrnSetting.Controls.Add(this.labelX4); this.expPrnSetting.Controls.Add(this.swtbtnPDFdtPrefixSuffix); this.expPrnSetting.Controls.Add(this.ppGpbxUserSpecCB); @@ -1158,16 +1179,15 @@ namespace VEPROMS this.expPrnSetting.Controls.Add(this.swtbtnPDFLinks); this.expPrnSetting.Controls.Add(this.swtbtnPROMSVersion); this.expPrnSetting.Controls.Add(this.labelX1); - this.expPrnSetting.Controls.Add(this.labelX2); - this.expPrnSetting.Controls.Add(this.swtbtnBlankPgsForDuplex); this.expPrnSetting.DisabledBackColor = System.Drawing.Color.Empty; this.expPrnSetting.Dock = System.Windows.Forms.DockStyle.Right; this.expPrnSetting.ExpandOnTitleClick = true; this.expPrnSetting.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.expPrnSetting.HideControlsWhenCollapsed = true; - this.expPrnSetting.Location = new System.Drawing.Point(610, 0); + this.expPrnSetting.Location = new System.Drawing.Point(813, 0); + this.expPrnSetting.Margin = new System.Windows.Forms.Padding(4); this.expPrnSetting.Name = "expPrnSetting"; - this.expPrnSetting.Size = new System.Drawing.Size(411, 402); + this.expPrnSetting.Size = new System.Drawing.Size(548, 567); 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; @@ -1176,6 +1196,7 @@ namespace VEPROMS this.expPrnSetting.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; this.expPrnSetting.Style.GradientAngle = 90; this.expPrnSetting.TabIndex = 112; + this.expPrnSetting.TitleHeight = 32; this.expPrnSetting.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.expPrnSetting.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expPrnSetting.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1187,15 +1208,89 @@ namespace VEPROMS this.expPrnSetting.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expPrnSetting_ExpandedChanging); this.expPrnSetting.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expPrnSetting_ExpandedChanged); // + // ppGpDuplex + // + this.ppGpDuplex.BackColor = System.Drawing.Color.Transparent; + this.ppGpDuplex.CanvasColor = System.Drawing.SystemColors.Control; + this.ppGpDuplex.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.ppGpDuplex.Controls.Add(this.swtbtnBlankPgsForDuplex); + this.ppGpDuplex.Controls.Add(this.labelX2); + 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(25, 264); + this.ppGpDuplex.Name = "ppGpDuplex"; + this.ppGpDuplex.Size = new System.Drawing.Size(515, 105); + // + // + // + this.ppGpDuplex.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.ppGpDuplex.Style.BackColorGradientAngle = 90; + this.ppGpDuplex.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.ppGpDuplex.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpDuplex.Style.BorderBottomWidth = 1; + this.ppGpDuplex.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.ppGpDuplex.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpDuplex.Style.BorderLeftWidth = 1; + this.ppGpDuplex.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpDuplex.Style.BorderRightWidth = 1; + this.ppGpDuplex.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpDuplex.Style.BorderTopWidth = 1; + this.ppGpDuplex.Style.CornerDiameter = 4; + this.ppGpDuplex.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.ppGpDuplex.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.ppGpDuplex.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.ppGpDuplex.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.ppGpDuplex.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ppGpDuplex.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ppGpDuplex.TabIndex = 115; + this.ppGpDuplex.Text = "Duplex Printing"; + // + // tbBlankPage + // + // + // + // + this.tbBlankPage.Border.Class = "TextBoxBorder"; + this.tbBlankPage.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.tbBlankPage.Enabled = false; + this.tbBlankPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbBlankPage.Location = new System.Drawing.Point(85, 47); + this.tbBlankPage.Name = "tbBlankPage"; + this.tbBlankPage.PreventEnterBeep = true; + this.tbBlankPage.Size = new System.Drawing.Size(419, 24); + this.tbBlankPage.TabIndex = 113; + // + // lblBlPg + // + this.lblBlPg.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblBlPg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblBlPg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblBlPg.Location = new System.Drawing.Point(16, 47); + this.lblBlPg.Name = "lblBlPg"; + this.lblBlPg.Size = new System.Drawing.Size(74, 25); + this.lblBlPg.TabIndex = 114; + this.lblBlPg.Text = "Message"; + // // swtbtnPDFdtPrefixSuffix // // // // this.swtbtnPDFdtPrefixSuffix.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnPDFdtPrefixSuffix.Location = new System.Drawing.Point(20, 155); + this.swtbtnPDFdtPrefixSuffix.Location = new System.Drawing.Point(27, 154); + this.swtbtnPDFdtPrefixSuffix.Margin = new System.Windows.Forms.Padding(4); this.swtbtnPDFdtPrefixSuffix.Name = "swtbtnPDFdtPrefixSuffix"; - this.swtbtnPDFdtPrefixSuffix.Size = new System.Drawing.Size(66, 22); + this.swtbtnPDFdtPrefixSuffix.Size = new System.Drawing.Size(88, 27); this.swtbtnPDFdtPrefixSuffix.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnPDFdtPrefixSuffix.SwitchClickTogglesValue = true; this.swtbtnPDFdtPrefixSuffix.TabIndex = 111; @@ -1203,16 +1298,16 @@ namespace VEPROMS // // DlgPrintProcedure // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(1021, 402); + this.ClientSize = new System.Drawing.Size(1361, 567); 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); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "DlgPrintProcedure"; @@ -1232,6 +1327,7 @@ namespace VEPROMS this.panelEx2.ResumeLayout(false); this.panelEx2.PerformLayout(); this.expPrnSetting.ResumeLayout(false); + this.ppGpDuplex.ResumeLayout(false); this.ResumeLayout(false); } @@ -1301,5 +1397,8 @@ namespace VEPROMS private DevComponents.DotNetBar.ExpandablePanel expPrnSetting; private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.Controls.SwitchButton swtbtnPDFdtPrefixSuffix; + private DevComponents.DotNetBar.Controls.TextBoxX tbBlankPage; + private DevComponents.DotNetBar.LabelX lblBlPg; + private DevComponents.DotNetBar.Controls.GroupPanel ppGpDuplex; } } diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index ae66493b..8477a3b7 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -158,7 +158,11 @@ namespace VEPROMS MyProcedure = dvi.Procedures[0].MyProcedure; // B2017-188: Don't allow user to uncheck the checkbox for printing blank pages if procedure has supplemental information // This change was made to each of the DlgPrintProcedure methods. - if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) swtbtnBlankPgsForDuplex.Enabled = false; + if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) + { + swtbtnBlankPgsForDuplex.Enabled = false; + tbBlankPage.Enabled = true; // C2019-004: Allow user to define duplex blank page text (similar changes throughout file are not commented) + } btnCreatePDF.Text = "Create PDFs"; HandleDocVersionSettings(); PrepForAllOrOne(false); @@ -176,8 +180,13 @@ namespace VEPROMS _DocVersionConfig = dvi.DocVersionConfig; _DocVersionInfo = dvi; swtbtnBlankPgsForDuplex.Value = dvi.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts; + tbBlankPage.Enabled = swtbtnBlankPgsForDuplex.Value; MyProcedure = dvi.Procedures[0].MyProcedure; - if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) swtbtnBlankPgsForDuplex.Enabled = false; + if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) + { + swtbtnBlankPgsForDuplex.Enabled = false; + tbBlankPage.Enabled = true; + } btnCreatePDF.Text = "Create PDFs"; HandleDocVersionSettings(); PrepForAllOrOne(false); @@ -221,8 +230,13 @@ namespace VEPROMS _AllProcedures = false; _DocVersionConfig = pi.MyDocVersion.DocVersionConfig; swtbtnBlankPgsForDuplex.Value = pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts; + tbBlankPage.Enabled = swtbtnBlankPgsForDuplex.Value; MyProcedure = pi; - if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) swtbtnBlankPgsForDuplex.Enabled = false; + if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) + { + swtbtnBlankPgsForDuplex.Enabled = false; + tbBlankPage.Enabled = true; + } btnCreatePDF.Text = "Create PDF"; HandleDocVersionSettings(); PrepForAllOrOne(true); @@ -238,8 +252,13 @@ namespace VEPROMS _AllProcedures = false; _DocVersionConfig = pi.MyDocVersion.DocVersionConfig; swtbtnBlankPgsForDuplex.Value = pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts; + tbBlankPage.Enabled = swtbtnBlankPgsForDuplex.Value; MyProcedure = pi; - if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) swtbtnBlankPgsForDuplex.Enabled = false; + if (_MyProcedure != null && _MyProcedure.ProcHasSupInfoData) + { + swtbtnBlankPgsForDuplex.Enabled = false; + tbBlankPage.Enabled = true; + } btnCreatePDF.Text = "Create PDF"; HandleDocVersionSettings(); PrepForAllOrOne(true); @@ -551,7 +570,10 @@ namespace VEPROMS _MyProcedure = value; // if procedure has supplemental information, the automatially check the add blank pages for duplex printing if (_MyProcedure.ProcHasSupInfoData) + { swtbtnBlankPgsForDuplex.Value = true; + tbBlankPage.Enabled = true; + } SetupPrefixSuffixSwitch(); // C2018-033 Enable the switch to control whether to add Prefix and/or Suffix to PDF file name } } @@ -624,7 +646,7 @@ namespace VEPROMS // RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered. frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, myPDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50), - swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true);//C2018-009 print PROMS version + swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text);//C2018-009 print PROMS version frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.CancelStop = true; @@ -650,7 +672,7 @@ namespace VEPROMS // B2016-249 Output Procedure to folder associated with Parent Child frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50), - swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true);//C2018-009 print PROMS version + swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text);//C2018-009 print PROMS version frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.CancelStop = true; @@ -679,7 +701,7 @@ namespace VEPROMS // B2016-249 Output Procedure to folder associated with Parent Child frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, - new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true);//C2018-009 print PROMS version + new Point(Left, Bottom - 50), swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, true, tbBlankPage.Text);//C2018-009 print PROMS version frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.CancelStop = true; @@ -778,8 +800,8 @@ namespace VEPROMS // B2016-249 Output Procedure to folder associated with Parent Child // B2018-124 use text of watermark form drop down list instead of enum value frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNumAndDate, waterMarkText, cbxDebug.Checked, cbxOrPgBrk.Checked, - cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50), - swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic,Prefix,SaveLinks,RemoveTrailingHardReturnsAndManualPageBreaks,swtbtnPROMSVersion.Value, false); //C2018-009 print PROMS version + cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50), + swtbtnBlankPgsForDuplex.Value, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, swtbtnPROMSVersion.Value, false, tbBlankPage.Text); //C2018-009 print PROMS version frmStatus.MakePlaceKeeper = swtbtnGeneratePlacekeeper.Value; frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked; if (Automatic && cbxGenerateConActSum.Checked) @@ -1046,8 +1068,12 @@ namespace VEPROMS BuildPDFFileName(); } - - + // C2019-004: Allow user to define duplex blank page text. The text box for blank page text is always enabled for procedures with + // supplemental information. For other types of procedures, the text box is enabled if duplex printing is turned on. + private void swtbtnBlankPgsForDuplex_ValueChanged(object sender, EventArgs e) + { + tbBlankPage.Enabled = swtbtnBlankPgsForDuplex.Value; + } //private void cbxDebug_CheckedChanged(object sender, EventArgs e) //{ diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index 1c6c7a78..41c2c212 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx @@ -120,15 +120,15 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAScQAA - EnEB89x6jgAAAVlJREFUOE+l088rw2EcwPHPXfEPWGRJLY3QLsr8KDcppRAK7cBlJUVJJHYg37hxp+RA - SZr8ti2MfDczbg40U4vD892++8539fF8Lt81k3rm8Lo8Pe9Pn556ABH/BcJLNoljv6DzAo7u5DAGPK40 - KukPGfX3M0M6do3Ro3kttFAncYUc/JQZsGyPaw/DqN0PZoQcmApP45t7Rgu6atkfJAgt1ivqTTcmPC0Z - 3lZU/Z2oBcdRf9nN2s7Y8jOA8mw1A3nOpqjedozvW7K5qzBx0oCqpw1VX0eOpOzE2ykrg6vJGiWy3oSv - a2VCIhvN6J+oZHA5ZmHp2B5/OHHUgtdZwfToFiYDvUKooRYuRsrZ1/MqJs7tQqihFk4dZpZ6cvFHswqh - hlo4Hihl2t0oKjsmIdRQC4d9JUz19SPbLBJCDbVw0GPiA4ZQ2TYLoYZacHcVSxzLk2R8ivwgfAOkg8se - rIQcQAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAABJxAAAScQHz3HqOAAABWUlE + QVQ4T6XTzyvDYRzA8c9d8Q9YZEktjdAuyvwoNymlEArtwGUlRUkkdiDfuHGn5EBJmvy2LYx8NzNuDjRT + i8Pz3b77znf18Xwu3zWTeubwujw970+fnnoAEf8Fwks2iWO/oPMCju7kMAY8rjQq6Q8Z9fczQzp2jdGj + eS20UCdxhRz8lBmwbI9rD8Oo3Q9mhByYCk/jm3tGC7pq2R8kCC3WK+pNNyY8LRneVlT9nagFx1F/2c3a + ztjyM4DybDUDec6mqN52jO9bsrmrMHHSgKqnDVVfR46k7MTbKSuDq8kaJbLehK9rZUIiG83on6hkcDlm + YenYHn84cdSC11nB9OgWJgO9QqihFi5GytnX8yomzu1CqKEWTh1mlnpy8UezCqGGWjgeKGXa3SgqOyYh + 1FALh30lTPX1I9ssEkINtXDQY+IDhlDZNguhhlpwdxVLHMuTZHyK/CB8A6SDyx6shBxAAAAAAElFTkSu + QmCC diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 23e409a2..498dede9 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -1111,7 +1111,7 @@ namespace VEPROMS //ProcedureInfo myproc = pi; //frmPDFStatusForm frm = new frmPDFStatusForm(myproc, ap.RevNumber, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); //myproc.ChangeBarDate = myDTS; - frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumAndDate, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location, pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts, true,"",false,false,false,MyProcedures.Count > (MyProcedures[0].ProcInfo.MyDocVersion.Procedures.Count/4)); + frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumAndDate, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location, pi.MyDocVersion.DocVersionConfig.Print_AddBlankPagesWhenUsingDuplexFoldouts, true, "", false, false, false, MyProcedures.Count > (MyProcedures[0].ProcInfo.MyDocVersion.Procedures.Count / 4), null); frm.AllowAllWatermarks = true; frm.CloseWhenDone = !ViewPDF; frm.DocReplace = new Dictionary(); // will hold the Word Attachments with resolved ROs diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index da35d707..40628636 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -81,7 +81,7 @@ namespace VEPROMS get { return _DidAll; } set { _DidAll = value; } } - public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd,string pdfFile, Point newLocation,bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, bool removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll) + public frmPDFStatusForm(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd,string pdfFile, Point newLocation,bool insertBlankPages, bool allOrAuto, string prefix, bool saveLinks, bool removeTrailingHardReturnsAndManualPageBreaks, bool showPROMSVer, bool didAll, string blankPageText) { Prefix = prefix; OpenPDF = openPDF; @@ -89,7 +89,7 @@ namespace VEPROMS InitializeComponent(); // if the version number of PROMS is 1.0, then we are running a Demo version. // When running a Demo version, force a "Sample" watermark when printing. - MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile, insertBlankPages, allOrAuto,Prefix,saveLinks,removeTrailingHardReturnsAndManualPageBreaks); + MyPromsPrinter = new PromsPrinter(myItem, rev, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile, insertBlankPages, allOrAuto,Prefix,saveLinks,removeTrailingHardReturnsAndManualPageBreaks, blankPageText); MyPromsPrinter.PromsVersion = (showPROMSVer) ? AboutVEPROMS.PROMSVersion : ""; //C2018-009 print PROMS version PDFPath = pdfPath; this.Text = "Creating PDF of " + myItem.DisplayNumber; diff --git a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.Designer.cs b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.Designer.cs index c27f976c..102e9ec9 100644 --- a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.Designer.cs +++ b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.Designer.cs @@ -53,13 +53,15 @@ namespace PrintMSWord // // menuStrip1 // + this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.pDFToolStripMenuItem, this.pDFsToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(844, 24); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(1125, 28); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -68,50 +70,52 @@ namespace PrintMSWord this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(44, 24); this.fileToolStripMenuItem.Text = "&File"; // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(92, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(108, 26); this.exitToolStripMenuItem.Text = "E&xit"; // // pDFToolStripMenuItem // this.pDFToolStripMenuItem.Name = "pDFToolStripMenuItem"; - this.pDFToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.pDFToolStripMenuItem.Size = new System.Drawing.Size(47, 24); this.pDFToolStripMenuItem.Text = "PDF"; this.pDFToolStripMenuItem.Click += new System.EventHandler(this.pDFToolStripMenuItem_Click); // // pDFsToolStripMenuItem // this.pDFsToolStripMenuItem.Name = "pDFsToolStripMenuItem"; - this.pDFsToolStripMenuItem.Size = new System.Drawing.Size(45, 20); + this.pDFsToolStripMenuItem.Size = new System.Drawing.Size(53, 24); this.pDFsToolStripMenuItem.Text = "PDFs"; this.pDFsToolStripMenuItem.Click += new System.EventHandler(this.pDFsToolStripMenuItem_Click); // // statusStrip1 // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tspbStatus, this.tsslStatus}); - this.statusStrip1.Location = new System.Drawing.Point(0, 315); + this.statusStrip1.Location = new System.Drawing.Point(0, 390); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(844, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.statusStrip1.Size = new System.Drawing.Size(1125, 25); this.statusStrip1.TabIndex = 1; this.statusStrip1.Text = "statusStrip1"; // // tspbStatus // this.tspbStatus.Name = "tspbStatus"; - this.tspbStatus.Size = new System.Drawing.Size(100, 16); + this.tspbStatus.Size = new System.Drawing.Size(133, 20); this.tspbStatus.Visible = false; // // tsslStatus // this.tsslStatus.Name = "tsslStatus"; - this.tsslStatus.Size = new System.Drawing.Size(39, 17); + this.tsslStatus.Size = new System.Drawing.Size(50, 20); this.tsslStatus.Text = "Ready"; // // panel1 @@ -125,9 +129,10 @@ namespace PrintMSWord this.panel1.Controls.Add(this.tbRev); this.panel1.Controls.Add(this.label1); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(485, 24); + this.panel1.Location = new System.Drawing.Point(646, 28); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(359, 291); + this.panel1.Size = new System.Drawing.Size(479, 362); this.panel1.TabIndex = 2; // // cbDebugOutput @@ -135,14 +140,14 @@ namespace PrintMSWord // // // - this.cbDebugOutput.BackgroundStyle.Class = ""; + this.cbDebugOutput.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbDebugOutput.Checked = true; this.cbDebugOutput.CheckState = System.Windows.Forms.CheckState.Checked; this.cbDebugOutput.CheckValue = "Y"; - this.cbDebugOutput.Location = new System.Drawing.Point(8, 32); - this.cbDebugOutput.Margin = new System.Windows.Forms.Padding(2); + this.cbDebugOutput.Location = new System.Drawing.Point(11, 39); + this.cbDebugOutput.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbDebugOutput.Name = "cbDebugOutput"; - this.cbDebugOutput.Size = new System.Drawing.Size(110, 19); + this.cbDebugOutput.Size = new System.Drawing.Size(147, 23); this.cbDebugOutput.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.cbDebugOutput.TabIndex = 9; this.cbDebugOutput.Text = "Debug Output"; @@ -150,22 +155,24 @@ namespace PrintMSWord // tbTimings // this.tbTimings.AcceptsReturn = true; - this.tbTimings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tbTimings.Location = new System.Drawing.Point(0, 56); + this.tbTimings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tbTimings.Location = new System.Drawing.Point(0, 69); + this.tbTimings.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbTimings.Multiline = true; this.tbTimings.Name = "tbTimings"; this.tbTimings.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.tbTimings.Size = new System.Drawing.Size(359, 235); + this.tbTimings.Size = new System.Drawing.Size(477, 292); this.tbTimings.TabIndex = 8; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(180, 32); + this.label3.Location = new System.Drawing.Point(240, 39); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(59, 13); + this.label3.Size = new System.Drawing.Size(77, 17); this.label3.TabIndex = 5; this.label3.Text = "Watermark"; // @@ -179,44 +186,49 @@ namespace PrintMSWord "Sample", "Reference", "Information Only"}); - this.cbWatermark.Location = new System.Drawing.Point(245, 29); + this.cbWatermark.Location = new System.Drawing.Point(327, 36); + this.cbWatermark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cbWatermark.Name = "cbWatermark"; - this.cbWatermark.Size = new System.Drawing.Size(100, 21); + this.cbWatermark.Size = new System.Drawing.Size(132, 24); this.cbWatermark.TabIndex = 4; this.cbWatermark.Text = "(None)"; // // tbRevDate // this.tbRevDate.AcceptsReturn = true; - this.tbRevDate.Location = new System.Drawing.Point(245, 3); + this.tbRevDate.Location = new System.Drawing.Point(327, 4); + this.tbRevDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbRevDate.Name = "tbRevDate"; - this.tbRevDate.Size = new System.Drawing.Size(100, 20); + this.tbRevDate.Size = new System.Drawing.Size(132, 22); this.tbRevDate.TabIndex = 3; this.tbRevDate.Text = "07/27/10"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(180, 6); + this.label2.Location = new System.Drawing.Point(240, 7); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(30, 13); + this.label2.Size = new System.Drawing.Size(38, 17); this.label2.TabIndex = 2; this.label2.Text = "Date"; // // tbRev // - this.tbRev.Location = new System.Drawing.Point(71, 3); + this.tbRev.Location = new System.Drawing.Point(95, 4); + this.tbRev.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tbRev.Name = "tbRev"; - this.tbRev.Size = new System.Drawing.Size(100, 20); + this.tbRev.Size = new System.Drawing.Size(132, 22); this.tbRev.TabIndex = 1; this.tbRev.Text = "25"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(6, 6); + this.label1.Location = new System.Drawing.Point(8, 7); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(27, 13); + this.label1.Size = new System.Drawing.Size(33, 17); this.label1.TabIndex = 0; this.label1.Text = "Rev"; // @@ -224,22 +236,25 @@ namespace PrintMSWord // this.lbProcs.Dock = System.Windows.Forms.DockStyle.Fill; this.lbProcs.FormattingEnabled = true; - this.lbProcs.Location = new System.Drawing.Point(0, 24); + this.lbProcs.ItemHeight = 16; + this.lbProcs.Location = new System.Drawing.Point(0, 28); + this.lbProcs.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lbProcs.Name = "lbProcs"; - this.lbProcs.Size = new System.Drawing.Size(485, 290); + this.lbProcs.Size = new System.Drawing.Size(646, 362); this.lbProcs.TabIndex = 3; this.lbProcs.DoubleClick += new System.EventHandler(this.lbProcs_DoubleClick); // // frmPrintMSWord // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(844, 337); + this.ClientSize = new System.Drawing.Size(1125, 415); this.Controls.Add(this.lbProcs); this.Controls.Add(this.panel1); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.menuStrip1); this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "frmPrintMSWord"; this.Text = "PrintMSWord"; this.Load += new System.EventHandler(this.frmPrintMSWord_Load); diff --git a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs index f3b0270d..2ba87b00 100644 --- a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs +++ b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs @@ -87,7 +87,7 @@ namespace PrintMSWord changeBarData.ChangeBarMessage == "None" ? PrintChangeBarText.None : changeBarData.ChangeBarMessage == "RevNum" ? PrintChangeBarText.RevNum : PrintChangeBarText.UserDef; PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, cbWatermark.Text, cbDebugOutput.Checked, false, @"C:\TEMP\32Bit\Compare", openPdf, true, cbd, - myProcedure.DisplayNumber.Replace('/','_').Replace('\\','_'),false,false,"",false,false); + myProcedure.DisplayNumber.Replace('/','_').Replace('\\','_'),false,false,"",false,false,null); pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); _ElapsedTime = new Dictionary(); DateTime tStart = DateTime.Now; diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index b0062e40..259d673f 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -253,8 +253,15 @@ namespace Volian.Print.Library get { return _MyReaderHelper; } set { _MyReaderHelper = value; } } + private string _BlankPageText; // C2019-004: Allow user to define duplex blank page text + public string BlankPageText + { + get { return _BlankPageText; } + set { _BlankPageText = value; } + } + public PromsPrinter(ItemInfo myItem, string rev, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, - ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, bool removeTrailngHardReturnsAndManualPageBreaks) + ChangeBarDefinition cbd, String pdfFile, bool insertBlankPages, bool batchPrint, string prefix, bool saveLinks, bool removeTrailngHardReturnsAndManualPageBreaks, string blankPageText) { Prefix = prefix; // RHM20150506 Multiline ItemID TextBox _MyItem = myItem; @@ -272,6 +279,7 @@ namespace Volian.Print.Library _MyReaderHelper = new ReaderHelper(this); _SaveLinks = saveLinks; _RemoveTrailingHardReturnsAndManualPageBreaks = removeTrailngHardReturnsAndManualPageBreaks; + _BlankPageText = blankPageText; //_MyReaderHelper.LoadTree(myItem); } // Pass 1 PDF Name @@ -946,7 +954,8 @@ namespace Volian.Print.Library _MyHelper.MySvg = null; while (cb.PdfWriter.CurrentPageNumber <= _MyHelper.BackgroundPageCount) { - PrintTextMessage(cb, "No Proms Output", _TextLayer); + iTextSharp.text.Font font = FontFactory.GetFont("Arial", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, 30, iTextSharp.text.Font.NORMAL, new iTextSharp.text.Color(PrintOverride.TextColor)); + PrintTextMessage(cb, "No Proms Output", _TextLayer, font); NewPage(); //_MyLog.InfoFormat("NewPage 2 {0}", cb.PdfWriter.CurrentPageNumber); if (DebugPagination.IsOpen) DebugPagination.WriteLine("{0:D6},'{1}'", @@ -990,7 +999,15 @@ namespace Volian.Print.Library public void InsertBlankPage(PdfContentByte cb) { _MyHelper.OnBlankPage = true; - cb.PdfDocument.Add(new iTextSharp.text.Table(1)); + if (_BlankPageText != null && _BlankPageText != "") // C2019-004: Allow user to define duplex blank page text + { + string bsfontfamily = MyItem.ActiveFormat.PlantFormat.FormatData.StepDataList[0].Font.Family; + int bsfontsize = 26; + iTextSharp.text.Font font = FontFactory.GetFont(bsfontfamily, BaseFont.IDENTITY_H, BaseFont.EMBEDDED, bsfontsize, iTextSharp.text.Font.NORMAL, new iTextSharp.text.Color(PrintOverride.TextColor)); + PrintTextMessage(cb, _BlankPageText, _TextLayer, font); + } + else + cb.PdfDocument.Add(new iTextSharp.text.Table(1)); NewPage(); Volian.Base.Library.BaselineMetaFile.WriteLine("==Insert Blank Page=="); } @@ -1654,15 +1671,15 @@ namespace Volian.Print.Library // PdfTemplate tmp = _MyHelper.MyTOCPageCounts.AddToTemplateList(key, _MyHelper.MyPdfWriter, "{TOCPAGE}", tOfC.Font.WindowsFont, Element.ALIGN_LEFT, PrintOverride.TextColor); // _MyHelper.MyPdfContentByte.AddTemplate(tmp, leftMargin + secPagePos, (yPageStartAdj - yLocation) - height / 2); //} - private static void PrintTextMessage(PdfContentByte cb, string message, PdfLayer textLayer) + private static void PrintTextMessage(PdfContentByte cb, string message, PdfLayer textLayer, iTextSharp.text.Font font) { if (textLayer != null) cb.BeginLayer(textLayer); - float fontSize = 30; + float fontSize = font.Size; ColumnText ct = new ColumnText(cb); - iTextSharp.text.Font font = FontFactory.GetFont("Arial", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, fontSize,iTextSharp.text.Font.NORMAL, new iTextSharp.text.Color(PrintOverride.TextColor)); + //iTextSharp.text.Font font = FontFactory.GetFont("Arial", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, fontSize,iTextSharp.text.Font.NORMAL, new iTextSharp.text.Color(PrintOverride.TextColor)); Chunk chk = new Chunk(message, font); float xCenter = cb.PdfDocument.PageSize.Width / 2; - float yCenter = cb.PdfDocument.PageSize.Height / 2; + float yCenter = cb.PdfDocument.PageSize.Height / 2; // 1.8f; float width = chk.GetWidthPoint() * 1.01F; float height = fontSize * 1.5F; ct.SetSimpleColumn(xCenter - width / 2, yCenter - height / 2, xCenter + width / 2, yCenter + height / 2); @@ -1739,9 +1756,12 @@ namespace Volian.Print.Library else if (!myItemInfo.MyDocStyle.OptionalSectionContent) { SectionInfo si = myItemInfo.ActiveSection as SectionInfo; - if(si.IsSeparatePagination()) // Don't output this message for continuous sections + if (si.IsSeparatePagination()) // Don't output this message for continuous sections + { // This was causing overlap of this message with previous sections - PrintTextMessage(cb, "No Section Content", _TextLayer); + iTextSharp.text.Font font = FontFactory.GetFont("Arial", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, 30, iTextSharp.text.Font.NORMAL, new iTextSharp.text.Color(PrintOverride.TextColor)); + PrintTextMessage(cb, "No Section Content", _TextLayer, font); + } } SectionConfig.SectionPagination sp = SectionConfig.SectionPagination.Separate; // always the default ItemInfo nxtItem = section.NextItem; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 7fca9041..053690d4 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1810,9 +1810,7 @@ namespace Volian.Print.Library } else { - MyPageHelper.OnBlankPage = true; - cb.PdfDocument.Add(new iTextSharp.text.Table(1)); - MyPromsPrinter.NewPage(); + MyPromsPrinter.InsertBlankPage(cb); // C2019-004: Allow user to define duplex blank page text } } if (MyItemInfo.MyDocStyle.LandscapePageList)