diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index 9c1851ab..6fe69102 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -32,20 +32,15 @@ namespace VEPROMS System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DlgPrintProcedure)); this.tabControl1 = new DevComponents.DotNetBar.TabControl(); this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.pbPDFsStatus = new DevComponents.DotNetBar.Controls.ProgressBarX(); this.gpnlDebug = new DevComponents.DotNetBar.Controls.GroupPanel(); 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.txbReviewDate = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.txbRevDate = new DevComponents.DotNetBar.Controls.TextBoxX(); this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX(); this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox(); this.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); this.cbxOverwritePDF2 = new System.Windows.Forms.CheckBox(); this.txbRevNum = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.lblReviewDate = new DevComponents.DotNetBar.LabelX(); - this.lblRevDate = new DevComponents.DotNetBar.LabelX(); this.lblRevNum = new DevComponents.DotNetBar.LabelX(); this.txbPDFName = new DevComponents.DotNetBar.Controls.TextBoxX(); this.lblPDFFileName = new DevComponents.DotNetBar.LabelX(); @@ -88,12 +83,10 @@ namespace VEPROMS this.cbxOrPgBrk = new System.Windows.Forms.CheckBox(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.cbxCmpPRMSpfd = new System.Windows.Forms.CheckBox(); - this.pbPDFsStatus = new DevComponents.DotNetBar.Controls.ProgressBarX(); ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); this.gpnlDebug.SuspendLayout(); - this.grpDateSelector.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); this.tabControlPanel1.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); @@ -105,19 +98,19 @@ namespace VEPROMS // tabControl1 // this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); 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.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.Controls.Add(this.tabControlPanel1); + this.tabControl1.Location = new System.Drawing.Point(3, 0); + this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(733, 331); this.tabControl1.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabControl1.TabIndex = 0; this.tabControl1.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -131,35 +124,44 @@ namespace VEPROMS this.tabControlPanel3.AutoScroll = true; this.tabControlPanel3.Controls.Add(this.pbPDFsStatus); this.tabControlPanel3.Controls.Add(this.gpnlDebug); - this.tabControlPanel3.Controls.Add(this.grpDateSelector); - this.tabControlPanel3.Controls.Add(this.txbReviewDate); - this.tabControlPanel3.Controls.Add(this.txbRevDate); this.tabControlPanel3.Controls.Add(this.txbPDFLocation); this.tabControlPanel3.Controls.Add(this.cbxOpenAfterCreate2); this.tabControlPanel3.Controls.Add(this.cbxOverwritePDF2); this.tabControlPanel3.Controls.Add(this.txbRevNum); - this.tabControlPanel3.Controls.Add(this.lblReviewDate); - this.tabControlPanel3.Controls.Add(this.lblRevDate); this.tabControlPanel3.Controls.Add(this.lblRevNum); this.tabControlPanel3.Controls.Add(this.txbPDFName); this.tabControlPanel3.Controls.Add(this.lblPDFFileName); this.tabControlPanel3.Controls.Add(this.lblPDFLoc); this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel3.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(733, 307); 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; this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel3.Style.GradientAngle = 90; this.tabControlPanel3.TabIndex = 3; this.tabControlPanel3.TabItem = this.tbGeneral; // + // pbPDFsStatus + // + // + // + // + this.pbPDFsStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.pbPDFsStatus.Location = new System.Drawing.Point(9, 271); + this.pbPDFsStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.pbPDFsStatus.Name = "pbPDFsStatus"; + this.pbPDFsStatus.Size = new System.Drawing.Size(719, 28); + this.pbPDFsStatus.TabIndex = 87; + this.pbPDFsStatus.Text = "Procedures Converted to PDF"; + this.pbPDFsStatus.Visible = false; + // // gpnlDebug // this.gpnlDebug.BackColor = System.Drawing.Color.Transparent; @@ -167,10 +169,10 @@ namespace VEPROMS this.gpnlDebug.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.gpnlDebug.Controls.Add(this.cbxDebugText); this.gpnlDebug.Controls.Add(this.cbxDebugPagination); - this.gpnlDebug.Location = new System.Drawing.Point(401, 75); - this.gpnlDebug.Margin = new System.Windows.Forms.Padding(2); + this.gpnlDebug.Location = new System.Drawing.Point(535, 92); + this.gpnlDebug.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpnlDebug.Name = "gpnlDebug"; - this.gpnlDebug.Size = new System.Drawing.Size(90, 74); + this.gpnlDebug.Size = new System.Drawing.Size(120, 91); // // // @@ -206,10 +208,10 @@ namespace VEPROMS // this.cbxDebugText.AutoSize = true; this.cbxDebugText.BackColor = System.Drawing.Color.Transparent; - this.cbxDebugText.Location = new System.Drawing.Point(8, 30); - this.cbxDebugText.Margin = new System.Windows.Forms.Padding(2); + this.cbxDebugText.Location = new System.Drawing.Point(11, 37); + this.cbxDebugText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxDebugText.Name = "cbxDebugText"; - this.cbxDebugText.Size = new System.Drawing.Size(47, 17); + this.cbxDebugText.Size = new System.Drawing.Size(57, 21); this.cbxDebugText.TabIndex = 1; this.cbxDebugText.Text = "Text"; this.cbxDebugText.UseVisualStyleBackColor = false; @@ -218,144 +220,29 @@ namespace VEPROMS // this.cbxDebugPagination.AutoSize = true; this.cbxDebugPagination.BackColor = System.Drawing.Color.Transparent; - this.cbxDebugPagination.Location = new System.Drawing.Point(9, 7); - this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(2); + this.cbxDebugPagination.Location = new System.Drawing.Point(12, 9); + this.cbxDebugPagination.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxDebugPagination.Name = "cbxDebugPagination"; - this.cbxDebugPagination.Size = new System.Drawing.Size(76, 17); + this.cbxDebugPagination.Size = new System.Drawing.Size(97, 21); this.cbxDebugPagination.TabIndex = 0; this.cbxDebugPagination.Text = "Pagination"; this.cbxDebugPagination.UseVisualStyleBackColor = false; // - // grpDateSelector - // - this.grpDateSelector.BackColor = System.Drawing.Color.Transparent; - this.grpDateSelector.CanvasColor = System.Drawing.SystemColors.Control; - this.grpDateSelector.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.grpDateSelector.Controls.Add(this.calDateSelector); - this.grpDateSelector.Location = new System.Drawing.Point(197, 75); - this.grpDateSelector.Margin = new System.Windows.Forms.Padding(2); - this.grpDateSelector.Name = "grpDateSelector"; - this.grpDateSelector.Size = new System.Drawing.Size(195, 154); - // - // - // - this.grpDateSelector.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.grpDateSelector.Style.BackColorGradientAngle = 90; - this.grpDateSelector.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.grpDateSelector.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grpDateSelector.Style.BorderBottomWidth = 1; - this.grpDateSelector.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.grpDateSelector.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grpDateSelector.Style.BorderLeftWidth = 1; - this.grpDateSelector.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grpDateSelector.Style.BorderRightWidth = 1; - this.grpDateSelector.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.grpDateSelector.Style.BorderTopWidth = 1; - this.grpDateSelector.Style.CornerDiameter = 4; - this.grpDateSelector.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.grpDateSelector.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.grpDateSelector.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.grpDateSelector.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.grpDateSelector.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.grpDateSelector.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.grpDateSelector.TabIndex = 85; - this.grpDateSelector.Text = "Select Revision Date"; - this.grpDateSelector.Visible = false; - // - // calDateSelector - // - this.calDateSelector.AnnuallyMarkedDates = new System.DateTime[0]; - this.calDateSelector.AutoSize = true; - // - // - // - this.calDateSelector.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.calDateSelector.BackgroundStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.calDateSelector.BackgroundStyle.BorderBottomWidth = 1; - this.calDateSelector.BackgroundStyle.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.calDateSelector.BackgroundStyle.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.calDateSelector.BackgroundStyle.BorderLeftWidth = 1; - this.calDateSelector.BackgroundStyle.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.calDateSelector.BackgroundStyle.BorderRightWidth = 1; - this.calDateSelector.BackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.calDateSelector.BackgroundStyle.BorderTopWidth = 1; - this.calDateSelector.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.calDateSelector.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.calDateSelector.ContainerControlProcessDialogKey = true; - this.calDateSelector.DisplayMonth = new System.DateTime(2010, 8, 1, 0, 0, 0, 0); - this.calDateSelector.Location = new System.Drawing.Point(10, 2); - this.calDateSelector.Margin = new System.Windows.Forms.Padding(2); - this.calDateSelector.MarkedDates = new System.DateTime[0]; - this.calDateSelector.MonthlyMarkedDates = new System.DateTime[0]; - this.calDateSelector.Name = "calDateSelector"; - // - // - // - this.calDateSelector.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - 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.TabIndex = 84; - this.calDateSelector.Text = "monthCalendarAdv1"; - this.calDateSelector.Visible = false; - this.calDateSelector.WeeklyMarkedDays = new System.DayOfWeek[0]; - this.calDateSelector.DateSelected += new System.Windows.Forms.DateRangeEventHandler(this.calDateSelector_DateSelected); - // - // txbReviewDate - // - // - // - // - this.txbReviewDate.Border.Class = "TextBoxBorder"; - this.txbReviewDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbReviewDate.Location = new System.Drawing.Point(102, 140); - this.txbReviewDate.Margin = new System.Windows.Forms.Padding(2); - this.txbReviewDate.Name = "txbReviewDate"; - this.txbReviewDate.Size = new System.Drawing.Size(91, 20); - this.txbReviewDate.TabIndex = 83; - this.txbReviewDate.Leave += new System.EventHandler(this.txbReviewDate_Leave); - this.txbReviewDate.Enter += new System.EventHandler(this.txbReviewDate_Enter); - // - // txbRevDate - // - // - // - // - this.txbRevDate.Border.Class = "TextBoxBorder"; - this.txbRevDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbRevDate.Location = new System.Drawing.Point(102, 107); - this.txbRevDate.Margin = new System.Windows.Forms.Padding(2); - this.txbRevDate.Name = "txbRevDate"; - this.txbRevDate.Size = new System.Drawing.Size(91, 20); - this.txbRevDate.TabIndex = 82; - this.txbRevDate.Leave += new System.EventHandler(this.txbRevDate_Leave); - this.txbRevDate.Enter += new System.EventHandler(this.txbRevDate_Enter); - // // txbPDFLocation // this.txbPDFLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); // // // this.txbPDFLocation.Border.Class = "TextBoxBorder"; this.txbPDFLocation.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.txbPDFLocation.Enabled = false; - this.txbPDFLocation.Location = new System.Drawing.Point(102, 8); - this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(2); + this.txbPDFLocation.Location = new System.Drawing.Point(136, 10); + this.txbPDFLocation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(763, 26); this.txbPDFLocation.TabIndex = 81; this.txbPDFLocation.WatermarkText = "PDF Location"; this.txbPDFLocation.Leave += new System.EventHandler(this.txbPDFLocation_Leave); @@ -366,10 +253,10 @@ namespace VEPROMS this.cbxOpenAfterCreate2.BackColor = System.Drawing.Color.Transparent; 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", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(7, 220); - this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(2); + this.cbxOpenAfterCreate2.Location = new System.Drawing.Point(9, 271); + this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOpenAfterCreate2.Name = "cbxOpenAfterCreate2"; - this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(145, 19); + this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(177, 22); this.cbxOpenAfterCreate2.TabIndex = 80; this.cbxOpenAfterCreate2.Text = "View PDF After Create"; this.cbxOpenAfterCreate2.UseVisualStyleBackColor = false; @@ -386,10 +273,10 @@ 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.Margin = new System.Windows.Forms.Padding(2); + this.cbxOverwritePDF2.Location = new System.Drawing.Point(717, 48); + this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; - this.cbxOverwritePDF2.Size = new System.Drawing.Size(127, 19); + this.cbxOverwritePDF2.Size = new System.Drawing.Size(154, 22); this.cbxOverwritePDF2.TabIndex = 79; this.cbxOverwritePDF2.Text = "Overwrite PDF File"; this.cbxOverwritePDF2.UseVisualStyleBackColor = false; @@ -401,45 +288,13 @@ namespace VEPROMS // this.txbRevNum.Border.Class = "TextBoxBorder"; this.txbRevNum.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbRevNum.Location = new System.Drawing.Point(102, 75); - this.txbRevNum.Margin = new System.Windows.Forms.Padding(2); + this.txbRevNum.Location = new System.Drawing.Point(136, 92); + this.txbRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.txbRevNum.Name = "txbRevNum"; - this.txbRevNum.Size = new System.Drawing.Size(91, 20); + this.txbRevNum.Size = new System.Drawing.Size(270, 26); this.txbRevNum.TabIndex = 73; this.txbRevNum.Leave += new System.EventHandler(this.txbRevNum_Leave); // - // lblReviewDate - // - this.lblReviewDate.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblReviewDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblReviewDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblReviewDate.Location = new System.Drawing.Point(7, 140); - this.lblReviewDate.Margin = new System.Windows.Forms.Padding(2); - this.lblReviewDate.Name = "lblReviewDate"; - this.lblReviewDate.Size = new System.Drawing.Size(86, 19); - this.lblReviewDate.TabIndex = 72; - this.lblReviewDate.Text = "Review Date"; - this.lblReviewDate.TextAlignment = System.Drawing.StringAlignment.Far; - // - // lblRevDate - // - this.lblRevDate.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblRevDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.lblRevDate.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblRevDate.Location = new System.Drawing.Point(7, 107); - this.lblRevDate.Margin = new System.Windows.Forms.Padding(2); - this.lblRevDate.Name = "lblRevDate"; - this.lblRevDate.Size = new System.Drawing.Size(86, 19); - this.lblRevDate.TabIndex = 71; - this.lblRevDate.Text = "Revision Date"; - this.lblRevDate.TextAlignment = System.Drawing.StringAlignment.Far; - // // lblRevNum // this.lblRevNum.BackColor = System.Drawing.Color.Transparent; @@ -448,10 +303,10 @@ namespace VEPROMS // this.lblRevNum.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblRevNum.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblRevNum.Location = new System.Drawing.Point(7, 75); - this.lblRevNum.Margin = new System.Windows.Forms.Padding(2); + this.lblRevNum.Location = new System.Drawing.Point(9, 92); + this.lblRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblRevNum.Name = "lblRevNum"; - this.lblRevNum.Size = new System.Drawing.Size(86, 19); + this.lblRevNum.Size = new System.Drawing.Size(115, 23); this.lblRevNum.TabIndex = 70; this.lblRevNum.Text = "Revision Number"; this.lblRevNum.TextAlignment = System.Drawing.StringAlignment.Far; @@ -459,15 +314,16 @@ namespace VEPROMS // txbPDFName // this.txbPDFName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); // // // this.txbPDFName.Border.Class = "TextBoxBorder"; this.txbPDFName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbPDFName.Location = new System.Drawing.Point(102, 39); + this.txbPDFName.Location = new System.Drawing.Point(136, 48); + this.txbPDFName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txbPDFName.Name = "txbPDFName"; - this.txbPDFName.Size = new System.Drawing.Size(245, 20); + this.txbPDFName.Size = new System.Drawing.Size(509, 26); this.txbPDFName.TabIndex = 8; // // lblPDFFileName @@ -478,9 +334,10 @@ namespace VEPROMS // this.lblPDFFileName.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPDFFileName.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPDFFileName.Location = new System.Drawing.Point(7, 34); + this.lblPDFFileName.Location = new System.Drawing.Point(9, 42); + this.lblPDFFileName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lblPDFFileName.Name = "lblPDFFileName"; - this.lblPDFFileName.Size = new System.Drawing.Size(86, 19); + this.lblPDFFileName.Size = new System.Drawing.Size(115, 23); this.lblPDFFileName.TabIndex = 7; this.lblPDFFileName.Text = "PDF Name"; this.lblPDFFileName.TextAlignment = System.Drawing.StringAlignment.Far; @@ -493,10 +350,10 @@ namespace VEPROMS // this.lblPDFLoc.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPDFLoc.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPDFLoc.Location = new System.Drawing.Point(7, 3); - this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(2); + this.lblPDFLoc.Location = new System.Drawing.Point(9, 4); + this.lblPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblPDFLoc.Name = "lblPDFLoc"; - this.lblPDFLoc.Size = new System.Drawing.Size(86, 19); + this.lblPDFLoc.Size = new System.Drawing.Size(115, 23); this.lblPDFLoc.TabIndex = 4; this.lblPDFLoc.Text = "PDF Location"; this.lblPDFLoc.TextAlignment = System.Drawing.StringAlignment.Far; @@ -523,17 +380,17 @@ namespace VEPROMS this.tabControlPanel1.Controls.Add(this.lblChgBars); this.tabControlPanel1.Controls.Add(this.btnChgBarOn); this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(733, 307); 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; this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 90; this.tabControlPanel1.TabIndex = 5; this.tabControlPanel1.TabItem = this.tbSettings; @@ -546,10 +403,10 @@ namespace VEPROMS // this.lblWatermarkS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblWatermarkS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblWatermarkS.Location = new System.Drawing.Point(30, 84); - this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(2); + this.lblWatermarkS.Location = new System.Drawing.Point(40, 103); + this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblWatermarkS.Name = "lblWatermarkS"; - this.lblWatermarkS.Size = new System.Drawing.Size(86, 19); + this.lblWatermarkS.Size = new System.Drawing.Size(115, 23); this.lblWatermarkS.TabIndex = 106; this.lblWatermarkS.Text = "Watermark"; this.lblWatermarkS.TextAlignment = System.Drawing.StringAlignment.Far; @@ -557,17 +414,17 @@ namespace VEPROMS // txbPdfLocationS // this.txbPdfLocationS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + | System.Windows.Forms.AnchorStyles.Right))); // // // this.txbPdfLocationS.Border.Class = "TextBoxBorder"; this.txbPdfLocationS.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbPdfLocationS.Location = new System.Drawing.Point(94, 3); - this.txbPdfLocationS.Margin = new System.Windows.Forms.Padding(2); + this.txbPdfLocationS.Location = new System.Drawing.Point(125, 4); + this.txbPdfLocationS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(561, 26); this.txbPdfLocationS.TabIndex = 98; this.txbPdfLocationS.WatermarkText = "PDF Location"; // @@ -576,10 +433,12 @@ namespace VEPROMS this.btnPdfLocation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnPdfLocation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnPdfLocation.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnPdfLocation.FocusOnLeftMouseButtonDown = true; this.btnPdfLocation.Image = ((System.Drawing.Image)(resources.GetObject("btnPdfLocation.Image"))); - this.btnPdfLocation.Location = new System.Drawing.Point(519, 3); + this.btnPdfLocation.Location = new System.Drawing.Point(692, 4); + this.btnPdfLocation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnPdfLocation.Name = "btnPdfLocation"; - this.btnPdfLocation.Size = new System.Drawing.Size(20, 19); + this.btnPdfLocation.Size = new System.Drawing.Size(27, 23); this.btnPdfLocation.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnPdfLocation.TabIndex = 99; this.btnPdfLocation.Click += new System.EventHandler(this.btnPdfLocation_Click); @@ -592,10 +451,10 @@ namespace VEPROMS // this.lblPdfLocS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblPdfLocS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblPdfLocS.Location = new System.Drawing.Point(7, 3); - this.lblPdfLocS.Margin = new System.Windows.Forms.Padding(2); + this.lblPdfLocS.Location = new System.Drawing.Point(9, 4); + this.lblPdfLocS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblPdfLocS.Name = "lblPdfLocS"; - this.lblPdfLocS.Size = new System.Drawing.Size(86, 19); + this.lblPdfLocS.Size = new System.Drawing.Size(115, 23); this.lblPdfLocS.TabIndex = 97; this.lblPdfLocS.Text = "PDF Location"; this.lblPdfLocS.TextAlignment = System.Drawing.StringAlignment.Far; @@ -605,10 +464,11 @@ namespace VEPROMS this.btnWaterMarkOff.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnWaterMarkOff.Checked = true; this.btnWaterMarkOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnWaterMarkOff.Location = new System.Drawing.Point(164, 84); - this.btnWaterMarkOff.Margin = new System.Windows.Forms.Padding(2); + this.btnWaterMarkOff.FocusOnLeftMouseButtonDown = true; + this.btnWaterMarkOff.Location = new System.Drawing.Point(219, 103); + this.btnWaterMarkOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnWaterMarkOff.Name = "btnWaterMarkOff"; - this.btnWaterMarkOff.Size = new System.Drawing.Size(34, 19); + this.btnWaterMarkOff.Size = new System.Drawing.Size(45, 23); this.btnWaterMarkOff.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnWaterMarkOff.TabIndex = 93; this.btnWaterMarkOff.Text = "OFF"; @@ -619,10 +479,11 @@ namespace VEPROMS this.btnChgBarOff.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnChgBarOff.Checked = true; this.btnChgBarOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnChgBarOff.Location = new System.Drawing.Point(164, 58); - this.btnChgBarOff.Margin = new System.Windows.Forms.Padding(2); + this.btnChgBarOff.FocusOnLeftMouseButtonDown = true; + this.btnChgBarOff.Location = new System.Drawing.Point(219, 71); + this.btnChgBarOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnChgBarOff.Name = "btnChgBarOff"; - this.btnChgBarOff.Size = new System.Drawing.Size(34, 19); + this.btnChgBarOff.Size = new System.Drawing.Size(45, 23); this.btnChgBarOff.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnChgBarOff.TabIndex = 92; this.btnChgBarOff.Text = "OFF"; @@ -633,10 +494,11 @@ namespace VEPROMS this.btnDuplxOff.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnDuplxOff.Checked = true; this.btnDuplxOff.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDuplxOff.Location = new System.Drawing.Point(164, 111); - this.btnDuplxOff.Margin = new System.Windows.Forms.Padding(2); + this.btnDuplxOff.FocusOnLeftMouseButtonDown = true; + this.btnDuplxOff.Location = new System.Drawing.Point(219, 137); + this.btnDuplxOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnDuplxOff.Name = "btnDuplxOff"; - this.btnDuplxOff.Size = new System.Drawing.Size(33, 19); + this.btnDuplxOff.Size = new System.Drawing.Size(44, 23); this.btnDuplxOff.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnDuplxOff.TabIndex = 91; this.btnDuplxOff.Text = "OFF"; @@ -650,10 +512,10 @@ namespace VEPROMS // this.lblAutoDuplexing.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblAutoDuplexing.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAutoDuplexing.Location = new System.Drawing.Point(30, 111); - this.lblAutoDuplexing.Margin = new System.Windows.Forms.Padding(2); + this.lblAutoDuplexing.Location = new System.Drawing.Point(40, 137); + this.lblAutoDuplexing.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblAutoDuplexing.Name = "lblAutoDuplexing"; - this.lblAutoDuplexing.Size = new System.Drawing.Size(86, 19); + this.lblAutoDuplexing.Size = new System.Drawing.Size(115, 23); this.lblAutoDuplexing.TabIndex = 90; this.lblAutoDuplexing.Text = "Auto Duplexing"; this.lblAutoDuplexing.TextAlignment = System.Drawing.StringAlignment.Far; @@ -662,10 +524,11 @@ namespace VEPROMS // this.btnDuplxOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnDuplxOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDuplxOn.Location = new System.Drawing.Point(123, 111); - this.btnDuplxOn.Margin = new System.Windows.Forms.Padding(2); + this.btnDuplxOn.FocusOnLeftMouseButtonDown = true; + this.btnDuplxOn.Location = new System.Drawing.Point(164, 137); + this.btnDuplxOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnDuplxOn.Name = "btnDuplxOn"; - this.btnDuplxOn.Size = new System.Drawing.Size(34, 19); + this.btnDuplxOn.Size = new System.Drawing.Size(45, 23); this.btnDuplxOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnDuplxOn.TabIndex = 89; this.btnDuplxOn.Text = "ON"; @@ -675,10 +538,11 @@ namespace VEPROMS // this.btnWaterMarkOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnWaterMarkOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnWaterMarkOn.Location = new System.Drawing.Point(123, 84); - this.btnWaterMarkOn.Margin = new System.Windows.Forms.Padding(2); + this.btnWaterMarkOn.FocusOnLeftMouseButtonDown = true; + this.btnWaterMarkOn.Location = new System.Drawing.Point(164, 103); + this.btnWaterMarkOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnWaterMarkOn.Name = "btnWaterMarkOn"; - this.btnWaterMarkOn.Size = new System.Drawing.Size(34, 19); + this.btnWaterMarkOn.Size = new System.Drawing.Size(45, 23); this.btnWaterMarkOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnWaterMarkOn.TabIndex = 88; this.btnWaterMarkOn.Text = "ON"; @@ -691,10 +555,10 @@ namespace VEPROMS this.cbxWaterMark.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.cbxWaterMark.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbxWaterMark.FormattingEnabled = true; - this.cbxWaterMark.Location = new System.Drawing.Point(202, 84); - this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(2); + this.cbxWaterMark.Location = new System.Drawing.Point(269, 103); + this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxWaterMark.Name = "cbxWaterMark"; - this.cbxWaterMark.Size = new System.Drawing.Size(138, 21); + this.cbxWaterMark.Size = new System.Drawing.Size(183, 23); this.cbxWaterMark.TabIndex = 87; this.cbxWaterMark.Visible = false; this.cbxWaterMark.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -708,10 +572,10 @@ namespace VEPROMS // this.lblChgBars.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblChgBars.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblChgBars.Location = new System.Drawing.Point(30, 58); - this.lblChgBars.Margin = new System.Windows.Forms.Padding(2); + this.lblChgBars.Location = new System.Drawing.Point(40, 71); + this.lblChgBars.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblChgBars.Name = "lblChgBars"; - this.lblChgBars.Size = new System.Drawing.Size(86, 19); + this.lblChgBars.Size = new System.Drawing.Size(115, 23); this.lblChgBars.TabIndex = 85; this.lblChgBars.Text = "Change Bars"; this.lblChgBars.TextAlignment = System.Drawing.StringAlignment.Far; @@ -720,10 +584,11 @@ namespace VEPROMS // this.btnChgBarOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnChgBarOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnChgBarOn.Location = new System.Drawing.Point(123, 58); - this.btnChgBarOn.Margin = new System.Windows.Forms.Padding(2); + this.btnChgBarOn.FocusOnLeftMouseButtonDown = true; + this.btnChgBarOn.Location = new System.Drawing.Point(164, 71); + this.btnChgBarOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnChgBarOn.Name = "btnChgBarOn"; - this.btnChgBarOn.Size = new System.Drawing.Size(34, 19); + this.btnChgBarOn.Size = new System.Drawing.Size(45, 23); this.btnChgBarOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnChgBarOn.TabIndex = 84; this.btnChgBarOn.Text = "ON"; @@ -741,17 +606,17 @@ namespace VEPROMS this.tabControlPanel2.Controls.Add(this.ppGpbxCBType); this.tabControlPanel2.Controls.Add(this.ppGpbxUserSpecCB); this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 22); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel2.Location = new System.Drawing.Point(0, 24); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(733, 307); 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; this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 90; this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.tbChangeBars; @@ -763,10 +628,10 @@ namespace VEPROMS this.ppGpbxCBType.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.ppGpbxCBType.Controls.Add(this.rbCustom); this.ppGpbxCBType.Controls.Add(this.rbFormatDefault); - this.ppGpbxCBType.Location = new System.Drawing.Point(41, 10); - this.ppGpbxCBType.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxCBType.Location = new System.Drawing.Point(55, 12); + this.ppGpbxCBType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxCBType.Name = "ppGpbxCBType"; - this.ppGpbxCBType.Size = new System.Drawing.Size(426, 45); + this.ppGpbxCBType.Size = new System.Drawing.Size(568, 55); // // // @@ -801,10 +666,10 @@ namespace VEPROMS // rbCustom // this.rbCustom.AutoSize = true; - this.rbCustom.Location = new System.Drawing.Point(197, 4); - this.rbCustom.Margin = new System.Windows.Forms.Padding(2); + this.rbCustom.Location = new System.Drawing.Point(263, 5); + this.rbCustom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rbCustom.Name = "rbCustom"; - this.rbCustom.Size = new System.Drawing.Size(143, 17); + this.rbCustom.Size = new System.Drawing.Size(186, 21); this.rbCustom.TabIndex = 1; this.rbCustom.TabStop = true; this.rbCustom.Text = "Custom Change Bar Text"; @@ -814,10 +679,10 @@ namespace VEPROMS // rbFormatDefault // this.rbFormatDefault.AutoSize = true; - this.rbFormatDefault.Location = new System.Drawing.Point(26, 4); - this.rbFormatDefault.Margin = new System.Windows.Forms.Padding(2); + this.rbFormatDefault.Location = new System.Drawing.Point(35, 5); + this.rbFormatDefault.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.rbFormatDefault.Name = "rbFormatDefault"; - this.rbFormatDefault.Size = new System.Drawing.Size(94, 17); + this.rbFormatDefault.Size = new System.Drawing.Size(122, 21); this.rbFormatDefault.TabIndex = 0; this.rbFormatDefault.TabStop = true; this.rbFormatDefault.Text = "Format Default"; @@ -835,10 +700,10 @@ namespace VEPROMS this.ppGpbxUserSpecCB.Controls.Add(this.label12); this.ppGpbxUserSpecCB.Controls.Add(this.ppCmbxChgBarTxtType); this.ppGpbxUserSpecCB.Controls.Add(this.label13); - this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(41, 68); - this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecCB.Location = new System.Drawing.Point(55, 84); + this.ppGpbxUserSpecCB.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecCB.Name = "ppGpbxUserSpecCB"; - this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(426, 130); + this.ppGpbxUserSpecCB.Size = new System.Drawing.Size(568, 160); // // // @@ -878,10 +743,10 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.Controls.Add(this.ppTxbxChangeBarUserMsgTwo); this.ppGpbxUserSpecTxt.Controls.Add(this.label15); this.ppGpbxUserSpecTxt.Controls.Add(this.ppTxbxChangeBarUserMsgOne); - this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(242, 14); - this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(2); + this.ppGpbxUserSpecTxt.Location = new System.Drawing.Point(323, 17); + this.ppGpbxUserSpecTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppGpbxUserSpecTxt.Name = "ppGpbxUserSpecTxt"; - this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(158, 85); + this.ppGpbxUserSpecTxt.Size = new System.Drawing.Size(211, 105); // // // @@ -916,42 +781,40 @@ namespace VEPROMS // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(34, 11); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Location = new System.Drawing.Point(45, 14); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(48, 13); + this.label14.Size = new System.Drawing.Size(63, 17); this.label14.TabIndex = 4; this.label14.Text = "Line one"; // // ppTxbxChangeBarUserMsgTwo // this.ppTxbxChangeBarUserMsgTwo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_UserCBMess2", true)); - this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(89, 38); - this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(2); + this.ppTxbxChangeBarUserMsgTwo.Location = new System.Drawing.Point(119, 47); + this.ppTxbxChangeBarUserMsgTwo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgTwo.Multiline = false; this.ppTxbxChangeBarUserMsgTwo.Name = "ppTxbxChangeBarUserMsgTwo"; - this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgTwo.Size = new System.Drawing.Size(57, 24); this.ppTxbxChangeBarUserMsgTwo.TabIndex = 2; this.ppTxbxChangeBarUserMsgTwo.Text = ""; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(37, 41); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label15.Location = new System.Drawing.Point(49, 50); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(47, 13); + this.label15.Size = new System.Drawing.Size(60, 17); this.label15.TabIndex = 5; this.label15.Text = "Line two"; // // ppTxbxChangeBarUserMsgOne // this.ppTxbxChangeBarUserMsgOne.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_UserCBMess1", true)); - this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(89, 9); - this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(2); + this.ppTxbxChangeBarUserMsgOne.Location = new System.Drawing.Point(119, 11); + this.ppTxbxChangeBarUserMsgOne.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxbxChangeBarUserMsgOne.Multiline = false; this.ppTxbxChangeBarUserMsgOne.Name = "ppTxbxChangeBarUserMsgOne"; - this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(44, 20); + this.ppTxbxChangeBarUserMsgOne.Size = new System.Drawing.Size(57, 24); this.ppTxbxChangeBarUserMsgOne.TabIndex = 1; this.ppTxbxChangeBarUserMsgOne.Text = ""; // @@ -962,10 +825,10 @@ namespace VEPROMS this.ppCmbxChgBarPos.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxChgBarPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarPos.FormattingEnabled = true; - this.ppCmbxChgBarPos.Location = new System.Drawing.Point(82, 80); - this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxChgBarPos.Location = new System.Drawing.Point(109, 98); + this.ppCmbxChgBarPos.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarPos.Name = "ppCmbxChgBarPos"; - this.ppCmbxChgBarPos.Size = new System.Drawing.Size(135, 21); + this.ppCmbxChgBarPos.Size = new System.Drawing.Size(179, 23); this.ppCmbxChgBarPos.TabIndex = 48; this.ppCmbxChgBarPos.Visible = false; this.ppCmbxChgBarPos.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -974,10 +837,9 @@ namespace VEPROMS // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(34, 82); - this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label12.Location = new System.Drawing.Point(45, 101); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(44, 13); + this.label12.Size = new System.Drawing.Size(58, 17); this.label12.TabIndex = 9; this.label12.Text = "Position"; this.label12.Visible = false; @@ -989,10 +851,10 @@ namespace VEPROMS this.ppCmbxChgBarTxtType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxChgBarTxtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxChgBarTxtType.FormattingEnabled = true; - this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(82, 40); - this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(2); + this.ppCmbxChgBarTxtType.Location = new System.Drawing.Point(109, 49); + this.ppCmbxChgBarTxtType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCmbxChgBarTxtType.Name = "ppCmbxChgBarTxtType"; - this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(140, 21); + this.ppCmbxChgBarTxtType.Size = new System.Drawing.Size(185, 23); this.ppCmbxChgBarTxtType.TabIndex = 48; this.ppCmbxChgBarTxtType.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ppCmbxChgBarTxtType.WatermarkText = "select change bar text type"; @@ -1001,10 +863,9 @@ namespace VEPROMS // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(25, 41); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Location = new System.Drawing.Point(33, 50); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(55, 13); + this.label13.Size = new System.Drawing.Size(71, 17); this.label13.TabIndex = 8; this.label13.Text = "Text Type"; // @@ -1021,11 +882,12 @@ namespace VEPROMS this.btnCreatePDF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCreatePDF.BackColor = System.Drawing.SystemColors.Control; this.btnCreatePDF.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCreatePDF.FocusOnLeftMouseButtonDown = true; this.btnCreatePDF.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCreatePDF.Location = new System.Drawing.Point(5, 281); - this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(2); + this.btnCreatePDF.Location = new System.Drawing.Point(7, 346); + this.btnCreatePDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCreatePDF.Name = "btnCreatePDF"; - this.btnCreatePDF.Size = new System.Drawing.Size(113, 37); + this.btnCreatePDF.Size = new System.Drawing.Size(151, 46); this.btnCreatePDF.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCreatePDF.TabIndex = 1; this.btnCreatePDF.Text = "Create PDF"; @@ -1038,11 +900,12 @@ namespace VEPROMS this.btnCancel.BackColor = System.Drawing.SystemColors.Control; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.FocusOnLeftMouseButtonDown = true; this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnCancel.Location = new System.Drawing.Point(450, 281); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2); + this.btnCancel.Location = new System.Drawing.Point(600, 346); + this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 37); + this.btnCancel.Size = new System.Drawing.Size(133, 46); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 2; this.btnCancel.Text = "Cancel"; @@ -1058,10 +921,10 @@ 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(127, 282); - this.cbxDebug.Margin = new System.Windows.Forms.Padding(2); + this.cbxDebug.Location = new System.Drawing.Point(185, 347); + this.cbxDebug.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxDebug.Name = "cbxDebug"; - this.cbxDebug.Size = new System.Drawing.Size(115, 19); + this.cbxDebug.Size = new System.Drawing.Size(137, 22); this.cbxDebug.TabIndex = 98; this.cbxDebug.Text = "Compare PDF"; this.cbxDebug.UseVisualStyleBackColor = false; @@ -1074,10 +937,10 @@ 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(255, 282); - this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(2); + this.cbxOrPgBrk.Location = new System.Drawing.Point(371, 347); + this.cbxOrPgBrk.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxOrPgBrk.Name = "cbxOrPgBrk"; - this.cbxOrPgBrk.Size = new System.Drawing.Size(191, 19); + this.cbxOrPgBrk.Size = new System.Drawing.Size(224, 22); this.cbxOrPgBrk.TabIndex = 99; this.cbxOrPgBrk.Text = "Use Original Page Breaks"; this.cbxOrPgBrk.UseVisualStyleBackColor = false; @@ -1094,34 +957,21 @@ namespace VEPROMS 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(142, 305); - this.cbxCmpPRMSpfd.Margin = new System.Windows.Forms.Padding(2); + this.cbxCmpPRMSpfd.Location = new System.Drawing.Point(220, 375); + this.cbxCmpPRMSpfd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxCmpPRMSpfd.Name = "cbxCmpPRMSpfd"; - this.cbxCmpPRMSpfd.Size = new System.Drawing.Size(165, 17); + this.cbxCmpPRMSpfd.Size = new System.Drawing.Size(189, 19); this.cbxCmpPRMSpfd.TabIndex = 100; this.cbxCmpPRMSpfd.Text = "PROMS PDF to PROMS PDF"; this.cbxCmpPRMSpfd.UseVisualStyleBackColor = false; this.cbxCmpPRMSpfd.Visible = false; // - // 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; - // // DlgPrintProcedure // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(554, 328); + this.ClientSize = new System.Drawing.Size(739, 404); this.Controls.Add(this.cbxCmpPRMSpfd); this.Controls.Add(this.cbxOrPgBrk); this.Controls.Add(this.cbxDebug); @@ -1130,7 +980,7 @@ namespace VEPROMS this.Controls.Add(this.tabControl1); this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "DlgPrintProcedure"; @@ -1144,8 +994,6 @@ namespace VEPROMS this.tabControlPanel3.PerformLayout(); this.gpnlDebug.ResumeLayout(false); this.gpnlDebug.PerformLayout(); - this.grpDateSelector.ResumeLayout(false); - this.grpDateSelector.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel2.ResumeLayout(false); @@ -1172,8 +1020,6 @@ namespace VEPROMS private DevComponents.DotNetBar.LabelX lblPDFLoc; private System.Windows.Forms.FolderBrowserDialog DlgBrowseFolder; private DevComponents.DotNetBar.Controls.TextBoxX txbRevNum; - private DevComponents.DotNetBar.LabelX lblReviewDate; - private DevComponents.DotNetBar.LabelX lblRevDate; private DevComponents.DotNetBar.LabelX lblRevNum; private DevComponents.DotNetBar.Controls.TextBoxX txbPDFName; private DevComponents.DotNetBar.LabelX lblPDFFileName; @@ -1205,14 +1051,10 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.TextBoxX txbPdfLocationS; private DevComponents.DotNetBar.ButtonX btnPdfLocation; private DevComponents.DotNetBar.LabelX lblPdfLocS; - private DevComponents.DotNetBar.Controls.TextBoxX txbRevDate; - private DevComponents.DotNetBar.Controls.TextBoxX txbReviewDate; private DevComponents.DotNetBar.LabelX lblWatermarkS; private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxCBType; private System.Windows.Forms.RadioButton rbCustom; private System.Windows.Forms.RadioButton rbFormatDefault; - private DevComponents.Editors.DateTimeAdv.MonthCalendarAdv calDateSelector; - private DevComponents.DotNetBar.Controls.GroupPanel grpDateSelector; private System.Windows.Forms.Label label13; private DevComponents.DotNetBar.Controls.GroupPanel gpnlDebug; private System.Windows.Forms.CheckBox cbxDebugText; diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 0c2e556f..5c5e45eb 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -46,16 +46,6 @@ namespace VEPROMS get { return txbPDFLocation.Text; } set { txbPDFLocation.Text = value; } } - public string RevDate - { - get { return txbRevDate.Text; } - set { txbRevDate.Text = value; } - } - public string ReviewDate - { - get { return txbReviewDate.Text; } - set { txbReviewDate.Text = value; } - } public string PDFPathSetting { get { return txbPdfLocationS.Text; } @@ -93,8 +83,6 @@ namespace VEPROMS { txbPDFName.Visible = lblPDFFileName.Visible = oneProcedure; txbRevNum.Visible = lblRevNum.Visible = oneProcedure; - txbReviewDate.Visible = lblReviewDate.Visible = oneProcedure; - txbRevDate.Visible = lblRevDate.Visible = oneProcedure; cbxOpenAfterCreate2.Visible = oneProcedure; cbxOpenAfterCreate2.Checked = false; cbxOverwritePDF2.Visible = oneProcedure; @@ -237,17 +225,9 @@ namespace VEPROMS txbPDFName.Text = string.Format("{0}.pdf", ProcNum.Replace('/', '_').Replace('\\', '_')); ProcedureConfig pc = _MyProcedure.MyConfig as ProcedureConfig; if (pc != null) - { RevNum = pc.Print_Rev; - RevDate = pc.Print_RevDate; //== null || pc.Print_RevDate=="" ? DateTime.Today : Convert.ToDateTime(pc.Print_RevDate); - ReviewDate = pc.Print_ReviewDate; // == null ? DateTime.Today : Convert.ToDateTime(pc.Print_ReviewDate); - } else - { RevNum = "0"; - RevDate = DateTime.Today.ToShortDateString(); - ReviewDate = null; - } cbxWaterMark.DataSource = EnumDetail.Details(); cbxWaterMark.DisplayMember = "Description"; cbxWaterMark.ValueMember = "EValue"; @@ -273,7 +253,6 @@ namespace VEPROMS foreach (SectionInfo mysection in _MyProcedure.Sections) hasReviewDate |= mysection.ActiveFormat.PlantFormat.HasPageListToken("{REVIEWDATE}"); } - lblReviewDate.Visible = txbReviewDate.Visible = !_AllProcedures && hasReviewDate; } private void btnCancel_Click(object sender, EventArgs e) @@ -414,7 +393,7 @@ namespace VEPROMS pbPDFsStatus.Text = string.Format("Creating PDF for {0} ({1} of {2})", myProc.DisplayNumber, ++i, n); pbPDFsStatus.Value = i; // RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered. - frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left,Bottom-50)); + frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left,Bottom-50)); frmStatus.CloseWhenDone = true; frmStatus.CancelStop = true; frmStatus.ShowDialog(); @@ -450,7 +429,7 @@ namespace VEPROMS // Also check that format allows override. ChangeBarDefinition cbd = DetermineChangeBarSettings(); // RHM 20120925 Overlay the bottom of the dialog so that cancel button is covered. - frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50)); + frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, pw.ToString(), cbxDebug.Checked, cbxOrPgBrk.Checked, cbxOpenAfterCreate2.Checked, cbxOverwritePDF2.Checked, PDFPath, cbd, txbPDFName.Text, new Point(Left, Bottom - 50)); frmStatus.ShowDialog(); this.Close(); ShowDebugFiles(); @@ -507,6 +486,7 @@ namespace VEPROMS } private void btnCreatePDF_Click(object sender, EventArgs e) { + Rtf2iTextSharp.DoingComparison = cbxDebug.Checked; if (_AllProcedures) { DateTime dtStart = DateTime.Now; @@ -581,62 +561,6 @@ namespace VEPROMS if (_Initializing) return; ppGpbxUserSpecTxt.Enabled = ppCmbxChgBarTxtType.SelectedIndex == (int)PrintChangeBarText.UserDef; } - private void txbRevDate_Enter(object sender, EventArgs e) - { - txbDate = txbRevDate; - grpDateSelector.Text = "Select Revision Date"; - grpDateSelector.Visible = calDateSelector.Visible = true; - - } - - private void txbRevDate_Leave(object sender, EventArgs e) - { - if (_Initializing) return; - txbDate = null; - grpDateSelector.Visible = calDateSelector.Visible = false; - // save the RevDate to the procedure's config. - ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig; - if (pc == null) return; - pc.Print_RevDate = txbRevDate.Text; - using (Item itm = Item.Get(MyProcedure.ItemID)) - { - itm.MyContent.Config = MyProcedure.MyConfig.ToString(); - itm.Save(); - } - - } - - private void txbReviewDate_Leave(object sender, EventArgs e) - { - if (_Initializing) return; - txbDate = null; - grpDateSelector.Visible = calDateSelector.Visible = false; - // save the ReviewDate to the procedure's config. - ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig; - if (pc == null) return; - pc.Print_ReviewDate = txbReviewDate.Text; - using (Item itm = Item.Get(MyProcedure.ItemID)) - { - itm.MyContent.Config = MyProcedure.MyConfig.ToString(); - itm.Save(); - // need to reset config to !dirty? - } - - } - private void txbReviewDate_Enter(object sender, EventArgs e) - { - txbDate = txbReviewDate; - grpDateSelector.Text = "Select Review Date"; - grpDateSelector.Visible = calDateSelector.Visible = true; - } - - private TextBox txbDate = null; - private void calDateSelector_DateSelected(object sender, DateRangeEventArgs e) - { - if (txbDate != null) - txbDate.Text = e.Start.ToShortDateString(); - } - private void txbRevNum_Leave(object sender, EventArgs e) { if (_Initializing) return; diff --git a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs index 841d0a6c..e77b1f54 100644 --- a/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs +++ b/PROMS/VEPROMS User Interface/dlgApproveProcedure.cs @@ -639,13 +639,14 @@ namespace VEPROMS { ProcInfo = proc; RevNumber = proc.ProcedureConfig.Print_Rev == string.Empty ? "0" : proc.ProcedureConfig.Print_Rev; - DateTime revdate; - string print_revdate = proc.ProcedureConfig.Print_RevDate; - if (print_revdate == string.Empty && DateTime.TryParse(RevNumber, out revdate)) - ; - else - revdate = DateTime.TryParse(proc.ProcedureConfig.Print_RevDate.Replace("-","/").Replace("00/","01/"), out revdate) ? revdate : DateTime.Now; - RevDate = revdate; + //AppRevDate Change + //DateTime revdate; + //string print_revdate = proc.ProcedureConfig.Print_RevDate; + //if (print_revdate == string.Empty && DateTime.TryParse(RevNumber, out revdate)) + // ; + //else + // revdate = DateTime.TryParse(proc.ProcedureConfig.Print_RevDate.Replace("-","/").Replace("00/","01/"), out revdate) ? revdate : DateTime.Now; + //RevDate = revdate; } } public class ApprovalMessageArgs : EventArgs @@ -988,7 +989,7 @@ namespace VEPROMS // Moved to end so that Item and Content are saved at the same time //UpdateProcedureConfig(pi, ap.RevNumber, ap.RevDate, myDTS); string waterMark = Stage.Get(RevStage).IsApproved > 0 ? null : Stage.Get(RevStage).Name; - frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumber, ap.RevDate.ToString("MM/dd/yyyy"), waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); + frmPDFStatusForm frm = new frmPDFStatusForm(pi, ap.RevNumber, /* revdate change: ap.RevDate.ToString("MM/dd/yyyy") ,*/ waterMark, false, false, ViewPDF, true, VlnSettings.TemporaryFolder, new ChangeBarDefinition(pi.MyDocVersion.MyConfig as DocVersionConfig, pi.ActiveFormat), pdfTmp, location); frm.AllowAllWatermarks = true; frm.CloseWhenDone = !ViewPDF; frm.ShowDialog(); @@ -1124,7 +1125,8 @@ namespace VEPROMS ProcedureConfig pc = procedureInfo.MyConfig as ProcedureConfig; if (pc == null) return; pc.Print_Rev = revNumber; - pc.Print_RevDate = revDate.ToString(); + //AppRevDate Change + //pc.Print_RevDate = revDate.ToString(); using (Item itm = Item.Get(procedureInfo.ItemID)) { itm.MyContent.Config = pc.ToString();