From 4b4734b1ba99ada2a4cb06e579ecb430e5f80e5c Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 8 May 2012 12:54:05 +0000 Subject: [PATCH] --- .../DlgPrintProcedure.Designer.cs | 56 ++++++++++--------- .../DlgPrintProcedure.cs | 9 ++- .../dlgApproveProcedure.cs | 2 +- .../frmPDFStatusForm.cs | 4 +- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 58305727..c0a9d239 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -85,6 +85,7 @@ namespace VEPROMS this.btnCancel = new DevComponents.DotNetBar.ButtonX(); this.DlgBrowseFolder = new System.Windows.Forms.FolderBrowserDialog(); this.cbxDebug = new System.Windows.Forms.CheckBox(); + this.cbxOrPgBrk = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); @@ -180,7 +181,6 @@ namespace VEPROMS this.gpnlDebug.Style.BorderRightWidth = 1; this.gpnlDebug.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpnlDebug.Style.BorderTopWidth = 1; - this.gpnlDebug.Style.Class = ""; this.gpnlDebug.Style.CornerDiameter = 4; this.gpnlDebug.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpnlDebug.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -189,12 +189,10 @@ namespace VEPROMS // // // - this.gpnlDebug.StyleMouseDown.Class = ""; this.gpnlDebug.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gpnlDebug.StyleMouseOver.Class = ""; this.gpnlDebug.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.gpnlDebug.TabIndex = 86; this.gpnlDebug.Text = "Debug"; @@ -245,7 +243,6 @@ namespace VEPROMS this.grpDateSelector.Style.BorderRightWidth = 1; this.grpDateSelector.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.grpDateSelector.Style.BorderTopWidth = 1; - this.grpDateSelector.Style.Class = ""; this.grpDateSelector.Style.CornerDiameter = 4; this.grpDateSelector.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.grpDateSelector.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -254,12 +251,10 @@ namespace VEPROMS // // // - this.grpDateSelector.StyleMouseDown.Class = ""; this.grpDateSelector.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.grpDateSelector.StyleMouseOver.Class = ""; this.grpDateSelector.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.grpDateSelector.TabIndex = 85; this.grpDateSelector.Text = "Select Revision Date"; @@ -282,12 +277,10 @@ namespace VEPROMS this.calDateSelector.BackgroundStyle.BorderRightWidth = 1; this.calDateSelector.BackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.calDateSelector.BackgroundStyle.BorderTopWidth = 1; - this.calDateSelector.BackgroundStyle.Class = ""; this.calDateSelector.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.calDateSelector.CommandsBackgroundStyle.Class = ""; 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); @@ -301,7 +294,6 @@ namespace VEPROMS this.calDateSelector.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; this.calDateSelector.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.calDateSelector.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.calDateSelector.NavigationBackgroundStyle.Class = ""; this.calDateSelector.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.calDateSelector.Size = new System.Drawing.Size(170, 131); this.calDateSelector.TabIndex = 84; @@ -412,7 +404,6 @@ namespace VEPROMS // // // - this.lblReviewDate.BackgroundStyle.Class = ""; 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); @@ -429,7 +420,6 @@ namespace VEPROMS // // // - this.lblRevDate.BackgroundStyle.Class = ""; 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); @@ -446,7 +436,6 @@ namespace VEPROMS // // // - this.lblRevNum.BackgroundStyle.Class = ""; 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); @@ -478,7 +467,6 @@ namespace VEPROMS // // // - this.lblPDFFileName.BackgroundStyle.Class = ""; 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); @@ -495,7 +483,6 @@ namespace VEPROMS // // // - this.lblPDFLoc.BackgroundStyle.Class = ""; 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); @@ -558,7 +545,6 @@ namespace VEPROMS this.ppGpbxCBType.Style.BorderRightWidth = 1; this.ppGpbxCBType.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ppGpbxCBType.Style.BorderTopWidth = 1; - this.ppGpbxCBType.Style.Class = ""; this.ppGpbxCBType.Style.CornerDiameter = 4; this.ppGpbxCBType.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.ppGpbxCBType.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -567,12 +553,10 @@ namespace VEPROMS // // // - this.ppGpbxCBType.StyleMouseDown.Class = ""; this.ppGpbxCBType.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ppGpbxCBType.StyleMouseOver.Class = ""; this.ppGpbxCBType.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGpbxCBType.TabIndex = 54; this.ppGpbxCBType.Text = "Type"; @@ -631,7 +615,6 @@ namespace VEPROMS this.ppGpbxUserSpecCB.Style.BorderRightWidth = 1; this.ppGpbxUserSpecCB.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ppGpbxUserSpecCB.Style.BorderTopWidth = 1; - this.ppGpbxUserSpecCB.Style.Class = ""; this.ppGpbxUserSpecCB.Style.CornerDiameter = 4; this.ppGpbxUserSpecCB.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.ppGpbxUserSpecCB.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -640,12 +623,10 @@ namespace VEPROMS // // // - this.ppGpbxUserSpecCB.StyleMouseDown.Class = ""; this.ppGpbxUserSpecCB.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ppGpbxUserSpecCB.StyleMouseOver.Class = ""; this.ppGpbxUserSpecCB.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGpbxUserSpecCB.TabIndex = 53; this.ppGpbxUserSpecCB.Text = "Custom Change Bar Text"; @@ -677,7 +658,6 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.Style.BorderRightWidth = 1; this.ppGpbxUserSpecTxt.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.ppGpbxUserSpecTxt.Style.BorderTopWidth = 1; - this.ppGpbxUserSpecTxt.Style.Class = ""; this.ppGpbxUserSpecTxt.Style.CornerDiameter = 4; this.ppGpbxUserSpecTxt.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.ppGpbxUserSpecTxt.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -686,12 +666,10 @@ namespace VEPROMS // // // - this.ppGpbxUserSpecTxt.StyleMouseDown.Class = ""; this.ppGpbxUserSpecTxt.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ppGpbxUserSpecTxt.StyleMouseOver.Class = ""; this.ppGpbxUserSpecTxt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGpbxUserSpecTxt.TabIndex = 51; this.ppGpbxUserSpecTxt.Text = "Custom Change Bar Text"; @@ -831,7 +809,6 @@ namespace VEPROMS // // // - this.lblWatermarkS.BackgroundStyle.Class = ""; 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, 104); @@ -863,6 +840,7 @@ namespace VEPROMS this.btnPdfLocation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; 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.FocusOnLeftMouseButtonDown = true; this.btnPdfLocation.Image = ((System.Drawing.Image)(resources.GetObject("btnPdfLocation.Image"))); this.btnPdfLocation.Location = new System.Drawing.Point(628, 4); this.btnPdfLocation.Margin = new System.Windows.Forms.Padding(4); @@ -878,7 +856,6 @@ namespace VEPROMS // // // - this.lblPdfLocS.BackgroundStyle.Class = ""; 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); @@ -894,6 +871,7 @@ namespace VEPROMS this.btnWaterMarkOff.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnWaterMarkOff.Checked = true; this.btnWaterMarkOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnWaterMarkOff.FocusOnLeftMouseButtonDown = true; this.btnWaterMarkOff.Location = new System.Drawing.Point(219, 104); this.btnWaterMarkOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnWaterMarkOff.Name = "btnWaterMarkOff"; @@ -908,6 +886,7 @@ namespace VEPROMS this.btnChgBarOff.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; 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.Name = "btnChgBarOff"; @@ -922,6 +901,7 @@ namespace VEPROMS this.btnDuplxOff.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; 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.Name = "btnDuplxOff"; @@ -937,7 +917,6 @@ namespace VEPROMS // // // - this.lblAutoDuplexing.BackgroundStyle.Class = ""; 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); @@ -952,6 +931,7 @@ 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.Name = "btnDuplxOn"; @@ -965,6 +945,7 @@ 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, 104); this.btnWaterMarkOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnWaterMarkOn.Name = "btnWaterMarkOn"; @@ -996,7 +977,6 @@ namespace VEPROMS // // // - this.lblChgBars.BackgroundStyle.Class = ""; 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); @@ -1011,6 +991,7 @@ 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.Name = "btnChgBarOn"; @@ -1033,6 +1014,7 @@ namespace VEPROMS this.btnCreatePDF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCreatePDF.BackColor = System.Drawing.SystemColors.Control; 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(20, 306); this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1050,6 +1032,7 @@ namespace VEPROMS this.btnCancel.BackColor = System.Drawing.SystemColors.Control; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; 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(535, 306); this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1078,12 +1061,30 @@ namespace VEPROMS this.cbxDebug.Text = "Debug"; this.cbxDebug.UseVisualStyleBackColor = false; // + // cbxOrPgBrk + // + this.cbxOrPgBrk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbxOrPgBrk.AutoSize = true; + this.cbxOrPgBrk.BackColor = System.Drawing.Color.Transparent; + 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(292, 320); + this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxOrPgBrk.Name = "cbxOrPgBrk"; + this.cbxOrPgBrk.Size = new System.Drawing.Size(200, 22); + this.cbxOrPgBrk.TabIndex = 99; + this.cbxOrPgBrk.Text = "Use Original Page Breaks"; + this.cbxOrPgBrk.ThreeState = true; + this.cbxOrPgBrk.UseVisualStyleBackColor = false; + // // DlgPrintProcedure // 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(675, 343); + this.Controls.Add(this.cbxOrPgBrk); this.Controls.Add(this.cbxDebug); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnCreatePDF); @@ -1177,5 +1178,6 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.GroupPanel gpnlDebug; private System.Windows.Forms.CheckBox cbxDebugText; private System.Windows.Forms.CheckBox cbxDebugPagination; + private System.Windows.Forms.CheckBox cbxOrPgBrk; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 3dfd40f5..6dc167b2 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -184,6 +184,11 @@ namespace VEPROMS } // default to print Debug info if App.config is set to debug mode cbxDebug.Checked = VlnSettings.DebugMode; + + // default to using OriginalPageBreaks (16bit page breaks) if App.config is set + // to true: + cbxOrPgBrk.Visible = VlnSettings.OriginalPageBreak; + cbxOrPgBrk.Checked = false; } private void DlgPrintProcedure_Load(object sender, EventArgs e) @@ -387,7 +392,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, 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, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left,Bottom)); frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.ShowDialog(); @@ -420,7 +425,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, 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, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom)); frmStatus.ShowDialog(); this.Close(); ShowDebugFiles(); diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index fa7da6e4..62daed4c 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -985,7 +985,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, 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, 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 0aa6cc63..ee48fd6a 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -41,11 +41,11 @@ namespace VEPROMS set { _OpenPDF = value; } } private Point _NewLocation; - public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, 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 openPDF, bool overWrite, string pdfPath, ChangeBarDefinition cbd,string pdfFile, Point newLocation) { OpenPDF = openPDF; InitializeComponent(); - MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile);//openPDF); + MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, origPgBrk, pdfPath + @"\\Compare", false, overWrite, cbd, pdfFile);//openPDF); PDFPath = pdfPath; this.Text = "Creating PDF of " + myItem.DisplayNumber; _NewLocation = newLocation;