From aa7a427dd1ce416e2169dfb018a46b72a18737e0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Apr 2018 20:28:06 +0000 Subject: [PATCH] =?UTF-8?q?B2018-059=20Don=E2=80=99t=20close=20the=20calen?= =?UTF-8?q?dar=20when=20the=20month=20or=20year=20button=20is=20selected?= =?UTF-8?q?=20C2018-009=20Added=20a=20check=20box=20to=20print=20the=20PRO?= =?UTF-8?q?MS=20version=20number=20on=20each=20page=20of=20the=20PFD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DlgPrintProcedure.Designer.cs | 102 ++++++++++++------ .../DlgPrintProcedure.cs | 39 ++++--- .../DlgPrintProcedure.resx | 5 +- 3 files changed, 98 insertions(+), 48 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index c506779f..403773df 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -33,12 +33,13 @@ namespace VEPROMS this.tabControl1 = new DevComponents.DotNetBar.TabControl(); this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); this.btnPdfLocation = new DevComponents.DotNetBar.ButtonX(); - this.pbPDFsStatus = new DevComponents.DotNetBar.Controls.ProgressBarX(); this.gpnlDebug = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbxMetaFile = new System.Windows.Forms.CheckBox(); this.cbxDebugText = new System.Windows.Forms.CheckBox(); this.cbxDebugPagination = new System.Windows.Forms.CheckBox(); this.grpDateSelector = new DevComponents.DotNetBar.Controls.GroupPanel(); this.calDateSelector = new DevComponents.Editors.DateTimeAdv.MonthCalendarAdv(); + this.pbPDFsStatus = new DevComponents.DotNetBar.Controls.ProgressBarX(); this.txbReviewDate = new DevComponents.DotNetBar.Controls.TextBoxX(); this.txbRevDate = new DevComponents.DotNetBar.Controls.TextBoxX(); this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -87,6 +88,7 @@ namespace VEPROMS this.lblChgBars = new DevComponents.DotNetBar.LabelX(); this.btnChgBarOn = new DevComponents.DotNetBar.ButtonX(); this.tbSettings = new DevComponents.DotNetBar.TabItem(this.components); + this.cbxPROMSVersion = new System.Windows.Forms.CheckBox(); this.btnCreatePDF = new DevComponents.DotNetBar.ButtonX(); this.btnCancel = new DevComponents.DotNetBar.ButtonX(); this.DlgBrowseFolder = new System.Windows.Forms.FolderBrowserDialog(); @@ -126,7 +128,7 @@ namespace VEPROMS 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(613, 285); + this.tabControl1.Size = new System.Drawing.Size(619, 269); this.tabControl1.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabControl1.TabIndex = 0; this.tabControl1.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -139,7 +141,6 @@ namespace VEPROMS // this.tabControlPanel3.AutoScroll = true; this.tabControlPanel3.Controls.Add(this.btnPdfLocation); - this.tabControlPanel3.Controls.Add(this.pbPDFsStatus); this.tabControlPanel3.Controls.Add(this.gpnlDebug); this.tabControlPanel3.Controls.Add(this.grpDateSelector); this.tabControlPanel3.Controls.Add(this.txbReviewDate); @@ -160,7 +161,7 @@ namespace VEPROMS 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(613, 263); + this.tabControlPanel3.Size = new System.Drawing.Size(619, 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; @@ -177,38 +178,26 @@ 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(578, 7); + this.btnPdfLocation.Location = new System.Drawing.Point(594, 8); this.btnPdfLocation.Name = "btnPdfLocation"; this.btnPdfLocation.Size = new System.Drawing.Size(20, 19); this.btnPdfLocation.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnPdfLocation.TabIndex = 100; this.btnPdfLocation.Click += new System.EventHandler(this.btnPdfLocation_Click); // - // pbPDFsStatus - // - // - // - // - this.pbPDFsStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.pbPDFsStatus.Location = new System.Drawing.Point(7, 220); - this.pbPDFsStatus.Name = "pbPDFsStatus"; - this.pbPDFsStatus.Size = new System.Drawing.Size(539, 23); - this.pbPDFsStatus.TabIndex = 87; - this.pbPDFsStatus.Text = "Procedures Converted to PDF"; - this.pbPDFsStatus.Visible = false; - // // gpnlDebug // this.gpnlDebug.BackColor = System.Drawing.Color.Transparent; this.gpnlDebug.CanvasColor = System.Drawing.SystemColors.Control; this.gpnlDebug.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpnlDebug.Controls.Add(this.cbxMetaFile); 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(401, 75); this.gpnlDebug.Margin = new System.Windows.Forms.Padding(2); this.gpnlDebug.Name = "gpnlDebug"; - this.gpnlDebug.Size = new System.Drawing.Size(90, 74); + this.gpnlDebug.Size = new System.Drawing.Size(90, 97); // // // @@ -240,6 +229,18 @@ namespace VEPROMS this.gpnlDebug.TabIndex = 86; this.gpnlDebug.Text = "Debug"; // + // cbxMetaFile + // + 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.Name = "cbxMetaFile"; + this.cbxMetaFile.Size = new System.Drawing.Size(69, 17); + this.cbxMetaFile.TabIndex = 1; + this.cbxMetaFile.Text = "Meta File"; + this.cbxMetaFile.UseVisualStyleBackColor = false; + // // cbxDebugText // this.cbxDebugText.AutoSize = true; @@ -270,6 +271,7 @@ namespace VEPROMS this.grpDateSelector.CanvasColor = System.Drawing.SystemColors.Control; this.grpDateSelector.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpDateSelector.Controls.Add(this.calDateSelector); + this.grpDateSelector.Controls.Add(this.pbPDFsStatus); this.grpDateSelector.DisabledBackColor = System.Drawing.Color.Empty; this.grpDateSelector.Location = new System.Drawing.Point(197, 75); this.grpDateSelector.Margin = new System.Windows.Forms.Padding(2); @@ -346,6 +348,19 @@ namespace VEPROMS this.calDateSelector.Visible = false; this.calDateSelector.DateSelected += new System.Windows.Forms.DateRangeEventHandler(this.calDateSelector_DateSelected); // + // pbPDFsStatus + // + // + // + // + this.pbPDFsStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.pbPDFsStatus.Location = new System.Drawing.Point(-197, 123); + this.pbPDFsStatus.Name = "pbPDFsStatus"; + this.pbPDFsStatus.Size = new System.Drawing.Size(539, 23); + this.pbPDFsStatus.TabIndex = 87; + this.pbPDFsStatus.Text = "Procedures Converted to PDF"; + this.pbPDFsStatus.Visible = false; + // // txbReviewDate // // @@ -388,7 +403,7 @@ namespace VEPROMS this.txbPDFLocation.Location = new System.Drawing.Point(102, 8); this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(2); this.txbPDFLocation.Name = "txbPDFLocation"; - this.txbPDFLocation.Size = new System.Drawing.Size(464, 20); + this.txbPDFLocation.Size = new System.Drawing.Size(487, 20); this.txbPDFLocation.TabIndex = 81; this.txbPDFLocation.WatermarkText = "PDF Location"; this.txbPDFLocation.Leave += new System.EventHandler(this.txbPDFLocation_Leave); @@ -419,7 +434,7 @@ 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(452, 39); + this.cbxOverwritePDF2.Location = new System.Drawing.Point(475, 39); this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(2); this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; this.cbxOverwritePDF2.Size = new System.Drawing.Size(127, 19); @@ -500,7 +515,7 @@ namespace VEPROMS this.txbPDFName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbPDFName.Location = new System.Drawing.Point(102, 39); this.txbPDFName.Name = "txbPDFName"; - this.txbPDFName.Size = new System.Drawing.Size(308, 20); + this.txbPDFName.Size = new System.Drawing.Size(331, 20); this.txbPDFName.TabIndex = 8; // // lblPDFFileName @@ -550,7 +565,7 @@ namespace VEPROMS 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(613, 263); + this.tabControlPanel2.Size = new System.Drawing.Size(619, 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; @@ -845,7 +860,7 @@ namespace VEPROMS 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(613, 263); + this.tabControlPanel1.Size = new System.Drawing.Size(619, 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; @@ -1068,6 +1083,22 @@ namespace VEPROMS this.tbSettings.Name = "tbSettings"; this.tbSettings.Text = "Settings"; // + // cbxPROMSVersion + // + this.cbxPROMSVersion.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.cbxPROMSVersion.AutoSize = true; + this.cbxPROMSVersion.BackColor = System.Drawing.Color.Transparent; + this.cbxPROMSVersion.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); + this.cbxPROMSVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold); + this.cbxPROMSVersion.ForeColor = System.Drawing.SystemColors.ControlText; + this.cbxPROMSVersion.Location = new System.Drawing.Point(143, 349); + this.cbxPROMSVersion.Margin = new System.Windows.Forms.Padding(2); + this.cbxPROMSVersion.Name = "cbxPROMSVersion"; + this.cbxPROMSVersion.Size = new System.Drawing.Size(213, 19); + this.cbxPROMSVersion.TabIndex = 101; + this.cbxPROMSVersion.Text = "Show Proms Version Number"; + this.cbxPROMSVersion.UseVisualStyleBackColor = false; + // // btnCreatePDF // this.btnCreatePDF.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; @@ -1075,7 +1106,7 @@ namespace VEPROMS this.btnCreatePDF.BackColor = System.Drawing.SystemColors.Control; this.btnCreatePDF.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCreatePDF.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCreatePDF.Location = new System.Drawing.Point(2, 314); + this.btnCreatePDF.Location = new System.Drawing.Point(2, 326); this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); this.btnCreatePDF.Name = "btnCreatePDF"; this.btnCreatePDF.Size = new System.Drawing.Size(113, 37); @@ -1092,7 +1123,7 @@ namespace VEPROMS this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(513, 314); + this.btnCancel.Location = new System.Drawing.Point(519, 326); this.btnCancel.Margin = new System.Windows.Forms.Padding(2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(102, 37); @@ -1111,7 +1142,7 @@ namespace VEPROMS this.cbxDebug.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); this.cbxDebug.Font = new System.Drawing.Font("Microsoft Sans Serif", 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(3, 289); + this.cbxDebug.Location = new System.Drawing.Point(8, 292); this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); this.cbxDebug.Name = "cbxDebug"; this.cbxDebug.Size = new System.Drawing.Size(115, 19); @@ -1127,7 +1158,7 @@ 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(422, 289); + this.cbxOrPgBrk.Location = new System.Drawing.Point(427, 273); this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(2); this.cbxOrPgBrk.Name = "cbxOrPgBrk"; this.cbxOrPgBrk.Size = new System.Drawing.Size(191, 19); @@ -1148,7 +1179,7 @@ namespace VEPROMS this.cbxBlankPgsForDuplex.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); this.cbxBlankPgsForDuplex.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxBlankPgsForDuplex.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxBlankPgsForDuplex.Location = new System.Drawing.Point(138, 340); + this.cbxBlankPgsForDuplex.Location = new System.Drawing.Point(143, 330); this.cbxBlankPgsForDuplex.Margin = new System.Windows.Forms.Padding(2); this.cbxBlankPgsForDuplex.Name = "cbxBlankPgsForDuplex"; this.cbxBlankPgsForDuplex.Size = new System.Drawing.Size(262, 19); @@ -1163,7 +1194,7 @@ namespace VEPROMS this.cbxGeneratePlacekeeper.BackColor = System.Drawing.Color.Transparent; this.cbxGeneratePlacekeeper.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxGeneratePlacekeeper.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxGeneratePlacekeeper.Location = new System.Drawing.Point(138, 289); + this.cbxGeneratePlacekeeper.Location = new System.Drawing.Point(143, 273); this.cbxGeneratePlacekeeper.Margin = new System.Windows.Forms.Padding(2); this.cbxGeneratePlacekeeper.Name = "cbxGeneratePlacekeeper"; this.cbxGeneratePlacekeeper.Size = new System.Drawing.Size(169, 19); @@ -1178,7 +1209,7 @@ namespace VEPROMS this.cbxPDFLinks.BackColor = System.Drawing.Color.Transparent; this.cbxPDFLinks.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxPDFLinks.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxPDFLinks.Location = new System.Drawing.Point(138, 323); + this.cbxPDFLinks.Location = new System.Drawing.Point(143, 311); this.cbxPDFLinks.Margin = new System.Windows.Forms.Padding(2); this.cbxPDFLinks.Name = "cbxPDFLinks"; this.cbxPDFLinks.Size = new System.Drawing.Size(91, 19); @@ -1193,7 +1224,7 @@ namespace VEPROMS this.cbxRemoveManualPageBreaks.BackColor = System.Drawing.Color.Transparent; this.cbxRemoveManualPageBreaks.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxRemoveManualPageBreaks.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(138, 306); + this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(143, 292); this.cbxRemoveManualPageBreaks.Margin = new System.Windows.Forms.Padding(2); this.cbxRemoveManualPageBreaks.Name = "cbxRemoveManualPageBreaks"; this.cbxRemoveManualPageBreaks.Size = new System.Drawing.Size(370, 19); @@ -1208,7 +1239,7 @@ namespace VEPROMS this.cbxGenerateConActSum.BackColor = System.Drawing.Color.Transparent; this.cbxGenerateConActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxGenerateConActSum.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxGenerateConActSum.Location = new System.Drawing.Point(243, 309); + this.cbxGenerateConActSum.Location = new System.Drawing.Point(248, 292); this.cbxGenerateConActSum.Margin = new System.Windows.Forms.Padding(2); this.cbxGenerateConActSum.Name = "cbxGenerateConActSum"; this.cbxGenerateConActSum.Size = new System.Drawing.Size(260, 19); @@ -1222,7 +1253,8 @@ namespace VEPROMS 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(617, 359); + this.ClientSize = new System.Drawing.Size(623, 367); + this.Controls.Add(this.cbxPROMSVersion); this.Controls.Add(this.cbxGenerateConActSum); this.Controls.Add(this.cbxGeneratePlacekeeper); this.Controls.Add(this.cbxPDFLinks); @@ -1335,5 +1367,7 @@ namespace VEPROMS private System.Windows.Forms.CheckBox cbxRemoveManualPageBreaks; private DevComponents.DotNetBar.ButtonX btnPdfLocation; private System.Windows.Forms.CheckBox cbxGenerateConActSum; + private System.Windows.Forms.CheckBox cbxMetaFile; + private System.Windows.Forms.CheckBox cbxPROMSVersion; } } diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 83ecf72f..9313ce0b 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -50,17 +50,20 @@ namespace VEPROMS { cbxDebugPagination.Checked = true; cbxDebugText.Checked = true; + cbxMetaFile.Checked = true; // C2018-004 create meta file for baseline compares Application.DoEvents(); string[] parameters = System.Environment.CommandLine.Split(" ".ToCharArray()); bool ranAuto = false; foreach (string parameter in parameters) { - if (parameter.ToUpper() == "/NT") - cbxDebugText.Checked = false; - else if (parameter.ToUpper() == "/NP") - cbxDebugPagination.Checked = false; - else if (parameter.ToUpper() == "/NC") - cbxDebug.Checked = false; + if (parameter.ToUpper() == "/NT") + cbxDebugText.Checked = false; + else if (parameter.ToUpper() == "/NP") + cbxDebugPagination.Checked = false; + else if (parameter.ToUpper() == "/NC") + cbxDebug.Checked = false; + else if (parameter.ToUpper() == "/NM") + cbxMetaFile.Checked = false; // C2018-004 turn off create meta file for baseline compares } CreatePDFs(); this.Close(); @@ -606,7 +609,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), - cbxBlankPgsForDuplex.Checked, _AllProcedures||Automatic,Prefix,SaveLinks,RemoveTrailingHardReturnsAndManualPageBreaks); + cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, cbxPROMSVersion.Checked);//C2018-009 print PROMS version frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.CancelStop = true; @@ -628,8 +631,8 @@ namespace VEPROMS // RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered. // 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), - cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic,Prefix,SaveLinks,RemoveTrailingHardReturnsAndManualPageBreaks); + cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, new Point(Left, Bottom - 50), + cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, cbxPROMSVersion.Checked);//C2018-009 print PROMS version frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.CancelStop = true; @@ -654,8 +657,8 @@ namespace VEPROMS ProfileTimer.Pop(profileDepth1); // 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), cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic,Prefix,SaveLinks,RemoveTrailingHardReturnsAndManualPageBreaks); + cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, GetMultiunitPDFPath(), cbd, txbPDFName.Text, + new Point(Left, Bottom - 50), cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic, Prefix, SaveLinks, RemoveTrailingHardReturnsAndManualPageBreaks, cbxPROMSVersion.Checked);//C2018-009 print PROMS version frmStatus.CloseWhenDone = true; Application.DoEvents(); frmStatus.CancelStop = true; @@ -702,6 +705,9 @@ namespace VEPROMS Volian.Base.Library.DebugPagination.Open(PDFPath + "\\DebugPagination.txt"); // RHM 20120925 Corrected spelling if (cbxDebugText.Checked) Volian.Base.Library.DebugText.Open(PDFPath + "\\DebugText.txt"); + if (cbxMetaFile.Checked) // C2018-004 create meta file for baseline compares + Volian.Base.Library.BaselineMetaFile.Open(PDFPath + "\\DebugMeta.txt"); + Rtf2Pdf._lastPageNum = 0; // reset page number } private void ShowDebugFiles() { @@ -709,6 +715,8 @@ namespace VEPROMS Volian.Base.Library.DebugPagination.Show(); if (cbxDebugText.Checked) Volian.Base.Library.DebugText.Show(); + if (cbxMetaFile.Checked)// C2018-004 create meta file for baseline compares + Volian.Base.Library.BaselineMetaFile.Show(); // baseline } public void CreatePDF() // RHM20150506 Multiline ItemID TextBox { @@ -740,7 +748,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), - cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic,Prefix,SaveLinks,RemoveTrailingHardReturnsAndManualPageBreaks); + cbxBlankPgsForDuplex.Checked, _AllProcedures || Automatic,Prefix,SaveLinks,RemoveTrailingHardReturnsAndManualPageBreaks,cbxPROMSVersion.Checked); //C2018-009 print PROMS version frmStatus.MakePlaceKeeper = cbxGeneratePlacekeeper.Checked; frmStatus.MakeContinuousActionSummary = cbxGenerateConActSum.Checked; if (Automatic && cbxGenerateConActSum.Checked) @@ -901,6 +909,11 @@ namespace VEPROMS private void txbRevDate_Leave(object sender, EventArgs e) { if (_Initializing) return; + if (this.ActiveControl == calDateSelector) + { + txbRevDate.Focus(); //B2018-059 keep the calendar open until a different field on the print dialog is selected + return; + } txbDate = null; grpDateSelector.Visible = calDateSelector.Visible = false; // save the RevDate to the procedure's config. @@ -964,4 +977,4 @@ namespace VEPROMS // cbxCmpPRMSpfd.Visible = cbxDebug.Checked; //} } -} \ No newline at end of file +} diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index d83968cc..bfc08f3e 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx @@ -134,6 +134,9 @@ 321, 17 + + 321, 17 + 153, 17 @@ -2053,4 +2056,4 @@ AACAAwAAgAMAAIADAACAAwAAgAMAAIADAACAAwAAgAMAAIADAAA= - \ No newline at end of file +