diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs index d09a6dd1..802464f3 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.Designer.cs @@ -31,29 +31,15 @@ namespace VEPROMS this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DlgPrintProcedure)); this.tabControl1 = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.txbPDFLocation = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btnSelect = new DevComponents.DotNetBar.ButtonX(); - this.cbxOpenAfterCreate2 = new System.Windows.Forms.CheckBox(); - this.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.cbxOverwritePDF2 = new System.Windows.Forms.CheckBox(); - this.dtReviewDate = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - this.dtRevDate = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); - 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.tbxPDFName = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.lblPDFFileName = new DevComponents.DotNetBar.LabelX(); - this.lblPDFLoc = new DevComponents.DotNetBar.LabelX(); - this.tbGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); - this.ppCmbxChangeBarType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.label11 = new System.Windows.Forms.Label(); + this.ppGpbxCBType = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.rbCustom = new System.Windows.Forms.RadioButton(); + this.rbFormatDefault = new System.Windows.Forms.RadioButton(); 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.docVersionConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); this.label15 = new System.Windows.Forms.Label(); this.ppTxbxChangeBarUserMsgOne = new System.Windows.Forms.RichTextBox(); this.ppCmbxChgBarPos = new DevComponents.DotNetBar.Controls.ComboBoxEx(); @@ -61,31 +47,53 @@ namespace VEPROMS this.ppCmbxChgBarTxtType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label13 = new System.Windows.Forms.Label(); this.tbChangeBars = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + 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.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(); + this.lblPDFLoc = new DevComponents.DotNetBar.LabelX(); + this.tbGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.lblWatermarkS = new DevComponents.DotNetBar.LabelX(); + this.txbReviewDateS = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.txbRevDateS = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.txbRevNumS = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.lblReviewDateS = new DevComponents.DotNetBar.LabelX(); + this.lblRevDateS = new DevComponents.DotNetBar.LabelX(); + this.lblRevNumS = new DevComponents.DotNetBar.LabelX(); + this.txbPdfLocationS = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.btnPdfLocation = new DevComponents.DotNetBar.ButtonX(); + this.lblPdfLocS = new DevComponents.DotNetBar.LabelX(); this.btnWaterMarkOff = new DevComponents.DotNetBar.ButtonX(); this.btnChgBarOff = new DevComponents.DotNetBar.ButtonX(); this.btnDuplxOff = new DevComponents.DotNetBar.ButtonX(); this.lblAutoDuplexing = new DevComponents.DotNetBar.LabelX(); this.btnDuplxOn = new DevComponents.DotNetBar.ButtonX(); this.btnWaterMarkOn = new DevComponents.DotNetBar.ButtonX(); - this.lblWaterMark = new System.Windows.Forms.Label(); this.cbxWaterMark = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.lblChgBars = new DevComponents.DotNetBar.LabelX(); this.btnChgBarOn = new DevComponents.DotNetBar.ButtonX(); - this.tbAdvanced = new DevComponents.DotNetBar.TabItem(this.components); + this.tbSettings = new DevComponents.DotNetBar.TabItem(this.components); this.btnCreatePDF = new DevComponents.DotNetBar.ButtonX(); this.btnCancel = new DevComponents.DotNetBar.ButtonX(); this.DlgBrowseFolder = new System.Windows.Forms.FolderBrowserDialog(); this.cbxDebug = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).BeginInit(); this.tabControl1.SuspendLayout(); - this.tabControlPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dtReviewDate)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dtRevDate)).BeginInit(); this.tabControlPanel2.SuspendLayout(); + this.ppGpbxCBType.SuspendLayout(); this.ppGpbxUserSpecCB.SuspendLayout(); this.ppGpbxUserSpecTxt.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).BeginInit(); + this.tabControlPanel3.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.SuspendLayout(); // @@ -96,8 +104,8 @@ namespace VEPROMS | 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.tabControlPanel2); + this.tabControl1.Controls.Add(this.tabControlPanel3); this.tabControl1.Controls.Add(this.tabControlPanel1); this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -109,329 +117,13 @@ namespace VEPROMS this.tabControl1.TabIndex = 0; this.tabControl1.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; this.tabControl1.Tabs.Add(this.tbGeneral); - this.tabControl1.Tabs.Add(this.tbAdvanced); + this.tabControl1.Tabs.Add(this.tbSettings); this.tabControl1.Tabs.Add(this.tbChangeBars); this.tabControl1.Text = "tabControl1"; // - // tabControlPanel3 - // - this.tabControlPanel3.AutoScroll = true; - this.tabControlPanel3.Controls.Add(this.txbPDFLocation); - this.tabControlPanel3.Controls.Add(this.btnSelect); - this.tabControlPanel3.Controls.Add(this.cbxOpenAfterCreate2); - this.tabControlPanel3.Controls.Add(this.cbxOverwritePDF2); - this.tabControlPanel3.Controls.Add(this.dtReviewDate); - this.tabControlPanel3.Controls.Add(this.dtRevDate); - 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.tbxPDFName); - 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, 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(669, 275); - 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))); - this.tabControlPanel3.Style.GradientAngle = 90; - this.tabControlPanel3.TabIndex = 3; - this.tabControlPanel3.TabItem = this.tbGeneral; - // - // txbPDFLocation - // - this.txbPDFLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - // - // - // - this.txbPDFLocation.Border.Class = "TextBoxBorder"; - this.txbPDFLocation.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbPDFLocation.Location = new System.Drawing.Point(112, 9); - this.txbPDFLocation.Name = "txbPDFLocation"; - this.txbPDFLocation.ShortcutsEnabled = false; - this.txbPDFLocation.Size = new System.Drawing.Size(518, 22); - this.txbPDFLocation.TabIndex = 81; - this.txbPDFLocation.WatermarkText = "PDF Location"; - this.txbPDFLocation.Leave += new System.EventHandler(this.txbPDFLocation_Leave); - // - // btnSelect - // - this.btnSelect.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnSelect.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSelect.Image = ((System.Drawing.Image)(resources.GetObject("btnSelect.Image"))); - this.btnSelect.Location = new System.Drawing.Point(635, 9); - this.btnSelect.Margin = new System.Windows.Forms.Padding(4); - this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(27, 23); - this.btnSelect.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSelect.TabIndex = 96; - this.btnSelect.Click += new System.EventHandler(this.buttonX9_Click); - // - // cbxOpenAfterCreate2 - // - this.cbxOpenAfterCreate2.AutoSize = true; - 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(16, 240); - this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxOpenAfterCreate2.Name = "cbxOpenAfterCreate2"; - this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(177, 22); - this.cbxOpenAfterCreate2.TabIndex = 80; - this.cbxOpenAfterCreate2.Text = "View PDF After Create"; - this.cbxOpenAfterCreate2.UseVisualStyleBackColor = false; - // - // docVersionConfigBindingSource - // - this.docVersionConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.DocVersionConfig); - // - // cbxOverwritePDF2 - // - this.cbxOverwritePDF2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.cbxOverwritePDF2.AutoSize = true; - this.cbxOverwritePDF2.BackColor = System.Drawing.Color.Transparent; - 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(402, 48); - this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; - this.cbxOverwritePDF2.Size = new System.Drawing.Size(154, 22); - this.cbxOverwritePDF2.TabIndex = 79; - this.cbxOverwritePDF2.Text = "Overwrite PDF File"; - this.cbxOverwritePDF2.UseVisualStyleBackColor = false; - // - // dtReviewDate - // - this.dtReviewDate.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.dtReviewDate.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dtReviewDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtReviewDate.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dtReviewDate.ButtonDropDown.Visible = true; - this.dtReviewDate.Location = new System.Drawing.Point(141, 174); - this.dtReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - // - // - // - this.dtReviewDate.MonthCalendar.AnnuallyMarkedDates = new System.DateTime[0]; - // - // - // - this.dtReviewDate.MonthCalendar.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.dtReviewDate.MonthCalendar.BackgroundStyle.Class = ""; - this.dtReviewDate.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtReviewDate.MonthCalendar.ClearButtonVisible = true; - // - // - // - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.Class = ""; - this.dtReviewDate.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtReviewDate.MonthCalendar.DisplayMonth = new System.DateTime(2010, 6, 1, 0, 0, 0, 0); - this.dtReviewDate.MonthCalendar.MarkedDates = new System.DateTime[0]; - this.dtReviewDate.MonthCalendar.MonthlyMarkedDates = new System.DateTime[0]; - // - // - // - this.dtReviewDate.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dtReviewDate.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dtReviewDate.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dtReviewDate.MonthCalendar.NavigationBackgroundStyle.Class = ""; - this.dtReviewDate.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtReviewDate.MonthCalendar.TodayButtonVisible = true; - this.dtReviewDate.MonthCalendar.WeeklyMarkedDays = new System.DayOfWeek[0]; - this.dtReviewDate.Name = "dtReviewDate"; - this.dtReviewDate.Size = new System.Drawing.Size(145, 22); - this.dtReviewDate.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dtReviewDate.TabIndex = 75; - // - // dtRevDate - // - this.dtRevDate.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.dtRevDate.BackgroundStyle.Class = "DateTimeInputBackground"; - this.dtRevDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtRevDate.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown; - this.dtRevDate.ButtonDropDown.Visible = true; - this.dtRevDate.Location = new System.Drawing.Point(141, 130); - this.dtRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - // - // - // - this.dtRevDate.MonthCalendar.AnnuallyMarkedDates = new System.DateTime[0]; - // - // - // - this.dtRevDate.MonthCalendar.BackgroundStyle.BackColor = System.Drawing.SystemColors.Window; - this.dtRevDate.MonthCalendar.BackgroundStyle.Class = ""; - this.dtRevDate.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtRevDate.MonthCalendar.ClearButtonVisible = true; - // - // - // - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.Class = ""; - this.dtRevDate.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtRevDate.MonthCalendar.DisplayMonth = new System.DateTime(2010, 6, 1, 0, 0, 0, 0); - this.dtRevDate.MonthCalendar.MarkedDates = new System.DateTime[0]; - this.dtRevDate.MonthCalendar.MonthlyMarkedDates = new System.DateTime[0]; - // - // - // - this.dtRevDate.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.dtRevDate.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90; - this.dtRevDate.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.dtRevDate.MonthCalendar.NavigationBackgroundStyle.Class = ""; - this.dtRevDate.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.dtRevDate.MonthCalendar.TodayButtonVisible = true; - this.dtRevDate.MonthCalendar.WeeklyMarkedDays = new System.DayOfWeek[0]; - this.dtRevDate.Name = "dtRevDate"; - this.dtRevDate.Size = new System.Drawing.Size(145, 22); - this.dtRevDate.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.dtRevDate.TabIndex = 74; - // - // txbRevNum - // - // - // - // - this.txbRevNum.Border.Class = "TextBoxBorder"; - this.txbRevNum.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txbRevNum.Location = new System.Drawing.Point(141, 91); - this.txbRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.txbRevNum.Name = "txbRevNum"; - this.txbRevNum.Size = new System.Drawing.Size(121, 22); - this.txbRevNum.TabIndex = 73; - // - // lblReviewDate - // - this.lblReviewDate.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblReviewDate.BackgroundStyle.Class = ""; - 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(39, 175); - this.lblReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.lblReviewDate.Name = "lblReviewDate"; - this.lblReviewDate.Size = new System.Drawing.Size(91, 23); - this.lblReviewDate.TabIndex = 72; - this.lblReviewDate.Text = "Review Date"; - // - // lblRevDate - // - this.lblRevDate.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblRevDate.BackgroundStyle.Class = ""; - 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(29, 132); - this.lblRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.lblRevDate.Name = "lblRevDate"; - this.lblRevDate.Size = new System.Drawing.Size(100, 23); - this.lblRevDate.TabIndex = 71; - this.lblRevDate.Text = "Revision Date"; - // - // lblRevNum - // - this.lblRevNum.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblRevNum.BackgroundStyle.Class = ""; - 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(19, 90); - this.lblRevNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.lblRevNum.Name = "lblRevNum"; - this.lblRevNum.Size = new System.Drawing.Size(119, 23); - this.lblRevNum.TabIndex = 70; - this.lblRevNum.Text = "Revision Number"; - // - // tbxPDFName - // - this.tbxPDFName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - // - // - // - this.tbxPDFName.Border.Class = "TextBoxBorder"; - this.tbxPDFName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.tbxPDFName.Location = new System.Drawing.Point(112, 47); - this.tbxPDFName.Margin = new System.Windows.Forms.Padding(4); - this.tbxPDFName.Name = "tbxPDFName"; - this.tbxPDFName.Size = new System.Drawing.Size(263, 22); - this.tbxPDFName.TabIndex = 8; - // - // lblPDFFileName - // - this.lblPDFFileName.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblPDFFileName.BackgroundStyle.Class = ""; - 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(29, 42); - this.lblPDFFileName.Margin = new System.Windows.Forms.Padding(4); - this.lblPDFFileName.Name = "lblPDFFileName"; - this.lblPDFFileName.Size = new System.Drawing.Size(76, 28); - this.lblPDFFileName.TabIndex = 7; - this.lblPDFFileName.Text = "PDF Name"; - // - // lblPDFLoc - // - this.lblPDFLoc.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.lblPDFLoc.BackgroundStyle.Class = ""; - 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(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(94, 28); - this.lblPDFLoc.TabIndex = 4; - this.lblPDFLoc.Text = "PDF Location:"; - // - // tbGeneral - // - this.tbGeneral.AttachedControl = this.tabControlPanel3; - this.tbGeneral.Name = "tbGeneral"; - this.tbGeneral.Text = "General"; - // // tabControlPanel2 // - this.tabControlPanel2.Controls.Add(this.ppCmbxChangeBarType); - this.tabControlPanel2.Controls.Add(this.label11); + 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, 24); @@ -449,30 +141,75 @@ namespace VEPROMS this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.tbChangeBars; // - // ppCmbxChangeBarType + // ppGpbxCBType // - this.ppCmbxChangeBarType.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.docVersionConfigBindingSource, "Print_ChangeBar", true)); - this.ppCmbxChangeBarType.DisplayMember = "Text"; - this.ppCmbxChangeBarType.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.ppCmbxChangeBarType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ppCmbxChangeBarType.FormattingEnabled = true; - this.ppCmbxChangeBarType.Location = new System.Drawing.Point(129, 30); - this.ppCmbxChangeBarType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppCmbxChangeBarType.Name = "ppCmbxChangeBarType"; - this.ppCmbxChangeBarType.Size = new System.Drawing.Size(223, 23); - this.ppCmbxChangeBarType.TabIndex = 56; - this.ppCmbxChangeBarType.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.ppCmbxChangeBarType.WatermarkText = "select change bar setting"; + this.ppGpbxCBType.BackColor = System.Drawing.Color.Transparent; + this.ppGpbxCBType.CanvasColor = System.Drawing.SystemColors.Control; + 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(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(568, 55); // - // label11 // - this.label11.AutoSize = true; - this.label11.BackColor = System.Drawing.Color.Transparent; - this.label11.Location = new System.Drawing.Point(33, 33); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(90, 17); - this.label11.TabIndex = 54; - this.label11.Text = "Change Bars"; + // + this.ppGpbxCBType.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.ppGpbxCBType.Style.BackColorGradientAngle = 90; + this.ppGpbxCBType.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.ppGpbxCBType.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxCBType.Style.BorderBottomWidth = 1; + this.ppGpbxCBType.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.ppGpbxCBType.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxCBType.Style.BorderLeftWidth = 1; + this.ppGpbxCBType.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxCBType.Style.BorderRightWidth = 1; + this.ppGpbxCBType.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGpbxCBType.Style.BorderTopWidth = 1; + this.ppGpbxCBType.Style.Class = ""; + this.ppGpbxCBType.Style.CornerDiameter = 4; + this.ppGpbxCBType.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.ppGpbxCBType.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.ppGpbxCBType.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.ppGpbxCBType.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.ppGpbxCBType.StyleMouseDown.Class = ""; + this.ppGpbxCBType.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ppGpbxCBType.StyleMouseOver.Class = ""; + this.ppGpbxCBType.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ppGpbxCBType.TabIndex = 54; + this.ppGpbxCBType.Text = "Type"; + // + // rbCustom + // + this.rbCustom.AutoSize = true; + this.rbCustom.Location = new System.Drawing.Point(263, 5); + this.rbCustom.Name = "rbCustom"; + this.rbCustom.Size = new System.Drawing.Size(76, 21); + this.rbCustom.TabIndex = 1; + this.rbCustom.TabStop = true; + this.rbCustom.Text = "Custom"; + this.rbCustom.UseVisualStyleBackColor = true; + this.rbCustom.Click += new System.EventHandler(this.rbCustom_Click); + // + // rbFormatDefault + // + this.rbFormatDefault.AutoSize = true; + this.rbFormatDefault.Location = new System.Drawing.Point(34, 5); + this.rbFormatDefault.Name = "rbFormatDefault"; + this.rbFormatDefault.Size = new System.Drawing.Size(122, 21); + this.rbFormatDefault.TabIndex = 0; + this.rbFormatDefault.TabStop = true; + this.rbFormatDefault.Text = "Format Default"; + this.rbFormatDefault.UseVisualStyleBackColor = true; + this.rbFormatDefault.Click += new System.EventHandler(this.rbFormatDefault_Click); + this.rbFormatDefault.CheckedChanged += new System.EventHandler(this.rbFormatDefault_CheckedChanged); // // ppGpbxUserSpecCB // @@ -520,7 +257,7 @@ namespace VEPROMS this.ppGpbxUserSpecCB.StyleMouseOver.Class = ""; this.ppGpbxUserSpecCB.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGpbxUserSpecCB.TabIndex = 53; - this.ppGpbxUserSpecCB.Text = "Change Bar Override Settings"; + this.ppGpbxUserSpecCB.Text = "Custom Settings"; // // ppGpbxUserSpecTxt // @@ -566,7 +303,7 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.StyleMouseOver.Class = ""; this.ppGpbxUserSpecTxt.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGpbxUserSpecTxt.TabIndex = 51; - this.ppGpbxUserSpecTxt.Text = "Custom Change Bar Message"; + this.ppGpbxUserSpecTxt.Text = "Custom Change Bar Text"; // // label14 // @@ -588,6 +325,10 @@ namespace VEPROMS this.ppTxbxChangeBarUserMsgTwo.TabIndex = 2; this.ppTxbxChangeBarUserMsgTwo.Text = ""; // + // docVersionConfigBindingSource + // + this.docVersionConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.DocVersionConfig); + // // label15 // this.label15.AutoSize = true; @@ -646,6 +387,7 @@ namespace VEPROMS 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"; + this.ppCmbxChgBarTxtType.SelectedIndexChanged += new System.EventHandler(this.ppCmbxChgBarTxtType_SelectedIndexChanged); // // label13 // @@ -663,15 +405,251 @@ namespace VEPROMS this.tbChangeBars.Text = "Change Bars"; this.tbChangeBars.Visible = false; // + // tabControlPanel3 + // + this.tabControlPanel3.AutoScroll = true; + 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, 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(669, 275); + 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))); + this.tabControlPanel3.Style.GradientAngle = 90; + this.tabControlPanel3.TabIndex = 3; + this.tabControlPanel3.TabItem = this.tbGeneral; + // + // txbReviewDate + // + // + // + // + this.txbReviewDate.Border.Class = "TextBoxBorder"; + this.txbReviewDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbReviewDate.Enabled = false; + this.txbReviewDate.Location = new System.Drawing.Point(136, 172); + this.txbReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbReviewDate.Name = "txbReviewDate"; + this.txbReviewDate.Size = new System.Drawing.Size(121, 22); + this.txbReviewDate.TabIndex = 83; + // + // txbRevDate + // + // + // + // + this.txbRevDate.Border.Class = "TextBoxBorder"; + this.txbRevDate.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbRevDate.Enabled = false; + this.txbRevDate.Location = new System.Drawing.Point(136, 132); + this.txbRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbRevDate.Name = "txbRevDate"; + this.txbRevDate.Size = new System.Drawing.Size(121, 22); + this.txbRevDate.TabIndex = 82; + // + // txbPDFLocation + // + this.txbPDFLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | 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(136, 10); + this.txbPDFLocation.Name = "txbPDFLocation"; + this.txbPDFLocation.ShortcutsEnabled = false; + this.txbPDFLocation.Size = new System.Drawing.Size(518, 22); + this.txbPDFLocation.TabIndex = 81; + this.txbPDFLocation.WatermarkText = "PDF Location"; + this.txbPDFLocation.Leave += new System.EventHandler(this.txbPDFLocation_Leave); + // + // cbxOpenAfterCreate2 + // + this.cbxOpenAfterCreate2.AutoSize = true; + 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(16, 240); + this.cbxOpenAfterCreate2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxOpenAfterCreate2.Name = "cbxOpenAfterCreate2"; + this.cbxOpenAfterCreate2.Size = new System.Drawing.Size(177, 22); + this.cbxOpenAfterCreate2.TabIndex = 80; + this.cbxOpenAfterCreate2.Text = "View PDF After Create"; + this.cbxOpenAfterCreate2.UseVisualStyleBackColor = false; + // + // cbxOverwritePDF2 + // + this.cbxOverwritePDF2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.cbxOverwritePDF2.AutoSize = true; + this.cbxOverwritePDF2.BackColor = System.Drawing.Color.Transparent; + 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(471, 48); + this.cbxOverwritePDF2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxOverwritePDF2.Name = "cbxOverwritePDF2"; + this.cbxOverwritePDF2.Size = new System.Drawing.Size(154, 22); + this.cbxOverwritePDF2.TabIndex = 79; + this.cbxOverwritePDF2.Text = "Overwrite PDF File"; + this.cbxOverwritePDF2.UseVisualStyleBackColor = false; + // + // txbRevNum + // + // + // + // + this.txbRevNum.Border.Class = "TextBoxBorder"; + this.txbRevNum.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbRevNum.Enabled = false; + 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(121, 22); + this.txbRevNum.TabIndex = 73; + // + // lblReviewDate + // + this.lblReviewDate.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblReviewDate.BackgroundStyle.Class = ""; + 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(9, 172); + this.lblReviewDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblReviewDate.Name = "lblReviewDate"; + this.lblReviewDate.Size = new System.Drawing.Size(114, 23); + 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.Class = ""; + 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(9, 132); + this.lblRevDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblRevDate.Name = "lblRevDate"; + this.lblRevDate.Size = new System.Drawing.Size(114, 23); + this.lblRevDate.TabIndex = 71; + this.lblRevDate.Text = "Revision Date"; + this.lblRevDate.TextAlignment = System.Drawing.StringAlignment.Far; + // + // lblRevNum + // + this.lblRevNum.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblRevNum.BackgroundStyle.Class = ""; + 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(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(114, 23); + this.lblRevNum.TabIndex = 70; + this.lblRevNum.Text = "Revision Number"; + this.lblRevNum.TextAlignment = System.Drawing.StringAlignment.Far; + // + // txbPDFName + // + this.txbPDFName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | 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(136, 48); + this.txbPDFName.Margin = new System.Windows.Forms.Padding(4); + this.txbPDFName.Name = "txbPDFName"; + this.txbPDFName.Size = new System.Drawing.Size(263, 22); + this.txbPDFName.TabIndex = 8; + // + // lblPDFFileName + // + this.lblPDFFileName.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblPDFFileName.BackgroundStyle.Class = ""; + 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(9, 42); + this.lblPDFFileName.Margin = new System.Windows.Forms.Padding(4); + this.lblPDFFileName.Name = "lblPDFFileName"; + this.lblPDFFileName.Size = new System.Drawing.Size(114, 23); + this.lblPDFFileName.TabIndex = 7; + this.lblPDFFileName.Text = "PDF Name"; + this.lblPDFFileName.TextAlignment = System.Drawing.StringAlignment.Far; + // + // lblPDFLoc + // + this.lblPDFLoc.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblPDFLoc.BackgroundStyle.Class = ""; + 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(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(114, 23); + this.lblPDFLoc.TabIndex = 4; + this.lblPDFLoc.Text = "PDF Location"; + this.lblPDFLoc.TextAlignment = System.Drawing.StringAlignment.Far; + // + // tbGeneral + // + this.tbGeneral.AttachedControl = this.tabControlPanel3; + this.tbGeneral.Name = "tbGeneral"; + this.tbGeneral.Text = "General"; + // // tabControlPanel1 // + this.tabControlPanel1.Controls.Add(this.lblWatermarkS); + this.tabControlPanel1.Controls.Add(this.txbReviewDateS); + this.tabControlPanel1.Controls.Add(this.txbRevDateS); + this.tabControlPanel1.Controls.Add(this.txbRevNumS); + this.tabControlPanel1.Controls.Add(this.lblReviewDateS); + this.tabControlPanel1.Controls.Add(this.lblRevDateS); + this.tabControlPanel1.Controls.Add(this.lblRevNumS); + this.tabControlPanel1.Controls.Add(this.txbPdfLocationS); + this.tabControlPanel1.Controls.Add(this.btnPdfLocation); + this.tabControlPanel1.Controls.Add(this.lblPdfLocS); this.tabControlPanel1.Controls.Add(this.btnWaterMarkOff); this.tabControlPanel1.Controls.Add(this.btnChgBarOff); this.tabControlPanel1.Controls.Add(this.btnDuplxOff); this.tabControlPanel1.Controls.Add(this.lblAutoDuplexing); this.tabControlPanel1.Controls.Add(this.btnDuplxOn); this.tabControlPanel1.Controls.Add(this.btnWaterMarkOn); - this.tabControlPanel1.Controls.Add(this.lblWaterMark); this.tabControlPanel1.Controls.Add(this.cbxWaterMark); this.tabControlPanel1.Controls.Add(this.lblChgBars); this.tabControlPanel1.Controls.Add(this.btnChgBarOn); @@ -689,14 +667,171 @@ namespace VEPROMS | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 90; this.tabControlPanel1.TabIndex = 5; - this.tabControlPanel1.TabItem = this.tbAdvanced; + this.tabControlPanel1.TabItem = this.tbSettings; + // + // lblWatermarkS + // + this.lblWatermarkS.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblWatermarkS.BackgroundStyle.Class = ""; + 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(9, 203); + this.lblWatermarkS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblWatermarkS.Name = "lblWatermarkS"; + this.lblWatermarkS.Size = new System.Drawing.Size(114, 23); + this.lblWatermarkS.TabIndex = 106; + this.lblWatermarkS.Text = "Watermark"; + this.lblWatermarkS.TextAlignment = System.Drawing.StringAlignment.Far; + // + // txbReviewDateS + // + // + // + // + this.txbReviewDateS.Border.Class = "TextBoxBorder"; + this.txbReviewDateS.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbReviewDateS.Location = new System.Drawing.Point(126, 124); + this.txbReviewDateS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbReviewDateS.Name = "txbReviewDateS"; + this.txbReviewDateS.Size = new System.Drawing.Size(121, 22); + this.txbReviewDateS.TabIndex = 105; + this.txbReviewDateS.Leave += new System.EventHandler(this.txbReviewDateS_Leave); + // + // txbRevDateS + // + // + // + // + this.txbRevDateS.Border.Class = "TextBoxBorder"; + this.txbRevDateS.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbRevDateS.Location = new System.Drawing.Point(126, 84); + this.txbRevDateS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbRevDateS.Name = "txbRevDateS"; + this.txbRevDateS.Size = new System.Drawing.Size(121, 22); + this.txbRevDateS.TabIndex = 104; + this.txbRevDateS.Leave += new System.EventHandler(this.txbRevDateS_Leave); + // + // txbRevNumS + // + // + // + // + this.txbRevNumS.Border.Class = "TextBoxBorder"; + this.txbRevNumS.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txbRevNumS.Location = new System.Drawing.Point(126, 44); + this.txbRevNumS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txbRevNumS.Name = "txbRevNumS"; + this.txbRevNumS.Size = new System.Drawing.Size(121, 22); + this.txbRevNumS.TabIndex = 103; + this.txbRevNumS.Leave += new System.EventHandler(this.txbRevNumS_Leave); + // + // lblReviewDateS + // + this.lblReviewDateS.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblReviewDateS.BackgroundStyle.Class = ""; + this.lblReviewDateS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblReviewDateS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblReviewDateS.Location = new System.Drawing.Point(9, 124); + this.lblReviewDateS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblReviewDateS.Name = "lblReviewDateS"; + this.lblReviewDateS.Size = new System.Drawing.Size(114, 23); + this.lblReviewDateS.TabIndex = 102; + this.lblReviewDateS.Text = "Review Date"; + this.lblReviewDateS.TextAlignment = System.Drawing.StringAlignment.Far; + // + // lblRevDateS + // + this.lblRevDateS.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblRevDateS.BackgroundStyle.Class = ""; + this.lblRevDateS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblRevDateS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblRevDateS.Location = new System.Drawing.Point(9, 84); + this.lblRevDateS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblRevDateS.Name = "lblRevDateS"; + this.lblRevDateS.Size = new System.Drawing.Size(114, 23); + this.lblRevDateS.TabIndex = 101; + this.lblRevDateS.Text = "Revision Date"; + this.lblRevDateS.TextAlignment = System.Drawing.StringAlignment.Far; + // + // lblRevNumS + // + this.lblRevNumS.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblRevNumS.BackgroundStyle.Class = ""; + this.lblRevNumS.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.lblRevNumS.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblRevNumS.Location = new System.Drawing.Point(9, 44); + this.lblRevNumS.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblRevNumS.Name = "lblRevNumS"; + this.lblRevNumS.Size = new System.Drawing.Size(114, 23); + this.lblRevNumS.TabIndex = 100; + this.lblRevNumS.Text = "Revision Number"; + this.lblRevNumS.TextAlignment = System.Drawing.StringAlignment.Far; + // + // txbPdfLocationS + // + this.txbPdfLocationS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | 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(126, 4); + this.txbPdfLocationS.Name = "txbPdfLocationS"; + this.txbPdfLocationS.ShortcutsEnabled = false; + this.txbPdfLocationS.Size = new System.Drawing.Size(497, 22); + this.txbPdfLocationS.TabIndex = 98; + this.txbPdfLocationS.WatermarkText = "PDF Location"; + // + // btnPdfLocation + // + 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.Image = ((System.Drawing.Image)(resources.GetObject("btnPdfLocation.Image"))); + this.btnPdfLocation.Location = new System.Drawing.Point(628, 4); + this.btnPdfLocation.Margin = new System.Windows.Forms.Padding(4); + this.btnPdfLocation.Name = "btnPdfLocation"; + 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); + // + // lblPdfLocS + // + this.lblPdfLocS.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.lblPdfLocS.BackgroundStyle.Class = ""; + 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(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(114, 23); + this.lblPdfLocS.TabIndex = 97; + this.lblPdfLocS.Text = "PDF Location"; + this.lblPdfLocS.TextAlignment = System.Drawing.StringAlignment.Far; // // btnWaterMarkOff // 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(191, 104); + this.btnWaterMarkOff.Location = new System.Drawing.Point(181, 203); this.btnWaterMarkOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnWaterMarkOff.Name = "btnWaterMarkOff"; this.btnWaterMarkOff.Size = new System.Drawing.Size(45, 23); @@ -710,7 +845,7 @@ 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(191, 42); + this.btnChgBarOff.Location = new System.Drawing.Point(181, 170); this.btnChgBarOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnChgBarOff.Name = "btnChgBarOff"; this.btnChgBarOff.Size = new System.Drawing.Size(45, 23); @@ -724,7 +859,7 @@ 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(191, 163); + this.btnDuplxOff.Location = new System.Drawing.Point(181, 236); this.btnDuplxOff.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnDuplxOff.Name = "btnDuplxOff"; this.btnDuplxOff.Size = new System.Drawing.Size(44, 23); @@ -742,18 +877,19 @@ namespace VEPROMS this.lblAutoDuplexing.BackgroundStyle.Class = ""; 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(31, 163); + this.lblAutoDuplexing.Location = new System.Drawing.Point(9, 236); this.lblAutoDuplexing.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblAutoDuplexing.Name = "lblAutoDuplexing"; - this.lblAutoDuplexing.Size = new System.Drawing.Size(100, 23); + this.lblAutoDuplexing.Size = new System.Drawing.Size(114, 23); this.lblAutoDuplexing.TabIndex = 90; this.lblAutoDuplexing.Text = "Auto Duplexing"; + this.lblAutoDuplexing.TextAlignment = System.Drawing.StringAlignment.Far; // // btnDuplxOn // this.btnDuplxOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnDuplxOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDuplxOn.Location = new System.Drawing.Point(137, 163); + this.btnDuplxOn.Location = new System.Drawing.Point(126, 236); this.btnDuplxOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnDuplxOn.Name = "btnDuplxOn"; this.btnDuplxOn.Size = new System.Drawing.Size(45, 23); @@ -766,26 +902,15 @@ namespace VEPROMS // this.btnWaterMarkOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnWaterMarkOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnWaterMarkOn.Location = new System.Drawing.Point(137, 104); + this.btnWaterMarkOn.Location = new System.Drawing.Point(126, 203); this.btnWaterMarkOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnWaterMarkOn.Name = "btnWaterMarkOn"; this.btnWaterMarkOn.Size = new System.Drawing.Size(45, 23); this.btnWaterMarkOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnWaterMarkOn.TabIndex = 88; - this.btnWaterMarkOn.Text = "On"; + this.btnWaterMarkOn.Text = "ON"; this.btnWaterMarkOn.Click += new System.EventHandler(this.btnAdvWaterMarkOn_Click); // - // lblWaterMark - // - this.lblWaterMark.AutoSize = true; - this.lblWaterMark.BackColor = System.Drawing.Color.Transparent; - this.lblWaterMark.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblWaterMark.Location = new System.Drawing.Point(49, 108); - this.lblWaterMark.Name = "lblWaterMark"; - this.lblWaterMark.Size = new System.Drawing.Size(77, 17); - this.lblWaterMark.TabIndex = 86; - this.lblWaterMark.Text = "Watermark"; - // // cbxWaterMark // this.cbxWaterMark.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.docVersionConfigBindingSource, "Print_Watermark", true)); @@ -793,7 +918,7 @@ 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(249, 104); + this.cbxWaterMark.Location = new System.Drawing.Point(239, 203); this.cbxWaterMark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbxWaterMark.Name = "cbxWaterMark"; this.cbxWaterMark.Size = new System.Drawing.Size(183, 23); @@ -811,31 +936,33 @@ namespace VEPROMS this.lblChgBars.BackgroundStyle.Class = ""; 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(46, 42); + this.lblChgBars.Location = new System.Drawing.Point(9, 170); this.lblChgBars.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lblChgBars.Name = "lblChgBars"; - this.lblChgBars.Size = new System.Drawing.Size(85, 23); + this.lblChgBars.Size = new System.Drawing.Size(114, 23); this.lblChgBars.TabIndex = 85; this.lblChgBars.Text = "Change Bars"; + this.lblChgBars.TextAlignment = System.Drawing.StringAlignment.Far; // // btnChgBarOn // this.btnChgBarOn.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnChgBarOn.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnChgBarOn.Location = new System.Drawing.Point(137, 42); + this.btnChgBarOn.Location = new System.Drawing.Point(126, 170); this.btnChgBarOn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnChgBarOn.Name = "btnChgBarOn"; this.btnChgBarOn.Size = new System.Drawing.Size(45, 23); this.btnChgBarOn.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnChgBarOn.TabIndex = 84; - this.btnChgBarOn.Text = "On"; + this.btnChgBarOn.Text = "ON"; this.btnChgBarOn.Click += new System.EventHandler(this.btnAvChgBarOn_Click); // - // tbAdvanced + // tbSettings // - this.tbAdvanced.AttachedControl = this.tabControlPanel1; - this.tbAdvanced.Name = "tbAdvanced"; - this.tbAdvanced.Text = "Advanced"; + this.tbSettings.AttachedControl = this.tabControlPanel1; + this.tbSettings.Name = "tbSettings"; + this.tbSettings.Text = "Settings"; + this.tbSettings.Click += new System.EventHandler(this.tbSettings_Click); // // btnCreatePDF // @@ -910,19 +1037,17 @@ namespace VEPROMS this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.DlgPrintProcedure_FormClosed); ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).EndInit(); this.tabControl1.ResumeLayout(false); - this.tabControlPanel3.ResumeLayout(false); - this.tabControlPanel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dtReviewDate)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dtRevDate)).EndInit(); this.tabControlPanel2.ResumeLayout(false); - this.tabControlPanel2.PerformLayout(); + this.ppGpbxCBType.ResumeLayout(false); + this.ppGpbxCBType.PerformLayout(); this.ppGpbxUserSpecCB.ResumeLayout(false); this.ppGpbxUserSpecCB.PerformLayout(); this.ppGpbxUserSpecTxt.ResumeLayout(false); this.ppGpbxUserSpecTxt.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.docVersionConfigBindingSource)).EndInit(); + this.tabControlPanel3.ResumeLayout(false); + this.tabControlPanel3.PerformLayout(); this.tabControlPanel1.ResumeLayout(false); - this.tabControlPanel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -939,29 +1064,25 @@ namespace VEPROMS private DevComponents.DotNetBar.TabItem tbGeneral; private DevComponents.DotNetBar.LabelX lblPDFLoc; private System.Windows.Forms.FolderBrowserDialog DlgBrowseFolder; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dtReviewDate; - private DevComponents.Editors.DateTimeAdv.DateTimeInput dtRevDate; 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 tbxPDFName; + private DevComponents.DotNetBar.Controls.TextBoxX txbPDFName; private DevComponents.DotNetBar.LabelX lblPDFFileName; private System.Windows.Forms.CheckBox cbxOverwritePDF2; private System.Windows.Forms.CheckBox cbxOpenAfterCreate2; private DevComponents.DotNetBar.TabControlPanel tabControlPanel1; - private DevComponents.DotNetBar.ButtonX btnSelect; private DevComponents.DotNetBar.ButtonX btnWaterMarkOff; private DevComponents.DotNetBar.ButtonX btnChgBarOff; private DevComponents.DotNetBar.ButtonX btnDuplxOff; private DevComponents.DotNetBar.LabelX lblAutoDuplexing; private DevComponents.DotNetBar.ButtonX btnDuplxOn; private DevComponents.DotNetBar.ButtonX btnWaterMarkOn; - private System.Windows.Forms.Label lblWaterMark; private DevComponents.DotNetBar.Controls.ComboBoxEx cbxWaterMark; private DevComponents.DotNetBar.LabelX lblChgBars; private DevComponents.DotNetBar.ButtonX btnChgBarOn; - private DevComponents.DotNetBar.TabItem tbAdvanced; + private DevComponents.DotNetBar.TabItem tbSettings; private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxUserSpecCB; private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxUserSpecTxt; private System.Windows.Forms.Label label14; @@ -972,10 +1093,23 @@ namespace VEPROMS private System.Windows.Forms.Label label12; private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxChgBarTxtType; private System.Windows.Forms.Label label13; - private DevComponents.DotNetBar.Controls.ComboBoxEx ppCmbxChangeBarType; - private System.Windows.Forms.Label label11; private System.Windows.Forms.BindingSource docVersionConfigBindingSource; private DevComponents.DotNetBar.Controls.TextBoxX txbPDFLocation; private System.Windows.Forms.CheckBox cbxDebug; + private DevComponents.DotNetBar.Controls.TextBoxX txbRevNumS; + private DevComponents.DotNetBar.LabelX lblReviewDateS; + private DevComponents.DotNetBar.LabelX lblRevDateS; + private DevComponents.DotNetBar.LabelX lblRevNumS; + 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.Controls.TextBoxX txbReviewDateS; + private DevComponents.DotNetBar.Controls.TextBoxX txbRevDateS; + private DevComponents.DotNetBar.LabelX lblWatermarkS; + private DevComponents.DotNetBar.Controls.GroupPanel ppGpbxCBType; + private System.Windows.Forms.RadioButton rbCustom; + private System.Windows.Forms.RadioButton rbFormatDefault; } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 0f5ccc58..44148b01 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -16,55 +16,65 @@ namespace VEPROMS public partial class DlgPrintProcedure : DevComponents.DotNetBar.Office2007Form { private DocVersionConfig _DocVersionConfig; - //private string _RevNum; - public string RevNum { get { return txbRevNum.Text; } set { txbRevNum.Text = value; } } - //private string ProcNum; - public string ProcNum { get { return MyProcedure.DisplayNumber; } } - //private string _PDFPath; - public string PDFPath { get { return txbPDFLocation.Text; } set { txbPDFLocation.Text = value; } } - - //private DateTime _RevDate = DateTime.Today; - - public DateTime RevDate + public string RevDate { - get { return dtRevDate.Value; } - set { dtRevDate.Value = value; } + get { return txbRevDate.Text; } + set { txbRevDate.Text = value; } } - - //private DateTime _ReviewDate = DateTime.Today; - - public DateTime ReviewDate + public string ReviewDate { - get { return dtReviewDate.Value; } - set { dtReviewDate.Value = value; } + get { return txbReviewDate.Text; } + set { txbReviewDate.Text = value; } + } + public string PDFPathSetting + { + get { return txbPdfLocationS.Text; } + set { txbPdfLocationS.Text = value; } } - - public DlgPrintProcedure(ProcedureInfo pi) { InitializeComponent(); - _DocVersionConfig = (pi.ActiveParent as DocVersionInfo).DocVersionConfig; //docVersionConfig; + _DocVersionConfig = (pi.ActiveParent as DocVersionInfo).DocVersionConfig; _MyProcedure = pi; GetDocVersionSettings(); - // set to a default PDF location if non was specified in the DocVersions property + // set to a default PDF location if none was specified in the DocVersions property if (txbPDFLocation.Text == null || txbPDFLocation.Text.Length == 0 || !Directory.Exists(txbPDFLocation.Text)) txbPDFLocation.Text = VlnSettings.TemporaryFolder; + + // if the default setting is 'SelectBeforePrinting', put up a message box to determine whether the user + // wants change bars. If not, 'Change Bar' on the Setting tab is 'OFF' and no Change bar tab. + // If yes, the Change bar tab is the selected tab. + if (_DocVersionConfig.Print_ChangeBar == PrintChangeBar.SelectBeforePrinting) + { + DialogResult dr = MessageBox.Show("Do you want change bars?", "Change Bars", MessageBoxButtons.YesNo); + if (dr == DialogResult.Yes) + { + btnChgBarOn.PerformClick(); + tabControl1.SelectedTab = tbChangeBars; + rbFormatDefault.PerformClick(); + rbFormatDefault.Checked = true; // default to 'Format Default' + } + else + { + btnChgBarOff.PerformClick(); + } + } } private void GetDocVersionSettings() @@ -73,7 +83,6 @@ namespace VEPROMS _DocVersionConfig.ParentLookup = false; // PDF Location PDFPath = _DocVersionConfig.Print_PDFLocation; - //txbPDFLocation.Text = PDFPath; // Overwrite PDF cbxOverwritePDF2.Checked = _DocVersionConfig.Print_AlwaysOverwritePDF; // Open PDF After Create @@ -101,50 +110,45 @@ namespace VEPROMS private void DlgPrintProcedure_Load(object sender, EventArgs e) { this.Text = "Create PDF for " + ProcNum; - //dtRevDate.Value = _RevDate; - //dtReviewDate.Value = _ReviewDate; - //tbxRevNum.Text = _RevNum; // get list of previous pdf files // if no previous pdf file, then get path from frmVersionProperties // dlgSelectFile.InitialDirectory = pdf path from frmVersionProperties //cbxPDF.Text = string.Format(@"{0}\{1}.pdf", _PDFPath, _ProcNum); // General 2 settings //txbPDFLocation.Text = _PDFPath; - tbxPDFName.Text = string.Format("{0}.pdf", ProcNum); - //txbRevNum.Text = _RevNum; - //dtRevDate.Value = _RevDate; - //dtReviewDate.Value = _ReviewDate; - // Advanced tab - //cbxPDFloc.Text = _PDFPath; - RevNum = "0"; // need to get from procedure config? - RevDate = DateTime.Today; // need to get from procedure config? - ReviewDate = DateTime.Today; // need to get from procedure config? - + txbPDFName.Text = string.Format("{0}.pdf", ProcNum); + 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"; PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark; cbxWaterMark.Text = pw.ToString(); - ppCmbxChangeBarType.DataSource = EnumDetail.Details(); - ppCmbxChangeBarType.DisplayMember = "Description"; - ppCmbxChangeBarType.ValueMember = "EValue"; - ppCmbxChangeBarType.Text = MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBar.ToString(); - ppCmbxChgBarPos.DataSource = EnumDetail.Details(); ppCmbxChgBarPos.DisplayMember = "Description"; ppCmbxChgBarPos.ValueMember = "EValue"; - ppCmbxChgBarPos.Text = MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBarLoc.ToString(); + ppCmbxChgBarPos.SelectedIndex = (int)MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBarLoc; ppCmbxChgBarTxtType.DataSource = EnumDetail.Details(); ppCmbxChgBarTxtType.DisplayMember = "Description"; ppCmbxChgBarTxtType.ValueMember = "EValue"; - ppCmbxChgBarTxtType.Text = MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBarText.ToString(); + ppCmbxChgBarTxtType.SelectedIndex = (int)MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBarText; ppTxbxChangeBarUserMsgOne.Text = MyProcedure.MyDocVersion.DocVersionConfig.Print_UserCBMess1; - ppTxbxChangeBarUserMsgTwo.Text = MyProcedure.MyDocVersion.DocVersionConfig.Print_UserCBMess2; - + ppGpbxUserSpecTxt.Enabled = ppCmbxChgBarTxtType.SelectedIndex == (int)PrintChangeBarText.UserDef; } private void btnCancel_Click(object sender, EventArgs e) @@ -152,66 +156,6 @@ namespace VEPROMS this.Close(); } - //private void btnOpenFolder_Click(object sender, EventArgs e) - //{ - // saveFileDialog1.InitialDirectory = _PDFPath;//@"C:\16bit\PromsDat\VEHLP"; - // saveFileDialog1.FileName = string.Format(@"{0}\{1}.pdf", _PDFPath, _ProcNum); - // DialogResult drslt = saveFileDialog1.ShowDialog(); - // if (drslt == DialogResult.OK) - // { - // cbxPDF.Text = saveFileDialog1.FileName; // contails full path - // UpdateDropDown(); - // } - //} - - //private void btnAutoDuplxOn_Click(object sender, EventArgs e) - //{ - // if (!btnAutoDuplxOn.Checked) - // { - // btnAutoDuplxOn.Checked = true; - // btnAutoDuplxOff.Checked = false; - // } - //} - - //private void btnAutoDuplxOff_Click(object sender, EventArgs e) - //{ - // if (!btnAutoDuplxOff.Checked) - // { - // btnAutoDuplxOff.Checked = true; - // btnAutoDuplxOn.Checked = false; - // } - //} - - private void buttonX9_Click(object sender, EventArgs e) - { - DlgBrowseFolder.SelectedPath = PDFPath; - DialogResult drslt = DlgBrowseFolder.ShowDialog(); - if (drslt == DialogResult.OK) - { - //cbxPDFloc.Text = DlgBrowseFolder.SelectedPath; - txbPDFLocation.Text = DlgBrowseFolder.SelectedPath; - //lblCurPDFLoc.Text = cbxPDFloc.Text; - //UpdateDropDown2(); - } - } - //private void UpdateDropDown2() - //{ - // if (!cbxPDFloc.Text.Equals(string.Empty)) - // { - // string tstr = cbxPDFloc.Text; - // // if its already exists in the list - remove it - // if (cbxPDFloc.Items.Contains(tstr)) - // cbxPDFloc.Items.Remove(tstr); - // // Add the new criteria to the top of the list - // cbxPDFloc.Items.Insert(0, tstr); - // // set the text to the new criteria - // cbxPDFloc.Text = tstr; - // // If there are more than 10 remove the last one - // if (cbxPDFloc.Items.Count > 10) - // cbxPDFloc.Items.RemoveAt(10); - // } - //} - private void btnAvChgBarOn_Click(object sender, EventArgs e) { if (!btnChgBarOn.Checked) @@ -219,6 +163,18 @@ namespace VEPROMS btnChgBarOn.Checked = true; btnChgBarOff.Checked = false; tbChangeBars.Visible = true; + // to set which radio button (Format default or Custom) is checked, look at config data + switch (MyProcedure.MyDocVersion.DocVersionConfig.Print_ChangeBar) + { + case PrintChangeBar.WithUserSpecified: + rbCustom.Checked = true; + break; + case PrintChangeBar.SelectBeforePrinting: + case PrintChangeBar.WithDefault: + default: + rbFormatDefault.Checked = true; + break; + } } } private void btnAvChgBarOff_Click(object sender, EventArgs e) @@ -312,64 +268,178 @@ namespace VEPROMS private void CreatePDF() { Volian.Print.Library.Rtf2Pdf.PdfDebug = true; - //tbTimings.Text = ""; - //Cursor saveCursor = this.Cursor; - //this.Cursor = Cursors.WaitCursor; - //ProcedureConfig.PrintWatermark pw = MyProcedure.ProcedureConfig.Print_Watermark; PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue; - frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate.ToShortDateString(), pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, PDFPath); - frmStatus.Show(); + // Determine change bar settings. First get from config & then see if override from dialog. + // Also check that format allows override. + ChangeBarDefinition cbd = DetermineChangeBarSettings(); + frmPDFStatusForm frmStatus = new frmPDFStatusForm(MyProcedure, RevNum, RevDate, pw.ToString(), cbxDebug.Checked, VlnSettings.OldPDFFolder, cbxOpenAfterCreate2.Checked, PDFPath, cbd); + frmStatus.ShowDialog(); this.Close(); - - //PromsPrinter pp = new PromsPrinter(MyProcedure, RevNum, RevDate.ToShortDateString(), pw.ToString(), true, @"C:\TEMP\16Bit", cbxOpenAfterCreate2.Checked); - ////pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); - //pp.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); - ////_ElapsedTime = new Dictionary(); - //DateTime tStart = DateTime.Now; - //string pdfFile = pp.Print(PDFPath); - //DateTime tEnd = DateTime.Now; - ////_ElapsedTime.Add(PromsPrinterStatusType.Total, DateTime.Now - tStart); - //MyStatus = pdfFile + " created."; - ////this.Cursor = saveCursor; - ////ShowElapsedTime(); - //MyStatus = string.Format("{0} created in {1:0.} milliseconds", pdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds)); } - //void pp_StatusChanged(object sender, PromsPrintStatusArgs args) - //{ - // MyStatus = args.MyStatus; - //} + // Determine if any dialog selections for change bars have overridden the data + // supplied in the DocVconfig data or format file. Settings are location and text. + private ChangeBarDefinition DetermineChangeBarSettings() + { + ChangeBarDefinition cbd = new ChangeBarDefinition(); + // if the dialog has 'without change bar' selected, then just set without and return + if (btnChgBarOff.Checked) + { + cbd.MyChangeBarType = PrintChangeBar.Without; + return cbd; + } + // Get settings from dialog because these are used to set the initial dialog values and + // any changes from user overrides the initial settings. + ChangeBarData changeBarData = MyProcedure.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData; + if (rbFormatDefault.Checked || _DocVersionConfig == null || _DocVersionConfig.Print_ChangeBar == PrintChangeBar.WithDefault) + { + cbd.MyChangeBarType = PrintChangeBar.WithDefault; + cbd.MyChangeBarText = changeBarData.ChangeBarMessage == "ChgID" ? PrintChangeBarText.ChgID : + changeBarData.ChangeBarMessage == "DateAndChgID" ? PrintChangeBarText.DateChgID : + changeBarData.ChangeBarMessage == "None" ? PrintChangeBarText.None : + changeBarData.ChangeBarMessage == "RevNum" ? PrintChangeBarText.RevNum : PrintChangeBarText.UserDef; + } + else if (rbCustom.Checked || _DocVersionConfig.Print_ChangeBar == PrintChangeBar.WithUserSpecified) + { + cbd.MyChangeBarLoc = (PrintChangeBarLoc)ppCmbxChgBarPos.SelectedIndex; + cbd.MyChangeBarText = (PrintChangeBarText)ppCmbxChgBarTxtType.SelectedIndex; + } + else + { + cbd.MyChangeBarLoc = _DocVersionConfig.Print_ChangeBarLoc; + cbd.MyChangeBarText = _DocVersionConfig.Print_ChangeBarText; + } + + // now figure out the location. + if (cbd.MyChangeBarType != PrintChangeBar.Without) + { + // if the format has the absolutefixedchangecolumn format flag, then always use the fixedchangecolumn from the + // format, otherwise, use the default column based on the selected location, stored in the base format. + cbd.MyChangeBarColumn = (changeBarData.AbsoluteFixedChangeColumn) ? + (int)changeBarData.FixedChangeColumn : + System.Convert.ToInt32(changeBarData.DefaultCBLoc.Split(" ".ToCharArray())[System.Convert.ToInt32(cbd.MyChangeBarLoc)]); + if (cbd.MyChangeBarText == PrintChangeBarText.UserDef) + cbd.MyChangeBarMessage = _DocVersionConfig.Print_UserCBMess1 + @"\n" + _DocVersionConfig.Print_UserCBMess2; + + } + return cbd; + } private void btnCreatePDF_Click(object sender, EventArgs e) { CreatePDF(); } + private bool _Initializing = false; + private void tbSettings_Click(object sender, EventArgs e) + { + // Fill in the settings from the config. This tab is used + // to update the settings for PdfLocation, RevNum, RevDate and ReviewDate + _Initializing = true; + txbPdfLocationS.Text = txbPDFLocation.Text; + txbRevNumS.Text = txbRevNum.Text; + txbRevDateS.Text = txbRevDate.Text; + txbReviewDateS.Text = txbReviewDate.Text; + _Initializing = false; + } + private void txbRevNumS_Leave(object sender, EventArgs e) + { + if (_Initializing) return; + // save the RevNum to the procedure's config. + ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig; + if (pc == null) return; + pc.Print_Rev = txbRevNumS.Text; + using (Item itm = Item.Get(MyProcedure.ItemID)) + { + itm.MyContent.Config = MyProcedure.MyConfig.ToString(); + itm.Save(); + txbRevNum.Text = txbRevNumS.Text; + } + } - //private void txbRevNum_TextChanged(object sender, EventArgs e) - //{ - // RevNum = txbRevNum.Text; - //} + private void txbRevDateS_Leave(object sender, EventArgs e) + { + if (_Initializing) return; + // save the RevDate to the procedure's config. + ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig; + if (pc == null) return; + pc.Print_RevDate = txbRevDateS.Text; + using (Item itm = Item.Get(MyProcedure.ItemID)) + { + itm.MyContent.Config = MyProcedure.MyConfig.ToString(); + itm.Save(); + txbRevDate.Text = txbRevDateS.Text; + } + } - //private void dtRevDate_TextChanged(object sender, EventArgs e) - //{ - // RevDate = dtRevDate.Value; - //} + private void txbReviewDateS_Leave(object sender, EventArgs e) + { + if (_Initializing) return; + // save the ReviewDate to the procedure's config. + ProcedureConfig pc = MyProcedure.MyConfig as ProcedureConfig; + if (pc == null) return; + pc.Print_ReviewDate = txbReviewDateS.Text; + using (Item itm = Item.Get(MyProcedure.ItemID)) + { + itm.MyContent.Config = MyProcedure.MyConfig.ToString(); + itm.Save(); + txbReviewDate.Text = txbReviewDateS.Text; + // need to reset config to !dirty? + } + } - //private void dtReviewDate_Click(object sender, EventArgs e) - //{ - // ReviewDate = dtReviewDate.Value; - //} + private void btnPdfLocation_Click(object sender, EventArgs e) + { + DlgBrowseFolder.SelectedPath = PDFPathSetting; + DialogResult drslt = DlgBrowseFolder.ShowDialog(); + if (drslt == DialogResult.OK) + { + //cbxPDFloc.Text = DlgBrowseFolder.SelectedPath; + txbPdfLocationS.Text = DlgBrowseFolder.SelectedPath; + txbPDFLocation.Text = txbPdfLocationS.Text; + //lblCurPDFLoc.Text = cbxPDFloc.Text; + //UpdateDropDown2(); + } + } + private void rbFormatDefault_Click(object sender, EventArgs e) + { + SetCustomControls(false); + // Make Custom controls invisible + ppGpbxUserSpecCB.Visible = false; + } + + private void SetCustomControls(bool enabled) + { + ppCmbxChgBarPos.Enabled = enabled; + ppCmbxChgBarTxtType.Enabled = enabled; + ppTxbxChangeBarUserMsgOne.Enabled = enabled; + ppTxbxChangeBarUserMsgTwo.Enabled = enabled; + } + + private void rbCustom_Click(object sender, EventArgs e) + { + SetCustomControls(true); + // Make Custom controls visible + ppGpbxUserSpecCB.Visible = true; + } + + private void rbFormatDefault_CheckedChanged(object sender, EventArgs e) + { + SetCustomControls(false); + // Make Custom controls invisible + ppGpbxUserSpecCB.Visible = false; + } + + private void ppCmbxChgBarTxtType_SelectedIndexChanged(object sender, EventArgs e) + { + if (_Initializing) return; + ppGpbxUserSpecTxt.Enabled = ppCmbxChgBarTxtType.SelectedIndex == (int)PrintChangeBarText.UserDef; + } //public string MyStatus //{ // get { return lblStatus.Text;} // set { lblStatus.Text = value; Application.DoEvents(); } //} - - - - - } } \ No newline at end of file diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx index a19c5336..b266a269 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.resx @@ -117,8 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 321, 17 + + + 321, 17 + - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA @@ -131,9 +137,6 @@ Xbgb9AAAAABJRU5ErkJggg== - - 321, 17 - 153, 17 diff --git a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs index 775b1a2e..70891af5 100644 --- a/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs +++ b/PROMS/VEPROMS User Interface/frmPDFStatusForm.cs @@ -34,11 +34,11 @@ namespace VEPROMS get { return _OpenPDF; } set { _OpenPDF = value; } } - public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, string pdfPath) + public frmPDFStatusForm(ItemInfo myItem, string rev, string revDate, string watermark, bool debugOutput, string backgroundFolder, bool openPDF, string pdfPath, ChangeBarDefinition cbd) { OpenPDF = openPDF; InitializeComponent(); - MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false);//openPDF); + MyPromsPrinter = new PromsPrinter(myItem, rev, revDate, watermark, debugOutput, backgroundFolder, false, cbd);//openPDF); PDFPath = pdfPath; this.Text = "Creating PDF of " + myItem.DisplayNumber; @@ -76,6 +76,11 @@ namespace VEPROMS MyPromsPrinter.StatusChanged += new PromsPrinterStatusEvent(pp_StatusChanged); DateTime tStart = DateTime.Now; _PdfFile = MyPromsPrinter.Print(PDFPath); + if (_PdfFile == null) + { + this.Close(); + return; + } DateTime tEnd = DateTime.Now; MyStatus = _PdfFile + " created."; MyStatus = string.Format("{0} created in {1:0.} milliseconds", _PdfFile, (TimeSpan.FromTicks(tEnd.Ticks - tStart.Ticks).TotalMilliseconds)); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 95c29f2d..fd6b5d2f 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1305,7 +1305,7 @@ namespace VEPROMS //} //string pnum = DisplayText.StaticStripRtfCommands(this._CurrentItem.MyProcedure.ProcedureConfig.Number).Replace("\\u8209?", "-"); DlgPrintProcedure prnDlg = new DlgPrintProcedure(this._CurrentItem.MyProcedure);//dvi.DocVersionConfig,pnum); - prnDlg.Show(); + prnDlg.ShowDialog(); } }