diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 52791d53..8acbd799 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -135,7 +135,7 @@ namespace VEPROMS this.gpnlDebug.Controls.Add(this.cbxDebugPagination); this.gpnlDebug.DisabledBackColor = System.Drawing.Color.Empty; this.gpnlDebug.Location = new System.Drawing.Point(440, 150); - this.gpnlDebug.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.gpnlDebug.Margin = new System.Windows.Forms.Padding(2); this.gpnlDebug.Name = "gpnlDebug"; this.gpnlDebug.Size = new System.Drawing.Size(119, 97); // @@ -218,10 +218,10 @@ namespace VEPROMS this.grpDateSelector.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpDateSelector.Controls.Add(this.calDateSelector); this.grpDateSelector.DisabledBackColor = System.Drawing.Color.Empty; - this.grpDateSelector.Location = new System.Drawing.Point(235, 92); - this.grpDateSelector.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.grpDateSelector.Location = new System.Drawing.Point(235, 87); + this.grpDateSelector.Margin = new System.Windows.Forms.Padding(2); this.grpDateSelector.Name = "grpDateSelector"; - this.grpDateSelector.Size = new System.Drawing.Size(195, 154); + this.grpDateSelector.Size = new System.Drawing.Size(195, 186); // // // @@ -287,10 +287,11 @@ namespace VEPROMS this.calDateSelector.NavigationBackgroundStyle.BackColorGradientAngle = 90; this.calDateSelector.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.calDateSelector.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.calDateSelector.Size = new System.Drawing.Size(170, 131); + this.calDateSelector.Size = new System.Drawing.Size(170, 161); this.superTooltip1.SetSuperTooltip(this.calDateSelector, new DevComponents.DotNetBar.SuperTooltipInfo("Calandar", "", "Use the arrows to change the month and year.\r\n\r\nSelect the day.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(110, 100))); this.calDateSelector.TabIndex = 84; this.calDateSelector.Text = "monthCalendarAdv1"; + this.calDateSelector.TodayButtonVisible = true; this.calDateSelector.Visible = false; this.calDateSelector.DateSelected += new System.Windows.Forms.DateRangeEventHandler(this.calDateSelector_DateSelected); // @@ -367,7 +368,7 @@ namespace VEPROMS this.cbxOpenAfterCreate2.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysViewPDFAfterCreate", true)); this.cbxOpenAfterCreate2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(438, 90); - this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(2); this.cbxOpenAfterCreate2.Name = "cbxOpenAfterCreate2"; this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(159, 20); this.superTooltip1.SetSuperTooltip(this.cbxOpenAfterCreate2, new DevComponents.DotNetBar.SuperTooltipInfo("View PDF After Create", "", "PROMS will automatically open the created PDF in your PDF reader/viewer.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -388,7 +389,7 @@ namespace VEPROMS this.cbxOverwritePDF2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxOverwritePDF2.ForeColor = System.Drawing.SystemColors.ControlText; this.cbxOverwritePDF2.Location = new System.Drawing.Point(442, 61); - this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(2); this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; this.cbxOverwritePDF2.Size = new System.Drawing.Size(138, 20); this.superTooltip1.SetSuperTooltip(this.cbxOverwritePDF2, new DevComponents.DotNetBar.SuperTooltipInfo("Overwrite PDF File", "", "PROMS will automatically replace an existing PDF file of the same name at this PD" + @@ -576,7 +577,7 @@ namespace VEPROMS this.lblWatermarkS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblWatermarkS.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblWatermarkS.Location = new System.Drawing.Point(93, 67); - this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(2); this.lblWatermarkS.Name = "lblWatermarkS"; this.lblWatermarkS.Size = new System.Drawing.Size(79, 23); this.superTooltip1.SetSuperTooltip(this.lblWatermarkS, new DevComponents.DotNetBar.SuperTooltipInfo("Watermark", "", "Prints the selected watermark on each page of the generated PDF.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(115, 79))); @@ -592,7 +593,7 @@ namespace VEPROMS this.cbxWaterMark.FormattingEnabled = true; this.cbxWaterMark.ItemHeight = 17; this.cbxWaterMark.Location = new System.Drawing.Point(181, 70); - this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(2); this.cbxWaterMark.Name = "cbxWaterMark"; this.cbxWaterMark.Size = new System.Drawing.Size(157, 23); this.superTooltip1.SetSuperTooltip(this.cbxWaterMark, new DevComponents.DotNetBar.SuperTooltipInfo("Watermark", "", "Select the watermark text that will be printed on each page of the PDF.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); @@ -608,7 +609,7 @@ namespace VEPROMS 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(14, 410); - this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); this.btnCreatePDF.Name = "btnCreatePDF"; this.btnCreatePDF.Size = new System.Drawing.Size(133, 37); this.btnCreatePDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -626,7 +627,7 @@ namespace VEPROMS 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(474, 410); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCancel.Margin = new System.Windows.Forms.Padding(2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(122, 37); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -645,7 +646,7 @@ namespace VEPROMS 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(14, 382); - this.cbxDebug.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); this.cbxDebug.Name = "cbxDebug"; this.cbxDebug.Size = new System.Drawing.Size(104, 20); this.superTooltip1.SetSuperTooltip(this.cbxDebug, new DevComponents.DotNetBar.SuperTooltipInfo("Overlay PDF", "", resources.GetString("cbxDebug.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(250, 130))); @@ -682,7 +683,7 @@ namespace VEPROMS this.cbxRemoveTrailing.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxRemoveTrailing.ForeColor = System.Drawing.SystemColors.ControlText; this.cbxRemoveTrailing.Location = new System.Drawing.Point(2, 2); - this.cbxRemoveTrailing.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxRemoveTrailing.Margin = new System.Windows.Forms.Padding(2); this.cbxRemoveTrailing.Name = "cbxRemoveTrailing"; this.cbxRemoveTrailing.Size = new System.Drawing.Size(329, 20); this.superTooltip1.SetSuperTooltip(this.cbxRemoveTrailing, new DevComponents.DotNetBar.SuperTooltipInfo("Removing Hard Returns, Spaces and Manual Page Breaks", "", resources.GetString("cbxRemoveTrailing.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(280, 210))); @@ -891,10 +892,10 @@ namespace VEPROMS 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.labelX1.Size = new System.Drawing.Size(229, 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"; + this.labelX1.Text = "Create RO and Transition Hyperlinks"; // // labelX4 // @@ -920,7 +921,7 @@ namespace VEPROMS this.btnMergePDFs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnMergePDFs.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnMergePDFs.Location = new System.Drawing.Point(162, 410); - this.btnMergePDFs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnMergePDFs.Margin = new System.Windows.Forms.Padding(2); this.btnMergePDFs.Name = "btnMergePDFs"; this.btnMergePDFs.Size = new System.Drawing.Size(133, 37); this.btnMergePDFs.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -936,7 +937,7 @@ namespace VEPROMS this.cbxRemoveManualPgBrk.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxRemoveManualPgBrk.ForeColor = System.Drawing.SystemColors.ControlText; this.cbxRemoveManualPgBrk.Location = new System.Drawing.Point(2, 18); - this.cbxRemoveManualPgBrk.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxRemoveManualPgBrk.Margin = new System.Windows.Forms.Padding(2); this.cbxRemoveManualPgBrk.Name = "cbxRemoveManualPgBrk"; this.cbxRemoveManualPgBrk.Size = new System.Drawing.Size(218, 20); this.superTooltip1.SetSuperTooltip(this.cbxRemoveManualPgBrk, new DevComponents.DotNetBar.SuperTooltipInfo("Removing Hard Returns, Spaces and Manual Page Breaks", "", resources.GetString("cbxRemoveManualPgBrk.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(280, 210))); @@ -953,7 +954,7 @@ namespace VEPROMS 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, 2, 2, 2); + 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; @@ -975,7 +976,7 @@ namespace VEPROMS this.ppGpbxUserSpecCB.DisabledBackColor = System.Drawing.Color.Empty; this.ppGpbxUserSpecCB.Enabled = false; this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(19, 304); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(386, 148); // @@ -1188,7 +1189,7 @@ namespace VEPROMS this.groupPag.Controls.Add(this.cbxRemoveTrailing); this.groupPag.DisabledBackColor = System.Drawing.Color.Empty; this.groupPag.Location = new System.Drawing.Point(161, 343); - this.groupPag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPag.Margin = new System.Windows.Forms.Padding(2); this.groupPag.Name = "groupPag"; this.groupPag.Size = new System.Drawing.Size(337, 58); // @@ -1280,7 +1281,7 @@ namespace VEPROMS this.ppGpDuplex.Controls.Add(this.lblBlPg); this.ppGpDuplex.DisabledBackColor = System.Drawing.Color.Empty; this.ppGpDuplex.Location = new System.Drawing.Point(19, 214); - this.ppGpDuplex.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.ppGpDuplex.Margin = new System.Windows.Forms.Padding(2); this.ppGpDuplex.Name = "ppGpDuplex"; this.ppGpDuplex.Size = new System.Drawing.Size(386, 85); // @@ -1324,7 +1325,7 @@ namespace VEPROMS this.tbBlankPage.Enabled = false; this.tbBlankPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tbBlankPage.Location = new System.Drawing.Point(64, 38); - this.tbBlankPage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tbBlankPage.Margin = new System.Windows.Forms.Padding(2); this.tbBlankPage.Name = "tbBlankPage"; this.tbBlankPage.PreventEnterBeep = true; this.tbBlankPage.Size = new System.Drawing.Size(314, 21); @@ -1339,7 +1340,7 @@ namespace VEPROMS this.lblBlPg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblBlPg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblBlPg.Location = new System.Drawing.Point(12, 38); - this.lblBlPg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.lblBlPg.Margin = new System.Windows.Forms.Padding(2); this.lblBlPg.Name = "lblBlPg"; this.lblBlPg.Size = new System.Drawing.Size(56, 20); this.lblBlPg.TabIndex = 114; diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 5ee1da6b..6e60ae91 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -1029,7 +1029,9 @@ namespace VEPROMS txbDate = txbRevDate; grpDateSelector.Text = "Select Revision Date"; grpDateSelector.Visible = calDateSelector.Visible = true; - + //C2021-007 position the calendar to the current RevDate or if no RevDate, position to today's date + DateTime initSelDate =(txbDate.Text != null && txbDate.Text.Length != 0)? Convert.ToDateTime(txbDate.Text) : DateTime.Today; + calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate; } private void txbRevDate_Leave(object sender, EventArgs e) @@ -1076,6 +1078,9 @@ namespace VEPROMS txbDate = txbReviewDate; grpDateSelector.Text = "Select Review Date"; grpDateSelector.Visible = calDateSelector.Visible = true; + //C2021-007 position the calendar to the current ReviewDate or if no ReviewDate, position to today's date + DateTime initSelDate = (txbDate.Text != null && txbDate.Text.Length != 0) ? Convert.ToDateTime(txbDate.Text) : DateTime.Today; + calDateSelector.DisplayMonth = calDateSelector.SelectedDate = initSelDate; } private TextBox txbDate = null;