diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 38e8140f..5a588a2c 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -95,8 +95,8 @@ 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(); this.cbxBlankPgsForDuplex = new System.Windows.Forms.CheckBox(); + this.cbxGeneratePlacekeeper = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); @@ -118,14 +118,14 @@ namespace VEPROMS this.tabControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(125)))), ((int)(((byte)(125)))), ((int)(((byte)(125))))); this.tabControl1.CanReorderTabs = true; this.tabControl1.Controls.Add(this.tabControlPanel3); - this.tabControl1.Controls.Add(this.tabControlPanel2); this.tabControl1.Controls.Add(this.tabControlPanel1); + this.tabControl1.Controls.Add(this.tabControlPanel2); 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(550, 269); + this.tabControl1.Size = new System.Drawing.Size(613, 271); this.tabControl1.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabControl1.TabIndex = 0; this.tabControl1.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -157,7 +157,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(550, 247); + this.tabControlPanel3.Size = new System.Drawing.Size(613, 249); 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; @@ -376,7 +376,7 @@ namespace VEPROMS this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(2); this.txbPDFLocation.Name = "txbPDFLocation"; this.txbPDFLocation.ShortcutsEnabled = false; - this.txbPDFLocation.Size = new System.Drawing.Size(436, 20); + this.txbPDFLocation.Size = new System.Drawing.Size(499, 20); this.txbPDFLocation.TabIndex = 81; this.txbPDFLocation.WatermarkText = "PDF Location"; this.txbPDFLocation.Leave += new System.EventHandler(this.txbPDFLocation_Leave); @@ -407,7 +407,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(390, 39); + this.cbxOverwritePDF2.Location = new System.Drawing.Point(453, 39); this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(2); this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; this.cbxOverwritePDF2.Size = new System.Drawing.Size(127, 19); @@ -488,7 +488,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(245, 20); + this.txbPDFName.Size = new System.Drawing.Size(308, 20); this.txbPDFName.TabIndex = 8; // // lblPDFFileName @@ -537,7 +537,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(550, 247); + this.tabControlPanel2.Size = new System.Drawing.Size(613, 249); 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; @@ -829,7 +829,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(550, 247); + this.tabControlPanel1.Size = new System.Drawing.Size(613, 249); 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; @@ -928,7 +928,7 @@ namespace VEPROMS this.txbPdfLocationS.Margin = new System.Windows.Forms.Padding(2); this.txbPdfLocationS.Name = "txbPdfLocationS"; this.txbPdfLocationS.ShortcutsEnabled = false; - this.txbPdfLocationS.Size = new System.Drawing.Size(421, 20); + this.txbPdfLocationS.Size = new System.Drawing.Size(484, 20); this.txbPdfLocationS.TabIndex = 98; this.txbPdfLocationS.WatermarkText = "PDF Location"; // @@ -938,7 +938,7 @@ 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(519, 3); + this.btnPdfLocation.Location = new System.Drawing.Point(582, 3); this.btnPdfLocation.Name = "btnPdfLocation"; this.btnPdfLocation.Size = new System.Drawing.Size(20, 19); this.btnPdfLocation.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -1104,7 +1104,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(5, 275); + this.btnCreatePDF.Location = new System.Drawing.Point(2, 287); this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); this.btnCreatePDF.Name = "btnCreatePDF"; this.btnCreatePDF.Size = new System.Drawing.Size(113, 37); @@ -1121,10 +1121,10 @@ namespace VEPROMS this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(450, 275); + this.btnCancel.Location = new System.Drawing.Point(513, 287); this.btnCancel.Margin = new System.Windows.Forms.Padding(2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 37); + this.btnCancel.Size = new System.Drawing.Size(102, 37); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 2; this.btnCancel.Text = "Cancel"; @@ -1140,7 +1140,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(128, 273); + this.cbxDebug.Location = new System.Drawing.Point(155, 275); this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); this.cbxDebug.Name = "cbxDebug"; this.cbxDebug.Size = new System.Drawing.Size(115, 19); @@ -1156,7 +1156,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(256, 273); + this.cbxOrPgBrk.Location = new System.Drawing.Point(283, 275); this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(2); this.cbxOrPgBrk.Name = "cbxOrPgBrk"; this.cbxOrPgBrk.Size = new System.Drawing.Size(191, 19); @@ -1168,23 +1168,6 @@ namespace VEPROMS // this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // - // cbxCmpPRMSpfd - // - this.cbxCmpPRMSpfd.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - 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(281, 316); - 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; - this.cbxCmpPRMSpfd.Visible = false; - // // cbxBlankPgsForDuplex // this.cbxBlankPgsForDuplex.Anchor = System.Windows.Forms.AnchorStyles.Bottom; @@ -1193,7 +1176,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(125, 296); + this.cbxBlankPgsForDuplex.Location = new System.Drawing.Point(155, 321); this.cbxBlankPgsForDuplex.Margin = new System.Windows.Forms.Padding(2); this.cbxBlankPgsForDuplex.Name = "cbxBlankPgsForDuplex"; this.cbxBlankPgsForDuplex.Size = new System.Drawing.Size(323, 19); @@ -1201,14 +1184,29 @@ namespace VEPROMS this.cbxBlankPgsForDuplex.Text = "Add Blank Pages When Using Duplex Foldouts"; this.cbxBlankPgsForDuplex.UseVisualStyleBackColor = false; // + // cbxGeneratePlacekeeper + // + this.cbxGeneratePlacekeeper.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.cbxGeneratePlacekeeper.AutoSize = true; + 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(155, 298); + this.cbxGeneratePlacekeeper.Margin = new System.Windows.Forms.Padding(2); + this.cbxGeneratePlacekeeper.Name = "cbxGeneratePlacekeeper"; + this.cbxGeneratePlacekeeper.Size = new System.Drawing.Size(169, 19); + this.cbxGeneratePlacekeeper.TabIndex = 101; + this.cbxGeneratePlacekeeper.Text = "Generate Placekeeper"; + this.cbxGeneratePlacekeeper.UseVisualStyleBackColor = false; + // // DlgPrintProcedure // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(554, 327); + this.ClientSize = new System.Drawing.Size(617, 339); + this.Controls.Add(this.cbxGeneratePlacekeeper); this.Controls.Add(this.cbxBlankPgsForDuplex); - this.Controls.Add(this.cbxCmpPRMSpfd); this.Controls.Add(this.cbxOrPgBrk); this.Controls.Add(this.cbxDebug); this.Controls.Add(this.btnCancel); @@ -1304,7 +1302,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; private DevComponents.DotNetBar.LabelX lblMultiunitPdfLocation; private DevComponents.DotNetBar.Controls.ComboBoxEx cbxMultiunitPdfLocation; private DevComponents.Editors.ComboItem muLocNone; @@ -1314,5 +1311,6 @@ namespace VEPROMS private DevComponents.Editors.ComboItem muLocID; private DevComponents.DotNetBar.Controls.ProgressBarX pbPDFsStatus; private System.Windows.Forms.CheckBox cbxBlankPgsForDuplex; + private System.Windows.Forms.CheckBox cbxGeneratePlacekeeper; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index a3919dca..0a909943 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -140,6 +140,9 @@ namespace VEPROMS cbxOverwritePDF2.Visible = oneProcedure; cbxOverwritePDF2.Checked = true; gpnlDebug.Visible = Volian.Base.Library.VlnSettings.DebugMode; + cbxGeneratePlacekeeper.Checked = false; + cbxGeneratePlacekeeper.Visible = oneProcedure && + ((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper); } private string _UnitNumber; public string UnitNumber @@ -658,6 +661,7 @@ namespace VEPROMS MyProcedure = ProcedureInfo.GetItemAndChildren(MyProcedure.ItemID); // 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, PDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50), cbxBlankPgsForDuplex.Checked); + frmStatus.MakePlaceKeeper = cbxGeneratePlacekeeper.Checked; frmStatus.ShowDialog(); MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0; this.Close(); diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index 4a6c6e1b..4e24c29d 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx @@ -120,6 +120,9 @@ 321, 17 + + 321, 17 + diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index fc76a3d7..b989e1c0 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -106,6 +106,13 @@ namespace VEPROMS private string _PdfFile; + private bool _MakePlaceKeeper = false; + + public bool MakePlaceKeeper + { + get { return _MakePlaceKeeper; } + set { _MakePlaceKeeper = value; } + } private void tmrRun_Tick(object sender, EventArgs e) { tmrRun.Enabled = false; @@ -116,7 +123,7 @@ namespace VEPROMS if (!CancelStop) PromsPrinter.ClearTransPageNumProblems(); do { - _PdfFile = MyPromsPrinter.Print(PDFPath); + _PdfFile = MyPromsPrinter.Print(PDFPath, MakePlaceKeeper); } while (_PdfFile == null && MessageBox.Show("Try Again?", "PDF Creation Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes); if (_PdfFile == null) diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 1b70eae5..8af72d67 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -325,8 +325,9 @@ namespace VEPROMS ppCbPlaceKeeper.Enabled = _isStepSection; if (!_isStepSection && (_SectionConfig.MySection.MySectionInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.Placekeeper) == E_DocStructStyle.Placekeeper) { - ppCbPlaceKeeper.Text = "Auto Generate Placekeeper"; - ppCbPlaceKeeper.Enabled = true; + //ppCbPlaceKeeper.Text = "Auto Generate Placekeeper"; + //ppCbPlaceKeeper.Enabled = true; + ppCbPlaceKeeper.Enabled = false; } if (ppCbPlaceKeeper.Enabled) ppCbPlaceKeeper.Checked = _SectionConfig.Section_Placekeeper == "Y"; } diff --git a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs index e00970db..6316362f 100644 --- a/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs +++ b/PROMS/VEPROMS/PrintMSWord/frmPrintMsWord.cs @@ -91,7 +91,7 @@ namespace PrintMSWord pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); _ElapsedTime = new Dictionary(); DateTime tStart = DateTime.Now; - string pdfFile = pp.Print(@"C:\TEMP\32Bit"); + string pdfFile = pp.Print(@"C:\TEMP\32Bit", false); DateTime tEnd = DateTime.Now; _ElapsedTime.Add(PromsPrinterStatusType.Total, DateTime.Now - tStart); MyTimerStatus = pdfFile + " created.";