From ed2fcf39e1fd3ec32ac184e1f83cb57a7508b5e9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 20 Jun 2012 16:06:55 +0000 Subject: [PATCH] changes for comparing PROMS generated PDFs with PROMS generated PDFs Added checkbox to compare PROMS generated PDFs with PROMS generated PDFs Logic to support the comparing of PROMS generated PDFs with PROMS generated PDFs --- .../DlgPrintProcedure.Designer.cs | 324 ++++++++++-------- .../DlgPrintProcedure.cs | 9 +- .../dlgApproveProcedure.cs | 2 +- .../frmPDFStatusForm.cs | 4 +- PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs | 2 +- PROMS/Volian.Base.Library/VlnSettings.cs | 11 + PROMS/Volian.Print.Library/PromsPrinter.cs | 14 +- 7 files changed, 207 insertions(+), 159 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 75036ed0..a5493e11 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -87,6 +87,7 @@ namespace VEPROMS this.cbxDebug = new System.Windows.Forms.CheckBox(); this.cbxOrPgBrk = new System.Windows.Forms.CheckBox(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); + this.cbxCmpPRMSpfd = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); @@ -110,12 +111,12 @@ namespace VEPROMS this.tabControl1.Controls.Add(this.tabControlPanel3); this.tabControl1.Controls.Add(this.tabControlPanel1); this.tabControl1.Controls.Add(this.tabControlPanel2); - this.tabControl1.Location = new System.Drawing.Point(3, 0); - this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControl1.Location = new System.Drawing.Point(2, 0); + this.tabControl1.Margin = new System.Windows.Forms.Padding(2); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tabControl1.SelectedTabIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(733, 331); + this.tabControl1.Size = new System.Drawing.Size(550, 269); this.tabControl1.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabControl1.TabIndex = 0; this.tabControl1.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -142,11 +143,11 @@ namespace VEPROMS this.tabControlPanel3.Controls.Add(this.lblPDFFileName); this.tabControlPanel3.Controls.Add(this.lblPDFLoc); this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 24); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel3.Location = new System.Drawing.Point(0, 22); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(733, 307); + this.tabControlPanel3.Size = new System.Drawing.Size(550, 247); this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -164,10 +165,10 @@ namespace VEPROMS this.gpnlDebug.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.gpnlDebug.Controls.Add(this.cbxDebugText); this.gpnlDebug.Controls.Add(this.cbxDebugPagination); - this.gpnlDebug.Location = new System.Drawing.Point(535, 92); - this.gpnlDebug.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gpnlDebug.Location = new System.Drawing.Point(401, 75); + this.gpnlDebug.Margin = new System.Windows.Forms.Padding(2); this.gpnlDebug.Name = "gpnlDebug"; - this.gpnlDebug.Size = new System.Drawing.Size(120, 91); + this.gpnlDebug.Size = new System.Drawing.Size(90, 74); // // // @@ -203,10 +204,10 @@ namespace VEPROMS // this.cbxDebugText.AutoSize = true; this.cbxDebugText.BackColor = System.Drawing.Color.Transparent; - this.cbxDebugText.Location = new System.Drawing.Point(11, 37); - this.cbxDebugText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxDebugText.Location = new System.Drawing.Point(8, 30); + this.cbxDebugText.Margin = new System.Windows.Forms.Padding(2); this.cbxDebugText.Name = "cbxDebugText"; - this.cbxDebugText.Size = new System.Drawing.Size(57, 21); + this.cbxDebugText.Size = new System.Drawing.Size(47, 17); this.cbxDebugText.TabIndex = 1; this.cbxDebugText.Text = "Text"; this.cbxDebugText.UseVisualStyleBackColor = false; @@ -215,10 +216,10 @@ namespace VEPROMS // this.cbxDebugPagination.AutoSize = true; this.cbxDebugPagination.BackColor = System.Drawing.Color.Transparent; - this.cbxDebugPagination.Location = new System.Drawing.Point(12, 9); - this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxDebugPagination.Location = new System.Drawing.Point(9, 7); + this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(2); this.cbxDebugPagination.Name = "cbxDebugPagination"; - this.cbxDebugPagination.Size = new System.Drawing.Size(97, 21); + this.cbxDebugPagination.Size = new System.Drawing.Size(76, 17); this.cbxDebugPagination.TabIndex = 0; this.cbxDebugPagination.Text = "Pagination"; this.cbxDebugPagination.UseVisualStyleBackColor = false; @@ -229,10 +230,10 @@ namespace VEPROMS this.grpDateSelector.CanvasColor = System.Drawing.SystemColors.Control; this.grpDateSelector.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpDateSelector.Controls.Add(this.calDateSelector); - this.grpDateSelector.Location = new System.Drawing.Point(263, 92); - this.grpDateSelector.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.grpDateSelector.Location = new System.Drawing.Point(197, 75); + this.grpDateSelector.Margin = new System.Windows.Forms.Padding(2); this.grpDateSelector.Name = "grpDateSelector"; - this.grpDateSelector.Size = new System.Drawing.Size(260, 190); + this.grpDateSelector.Size = new System.Drawing.Size(195, 154); // // // @@ -289,8 +290,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(13, 2); - this.calDateSelector.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.calDateSelector.Location = new System.Drawing.Point(10, 2); + this.calDateSelector.Margin = new System.Windows.Forms.Padding(2); this.calDateSelector.MarkedDates = new System.DateTime[0]; this.calDateSelector.MonthlyMarkedDates = new System.DateTime[0]; this.calDateSelector.Name = "calDateSelector"; @@ -315,10 +316,10 @@ namespace VEPROMS // this.txbReviewDate.Border.Class = "TextBoxBorder"; this.txbReviewDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbReviewDate.Location = new System.Drawing.Point(136, 172); - this.txbReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbReviewDate.Location = new System.Drawing.Point(102, 140); + this.txbReviewDate.Margin = new System.Windows.Forms.Padding(2); this.txbReviewDate.Name = "txbReviewDate"; - this.txbReviewDate.Size = new System.Drawing.Size(121, 26); + this.txbReviewDate.Size = new System.Drawing.Size(91, 20); this.txbReviewDate.TabIndex = 83; this.txbReviewDate.Leave += new System.EventHandler(this.txbReviewDate_Leave); this.txbReviewDate.Enter += new System.EventHandler(this.txbReviewDate_Enter); @@ -330,10 +331,10 @@ namespace VEPROMS // this.txbRevDate.Border.Class = "TextBoxBorder"; this.txbRevDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbRevDate.Location = new System.Drawing.Point(136, 132); - this.txbRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbRevDate.Location = new System.Drawing.Point(102, 107); + this.txbRevDate.Margin = new System.Windows.Forms.Padding(2); this.txbRevDate.Name = "txbRevDate"; - this.txbRevDate.Size = new System.Drawing.Size(121, 26); + this.txbRevDate.Size = new System.Drawing.Size(91, 20); this.txbRevDate.TabIndex = 82; this.txbRevDate.Leave += new System.EventHandler(this.txbRevDate_Leave); this.txbRevDate.Enter += new System.EventHandler(this.txbRevDate_Enter); @@ -348,11 +349,11 @@ namespace VEPROMS this.txbPDFLocation.Border.Class = "TextBoxBorder"; this.txbPDFLocation.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbPDFLocation.Enabled = false; - this.txbPDFLocation.Location = new System.Drawing.Point(136, 10); - this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbPDFLocation.Location = new System.Drawing.Point(102, 8); + this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(2); this.txbPDFLocation.Name = "txbPDFLocation"; this.txbPDFLocation.ShortcutsEnabled = false; - this.txbPDFLocation.Size = new System.Drawing.Size(581, 26); + this.txbPDFLocation.Size = new System.Drawing.Size(436, 20); this.txbPDFLocation.TabIndex = 81; this.txbPDFLocation.WatermarkText = "PDF Location"; this.txbPDFLocation.Leave += new System.EventHandler(this.txbPDFLocation_Leave); @@ -363,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", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(9, 271); - this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(7, 220); + this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(2); this.cbxOpenAfterCreate2.Name = "cbxOpenAfterCreate2"; - this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(177, 22); + this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(145, 19); this.cbxOpenAfterCreate2.TabIndex = 80; this.cbxOpenAfterCreate2.Text = "View PDF After Create"; this.cbxOpenAfterCreate2.UseVisualStyleBackColor = false; @@ -383,10 +384,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", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxOverwritePDF2.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxOverwritePDF2.Location = new System.Drawing.Point(535, 48); - this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxOverwritePDF2.Location = new System.Drawing.Point(390, 39); + this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(2); this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; - this.cbxOverwritePDF2.Size = new System.Drawing.Size(154, 22); + this.cbxOverwritePDF2.Size = new System.Drawing.Size(127, 19); this.cbxOverwritePDF2.TabIndex = 79; this.cbxOverwritePDF2.Text = "Overwrite PDF File"; this.cbxOverwritePDF2.UseVisualStyleBackColor = false; @@ -398,10 +399,10 @@ namespace VEPROMS // this.txbRevNum.Border.Class = "TextBoxBorder"; this.txbRevNum.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbRevNum.Location = new System.Drawing.Point(136, 92); - this.txbRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbRevNum.Location = new System.Drawing.Point(102, 75); + this.txbRevNum.Margin = new System.Windows.Forms.Padding(2); this.txbRevNum.Name = "txbRevNum"; - this.txbRevNum.Size = new System.Drawing.Size(121, 26); + this.txbRevNum.Size = new System.Drawing.Size(91, 20); this.txbRevNum.TabIndex = 73; this.txbRevNum.Leave += new System.EventHandler(this.txbRevNum_Leave); // @@ -413,10 +414,10 @@ namespace VEPROMS // this.lblReviewDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblReviewDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblReviewDate.Location = new System.Drawing.Point(9, 172); - this.lblReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblReviewDate.Location = new System.Drawing.Point(7, 140); + this.lblReviewDate.Margin = new System.Windows.Forms.Padding(2); this.lblReviewDate.Name = "lblReviewDate"; - this.lblReviewDate.Size = new System.Drawing.Size(115, 23); + this.lblReviewDate.Size = new System.Drawing.Size(86, 19); this.lblReviewDate.TabIndex = 72; this.lblReviewDate.Text = "Review Date"; this.lblReviewDate.TextAlignment = System.Drawing.StringAlignment.Far; @@ -429,10 +430,10 @@ namespace VEPROMS // this.lblRevDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblRevDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblRevDate.Location = new System.Drawing.Point(9, 132); - this.lblRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblRevDate.Location = new System.Drawing.Point(7, 107); + this.lblRevDate.Margin = new System.Windows.Forms.Padding(2); this.lblRevDate.Name = "lblRevDate"; - this.lblRevDate.Size = new System.Drawing.Size(115, 23); + this.lblRevDate.Size = new System.Drawing.Size(86, 19); this.lblRevDate.TabIndex = 71; this.lblRevDate.Text = "Revision Date"; this.lblRevDate.TextAlignment = System.Drawing.StringAlignment.Far; @@ -445,10 +446,10 @@ namespace VEPROMS // this.lblRevNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblRevNum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblRevNum.Location = new System.Drawing.Point(9, 92); - this.lblRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblRevNum.Location = new System.Drawing.Point(7, 75); + this.lblRevNum.Margin = new System.Windows.Forms.Padding(2); this.lblRevNum.Name = "lblRevNum"; - this.lblRevNum.Size = new System.Drawing.Size(115, 23); + this.lblRevNum.Size = new System.Drawing.Size(86, 19); this.lblRevNum.TabIndex = 70; this.lblRevNum.Text = "Revision Number"; this.lblRevNum.TextAlignment = System.Drawing.StringAlignment.Far; @@ -462,10 +463,9 @@ namespace VEPROMS // this.txbPDFName.Border.Class = "TextBoxBorder"; this.txbPDFName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbPDFName.Location = new System.Drawing.Point(136, 48); - this.txbPDFName.Margin = new System.Windows.Forms.Padding(4); + this.txbPDFName.Location = new System.Drawing.Point(102, 39); this.txbPDFName.Name = "txbPDFName"; - this.txbPDFName.Size = new System.Drawing.Size(327, 26); + this.txbPDFName.Size = new System.Drawing.Size(245, 20); this.txbPDFName.TabIndex = 8; // // lblPDFFileName @@ -476,10 +476,9 @@ namespace VEPROMS // this.lblPDFFileName.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPDFFileName.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPDFFileName.Location = new System.Drawing.Point(9, 42); - this.lblPDFFileName.Margin = new System.Windows.Forms.Padding(4); + this.lblPDFFileName.Location = new System.Drawing.Point(7, 34); this.lblPDFFileName.Name = "lblPDFFileName"; - this.lblPDFFileName.Size = new System.Drawing.Size(115, 23); + this.lblPDFFileName.Size = new System.Drawing.Size(86, 19); this.lblPDFFileName.TabIndex = 7; this.lblPDFFileName.Text = "PDF Name"; this.lblPDFFileName.TextAlignment = System.Drawing.StringAlignment.Far; @@ -492,10 +491,10 @@ namespace VEPROMS // this.lblPDFLoc.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPDFLoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPDFLoc.Location = new System.Drawing.Point(9, 4); - this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblPDFLoc.Location = new System.Drawing.Point(7, 3); + this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(2); this.lblPDFLoc.Name = "lblPDFLoc"; - this.lblPDFLoc.Size = new System.Drawing.Size(115, 23); + this.lblPDFLoc.Size = new System.Drawing.Size(86, 19); this.lblPDFLoc.TabIndex = 4; this.lblPDFLoc.Text = "PDF Location"; this.lblPDFLoc.TextAlignment = System.Drawing.StringAlignment.Far; @@ -522,11 +521,11 @@ namespace VEPROMS this.tabControlPanel1.Controls.Add(this.lblChgBars); this.tabControlPanel1.Controls.Add(this.btnChgBarOn); this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 24); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(733, 307); + this.tabControlPanel1.Size = new System.Drawing.Size(550, 247); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -545,10 +544,10 @@ namespace VEPROMS // this.lblWatermarkS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblWatermarkS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblWatermarkS.Location = new System.Drawing.Point(40, 103); - this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblWatermarkS.Location = new System.Drawing.Point(30, 84); + this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(2); this.lblWatermarkS.Name = "lblWatermarkS"; - this.lblWatermarkS.Size = new System.Drawing.Size(115, 23); + this.lblWatermarkS.Size = new System.Drawing.Size(86, 19); this.lblWatermarkS.TabIndex = 106; this.lblWatermarkS.Text = "Watermark"; this.lblWatermarkS.TextAlignment = System.Drawing.StringAlignment.Far; @@ -562,11 +561,11 @@ namespace VEPROMS // this.txbPdfLocationS.Border.Class = "TextBoxBorder"; this.txbPdfLocationS.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbPdfLocationS.Location = new System.Drawing.Point(125, 4); - this.txbPdfLocationS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbPdfLocationS.Location = new System.Drawing.Point(94, 3); + this.txbPdfLocationS.Margin = new System.Windows.Forms.Padding(2); this.txbPdfLocationS.Name = "txbPdfLocationS"; this.txbPdfLocationS.ShortcutsEnabled = false; - this.txbPdfLocationS.Size = new System.Drawing.Size(561, 26); + this.txbPdfLocationS.Size = new System.Drawing.Size(421, 20); this.txbPdfLocationS.TabIndex = 98; this.txbPdfLocationS.WatermarkText = "PDF Location"; // @@ -577,10 +576,9 @@ namespace VEPROMS this.btnPdfLocation.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnPdfLocation.FocusOnLeftMouseButtonDown = true; this.btnPdfLocation.Image = ((System.Drawing.Image)(resources.GetObject("btnPdfLocation.Image"))); - this.btnPdfLocation.Location = new System.Drawing.Point(692, 4); - this.btnPdfLocation.Margin = new System.Windows.Forms.Padding(4); + this.btnPdfLocation.Location = new System.Drawing.Point(519, 3); this.btnPdfLocation.Name = "btnPdfLocation"; - this.btnPdfLocation.Size = new System.Drawing.Size(27, 23); + this.btnPdfLocation.Size = new System.Drawing.Size(20, 19); this.btnPdfLocation.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnPdfLocation.TabIndex = 99; this.btnPdfLocation.Click += new System.EventHandler(this.btnPdfLocation_Click); @@ -593,10 +591,10 @@ namespace VEPROMS // this.lblPdfLocS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPdfLocS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPdfLocS.Location = new System.Drawing.Point(9, 4); - this.lblPdfLocS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblPdfLocS.Location = new System.Drawing.Point(7, 3); + this.lblPdfLocS.Margin = new System.Windows.Forms.Padding(2); this.lblPdfLocS.Name = "lblPdfLocS"; - this.lblPdfLocS.Size = new System.Drawing.Size(115, 23); + this.lblPdfLocS.Size = new System.Drawing.Size(86, 19); this.lblPdfLocS.TabIndex = 97; this.lblPdfLocS.Text = "PDF Location"; this.lblPdfLocS.TextAlignment = System.Drawing.StringAlignment.Far; @@ -607,10 +605,10 @@ namespace VEPROMS this.btnWaterMarkOff.Checked = true; this.btnWaterMarkOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnWaterMarkOff.FocusOnLeftMouseButtonDown = true; - this.btnWaterMarkOff.Location = new System.Drawing.Point(219, 103); - this.btnWaterMarkOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnWaterMarkOff.Location = new System.Drawing.Point(164, 84); + this.btnWaterMarkOff.Margin = new System.Windows.Forms.Padding(2); this.btnWaterMarkOff.Name = "btnWaterMarkOff"; - this.btnWaterMarkOff.Size = new System.Drawing.Size(45, 23); + this.btnWaterMarkOff.Size = new System.Drawing.Size(34, 19); this.btnWaterMarkOff.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnWaterMarkOff.TabIndex = 93; this.btnWaterMarkOff.Text = "OFF"; @@ -622,10 +620,10 @@ namespace VEPROMS this.btnChgBarOff.Checked = true; this.btnChgBarOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnChgBarOff.FocusOnLeftMouseButtonDown = true; - this.btnChgBarOff.Location = new System.Drawing.Point(219, 71); - this.btnChgBarOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnChgBarOff.Location = new System.Drawing.Point(164, 58); + this.btnChgBarOff.Margin = new System.Windows.Forms.Padding(2); this.btnChgBarOff.Name = "btnChgBarOff"; - this.btnChgBarOff.Size = new System.Drawing.Size(45, 23); + this.btnChgBarOff.Size = new System.Drawing.Size(34, 19); this.btnChgBarOff.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnChgBarOff.TabIndex = 92; this.btnChgBarOff.Text = "OFF"; @@ -637,10 +635,10 @@ namespace VEPROMS this.btnDuplxOff.Checked = true; this.btnDuplxOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnDuplxOff.FocusOnLeftMouseButtonDown = true; - this.btnDuplxOff.Location = new System.Drawing.Point(219, 137); - this.btnDuplxOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnDuplxOff.Location = new System.Drawing.Point(164, 111); + this.btnDuplxOff.Margin = new System.Windows.Forms.Padding(2); this.btnDuplxOff.Name = "btnDuplxOff"; - this.btnDuplxOff.Size = new System.Drawing.Size(44, 23); + this.btnDuplxOff.Size = new System.Drawing.Size(33, 19); this.btnDuplxOff.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnDuplxOff.TabIndex = 91; this.btnDuplxOff.Text = "OFF"; @@ -654,10 +652,10 @@ namespace VEPROMS // this.lblAutoDuplexing.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblAutoDuplexing.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAutoDuplexing.Location = new System.Drawing.Point(40, 137); - this.lblAutoDuplexing.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblAutoDuplexing.Location = new System.Drawing.Point(30, 111); + this.lblAutoDuplexing.Margin = new System.Windows.Forms.Padding(2); this.lblAutoDuplexing.Name = "lblAutoDuplexing"; - this.lblAutoDuplexing.Size = new System.Drawing.Size(115, 23); + this.lblAutoDuplexing.Size = new System.Drawing.Size(86, 19); this.lblAutoDuplexing.TabIndex = 90; this.lblAutoDuplexing.Text = "Auto Duplexing"; this.lblAutoDuplexing.TextAlignment = System.Drawing.StringAlignment.Far; @@ -667,10 +665,10 @@ namespace VEPROMS this.btnDuplxOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnDuplxOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnDuplxOn.FocusOnLeftMouseButtonDown = true; - this.btnDuplxOn.Location = new System.Drawing.Point(164, 137); - this.btnDuplxOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnDuplxOn.Location = new System.Drawing.Point(123, 111); + this.btnDuplxOn.Margin = new System.Windows.Forms.Padding(2); this.btnDuplxOn.Name = "btnDuplxOn"; - this.btnDuplxOn.Size = new System.Drawing.Size(45, 23); + this.btnDuplxOn.Size = new System.Drawing.Size(34, 19); this.btnDuplxOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnDuplxOn.TabIndex = 89; this.btnDuplxOn.Text = "ON"; @@ -681,10 +679,10 @@ namespace VEPROMS this.btnWaterMarkOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnWaterMarkOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnWaterMarkOn.FocusOnLeftMouseButtonDown = true; - this.btnWaterMarkOn.Location = new System.Drawing.Point(164, 103); - this.btnWaterMarkOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnWaterMarkOn.Location = new System.Drawing.Point(123, 84); + this.btnWaterMarkOn.Margin = new System.Windows.Forms.Padding(2); this.btnWaterMarkOn.Name = "btnWaterMarkOn"; - this.btnWaterMarkOn.Size = new System.Drawing.Size(45, 23); + this.btnWaterMarkOn.Size = new System.Drawing.Size(34, 19); this.btnWaterMarkOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnWaterMarkOn.TabIndex = 88; this.btnWaterMarkOn.Text = "ON"; @@ -697,10 +695,10 @@ namespace VEPROMS this.cbxWaterMark.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.cbxWaterMark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbxWaterMark.FormattingEnabled = true; - this.cbxWaterMark.Location = new System.Drawing.Point(269, 103); - this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxWaterMark.Location = new System.Drawing.Point(202, 84); + this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(2); this.cbxWaterMark.Name = "cbxWaterMark"; - this.cbxWaterMark.Size = new System.Drawing.Size(183, 23); + this.cbxWaterMark.Size = new System.Drawing.Size(138, 21); this.cbxWaterMark.TabIndex = 87; 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))); @@ -714,10 +712,10 @@ namespace VEPROMS // this.lblChgBars.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblChgBars.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblChgBars.Location = new System.Drawing.Point(40, 71); - this.lblChgBars.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblChgBars.Location = new System.Drawing.Point(30, 58); + this.lblChgBars.Margin = new System.Windows.Forms.Padding(2); this.lblChgBars.Name = "lblChgBars"; - this.lblChgBars.Size = new System.Drawing.Size(115, 23); + this.lblChgBars.Size = new System.Drawing.Size(86, 19); this.lblChgBars.TabIndex = 85; this.lblChgBars.Text = "Change Bars"; this.lblChgBars.TextAlignment = System.Drawing.StringAlignment.Far; @@ -727,10 +725,10 @@ namespace VEPROMS this.btnChgBarOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnChgBarOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnChgBarOn.FocusOnLeftMouseButtonDown = true; - this.btnChgBarOn.Location = new System.Drawing.Point(164, 71); - this.btnChgBarOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnChgBarOn.Location = new System.Drawing.Point(123, 58); + this.btnChgBarOn.Margin = new System.Windows.Forms.Padding(2); this.btnChgBarOn.Name = "btnChgBarOn"; - this.btnChgBarOn.Size = new System.Drawing.Size(45, 23); + this.btnChgBarOn.Size = new System.Drawing.Size(34, 19); this.btnChgBarOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnChgBarOn.TabIndex = 84; this.btnChgBarOn.Text = "ON"; @@ -748,11 +746,11 @@ namespace VEPROMS this.tabControlPanel2.Controls.Add(this.ppGpbxCBType); this.tabControlPanel2.Controls.Add(this.ppGpbxUserSpecCB); this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 24); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel2.Location = new System.Drawing.Point(0, 22); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(733, 307); + this.tabControlPanel2.Size = new System.Drawing.Size(550, 247); this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -770,10 +768,10 @@ namespace VEPROMS this.ppGpbxCBType.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.ppGpbxCBType.Controls.Add(this.rbCustom); this.ppGpbxCBType.Controls.Add(this.rbFormatDefault); - this.ppGpbxCBType.Location = new System.Drawing.Point(55, 12); - this.ppGpbxCBType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppGpbxCBType.Location = new System.Drawing.Point(41, 10); + this.ppGpbxCBType.Margin = new System.Windows.Forms.Padding(2); this.ppGpbxCBType.Name = "ppGpbxCBType"; - this.ppGpbxCBType.Size = new System.Drawing.Size(568, 55); + this.ppGpbxCBType.Size = new System.Drawing.Size(426, 45); // // // @@ -808,10 +806,10 @@ namespace VEPROMS // rbCustom // this.rbCustom.AutoSize = true; - this.rbCustom.Location = new System.Drawing.Point(263, 5); - this.rbCustom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.rbCustom.Location = new System.Drawing.Point(197, 4); + this.rbCustom.Margin = new System.Windows.Forms.Padding(2); this.rbCustom.Name = "rbCustom"; - this.rbCustom.Size = new System.Drawing.Size(186, 21); + this.rbCustom.Size = new System.Drawing.Size(143, 17); this.rbCustom.TabIndex = 1; this.rbCustom.TabStop = true; this.rbCustom.Text = "Custom Change Bar Text"; @@ -821,10 +819,10 @@ namespace VEPROMS // rbFormatDefault // this.rbFormatDefault.AutoSize = true; - this.rbFormatDefault.Location = new System.Drawing.Point(35, 5); - this.rbFormatDefault.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.rbFormatDefault.Location = new System.Drawing.Point(26, 4); + this.rbFormatDefault.Margin = new System.Windows.Forms.Padding(2); this.rbFormatDefault.Name = "rbFormatDefault"; - this.rbFormatDefault.Size = new System.Drawing.Size(122, 21); + this.rbFormatDefault.Size = new System.Drawing.Size(94, 17); this.rbFormatDefault.TabIndex = 0; this.rbFormatDefault.TabStop = true; this.rbFormatDefault.Text = "Format Default"; @@ -842,10 +840,10 @@ namespace VEPROMS this.ppGpbxUserSpecCB.Controls.Add(this.label12); this.ppGpbxUserSpecCB.Controls.Add(this.ppCmbxChgBarTxtType); this.ppGpbxUserSpecCB.Controls.Add(this.label13); - this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(55, 84); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(41, 68); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; - this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(568, 160); + this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(426, 130); // // // @@ -885,10 +883,10 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.Controls.Add(this.ppTxbxChangeBarUserMsgTwo); this.ppGpbxUserSpecTxt.Controls.Add(this.label15); this.ppGpbxUserSpecTxt.Controls.Add(this.ppTxbxChangeBarUserMsgOne); - this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(323, 17); - this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(242, 14); + this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2); this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt"; - this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(211, 105); + this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(158, 85); // // // @@ -923,40 +921,42 @@ namespace VEPROMS // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(45, 14); + this.label14.Location = new System.Drawing.Point(34, 11); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(63, 17); + this.label14.Size = new System.Drawing.Size(48, 13); 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(119, 47); - this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(89, 38); + this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(2); this.ppTxbxChangeBarUserMsgTwo.Multiline = false; this.ppTxbxChangeBarUserMsgTwo.Name = "ppTxbxChangeBarUserMsgTwo"; - this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(57, 24); + this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(44, 20); this.ppTxbxChangeBarUserMsgTwo.TabIndex = 2; this.ppTxbxChangeBarUserMsgTwo.Text = ""; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(49, 50); + this.label15.Location = new System.Drawing.Point(37, 41); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(60, 17); + this.label15.Size = new System.Drawing.Size(47, 13); 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(119, 11); - this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(89, 9); + this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(2); this.ppTxbxChangeBarUserMsgOne.Multiline = false; this.ppTxbxChangeBarUserMsgOne.Name = "ppTxbxChangeBarUserMsgOne"; - this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(57, 24); + this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(44, 20); this.ppTxbxChangeBarUserMsgOne.TabIndex = 1; this.ppTxbxChangeBarUserMsgOne.Text = ""; // @@ -967,10 +967,10 @@ namespace VEPROMS this.ppCmbxChgBarPos.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxChgBarPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarPos.FormattingEnabled = true; - this.ppCmbxChgBarPos.Location = new System.Drawing.Point(109, 98); - this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppCmbxChgBarPos.Location = new System.Drawing.Point(82, 80); + this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(2); this.ppCmbxChgBarPos.Name = "ppCmbxChgBarPos"; - this.ppCmbxChgBarPos.Size = new System.Drawing.Size(179, 23); + this.ppCmbxChgBarPos.Size = new System.Drawing.Size(135, 21); this.ppCmbxChgBarPos.TabIndex = 48; this.ppCmbxChgBarPos.Visible = false; this.ppCmbxChgBarPos.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))); @@ -979,9 +979,10 @@ namespace VEPROMS // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(45, 101); + this.label12.Location = new System.Drawing.Point(34, 82); + this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(58, 17); + this.label12.Size = new System.Drawing.Size(44, 13); this.label12.TabIndex = 9; this.label12.Text = "Position"; this.label12.Visible = false; @@ -993,10 +994,10 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxChgBarTxtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarTxtType.FormattingEnabled = true; - this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(109, 49); - this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(82, 40); + this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2); this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType"; - this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(185, 23); + this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(140, 21); this.ppCmbxChgBarTxtType.TabIndex = 48; this.ppCmbxChgBarTxtType.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.ppCmbxChgBarTxtType.WatermarkText = "select change bar text type"; @@ -1005,9 +1006,10 @@ namespace VEPROMS // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(33, 50); + this.label13.Location = new System.Drawing.Point(25, 41); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(71, 17); + this.label13.Size = new System.Drawing.Size(55, 13); this.label13.TabIndex = 8; this.label13.Text = "Text Type"; // @@ -1026,10 +1028,10 @@ namespace VEPROMS this.btnCreatePDF.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCreatePDF.FocusOnLeftMouseButtonDown = true; 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(7, 346); - this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnCreatePDF.Location = new System.Drawing.Point(5, 281); + this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); this.btnCreatePDF.Name = "btnCreatePDF"; - this.btnCreatePDF.Size = new System.Drawing.Size(147, 46); + this.btnCreatePDF.Size = new System.Drawing.Size(113, 37); this.btnCreatePDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCreatePDF.TabIndex = 1; this.btnCreatePDF.Text = "Create PDF"; @@ -1044,10 +1046,10 @@ namespace VEPROMS this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.FocusOnLeftMouseButtonDown = true; 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(621, 346); - this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnCancel.Location = new System.Drawing.Point(450, 281); + this.btnCancel.Margin = new System.Windows.Forms.Padding(2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(112, 46); + this.btnCancel.Size = new System.Drawing.Size(100, 37); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 2; this.btnCancel.Text = "Cancel"; @@ -1063,13 +1065,14 @@ 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", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxDebug.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxDebug.Location = new System.Drawing.Point(176, 366); - this.cbxDebug.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxDebug.Location = new System.Drawing.Point(127, 282); + this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); this.cbxDebug.Name = "cbxDebug"; - this.cbxDebug.Size = new System.Drawing.Size(137, 22); + this.cbxDebug.Size = new System.Drawing.Size(115, 19); this.cbxDebug.TabIndex = 98; this.cbxDebug.Text = "Compare PDF"; this.cbxDebug.UseVisualStyleBackColor = false; + this.cbxDebug.CheckedChanged += new System.EventHandler(this.cbxDebug_CheckedChanged); // // cbxOrPgBrk // @@ -1079,10 +1082,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.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxOrPgBrk.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxOrPgBrk.Location = new System.Drawing.Point(379, 366); - this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxOrPgBrk.Location = new System.Drawing.Point(255, 282); + this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(2); this.cbxOrPgBrk.Name = "cbxOrPgBrk"; - this.cbxOrPgBrk.Size = new System.Drawing.Size(224, 22); + this.cbxOrPgBrk.Size = new System.Drawing.Size(191, 19); this.cbxOrPgBrk.TabIndex = 99; this.cbxOrPgBrk.Text = "Use Original Page Breaks"; this.cbxOrPgBrk.UseVisualStyleBackColor = false; @@ -1091,19 +1094,37 @@ namespace VEPROMS // this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // + // cbxCmpPRMSpfd + // + this.cbxCmpPRMSpfd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbxCmpPRMSpfd.AutoSize = true; + this.cbxCmpPRMSpfd.BackColor = System.Drawing.Color.Transparent; + this.cbxCmpPRMSpfd.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); + this.cbxCmpPRMSpfd.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxCmpPRMSpfd.ForeColor = System.Drawing.SystemColors.ControlText; + this.cbxCmpPRMSpfd.Location = new System.Drawing.Point(142, 305); + this.cbxCmpPRMSpfd.Margin = new System.Windows.Forms.Padding(2); + this.cbxCmpPRMSpfd.Name = "cbxCmpPRMSpfd"; + this.cbxCmpPRMSpfd.Size = new System.Drawing.Size(165, 17); + this.cbxCmpPRMSpfd.TabIndex = 100; + this.cbxCmpPRMSpfd.Text = "PROMS PDF to PROMS PDF"; + this.cbxCmpPRMSpfd.UseVisualStyleBackColor = false; + // // DlgPrintProcedure // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + 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(739, 404); + this.ClientSize = new System.Drawing.Size(554, 328); + this.Controls.Add(this.cbxCmpPRMSpfd); this.Controls.Add(this.cbxOrPgBrk); this.Controls.Add(this.cbxDebug); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnCreatePDF); this.Controls.Add(this.tabControl1); + this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "DlgPrintProcedure"; @@ -1192,5 +1213,6 @@ namespace VEPROMS private System.Windows.Forms.CheckBox cbxDebugPagination; private System.Windows.Forms.CheckBox cbxOrPgBrk; private DevComponents.DotNetBar.SuperTooltip superTooltip1; + private System.Windows.Forms.CheckBox cbxCmpPRMSpfd; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index dcd20f99..0fddd628 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -399,7 +399,7 @@ namespace VEPROMS { SetupForProcedure(); this.Text = string.Format("Create PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); - frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left,Bottom)); + frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxCmpPRMSpfd.Checked , cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left,Bottom)); frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.ShowDialog(); @@ -432,7 +432,7 @@ namespace VEPROMS // Determine change bar settings. First get from config & then see if override from dialog. // Also check that format allows override. ChangeBarDefinition cbd = DetermineChangeBarSettings(); - frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom)); + frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxCmpPRMSpfd.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom)); frmStatus.ShowDialog(); this.Close(); ShowDebugFiles(); @@ -633,5 +633,10 @@ namespace VEPROMS } } + private void cbxDebug_CheckedChanged(object sender, EventArgs e) + { + cbxCmpPRMSpfd.Visible = cbxDebug.Checked; + } + } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 841d0a6c..f384395e 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -988,7 +988,7 @@ namespace VEPROMS // Moved to end so that Item and Content are saved at the same time //UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS); string waterMark = Stage.Get(RevStage).IsApproved > 0 ? null : Stage.Get(RevStage).Name; - frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumber, ap.RevDate.ToString("MM/dd/yyyy"), waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); + frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumber, ap.RevDate.ToString("MM/dd/yyyy"), waterMark, false, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); frm.AllowAllWatermarks = true; frm.CloseWhenDone = !ViewPDF; frm.ShowDialog(); diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index 2d6100ad..639dc30f 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -42,13 +42,13 @@ namespace VEPROMS set { _OpenPDF = value; } } private Point _NewLocation; - public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, bool origPgBrk, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd,string pdfFile, Point newLocation) + public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, bool origPgBrk, bool PromsToPROMSpdfCompare, bool openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd,string pdfFile, Point newLocation) { OpenPDF = openPDF; 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, revDate, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile);//openPDF); + MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, (VlnSettings.ReleaseMode.Equals("DEMO")) ? "Sample" : watermark, debugOutput, origPgBrk, PromsToPROMSpdfCompare, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile);//openPDF); PDFPath = pdfPath; this.Text = "Creating PDF of " + myItem.DisplayNumber; _NewLocation = newLocation; diff --git a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs index 5554d216..7f795e58 100644 --- a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs +++ b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs @@ -86,7 +86,7 @@ namespace PrintMSWord changeBarData.ChangeBarMessage == "DateAndChgID" ? PrintChangeBarText.DateChgID : changeBarData.ChangeBarMessage == "None" ? PrintChangeBarText.None : changeBarData.ChangeBarMessage == "RevNum" ? PrintChangeBarText.RevNum : PrintChangeBarText.UserDef; - PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, tbRevDate.Text, cbWatermark.Text, cbDebugOutput.Checked, false, @"C:\TEMP\32Bit\Compare", openPdf, true, cbd, + PromsPrinter pp = new PromsPrinter(myProcedure, tbRev.Text, tbRevDate.Text, cbWatermark.Text, cbDebugOutput.Checked, false, false, @"C:\TEMP\32Bit\Compare", openPdf, true, cbd, myProcedure.DisplayNumber.Replace('/','_').Replace('\\','_')); pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); _ElapsedTime = new Dictionary(); diff --git a/PROMS/Volian.Base.Library/VlnSettings.cs b/PROMS/Volian.Base.Library/VlnSettings.cs index d56034c2..115a6180 100644 --- a/PROMS/Volian.Base.Library/VlnSettings.cs +++ b/PROMS/Volian.Base.Library/VlnSettings.cs @@ -69,6 +69,16 @@ namespace Volian.Base.Library } set { _OriginalPageBreak = value; } } + private static bool _ComparePROMStoPROMSPDF = false; // default to compare 16-bit generated PDFs + public static bool ComparePROMStoPROMSPDF + { + get + { + if (!WasLoaded) LoadOperatingMode(); + return _ComparePROMStoPROMSPDF; + } + set { _ComparePROMStoPROMSPDF = value; } + } private static void LoadOperatingMode() { string opMode = ConfigurationManager.AppSettings["OperatingMode"]; @@ -77,6 +87,7 @@ namespace Volian.Base.Library _DebugMode = opMode.ToUpper() == "DEBUG"; _DemoMode = opMode.ToUpper() == "DEMO"; _ProductionMode = opMode.ToUpper() == "PRODUCTION"; + _ComparePROMStoPROMSPDF = _DebugMode; } string pageBreak = ConfigurationManager.AppSettings["OriginalPageBreak"]; if (pageBreak != null && pageBreak != "") diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index b4f0b2d2..93a19a39 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -149,7 +149,13 @@ namespace Volian.Print.Library get { return _OriginalPageBreak; } set { _OriginalPageBreak = value; } } - public PromsPrinter(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, bool origPgBrk, string backgroundFolder, bool openPDF, bool overWrite, ChangeBarDefinition cbd, String pdfFile) + private bool _ComparePROMStoPROMSPDF; // compare folder contains PROMS generated PDFs + public bool ComparePROMStoPROMSPDF + { + get { return _ComparePROMStoPROMSPDF; } + set { _ComparePROMStoPROMSPDF = value; } + } + public PromsPrinter(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, bool origPgBrk, bool promsToPromsPDF, string backgroundFolder, bool openPDF, bool overWrite, ChangeBarDefinition cbd, String pdfFile) { _MyItem = myItem; _Rev = rev; @@ -162,6 +168,7 @@ namespace Volian.Print.Library _MyChangeBarDefinition = cbd; _PDFFile = pdfFile; _OriginalPageBreak = origPgBrk; + _ComparePROMStoPROMSPDF = promsToPromsPDF; } public string Print(string pdfFolder) { @@ -363,7 +370,10 @@ namespace Volian.Print.Library // X argument below: accounts for 16-bit pdf OverrideLeftMargin = -2 characters at the plant format's default Font's // characters per inch. // 16bit OverrideLeftMargin, defined as -2 in driver\drvin.rtf, - override took 2 characters out, so we're adding it back in: - _MyHelper.BackgroundOffset = new PointF(2 * 72F / (float)myProcedure.ActiveFormat.PlantFormat.FormatData.Font.CPI, -9.5F); + if (!_ComparePROMStoPROMSPDF) + _MyHelper.BackgroundOffset = new PointF(2 * 72F / (float)myProcedure.ActiveFormat.PlantFormat.FormatData.Font.CPI, -9.5F); + else + _MyHelper.BackgroundOffset = new PointF(0, 0); // compare folder contains PROMS generated PDF _MyHelper.BackgroundPageOffset = 0; } _MyHelper.WatermarkLayer = _WatermarkLayer;