diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 9b410d53..2d5da0b4 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -67,35 +67,37 @@ namespace VEPROMS this.cbxOrPgBrk = new System.Windows.Forms.CheckBox(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.cbxRemoveManualPageBreaks = new System.Windows.Forms.CheckBox(); - this.cbxGenerateConActSum = new System.Windows.Forms.CheckBox(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); - this.ppGpbxUserSpecCB = new DevComponents.DotNetBar.Controls.GroupPanel(); this.ppGpbxUserSpecTxt = new DevComponents.DotNetBar.Controls.GroupPanel(); this.label14 = new System.Windows.Forms.Label(); this.ppTxbxChangeBarUserMsgTwo = new System.Windows.Forms.RichTextBox(); this.label15 = new System.Windows.Forms.Label(); this.ppTxbxChangeBarUserMsgOne = new System.Windows.Forms.RichTextBox(); this.ppCmbxChgBarTxtType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.lblCbTxtType = new System.Windows.Forms.Label(); this.cbxOvrrideDefChgBars = new System.Windows.Forms.CheckBox(); this.lblGeneratePlacekeeper = new DevComponents.DotNetBar.LabelX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.cbxGenerateConActSum = new System.Windows.Forms.CheckBox(); + this.ppGpbxUserSpecCB = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.lblCbTxtType = new System.Windows.Forms.Label(); this.swtbtnChgBar = new DevComponents.DotNetBar.Controls.SwitchButton(); this.swtbtnWaterMark = new DevComponents.DotNetBar.Controls.SwitchButton(); this.swtbtnGeneratePlacekeeper = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.labelX3 = new DevComponents.DotNetBar.LabelX(); this.swtbtnPROMSVersion = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.swtbtnBlankPgsForDuplex = new DevComponents.DotNetBar.Controls.SwitchButton(); - this.labelX1 = new DevComponents.DotNetBar.LabelX(); this.swtbtnPDFLinks = new DevComponents.DotNetBar.Controls.SwitchButton(); this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.expPrnSetting = new DevComponents.DotNetBar.ExpandablePanel(); + this.swtbtnPDFdtPrefixSuffix = new DevComponents.DotNetBar.Controls.SwitchButton(); this.gpnlDebug.SuspendLayout(); this.grpDateSelector.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); - this.ppGpbxUserSpecCB.SuspendLayout(); this.ppGpbxUserSpecTxt.SuspendLayout(); + this.ppGpbxUserSpecCB.SuspendLayout(); this.panelEx2.SuspendLayout(); this.expPrnSetting.SuspendLayout(); this.SuspendLayout(); @@ -292,7 +294,7 @@ namespace VEPROMS // // this.pbPDFsStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.pbPDFsStatus.Location = new System.Drawing.Point(8, 241); + this.pbPDFsStatus.Location = new System.Drawing.Point(11, 294); this.pbPDFsStatus.Name = "pbPDFsStatus"; this.pbPDFsStatus.Size = new System.Drawing.Size(575, 23); this.pbPDFsStatus.TabIndex = 87; @@ -597,7 +599,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(11, 327); + this.btnCreatePDF.Location = new System.Drawing.Point(5, 350); this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); this.btnCreatePDF.Name = "btnCreatePDF"; this.btnCreatePDF.Size = new System.Drawing.Size(133, 37); @@ -615,7 +617,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(471, 327); + this.btnCancel.Location = new System.Drawing.Point(465, 350); this.btnCancel.Margin = new System.Windows.Forms.Padding(2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(122, 37); @@ -634,7 +636,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", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxDebug.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxDebug.Location = new System.Drawing.Point(11, 299); + this.cbxDebug.Location = new System.Drawing.Point(5, 322); this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); this.cbxDebug.Name = "cbxDebug"; this.cbxDebug.Size = new System.Drawing.Size(104, 20); @@ -671,7 +673,7 @@ namespace VEPROMS this.cbxRemoveManualPageBreaks.BackColor = System.Drawing.Color.Transparent; this.cbxRemoveManualPageBreaks.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxRemoveManualPageBreaks.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(144, 299); + this.cbxRemoveManualPageBreaks.Location = new System.Drawing.Point(138, 322); this.cbxRemoveManualPageBreaks.Margin = new System.Windows.Forms.Padding(2); this.cbxRemoveManualPageBreaks.Name = "cbxRemoveManualPageBreaks"; this.cbxRemoveManualPageBreaks.Size = new System.Drawing.Size(350, 20); @@ -680,23 +682,6 @@ namespace VEPROMS this.cbxRemoveManualPageBreaks.Text = "Remove Trailing Hard Returns && Manual Page Breaks"; this.cbxRemoveManualPageBreaks.UseVisualStyleBackColor = false; // - // cbxGenerateConActSum - // - this.cbxGenerateConActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.cbxGenerateConActSum.AutoSize = true; - this.cbxGenerateConActSum.BackColor = System.Drawing.Color.Transparent; - this.cbxGenerateConActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxGenerateConActSum.ForeColor = System.Drawing.SystemColors.ControlText; - this.cbxGenerateConActSum.Location = new System.Drawing.Point(243, 256); - this.cbxGenerateConActSum.Margin = new System.Windows.Forms.Padding(2); - this.cbxGenerateConActSum.Name = "cbxGenerateConActSum"; - this.cbxGenerateConActSum.Size = new System.Drawing.Size(284, 17); - this.cbxGenerateConActSum.TabIndex = 102; - this.cbxGenerateConActSum.Text = "Generate Contiuous Action Summary (hidden but used)"; - this.cbxGenerateConActSum.UseVisualStyleBackColor = false; - this.cbxGenerateConActSum.Visible = false; - // // labelX5 // this.labelX5.BackColor = System.Drawing.Color.Transparent; @@ -705,7 +690,7 @@ namespace VEPROMS // this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX5.Location = new System.Drawing.Point(92, 187); + this.labelX5.Location = new System.Drawing.Point(92, 216); this.labelX5.Name = "labelX5"; this.labelX5.Size = new System.Drawing.Size(152, 23); this.superTooltip1.SetSuperTooltip(this.labelX5, new DevComponents.DotNetBar.SuperTooltipInfo("Change Bars", "", "A change bar will be printed for each step editor text that has been modified sin" + @@ -713,54 +698,6 @@ namespace VEPROMS this.labelX5.TabIndex = 110; this.labelX5.Text = "Change Bars"; // - // ppGpbxUserSpecCB - // - this.ppGpbxUserSpecCB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.ppGpbxUserSpecCB.BackColor = System.Drawing.Color.Transparent; - this.ppGpbxUserSpecCB.CanvasColor = System.Drawing.SystemColors.Control; - this.ppGpbxUserSpecCB.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.ppGpbxUserSpecCB.Controls.Add(this.ppGpbxUserSpecTxt); - this.ppGpbxUserSpecCB.Controls.Add(this.ppCmbxChgBarTxtType); - this.ppGpbxUserSpecCB.Controls.Add(this.lblCbTxtType); - this.ppGpbxUserSpecCB.Controls.Add(this.cbxOvrrideDefChgBars); - this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGpbxUserSpecCB.Enabled = false; - this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(14, 215); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); - this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; - this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(386, 148); - // - // - // - this.ppGpbxUserSpecCB.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.ppGpbxUserSpecCB.Style.BackColorGradientAngle = 90; - this.ppGpbxUserSpecCB.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.ppGpbxUserSpecCB.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUserSpecCB.Style.BorderBottomWidth = 1; - this.ppGpbxUserSpecCB.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.ppGpbxUserSpecCB.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUserSpecCB.Style.BorderLeftWidth = 1; - this.ppGpbxUserSpecCB.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUserSpecCB.Style.BorderRightWidth = 1; - this.ppGpbxUserSpecCB.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGpbxUserSpecCB.Style.BorderTopWidth = 1; - this.ppGpbxUserSpecCB.Style.CornerDiameter = 4; - this.ppGpbxUserSpecCB.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.ppGpbxUserSpecCB.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.ppGpbxUserSpecCB.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.ppGpbxUserSpecCB.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.ppGpbxUserSpecCB.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ppGpbxUserSpecCB.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppGpbxUserSpecCB.TabIndex = 53; - this.ppGpbxUserSpecCB.Text = "Change Bar Settings"; - // // ppGpbxUserSpecTxt // this.ppGpbxUserSpecTxt.CanvasColor = System.Drawing.SystemColors.Control; @@ -870,18 +807,6 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.WatermarkText = "select change bar text type"; this.ppCmbxChgBarTxtType.SelectedIndexChanged += new System.EventHandler(this.ppCmbxChgBarTxtType_SelectedIndexChanged); // - // lblCbTxtType - // - this.lblCbTxtType.AutoSize = true; - this.lblCbTxtType.Enabled = false; - this.lblCbTxtType.Location = new System.Drawing.Point(2, 43); - this.lblCbTxtType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.lblCbTxtType.Name = "lblCbTxtType"; - this.lblCbTxtType.Size = new System.Drawing.Size(72, 16); - this.lblCbTxtType.TabIndex = 8; - this.lblCbTxtType.Text = "Text Type:"; - this.lblCbTxtType.TextAlign = System.Drawing.ContentAlignment.BottomLeft; - // // cbxOvrrideDefChgBars // this.cbxOvrrideDefChgBars.AutoSize = true; @@ -907,7 +832,7 @@ namespace VEPROMS // this.lblGeneratePlacekeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblGeneratePlacekeeper.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblGeneratePlacekeeper.Location = new System.Drawing.Point(93, 155); + this.lblGeneratePlacekeeper.Location = new System.Drawing.Point(93, 184); this.lblGeneratePlacekeeper.Name = "lblGeneratePlacekeeper"; this.lblGeneratePlacekeeper.Size = new System.Drawing.Size(152, 23); this.superTooltip1.SetSuperTooltip(this.lblGeneratePlacekeeper, new DevComponents.DotNetBar.SuperTooltipInfo("Generate PlaceKeeper", "", "PlaceKeeper information will be generated and displayed in Word. The contents of " + @@ -916,13 +841,154 @@ namespace VEPROMS this.lblGeneratePlacekeeper.Text = "Generate Placekeeper"; this.lblGeneratePlacekeeper.Visible = false; // + // labelX3 + // + this.labelX3.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX3.Location = new System.Drawing.Point(93, 126); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(245, 23); + this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Show PROMS Version Number", "", "The PROMS Version number will print in the upper right corner of each page.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.labelX3.TabIndex = 110; + this.labelX3.Text = "Show PROMS Version Number"; + // + // labelX2 + // + this.labelX2.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX2.Location = new System.Drawing.Point(93, 68); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(245, 23); + this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Add Blank Pages for Duplex Printing", "", "Blank pages will be inserted where needed (for the back side of a page) when gene" + + "rating the PDF that prints information (Foldouts or Supplemental Info) on back p" + + "ages.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.labelX2.TabIndex = 110; + this.labelX2.Text = "Add Blank Pages For Duplex Printing"; + // + // labelX1 + // + this.labelX1.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX1.Location = new System.Drawing.Point(93, 39); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(112, 23); + this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("PDF Links", "", resources.GetString("labelX1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 125))); + this.labelX1.TabIndex = 108; + this.labelX1.Text = "PDF Links"; + // + // labelX4 + // + this.labelX4.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX4.Location = new System.Drawing.Point(93, 155); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(278, 23); + this.superTooltip1.SetSuperTooltip(this.labelX4, new DevComponents.DotNetBar.SuperTooltipInfo("Add Prefix / Suffix To PDF File Name", "", "The prefix and/or suffix defined on the Output tab of the Working Draft property " + + "page will be added to the PDF file name. \r\n\r\nNote that the PDF Links option wil" + + "l not be available.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 105))); + this.labelX4.TabIndex = 112; + this.labelX4.Text = "Add Date/Time to PDF File Name"; + // + // cbxGenerateConActSum + // + this.cbxGenerateConActSum.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.cbxGenerateConActSum.AutoSize = true; + this.cbxGenerateConActSum.BackColor = System.Drawing.Color.Transparent; + this.cbxGenerateConActSum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxGenerateConActSum.ForeColor = System.Drawing.SystemColors.ControlText; + this.cbxGenerateConActSum.Location = new System.Drawing.Point(243, 256); + this.cbxGenerateConActSum.Margin = new System.Windows.Forms.Padding(2); + this.cbxGenerateConActSum.Name = "cbxGenerateConActSum"; + this.cbxGenerateConActSum.Size = new System.Drawing.Size(284, 17); + this.cbxGenerateConActSum.TabIndex = 102; + this.cbxGenerateConActSum.Text = "Generate Contiuous Action Summary (hidden but used)"; + this.cbxGenerateConActSum.UseVisualStyleBackColor = false; + this.cbxGenerateConActSum.Visible = false; + // + // ppGpbxUserSpecCB + // + this.ppGpbxUserSpecCB.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ppGpbxUserSpecCB.BackColor = System.Drawing.Color.Transparent; + this.ppGpbxUserSpecCB.CanvasColor = System.Drawing.SystemColors.Control; + this.ppGpbxUserSpecCB.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.ppGpbxUserSpecCB.Controls.Add(this.ppGpbxUserSpecTxt); + this.ppGpbxUserSpecCB.Controls.Add(this.ppCmbxChgBarTxtType); + this.ppGpbxUserSpecCB.Controls.Add(this.lblCbTxtType); + this.ppGpbxUserSpecCB.Controls.Add(this.cbxOvrrideDefChgBars); + this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty; + this.ppGpbxUserSpecCB.Enabled = false; + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(20, 244); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; + this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(386, 148); + // + // + // + this.ppGpbxUserSpecCB.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.ppGpbxUserSpecCB.Style.BackColorGradientAngle = 90; + this.ppGpbxUserSpecCB.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.ppGpbxUserSpecCB.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUserSpecCB.Style.BorderBottomWidth = 1; + this.ppGpbxUserSpecCB.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.ppGpbxUserSpecCB.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUserSpecCB.Style.BorderLeftWidth = 1; + this.ppGpbxUserSpecCB.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUserSpecCB.Style.BorderRightWidth = 1; + this.ppGpbxUserSpecCB.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxUserSpecCB.Style.BorderTopWidth = 1; + this.ppGpbxUserSpecCB.Style.CornerDiameter = 4; + this.ppGpbxUserSpecCB.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.ppGpbxUserSpecCB.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.ppGpbxUserSpecCB.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.ppGpbxUserSpecCB.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.ppGpbxUserSpecCB.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ppGpbxUserSpecCB.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ppGpbxUserSpecCB.TabIndex = 53; + this.ppGpbxUserSpecCB.Text = "Change Bar Settings"; + // + // lblCbTxtType + // + this.lblCbTxtType.AutoSize = true; + this.lblCbTxtType.Enabled = false; + this.lblCbTxtType.Location = new System.Drawing.Point(2, 43); + this.lblCbTxtType.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCbTxtType.Name = "lblCbTxtType"; + this.lblCbTxtType.Size = new System.Drawing.Size(72, 16); + this.lblCbTxtType.TabIndex = 8; + this.lblCbTxtType.Text = "Text Type:"; + this.lblCbTxtType.TextAlign = System.Drawing.ContentAlignment.BottomLeft; + // // swtbtnChgBar // // // // this.swtbtnChgBar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnChgBar.Location = new System.Drawing.Point(19, 187); + this.swtbtnChgBar.Location = new System.Drawing.Point(19, 216); this.swtbtnChgBar.Name = "swtbtnChgBar"; this.swtbtnChgBar.Size = new System.Drawing.Size(66, 22); this.swtbtnChgBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -950,7 +1016,7 @@ namespace VEPROMS // // this.swtbtnGeneratePlacekeeper.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.swtbtnGeneratePlacekeeper.Location = new System.Drawing.Point(20, 156); + this.swtbtnGeneratePlacekeeper.Location = new System.Drawing.Point(20, 185); this.swtbtnGeneratePlacekeeper.Name = "swtbtnGeneratePlacekeeper"; this.swtbtnGeneratePlacekeeper.Size = new System.Drawing.Size(66, 22); this.swtbtnGeneratePlacekeeper.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -958,21 +1024,6 @@ namespace VEPROMS this.swtbtnGeneratePlacekeeper.TabIndex = 109; this.swtbtnGeneratePlacekeeper.Visible = false; // - // labelX3 - // - this.labelX3.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX3.Location = new System.Drawing.Point(93, 126); - this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(245, 23); - this.superTooltip1.SetSuperTooltip(this.labelX3, new DevComponents.DotNetBar.SuperTooltipInfo("Show PROMS Version Number", "", "The PROMS Version number will print in the upper right corner of each page.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.labelX3.TabIndex = 110; - this.labelX3.Text = "Show PROMS Version Number"; - // // swtbtnPROMSVersion // // @@ -986,23 +1037,6 @@ namespace VEPROMS this.swtbtnPROMSVersion.SwitchClickTogglesValue = true; this.swtbtnPROMSVersion.TabIndex = 109; // - // labelX2 - // - this.labelX2.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX2.Location = new System.Drawing.Point(93, 68); - this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(245, 23); - this.superTooltip1.SetSuperTooltip(this.labelX2, new DevComponents.DotNetBar.SuperTooltipInfo("Add Blank Pages for Duplex Printing", "", "Blank pages will be inserted where needed (for the back side of a page) when gene" + - "rating the PDF that prints information (Foldouts or Supplemental Info) on back p" + - "ages.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.labelX2.TabIndex = 110; - this.labelX2.Text = "Add Blank Pages For Duplex Printing"; - // // swtbtnBlankPgsForDuplex // // @@ -1016,22 +1050,6 @@ namespace VEPROMS this.swtbtnBlankPgsForDuplex.SwitchClickTogglesValue = true; this.swtbtnBlankPgsForDuplex.TabIndex = 109; // - // labelX1 - // - this.labelX1.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX1.Location = new System.Drawing.Point(93, 39); - this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(112, 23); - this.superTooltip1.SetSuperTooltip(this.labelX1, new DevComponents.DotNetBar.SuperTooltipInfo("PDF Links", "", "Will create live hyperlinks for transitions and Referenced Objects in the generat" + - "ed PDF file. See chapter C.3 in the PROMS user manual for details.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 105))); - this.labelX1.TabIndex = 108; - this.labelX1.Text = "PDF Links"; - // // swtbtnPDFLinks // // @@ -1044,6 +1062,7 @@ namespace VEPROMS this.swtbtnPDFLinks.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.swtbtnPDFLinks.SwitchClickTogglesValue = true; this.swtbtnPDFLinks.TabIndex = 107; + this.swtbtnPDFLinks.ValueChanged += new System.EventHandler(this.swtbtnPDFLinks_ValueChanged); // // expandableSplitter1 // @@ -1073,7 +1092,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(604, 0); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(6, 374); + this.expandableSplitter1.Size = new System.Drawing.Size(6, 402); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 107; this.expandableSplitter1.TabStop = false; @@ -1110,7 +1129,7 @@ namespace VEPROMS this.panelEx2.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx2.Location = new System.Drawing.Point(0, 0); this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(604, 374); + this.panelEx2.Size = new System.Drawing.Size(604, 402); this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1125,6 +1144,8 @@ namespace VEPROMS this.expPrnSetting.CanvasColor = System.Drawing.SystemColors.Control; this.expPrnSetting.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.LeftToRight; this.expPrnSetting.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.expPrnSetting.Controls.Add(this.labelX4); + this.expPrnSetting.Controls.Add(this.swtbtnPDFdtPrefixSuffix); this.expPrnSetting.Controls.Add(this.ppGpbxUserSpecCB); this.expPrnSetting.Controls.Add(this.labelX5); this.expPrnSetting.Controls.Add(this.cbxWaterMark); @@ -1146,7 +1167,7 @@ namespace VEPROMS this.expPrnSetting.HideControlsWhenCollapsed = true; this.expPrnSetting.Location = new System.Drawing.Point(610, 0); this.expPrnSetting.Name = "expPrnSetting"; - this.expPrnSetting.Size = new System.Drawing.Size(411, 374); + this.expPrnSetting.Size = new System.Drawing.Size(411, 402); this.expPrnSetting.Style.Alignment = System.Drawing.StringAlignment.Center; this.expPrnSetting.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.expPrnSetting.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1166,12 +1187,26 @@ namespace VEPROMS this.expPrnSetting.ExpandedChanging += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expPrnSetting_ExpandedChanging); this.expPrnSetting.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.expPrnSetting_ExpandedChanged); // + // swtbtnPDFdtPrefixSuffix + // + // + // + // + this.swtbtnPDFdtPrefixSuffix.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.swtbtnPDFdtPrefixSuffix.Location = new System.Drawing.Point(20, 155); + this.swtbtnPDFdtPrefixSuffix.Name = "swtbtnPDFdtPrefixSuffix"; + this.swtbtnPDFdtPrefixSuffix.Size = new System.Drawing.Size(66, 22); + this.swtbtnPDFdtPrefixSuffix.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.swtbtnPDFdtPrefixSuffix.SwitchClickTogglesValue = true; + this.swtbtnPDFdtPrefixSuffix.TabIndex = 111; + this.swtbtnPDFdtPrefixSuffix.ValueChanged += new System.EventHandler(this.swtbtnPDFdtPrefixSuffix_ValueChanged); + // // 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(1021, 374); + this.ClientSize = new System.Drawing.Size(1021, 402); this.Controls.Add(this.panelEx2); this.Controls.Add(this.expandableSplitter1); this.Controls.Add(this.expPrnSetting); @@ -1190,10 +1225,10 @@ namespace VEPROMS this.grpDateSelector.ResumeLayout(false); this.grpDateSelector.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); - this.ppGpbxUserSpecCB.ResumeLayout(false); - this.ppGpbxUserSpecCB.PerformLayout(); this.ppGpbxUserSpecTxt.ResumeLayout(false); this.ppGpbxUserSpecTxt.PerformLayout(); + this.ppGpbxUserSpecCB.ResumeLayout(false); + this.ppGpbxUserSpecCB.PerformLayout(); this.panelEx2.ResumeLayout(false); this.panelEx2.PerformLayout(); this.expPrnSetting.ResumeLayout(false); @@ -1264,5 +1299,7 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.SwitchButton swtbtnPDFLinks; private System.Windows.Forms.CheckBox cbxOvrrideDefChgBars; private DevComponents.DotNetBar.ExpandablePanel expPrnSetting; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.Controls.SwitchButton swtbtnPDFdtPrefixSuffix; } } diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 5c8226f4..ae66493b 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -49,6 +49,21 @@ namespace VEPROMS get { return _Automatic; } set { _Automatic = value; } } + + // C2018-033 Used to turn off using the date/time PDF file prefix and suffix when doing batch file autmatic baseline print testing (frmVEPROMS.cs RunAutomatic()) + // This is needed so the the automatic baselines can compare results from different runs of PROMS + private bool _AllowDateTimePrefixSuffix = true; + public bool AllowDateTimePrefixSuffix + { + get { return _AllowDateTimePrefixSuffix; } + set + { + _AllowDateTimePrefixSuffix = value; + swtbtnPDFdtPrefixSuffix.Value = swtbtnPDFdtPrefixSuffix.Enabled = _AllowDateTimePrefixSuffix; + } + } + private DateTime _PrefixSuffixDTS = DateTime.Now; // C2018-033 date/time used for the date/time PDF file prefix and suffix + private bool _DateTimePrefixSuffixPrintingAllProcedures = true; // C2018-033 to control adding the Date/Time Prefix/Suffix to PFD name when printing All procedures private bool _IncludeWordSecTextInMetafile = true; // C2018-023 so that we can turn off including Word attachment text in metafile private void RunAutomatic() { @@ -61,13 +76,13 @@ namespace VEPROMS 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; - else if (parameter.ToUpper() == "/NM") + 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 else if (parameter.ToUpper() == "/NW") _IncludeWordSecTextInMetafile = false; // C2018-023 turn off putting Word attachment text in the meta file for baseline compares @@ -150,7 +165,8 @@ namespace VEPROMS Rtf2iTextSharp.DoingComparison = cbxDebug.Checked; // RHM20150506 Multiline ItemID TextBox // don't open all PDFs if doing All Procedures //cbxOpenAfterCreate2.Checked = dvi.DocVersionConfig.Print_AlwaysViewPDFAfterCreate; - expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value; + // C2018-033 added the Prefix / Suffix switch to the expand Additional Settings check + expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value; } public DlgPrintProcedure(DocVersionInfo dvi) { @@ -166,7 +182,8 @@ namespace VEPROMS HandleDocVersionSettings(); PrepForAllOrOne(false); // don't open all PDFs if doing All Procedures - expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value; + // C2018-033 added the Prefix / Suffix switch to the expand Additional Settings check + expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value; } private void PrepForAllOrOne(bool oneProcedure) { @@ -210,7 +227,8 @@ namespace VEPROMS HandleDocVersionSettings(); PrepForAllOrOne(true); cbxOpenAfterCreate2.Checked = pi.MyDocVersion.DocVersionConfig.Print_AlwaysViewPDFAfterCreate; - expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value; + // C2018-033 added the Prefix / Suffix switch to the expand Additional Settings check + expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value; } public DlgPrintProcedure(ProcedureInfo pi, bool automatic) // RHM20150506 Multiline ItemID TextBox { @@ -226,7 +244,8 @@ namespace VEPROMS HandleDocVersionSettings(); PrepForAllOrOne(true); cbxOpenAfterCreate2.Checked = pi.MyDocVersion.DocVersionConfig.Print_AlwaysViewPDFAfterCreate; - expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value; + // C2018-033 added the Prefix / Suffix switch to the expand Additional Settings check + expPrnSetting.Expanded = swtbtnBlankPgsForDuplex.Value || swtbtnChgBar.Value || swtbtnGeneratePlacekeeper.Value || swtbtnPDFLinks.Value || swtbtnPROMSVersion.Value || swtbtnWaterMark.Value || swtbtnPDFdtPrefixSuffix.Value; } /// /// RHM 20120925 Added so that the dialog would center over the PROMS window @@ -337,8 +356,6 @@ namespace VEPROMS private Timer _MyTimer; public void SetupForProcedure() // RHM20150506 Multiline ItemID TextBox { - string PDFFilePrefix = _DocVersionConfig.Print_PDFFilePrefix; - string PDFFileSuffix = _DocVersionConfig.Print_PDFFileSuffix; if(_DocVersionInfo == null)this.Text = "Create PDF for " + ProcNum; // get list of previous pdf files // if no previous pdf file, then get path from frmVersionProperties @@ -346,20 +363,7 @@ namespace VEPROMS //cbxPDF.Text = string.Format(@"{0}\{1}.pdf", _PDFPath, _ProcNum); // General 2 settings //txbPDFLocation.Text = _PDFPath; - string PDFFileName = ""; - if (ProcNum == string.Empty) - //txbPDFName.Text = this.UnitNumber + ".pdf"; - PDFFileName = this.UnitNumber; - else - //txbPDFName.Text = string.Format("{0}.pdf", _MyProcedure.PDFNumber); - PDFFileName = string.Format("{0}", _MyProcedure.PDFNumber); - //if (txbPDFName.Text.StartsWith("*")) - // txbPDFName.Text = txbPDFName.Text.Replace("*", this.UnitNumber); - if ((PDFFileName ?? "") == "") PDFFileName = "NoProcNumber"; - if (PDFFileName.StartsWith("*")) - PDFFileName = PDFFileName.Replace("*", this.UnitNumber); - if (PDFFileName.Contains("?")) PDFFileName = PDFFileName.Replace("?", "_"); // for wcn sys/BM-2xxA??, etc - txbPDFName.Text = PDFFilePrefix + PDFFileName + PDFFileSuffix + ".pdf"; + BuildPDFFileName(); ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig; if(SelectedSlave > 0) pc.SelectedSlave = SelectedSlave; if (pc != null) @@ -426,6 +430,52 @@ namespace VEPROMS lblRevDate.Visible = txbRevDate.Visible = !_AllProcedures && usesRevDate; } + // C2018-033 add the Prefix and/or Suffix to PDF file name if defined and wanted by the user + // this piece of code was functionalized from SetupForProcedure() + private void BuildPDFFileName() + { + if (MyProcedure == null) return; + string PDFFilePrefix = _DocVersionConfig.Print_PDFFilePrefix; + string PDFFileSuffix = _DocVersionConfig.Print_PDFFileSuffix; + string PDFFileName = ""; + if (AllowDateTimePrefixSuffix && swtbtnPDFdtPrefixSuffix.Value) + { + PDFDTPrefix dtPre = _DocVersionConfig.Print_PDFdtFilePrefix; + PDFDTSuffix dtSuf = _DocVersionConfig.Print_PDFdtFileSuffix; + //DateTime dts = DateTime.Now; + if (dtPre != PDFDTPrefix.None) + PDFFilePrefix = (_PrefixSuffixDTS.ToString(dtPre.ToString())).Replace("__", " ").Replace("_", "-") + "_"; + if (dtSuf != PDFDTSuffix.None) + PDFFileSuffix = "_" + (_PrefixSuffixDTS.ToString(dtSuf.ToString())).Replace("__", " ").Replace("_", "-"); + } + if (ProcNum == string.Empty) + //txbPDFName.Text = this.UnitNumber + ".pdf"; + PDFFileName = this.UnitNumber; + else + //txbPDFName.Text = string.Format("{0}.pdf", _MyProcedure.PDFNumber); + PDFFileName = string.Format("{0}", _MyProcedure.PDFNumber); + //if (txbPDFName.Text.StartsWith("*")) + // txbPDFName.Text = txbPDFName.Text.Replace("*", this.UnitNumber); + if ((PDFFileName ?? "") == "") PDFFileName = "NoProcNumber"; + if (PDFFileName.StartsWith("*")) + PDFFileName = PDFFileName.Replace("*", this.UnitNumber); + if (PDFFileName.Contains("?")) PDFFileName = PDFFileName.Replace("?", "_"); // for wcn sys/BM-2xxA??, etc + txbPDFName.Text = PDFFilePrefix + PDFFileName + PDFFileSuffix + ".pdf"; + } + + // C2018-033 Enable/disable the switch to control whether to add Prefix and/or Suffix to PDF file name + private void SetupPrefixSuffixSwitch() + { + // note that MyProcedure must be set before calling this because BuildPDFFileName() will be called when the swbtnPDFPrefixSuffix is set + string PDFFilePrefix = _DocVersionConfig.Print_PDFFilePrefix; + string PDFFileSuffix = _DocVersionConfig.Print_PDFFileSuffix; + PDFDTPrefix dtPre = _DocVersionConfig.Print_PDFdtFilePrefix; + PDFDTSuffix dtSuf = _DocVersionConfig.Print_PDFdtFileSuffix; + bool hasPrefixSuffix = _DateTimePrefixSuffixPrintingAllProcedures && (PDFFilePrefix.Length > 0 || PDFFileSuffix.Length > 0 || dtPre != PDFDTPrefix.None || dtSuf != PDFDTSuffix.None); + swtbtnPDFdtPrefixSuffix.Value = hasPrefixSuffix; // this will call BuildPDFFileName() thus MyProcedure must be set + swtbtnPDFdtPrefixSuffix.Enabled = hasPrefixSuffix; + } + private void btnCancel_Click(object sender, EventArgs e) { this.Close(); @@ -502,6 +552,7 @@ namespace VEPROMS // if procedure has supplemental information, the automatially check the add blank pages for duplex printing if (_MyProcedure.ProcHasSupInfoData) swtbtnBlankPgsForDuplex.Value = true; + SetupPrefixSuffixSwitch(); // C2018-033 Enable the switch to control whether to add Prefix and/or Suffix to PDF file name } } private int _SelectedSlave = 0; @@ -960,7 +1011,11 @@ namespace VEPROMS private void expPrnSetting_ExpandedChanged(object sender, DevComponents.DotNetBar.ExpandedChangeEventArgs e) { if (expPrnSetting.Expanded) + { this.Size = new Size(this.Size.Width + (expPrnSetting.Size.Width - expPrnSetting.TitlePanel.Size.Height), this.Size.Height); + // B2018-137 set the visability of Generate Placekeeper + swtbtnGeneratePlacekeeper.Visible = lblGeneratePlacekeeper.Visible = ((MyProcedure.ActiveFormat.PlantFormat.FormatData.PurchaseOptions & E_PurchaseOptions.AutoPlacekeeper) == E_PurchaseOptions.AutoPlacekeeper); + } //else // this.Size = new Size(this.Size.Width-(expPrnSetting.Size.Width-expPrnSetting.TitlePanel.Size.Height), this.Size.Height); //Refresh(); @@ -976,6 +1031,21 @@ namespace VEPROMS } + private void swtbtnPDFdtPrefixSuffix_ValueChanged(object sender, EventArgs e) + { + if (swtbtnPDFdtPrefixSuffix.Value) + swtbtnPDFLinks.Value = false; + if (_AllProcedures) _DateTimePrefixSuffixPrintingAllProcedures = swtbtnPDFdtPrefixSuffix.Value; // C2018-033 add switch to use Prefix and Suffix on PDF file name + BuildPDFFileName(); + } + + private void swtbtnPDFLinks_ValueChanged(object sender, EventArgs e) + { + if (swtbtnPDFLinks.Value) + swtbtnPDFdtPrefixSuffix.Value = false; + BuildPDFFileName(); + } + diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index c78ee4b1..1c6c7a78 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx @@ -158,9 +158,6 @@ A different location can be entered (or navigated to via the button to the right 321, 17 - - 321, 17 - This will be printed on the pages defined by the procedure's format. For example, on cover pages and in the header box of each page. @@ -181,9 +178,11 @@ This option is only available when PROMS is run in Debug mode. NOTE: If you find that manual page breaks and/or hard returns are needed for an acceptable output, please contact Volian so that we can improve the pagination logic. - - 40 - + + Will create live hyperlinks for transitions and Referenced Objects in the generated PDF file. See chapter C.3 in the PROMS user manual for details. + +Note that the Add Prefix / Suffix to PDF File Name option will not be available. + 40 diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index e4936b88..efe57331 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -2342,6 +2342,7 @@ namespace VEPROMS DlgPrintProcedure prnDlg = new DlgPrintProcedure(dvi, true); if (dvi.MultiUnitCount == 0) prnDlg.SelectedSlave = -1; + prnDlg.AllowDateTimePrefixSuffix = false; //C2018-033 don't append any selected date/time pdf file prefix or suffix (defined in working draft properties) prnDlg.ShowDialog(this); // RHM 20120925 - Center dialog over PROMS window //prnDlg.FormClosed += new FormClosedEventHandler(prnDlg_FormClosed); //while (!_RunNext) Application.DoEvents();