diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs index 1f7f72a7..4062b5b1 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs @@ -103,6 +103,16 @@ namespace VEPROMS this.ppLblDefSettingsInfo = new System.Windows.Forms.Label(); this.dlgROFolder = new System.Windows.Forms.FolderBrowserDialog(); this.tcVersions = new DevComponents.DotNetBar.TabControl(); + this.tcpOutputSettings = new DevComponents.DotNetBar.TabControlPanel(); + this.label30 = new System.Windows.Forms.Label(); + this.label29 = new System.Windows.Forms.Label(); + this.ppChbxAddBlankPgs = new System.Windows.Forms.CheckBox(); + this.ppChbxAlwaysViewPDF = new System.Windows.Forms.CheckBox(); + this.ppChbxAlwaysOvrWrtPDF = new System.Windows.Forms.CheckBox(); + this.ppGrpbxPrnAdj = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.tiOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.cbxEnhVersions = new System.Windows.Forms.ComboBox(); this.lblEnhDoc = new System.Windows.Forms.Label(); @@ -119,8 +129,6 @@ namespace VEPROMS this.lbEnhanced = new System.Windows.Forms.ListBox(); this.bsEnhanced = new System.Windows.Forms.BindingSource(this.components); this.tiEnhanced = new DevComponents.DotNetBar.TabItem(this.components); - this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel5 = new DevComponents.DotNetBar.TabControlPanel(); this.ppGrdLibDocList = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.documentEntryCountDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -138,14 +146,6 @@ namespace VEPROMS this.btnPhoneList = new DevComponents.DotNetBar.ButtonX(); this.ppLblUnitNum = new System.Windows.Forms.Label(); this.tiFmtSettings = new DevComponents.DotNetBar.TabItem(this.components); - this.tcpOutputSettings = new DevComponents.DotNetBar.TabControlPanel(); - this.label30 = new System.Windows.Forms.Label(); - this.label29 = new System.Windows.Forms.Label(); - this.ppChbxAddBlankPgs = new System.Windows.Forms.CheckBox(); - this.ppChbxAlwaysViewPDF = new System.Windows.Forms.CheckBox(); - this.ppChbxAlwaysOvrWrtPDF = new System.Windows.Forms.CheckBox(); - this.ppGrpbxPrnAdj = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.tiOutputSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tcpApplicability = new DevComponents.DotNetBar.TabControlPanel(); this.label28 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label(); @@ -197,18 +197,18 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).BeginInit(); this.tcVersions.SuspendLayout(); + this.tcpOutputSettings.SuspendLayout(); + this.ppGrpbxPrnAdj.SuspendLayout(); + this.tcpGeneral.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).BeginInit(); - this.tcpGeneral.SuspendLayout(); this.tabControlPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ppGrdLibDocList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.documentInfoListBindingSource)).BeginInit(); this.tcpRefereceObjects.SuspendLayout(); this.ppGpbxUpROvals.SuspendLayout(); this.tcpFormatSettings.SuspendLayout(); - this.tcpOutputSettings.SuspendLayout(); - this.ppGrpbxPrnAdj.SuspendLayout(); this.tcpApplicability.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniApple)).BeginInit(); this.panel1.SuspendLayout(); @@ -223,7 +223,7 @@ namespace VEPROMS // this.ppBtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.ppBtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.ppBtnCancel.Location = new System.Drawing.Point(751, 434); + this.ppBtnCancel.Location = new System.Drawing.Point(816, 424); this.ppBtnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnCancel.Name = "ppBtnCancel"; this.ppBtnCancel.Size = new System.Drawing.Size(75, 26); @@ -235,7 +235,7 @@ namespace VEPROMS // ppBtnOK // this.ppBtnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ppBtnOK.Location = new System.Drawing.Point(654, 434); + this.ppBtnOK.Location = new System.Drawing.Point(719, 424); this.ppBtnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnOK.Name = "ppBtnOK"; this.ppBtnOK.Size = new System.Drawing.Size(75, 26); @@ -747,7 +747,7 @@ namespace VEPROMS // this.ppBtnPDFLoc.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.ppBtnPDFLoc.Image = ((System.Drawing.Image)(resources.GetObject("ppBtnPDFLoc.Image"))); - this.ppBtnPDFLoc.Location = new System.Drawing.Point(620, 23); + this.ppBtnPDFLoc.Location = new System.Drawing.Point(612, 21); this.ppBtnPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppBtnPDFLoc.Name = "ppBtnPDFLoc"; this.ppBtnPDFLoc.Size = new System.Drawing.Size(21, 23); @@ -902,7 +902,7 @@ namespace VEPROMS this.ppTxtBxPDFLoc.Location = new System.Drawing.Point(110, 23); this.ppTxtBxPDFLoc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppTxtBxPDFLoc.Name = "ppTxtBxPDFLoc"; - this.ppTxtBxPDFLoc.Size = new System.Drawing.Size(504, 22); + this.ppTxtBxPDFLoc.Size = new System.Drawing.Size(496, 22); this.ppTxtBxPDFLoc.TabIndex = 30; // // label18 @@ -967,7 +967,7 @@ namespace VEPROMS // // this.ppCbShwDefSettings.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppCbShwDefSettings.Location = new System.Drawing.Point(23, 603); + this.ppCbShwDefSettings.Location = new System.Drawing.Point(23, 607); this.ppCbShwDefSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ppCbShwDefSettings.Name = "ppCbShwDefSettings"; this.ppCbShwDefSettings.Size = new System.Drawing.Size(205, 25); @@ -1080,7 +1080,7 @@ namespace VEPROMS // this.ppTxtBxPdfPre.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_PDFFilePrefix", true)); this.ppTxtBxPdfPre.Location = new System.Drawing.Point(120, 130); - this.ppTxtBxPdfPre.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ppTxtBxPdfPre.Margin = new System.Windows.Forms.Padding(4); this.ppTxtBxPdfPre.Name = "ppTxtBxPdfPre"; this.ppTxtBxPdfPre.Size = new System.Drawing.Size(132, 22); this.superTooltip1.SetSuperTooltip(this.ppTxtBxPdfPre, new DevComponents.DotNetBar.SuperTooltipInfo("PDF File Prefix", "", "The text entered here will be appended to the beginning of PDF file name when a p" + @@ -1091,7 +1091,7 @@ namespace VEPROMS // this.ppTxtBxPDFSuf.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.docVersionConfigBindingSource, "Print_PDFFileSuffix", true)); this.ppTxtBxPDFSuf.Location = new System.Drawing.Point(402, 130); - this.ppTxtBxPDFSuf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ppTxtBxPDFSuf.Margin = new System.Windows.Forms.Padding(4); this.ppTxtBxPDFSuf.Name = "ppTxtBxPDFSuf"; this.ppTxtBxPDFSuf.Size = new System.Drawing.Size(132, 22); this.superTooltip1.SetSuperTooltip(this.ppTxtBxPDFSuf, new DevComponents.DotNetBar.SuperTooltipInfo("PDF File Suffix", "", "The text entered here will be appended to the end of PDF file name when a procedu" + @@ -1114,7 +1114,7 @@ namespace VEPROMS this.ppLblDefSettingsInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.ppLblDefSettingsInfo.AutoSize = true; this.ppLblDefSettingsInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(14, 580); + this.ppLblDefSettingsInfo.Location = new System.Drawing.Point(14, 584); this.ppLblDefSettingsInfo.Name = "ppLblDefSettingsInfo"; this.ppLblDefSettingsInfo.Size = new System.Drawing.Size(205, 17); this.ppLblDefSettingsInfo.TabIndex = 25; @@ -1130,18 +1130,18 @@ namespace VEPROMS this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.CanReorderTabs = true; this.tcVersions.Controls.Add(this.tcpGeneral); + this.tcVersions.Controls.Add(this.tcpOutputSettings); this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tabControlPanel5); this.tcVersions.Controls.Add(this.tcpRefereceObjects); this.tcVersions.Controls.Add(this.tcpFormatSettings); - this.tcVersions.Controls.Add(this.tcpOutputSettings); this.tcVersions.Controls.Add(this.tcpApplicability); - this.tcVersions.Location = new System.Drawing.Point(211, 2); + this.tcVersions.Location = new System.Drawing.Point(209, 2); this.tcVersions.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcVersions.Name = "tcVersions"; this.tcVersions.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tcVersions.SelectedTabIndex = 0; - this.tcVersions.Size = new System.Drawing.Size(684, 414); + this.tcVersions.Size = new System.Drawing.Size(685, 414); this.tcVersions.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Dock; this.tcVersions.TabIndex = 28; this.tcVersions.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -1155,6 +1155,199 @@ namespace VEPROMS this.tcVersions.TabsVisible = false; this.tcVersions.Text = "tabControl1"; // + // tcpOutputSettings + // + this.tcpOutputSettings.Controls.Add(this.ppTxtBxPDFSuf); + this.tcpOutputSettings.Controls.Add(this.ppTxtBxPdfPre); + this.tcpOutputSettings.Controls.Add(this.label30); + this.tcpOutputSettings.Controls.Add(this.label29); + this.tcpOutputSettings.Controls.Add(this.ppChbxAddBlankPgs); + this.tcpOutputSettings.Controls.Add(this.ppTxtBxPDFLoc); + this.tcpOutputSettings.Controls.Add(this.label18); + this.tcpOutputSettings.Controls.Add(this.ppChbxAlwaysViewPDF); + this.tcpOutputSettings.Controls.Add(this.ppBtnPDFLoc); + this.tcpOutputSettings.Controls.Add(this.ppChbxAlwaysOvrWrtPDF); + this.tcpOutputSettings.Controls.Add(this.ppGrpbxPrnAdj); + this.tcpOutputSettings.Controls.Add(this.label17); + this.tcpOutputSettings.Controls.Add(this.ppBtnDeftDisAutoDuplx); + this.tcpOutputSettings.Controls.Add(this.ppBtnDefWatermark); + this.tcpOutputSettings.Controls.Add(this.ppChbxDisAutoDuplex); + this.tcpOutputSettings.Controls.Add(this.ppLblAutoDuplexDefault); + this.tcpOutputSettings.Controls.Add(this.ppCmbxWatermark); + this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); + this.tcpOutputSettings.DisabledBackColor = System.Drawing.Color.Empty; + this.tcpOutputSettings.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpOutputSettings.Location = new System.Drawing.Point(0, 24); + this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpOutputSettings.Name = "tcpOutputSettings"; + this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(2); + this.tcpOutputSettings.Size = new System.Drawing.Size(685, 390); + this.tcpOutputSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpOutputSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpOutputSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpOutputSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpOutputSettings.Style.GradientAngle = 90; + this.tcpOutputSettings.TabIndex = 3; + this.tcpOutputSettings.TabItem = this.tiOutputSettings; + this.tcpOutputSettings.Enter += new System.EventHandler(this.tabpage_Enter); + // + // label30 + // + this.label30.AutoSize = true; + this.label30.BackColor = System.Drawing.Color.Transparent; + this.label30.Location = new System.Drawing.Point(292, 133); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(99, 17); + this.label30.TabIndex = 67; + this.label30.Text = "PDF File Suffix"; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.BackColor = System.Drawing.Color.Transparent; + this.label29.Location = new System.Drawing.Point(11, 133); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(100, 17); + this.label29.TabIndex = 67; + this.label29.Text = "PDF File Prefix"; + // + // ppChbxAddBlankPgs + // + this.ppChbxAddBlankPgs.AutoSize = true; + this.ppChbxAddBlankPgs.BackColor = System.Drawing.Color.Transparent; + this.ppChbxAddBlankPgs.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AddBlankPagesWhenUsingDuplexFoldouts", true)); + this.ppChbxAddBlankPgs.Location = new System.Drawing.Point(12, 350); + this.ppChbxAddBlankPgs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppChbxAddBlankPgs.Name = "ppChbxAddBlankPgs"; + this.ppChbxAddBlankPgs.Size = new System.Drawing.Size(324, 21); + this.ppChbxAddBlankPgs.TabIndex = 66; + this.ppChbxAddBlankPgs.Text = "Add Blank Pages When Using Duplex Foldouts"; + this.ppChbxAddBlankPgs.UseVisualStyleBackColor = false; + // + // ppChbxAlwaysViewPDF + // + this.ppChbxAlwaysViewPDF.AutoSize = true; + this.ppChbxAlwaysViewPDF.BackColor = System.Drawing.Color.Transparent; + this.ppChbxAlwaysViewPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysViewPDFAfterCreate", true)); + this.ppChbxAlwaysViewPDF.Location = new System.Drawing.Point(12, 324); + this.ppChbxAlwaysViewPDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppChbxAlwaysViewPDF.Name = "ppChbxAlwaysViewPDF"; + this.ppChbxAlwaysViewPDF.Size = new System.Drawing.Size(227, 21); + this.ppChbxAlwaysViewPDF.TabIndex = 37; + this.ppChbxAlwaysViewPDF.Text = "Always View PDF after Creation"; + this.ppChbxAlwaysViewPDF.UseVisualStyleBackColor = false; + // + // ppChbxAlwaysOvrWrtPDF + // + this.ppChbxAlwaysOvrWrtPDF.AutoSize = true; + this.ppChbxAlwaysOvrWrtPDF.BackColor = System.Drawing.Color.Transparent; + this.ppChbxAlwaysOvrWrtPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); + this.ppChbxAlwaysOvrWrtPDF.Location = new System.Drawing.Point(12, 297); + this.ppChbxAlwaysOvrWrtPDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppChbxAlwaysOvrWrtPDF.Name = "ppChbxAlwaysOvrWrtPDF"; + this.ppChbxAlwaysOvrWrtPDF.Size = new System.Drawing.Size(168, 21); + this.ppChbxAlwaysOvrWrtPDF.TabIndex = 36; + this.ppChbxAlwaysOvrWrtPDF.Text = "Always Overwrite PDF"; + this.ppChbxAlwaysOvrWrtPDF.UseVisualStyleBackColor = false; + // + // ppGrpbxPrnAdj + // + this.ppGrpbxPrnAdj.BackColor = System.Drawing.Color.Transparent; + this.ppGrpbxPrnAdj.CanvasColor = System.Drawing.SystemColors.Control; + this.ppGrpbxPrnAdj.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOvrdPrnPenWidth); + this.ppGrpbxPrnAdj.Controls.Add(this.label19); + this.ppGrpbxPrnAdj.Controls.Add(this.label22); + this.ppGrpbxPrnAdj.Controls.Add(this.label20); + this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnAdjPrnStartPos); + this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOverdPrnPenBoldWidth); + this.ppGrpbxPrnAdj.Controls.Add(this.label21); + this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOvrdPrnPenULineWidth); + this.ppGrpbxPrnAdj.DisabledBackColor = System.Drawing.Color.Empty; + this.ppGrpbxPrnAdj.Location = new System.Drawing.Point(11, 174); + this.ppGrpbxPrnAdj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ppGrpbxPrnAdj.Name = "ppGrpbxPrnAdj"; + this.ppGrpbxPrnAdj.Size = new System.Drawing.Size(622, 119); + // + // + // + this.ppGrpbxPrnAdj.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.ppGrpbxPrnAdj.Style.BackColorGradientAngle = 90; + this.ppGrpbxPrnAdj.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.ppGrpbxPrnAdj.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGrpbxPrnAdj.Style.BorderBottomWidth = 1; + this.ppGrpbxPrnAdj.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.ppGrpbxPrnAdj.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGrpbxPrnAdj.Style.BorderLeftWidth = 1; + this.ppGrpbxPrnAdj.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGrpbxPrnAdj.Style.BorderRightWidth = 1; + this.ppGrpbxPrnAdj.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.ppGrpbxPrnAdj.Style.BorderTopWidth = 1; + this.ppGrpbxPrnAdj.Style.CornerDiameter = 4; + this.ppGrpbxPrnAdj.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.ppGrpbxPrnAdj.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.ppGrpbxPrnAdj.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.ppGrpbxPrnAdj.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.ppGrpbxPrnAdj.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ppGrpbxPrnAdj.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ppGrpbxPrnAdj.TabIndex = 65; + this.ppGrpbxPrnAdj.Text = "Output Adjustments"; + this.ppGrpbxPrnAdj.Visible = false; + // + // tiOutputSettings + // + this.tiOutputSettings.AttachedControl = this.tcpOutputSettings; + this.tiOutputSettings.Name = "tiOutputSettings"; + this.tiOutputSettings.Text = "Output Settings"; + // + // tcpGeneral + // + this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType); + this.tcpGeneral.Controls.Add(this.ppRTxtName); + this.tcpGeneral.Controls.Add(this.label9); + this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev); + this.tcpGeneral.Controls.Add(this.lblProcSetRev); + this.tcpGeneral.Controls.Add(this.label4); + this.tcpGeneral.Controls.Add(this.label3); + this.tcpGeneral.Controls.Add(this.ppRTxtTitle); + this.tcpGeneral.Controls.Add(this.ppTxtBxUserID); + this.tcpGeneral.Controls.Add(this.ppDTPicker); + this.tcpGeneral.Controls.Add(this.label2); + this.tcpGeneral.Controls.Add(this.label1); + this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty; + this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpGeneral.Location = new System.Drawing.Point(0, 24); + this.tcpGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpGeneral.Name = "tcpGeneral"; + this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2); + this.tcpGeneral.Size = new System.Drawing.Size(685, 390); + this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpGeneral.Style.GradientAngle = 90; + this.tcpGeneral.TabIndex = 1; + this.tcpGeneral.TabItem = this.tiGeneral; + // + // tiGeneral + // + this.tiGeneral.AttachedControl = this.tcpGeneral; + this.tiGeneral.Name = "tiGeneral"; + this.tiGeneral.Text = "General"; + // // tabControlPanel1 // this.tabControlPanel1.Controls.Add(this.cbxEnhVersions); @@ -1175,7 +1368,7 @@ namespace VEPROMS 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(684, 390); + this.tabControlPanel1.Size = new System.Drawing.Size(685, 390); 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; @@ -1317,44 +1510,6 @@ namespace VEPROMS this.tiEnhanced.Name = "tiEnhanced"; this.tiEnhanced.Text = "Enhanced"; // - // tcpGeneral - // - this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.tcpGeneral.Controls.Add(this.ppCmbxProcSetType); - this.tcpGeneral.Controls.Add(this.ppRTxtName); - this.tcpGeneral.Controls.Add(this.label9); - this.tcpGeneral.Controls.Add(this.ppRTxtProcSetRev); - this.tcpGeneral.Controls.Add(this.lblProcSetRev); - this.tcpGeneral.Controls.Add(this.label4); - this.tcpGeneral.Controls.Add(this.label3); - this.tcpGeneral.Controls.Add(this.ppRTxtTitle); - this.tcpGeneral.Controls.Add(this.ppTxtBxUserID); - this.tcpGeneral.Controls.Add(this.ppDTPicker); - this.tcpGeneral.Controls.Add(this.label2); - this.tcpGeneral.Controls.Add(this.label1); - this.tcpGeneral.DisabledBackColor = System.Drawing.Color.Empty; - this.tcpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpGeneral.Location = new System.Drawing.Point(0, 24); - this.tcpGeneral.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpGeneral.Name = "tcpGeneral"; - this.tcpGeneral.Padding = new System.Windows.Forms.Padding(2); - this.tcpGeneral.Size = new System.Drawing.Size(684, 390); - this.tcpGeneral.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tcpGeneral.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpGeneral.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpGeneral.Style.GradientAngle = 90; - this.tcpGeneral.TabIndex = 1; - this.tcpGeneral.TabItem = this.tiGeneral; - // - // tiGeneral - // - this.tiGeneral.AttachedControl = this.tcpGeneral; - this.tiGeneral.Name = "tiGeneral"; - this.tiGeneral.Text = "General"; - // // tabControlPanel5 // this.tabControlPanel5.AutoScroll = true; @@ -1365,7 +1520,7 @@ namespace VEPROMS this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel5.Name = "tabControlPanel5"; this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(2); - this.tabControlPanel5.Size = new System.Drawing.Size(684, 390); + this.tabControlPanel5.Size = new System.Drawing.Size(685, 390); this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1404,7 +1559,7 @@ namespace VEPROMS this.ppGrdLibDocList.RowTemplate.Height = 24; this.ppGrdLibDocList.SelectAllSignVisible = false; this.ppGrdLibDocList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.ppGrdLibDocList.Size = new System.Drawing.Size(680, 386); + this.ppGrdLibDocList.Size = new System.Drawing.Size(681, 386); this.ppGrdLibDocList.TabIndex = 1; // // documentEntryCountDataGridViewTextBoxColumn @@ -1449,7 +1604,7 @@ namespace VEPROMS this.tcpRefereceObjects.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpRefereceObjects.Name = "tcpRefereceObjects"; this.tcpRefereceObjects.Padding = new System.Windows.Forms.Padding(2); - this.tcpRefereceObjects.Size = new System.Drawing.Size(684, 390); + this.tcpRefereceObjects.Size = new System.Drawing.Size(685, 390); this.tcpRefereceObjects.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpRefereceObjects.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpRefereceObjects.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1572,7 +1727,7 @@ namespace VEPROMS this.tcpFormatSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpFormatSettings.Name = "tcpFormatSettings"; this.tcpFormatSettings.Padding = new System.Windows.Forms.Padding(2); - this.tcpFormatSettings.Size = new System.Drawing.Size(684, 390); + this.tcpFormatSettings.Size = new System.Drawing.Size(685, 390); this.tcpFormatSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpFormatSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpFormatSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -1613,161 +1768,6 @@ namespace VEPROMS this.tiFmtSettings.Name = "tiFmtSettings"; this.tiFmtSettings.Text = "Format Settings"; // - // tcpOutputSettings - // - this.tcpOutputSettings.Controls.Add(this.ppTxtBxPDFSuf); - this.tcpOutputSettings.Controls.Add(this.ppTxtBxPdfPre); - this.tcpOutputSettings.Controls.Add(this.label30); - this.tcpOutputSettings.Controls.Add(this.label29); - this.tcpOutputSettings.Controls.Add(this.ppChbxAddBlankPgs); - this.tcpOutputSettings.Controls.Add(this.ppTxtBxPDFLoc); - this.tcpOutputSettings.Controls.Add(this.label18); - this.tcpOutputSettings.Controls.Add(this.ppChbxAlwaysViewPDF); - this.tcpOutputSettings.Controls.Add(this.ppBtnPDFLoc); - this.tcpOutputSettings.Controls.Add(this.ppChbxAlwaysOvrWrtPDF); - this.tcpOutputSettings.Controls.Add(this.ppGrpbxPrnAdj); - this.tcpOutputSettings.Controls.Add(this.label17); - this.tcpOutputSettings.Controls.Add(this.ppBtnDeftDisAutoDuplx); - this.tcpOutputSettings.Controls.Add(this.ppBtnDefWatermark); - this.tcpOutputSettings.Controls.Add(this.ppChbxDisAutoDuplex); - this.tcpOutputSettings.Controls.Add(this.ppLblAutoDuplexDefault); - this.tcpOutputSettings.Controls.Add(this.ppCmbxWatermark); - this.tcpOutputSettings.Controls.Add(this.ppLblWatermarkDefault); - this.tcpOutputSettings.DisabledBackColor = System.Drawing.Color.Empty; - this.tcpOutputSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpOutputSettings.Location = new System.Drawing.Point(0, 24); - this.tcpOutputSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpOutputSettings.Name = "tcpOutputSettings"; - this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(2); - this.tcpOutputSettings.Size = new System.Drawing.Size(684, 390); - this.tcpOutputSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tcpOutputSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpOutputSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tcpOutputSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpOutputSettings.Style.GradientAngle = 90; - this.tcpOutputSettings.TabIndex = 3; - this.tcpOutputSettings.TabItem = this.tiOutputSettings; - this.tcpOutputSettings.Enter += new System.EventHandler(this.tabpage_Enter); - // - // label30 - // - this.label30.AutoSize = true; - this.label30.BackColor = System.Drawing.Color.Transparent; - this.label30.Location = new System.Drawing.Point(292, 133); - this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(99, 17); - this.label30.TabIndex = 67; - this.label30.Text = "PDF File Suffix"; - // - // label29 - // - this.label29.AutoSize = true; - this.label29.BackColor = System.Drawing.Color.Transparent; - this.label29.Location = new System.Drawing.Point(11, 133); - this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(100, 17); - this.label29.TabIndex = 67; - this.label29.Text = "PDF File Prefix"; - // - // ppChbxAddBlankPgs - // - this.ppChbxAddBlankPgs.AutoSize = true; - this.ppChbxAddBlankPgs.BackColor = System.Drawing.Color.Transparent; - this.ppChbxAddBlankPgs.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AddBlankPagesWhenUsingDuplexFoldouts", true)); - this.ppChbxAddBlankPgs.Location = new System.Drawing.Point(12, 350); - this.ppChbxAddBlankPgs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppChbxAddBlankPgs.Name = "ppChbxAddBlankPgs"; - this.ppChbxAddBlankPgs.Size = new System.Drawing.Size(324, 21); - this.ppChbxAddBlankPgs.TabIndex = 66; - this.ppChbxAddBlankPgs.Text = "Add Blank Pages When Using Duplex Foldouts"; - this.ppChbxAddBlankPgs.UseVisualStyleBackColor = false; - // - // ppChbxAlwaysViewPDF - // - this.ppChbxAlwaysViewPDF.AutoSize = true; - this.ppChbxAlwaysViewPDF.BackColor = System.Drawing.Color.Transparent; - this.ppChbxAlwaysViewPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysViewPDFAfterCreate", true)); - this.ppChbxAlwaysViewPDF.Location = new System.Drawing.Point(12, 324); - this.ppChbxAlwaysViewPDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppChbxAlwaysViewPDF.Name = "ppChbxAlwaysViewPDF"; - this.ppChbxAlwaysViewPDF.Size = new System.Drawing.Size(227, 21); - this.ppChbxAlwaysViewPDF.TabIndex = 37; - this.ppChbxAlwaysViewPDF.Text = "Always View PDF after Creation"; - this.ppChbxAlwaysViewPDF.UseVisualStyleBackColor = false; - // - // ppChbxAlwaysOvrWrtPDF - // - this.ppChbxAlwaysOvrWrtPDF.AutoSize = true; - this.ppChbxAlwaysOvrWrtPDF.BackColor = System.Drawing.Color.Transparent; - this.ppChbxAlwaysOvrWrtPDF.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.docVersionConfigBindingSource, "Print_AlwaysOverwritePDF", true)); - this.ppChbxAlwaysOvrWrtPDF.Location = new System.Drawing.Point(12, 297); - this.ppChbxAlwaysOvrWrtPDF.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppChbxAlwaysOvrWrtPDF.Name = "ppChbxAlwaysOvrWrtPDF"; - this.ppChbxAlwaysOvrWrtPDF.Size = new System.Drawing.Size(168, 21); - this.ppChbxAlwaysOvrWrtPDF.TabIndex = 36; - this.ppChbxAlwaysOvrWrtPDF.Text = "Always Overwrite PDF"; - this.ppChbxAlwaysOvrWrtPDF.UseVisualStyleBackColor = false; - // - // ppGrpbxPrnAdj - // - this.ppGrpbxPrnAdj.BackColor = System.Drawing.Color.Transparent; - this.ppGrpbxPrnAdj.CanvasColor = System.Drawing.SystemColors.Control; - this.ppGrpbxPrnAdj.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOvrdPrnPenWidth); - this.ppGrpbxPrnAdj.Controls.Add(this.label19); - this.ppGrpbxPrnAdj.Controls.Add(this.label22); - this.ppGrpbxPrnAdj.Controls.Add(this.label20); - this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnAdjPrnStartPos); - this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOverdPrnPenBoldWidth); - this.ppGrpbxPrnAdj.Controls.Add(this.label21); - this.ppGrpbxPrnAdj.Controls.Add(this.ppNumUpDwnOvrdPrnPenULineWidth); - this.ppGrpbxPrnAdj.DisabledBackColor = System.Drawing.Color.Empty; - this.ppGrpbxPrnAdj.Location = new System.Drawing.Point(11, 174); - this.ppGrpbxPrnAdj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.ppGrpbxPrnAdj.Name = "ppGrpbxPrnAdj"; - this.ppGrpbxPrnAdj.Size = new System.Drawing.Size(622, 119); - // - // - // - this.ppGrpbxPrnAdj.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.ppGrpbxPrnAdj.Style.BackColorGradientAngle = 90; - this.ppGrpbxPrnAdj.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.ppGrpbxPrnAdj.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGrpbxPrnAdj.Style.BorderBottomWidth = 1; - this.ppGrpbxPrnAdj.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.ppGrpbxPrnAdj.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGrpbxPrnAdj.Style.BorderLeftWidth = 1; - this.ppGrpbxPrnAdj.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGrpbxPrnAdj.Style.BorderRightWidth = 1; - this.ppGrpbxPrnAdj.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.ppGrpbxPrnAdj.Style.BorderTopWidth = 1; - this.ppGrpbxPrnAdj.Style.CornerDiameter = 4; - this.ppGrpbxPrnAdj.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.ppGrpbxPrnAdj.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.ppGrpbxPrnAdj.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.ppGrpbxPrnAdj.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.ppGrpbxPrnAdj.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ppGrpbxPrnAdj.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ppGrpbxPrnAdj.TabIndex = 65; - this.ppGrpbxPrnAdj.Text = "Output Adjustments"; - this.ppGrpbxPrnAdj.Visible = false; - // - // tiOutputSettings - // - this.tiOutputSettings.AttachedControl = this.tcpOutputSettings; - this.tiOutputSettings.Name = "tiOutputSettings"; - this.tiOutputSettings.Text = "Output Settings"; - // // tcpApplicability // this.tcpApplicability.Controls.Add(this.label28); @@ -1797,7 +1797,7 @@ namespace VEPROMS this.tcpApplicability.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tcpApplicability.Name = "tcpApplicability"; this.tcpApplicability.Padding = new System.Windows.Forms.Padding(2); - this.tcpApplicability.Size = new System.Drawing.Size(684, 390); + this.tcpApplicability.Size = new System.Drawing.Size(685, 390); this.tcpApplicability.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tcpApplicability.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tcpApplicability.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2201,7 +2201,7 @@ namespace VEPROMS this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.ppBtnCancel; this.CaptionFont = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ClientSize = new System.Drawing.Size(844, 461); + this.ClientSize = new System.Drawing.Size(895, 453); this.ControlBox = false; this.Controls.Add(this.panVerBtns); this.Controls.Add(this.tcVersions); @@ -2232,12 +2232,16 @@ namespace VEPROMS this.ppGpbxUserSpecTxt.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcVersions)).EndInit(); this.tcVersions.ResumeLayout(false); + this.tcpOutputSettings.ResumeLayout(false); + this.tcpOutputSettings.PerformLayout(); + this.ppGrpbxPrnAdj.ResumeLayout(false); + this.ppGrpbxPrnAdj.PerformLayout(); + this.tcpGeneral.ResumeLayout(false); + this.tcpGeneral.PerformLayout(); this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniEnhanced)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bsEnhanced)).EndInit(); - this.tcpGeneral.ResumeLayout(false); - this.tcpGeneral.PerformLayout(); this.tabControlPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.ppGrdLibDocList)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.documentInfoListBindingSource)).EndInit(); @@ -2246,10 +2250,6 @@ namespace VEPROMS this.ppGpbxUpROvals.ResumeLayout(false); this.tcpFormatSettings.ResumeLayout(false); this.tcpFormatSettings.PerformLayout(); - this.tcpOutputSettings.ResumeLayout(false); - this.tcpOutputSettings.PerformLayout(); - this.ppGrpbxPrnAdj.ResumeLayout(false); - this.ppGrpbxPrnAdj.PerformLayout(); this.tcpApplicability.ResumeLayout(false); this.tcpApplicability.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsMiniApple)).EndInit(); diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs index 4a643608..84f6da23 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs @@ -398,9 +398,8 @@ namespace VEPROMS } private void InitEnhanced() { - // first determine if enhanced tab should be turned off: KBR HOW? - - + btnEnhanced.Visible = true; + tiEnhanced.Visible = true; // get enhanced tab's data if: // 1) hasEnhancedPO: this is source and format file has the purchase options for enhanced deviation or enhanced background // 2) isEnhanced: this docversion has a config/enhanced node that defines it as an enhanced document. @@ -425,9 +424,15 @@ namespace VEPROMS cbxEnhVersions.SelectedIndex = 0; cbxEnhVersions.Enabled = false; } - // This is a source document that already has settings KBR ? - Can additions can be made else if (hasEnhancedPO) { + // if this is not a source, i.e. does not have myenhanceddocuments, then FOR NOW - UNTIL 'NEW' is done, turn off enhanced tab: + if (_DocVersionConfig.MyEnhancedDocuments == null || _DocVersionConfig.MyEnhancedDocuments.Count == 0) + { + btnEnhanced.Visible = false; + tiEnhanced.Visible = false; + return; + } // first set up existing enhanced linked documents (this is a listbox on left of form) _Enhanced = new List(); lbEnhanced.Visible = true; @@ -449,91 +454,7 @@ namespace VEPROMS bsMiniEnhanced.DataSource = bsEnhanced.Current as EnhancedMiniConfig; } } - //private void InitEnhancedOld() - //{ - // // get enhanced tab's data if: - // // 1) hasEnhancedPO: this is source and format file has the purchase options for enhanced deviation or enhanced background - // // 2) isEnhanced: this docversion has a config/enhanced node that defines it as an enhanced document. - // bool hasEnhancedPO = true; - // //if (((_DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedDeviations) == E_PurchaseOptions.EnhancedDeviations) - // // || ((_DocVersionConfig.MyDocVersion.MyDocVersionInfo.ActiveFormat.PlantFormat.FormatData.PurchaseOptions.Value & E_PurchaseOptions.EnhancedBackgrounds) == E_PurchaseOptions.EnhancedBackgrounds)) hasEnhancedPO = true; - // bool isEnhanced = (_DocVersionConfig.MyEnhancedDocuments != null && _DocVersionConfig.MyEnhancedDocuments.Count == 1 && _DocVersionConfig.MyEnhancedDocuments[0].Type == 0); - - // if (hasEnhancedPO || isEnhanced) - // { - // // need to filter the list and add only those that are set for the current doc version whose properties - // // we are working with, or that have no setting. (If the docversion has a source that is not this one, don't list) - // DocVersionInfoList dvil = DocVersionInfoList.Get(); - // _Enhanced = new List(); - // DVEnhancedDocument dvedUseData = null; - // int indxDataSource = 0; - // for (int ie = 0; ie < dvil.Count; ie++) - // { - // DocVersionInfo dvi = dvil[ie]; - // // get config items for filling in the data: - // DocVersionConfig dvc = dvi.MyConfig as DocVersionConfig; - // // need to see if it should be include - // bool includeit = false; - // if (isEnhanced && dvi.VersionID == _DocVersionConfig.MyDocVersion.VersionID) - // { - // dvedUseData = dvc.MyEnhancedDocuments[0]; - // includeit = true; - // } - // if (hasEnhancedPO && !isEnhanced) - // { - - // // if this docversion has no relationships, include it: - // if (dvc.MyEnhancedDocuments == null || dvc.MyEnhancedDocuments.Count == 0) - // includeit = true; - // else - // { - // //DVEnhancedDocuments dveds = _DocVersionConfig.MyEnhancedDocuments; - // //foreach (EnhancedDocument ed in sc.MyEnhancedDocuments) - // //{ - // // DVEnhancedDocument dved = dveds[ed.Type]; - // // AddLinkToEnhancedDocument(cb, yLocation, ed.ItemID, dved.PdfToken, dved.PdfX); - // //} - // foreach (DVEnhancedDocument ed in dvc.MyEnhancedDocuments) // config for enhanced - // { - // if (ed.VersionID == _DocVersionConfig.MyDocVersion.VersionID) - // { - // // the displayed data is the enhanced config item pointing to this one: - // foreach (DVEnhancedDocument sed in _DocVersionConfig.MyEnhancedDocuments) - // { - // if (sed.VersionID == dvi.VersionID) - // { - // dvedUseData = sed; - // break; - // } - // } - // if (dvedUseData != null) - // { - // includeit = true; - // break; - // } - // } - // } - // } - // } - // if (includeit) - // { - // // get config items for filling in the data: - // EnhancedMiniConfig ecfg = null; - // if (dvedUseData != null) - // ecfg = new EnhancedMiniConfig(indxDataSource, dvi.VersionID, "?", dvi.SearchDVPath, dvedUseData.Name, dvedUseData.Type.ToString(), dvedUseData.PdfToken, dvedUseData.PdfX.ToString()); - // else - // ecfg = new EnhancedMiniConfig(indxDataSource, dvi.VersionID, "?", dvi.SearchDVPath, "", "", "", ""); - // indxDataSource++; - // _Enhanced.Add(ecfg); - // dvedUseData = null; - // includeit = false; - // if (isEnhanced) break; - // } - // } - // bsEnhanced.DataSource = _Enhanced; - // } - //} - + void btnPC_Click(object sender, EventArgs e) { if (MessageBox.Show(this, "Are you sure you want to add Applicability to this Working Draft?", "Add Applicability", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Stop) == DialogResult.Yes) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs index 3fe8ddbf..a00ee672 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs @@ -871,6 +871,7 @@ namespace VEPROMS.CSLA.Library // if inserting after a caution or note, refreshes tabs. This will adjust bullets // of any previous cautions or notes. if (tmp.IsCaution || tmp.IsNote) ResetOrdinal(); + tmp.UpdateTransitionText(); // even though enhanced does not have transitions, this is needed to refresh tabs // Note that non-enhanced update transition and ro text at this point. But since // transitions and ro's are converted to text, this is not needed. @@ -1016,28 +1017,30 @@ namespace VEPROMS.CSLA.Library // tmpCopyStartSourceItem is the item that was copied in source. ItemInfo tmpCopyStartSourceItem = ItemInfo.Get(copyStartID); - // if the copied step is not a 'source', then this really needs to be more of an insert for the enhanced steps. - StepConfig stepFromCfg = tmpCopyStartSourceItem.MyConfig as StepConfig; - if (stepFromCfg.MyEnhancedDocuments == null || stepFromCfg.MyEnhancedDocuments.Count==0) + if (tmpCopyStartSourceItem.IsStep) { - // Insert the enhanced steps. Loop through all enhanced document types, insert from - // the paste item's linked step. - foreach (EnhancedDocument edSource in pasteFromItem.GetMyEnhancedDocuments()) + // if the copied step is not a 'source', then this really needs to be more of an insert for the enhanced steps. + StepConfig stepFromCfg = tmpCopyStartSourceItem.MyConfig as StepConfig; + if (stepFromCfg.MyEnhancedDocuments == null || stepFromCfg.MyEnhancedDocuments.Count == 0) { + // Insert the enhanced steps. Loop through all enhanced document types, insert from + // the paste item's linked step. + foreach (EnhancedDocument edSource in pasteFromItem.GetMyEnhancedDocuments()) + { // create a new enhanced step and link it to this new source step. // the new source step's item is used to know what type & what to link to. // The ed.Type & ed.itemid show what type of enhanced document (use to create new // config Type). - ItemInfo exEnh = ItemInfo.Get(edSource.ItemID); - ItemInfo newEnh = exEnh.InsertEnhancedSteps(tmpCopyStartSourceItem.MyContent.Text, null, addType, MyContent.Type, edSource.Type, this.ItemID); - if (newEnh == null) return null; - StepConfig sc = new StepConfig(MyContent.Config); - sc.AddEnhancedDocument(edSource.Type, newEnh.ItemID); - SaveConfig(sc.ToString()); + ItemInfo exEnh = ItemInfo.Get(edSource.ItemID); + ItemInfo newEnh = exEnh.InsertEnhancedSteps(tmpCopyStartSourceItem.MyContent.Text, null, addType, MyContent.Type, edSource.Type, this.ItemID); + if (newEnh == null) return null; + StepConfig sc = new StepConfig(MyContent.Config); + sc.AddEnhancedDocument(edSource.Type, newEnh.ItemID); + SaveConfig(sc.ToString()); + } + return null; } - return null; } - // loop through all enhanced document types, pasting in the copied item(s). // Note that the copy/paste finds the enhanced items that relate to source, // i.e. copied item & paste from, and uses those to do the copy/paste. @@ -1859,9 +1862,9 @@ namespace VEPROMS.CSLA.Library internal static ItemInfo CopyPasteReplaceItemInfoFetch(int copyStartID, ItemInfo itemInfo) // int itemID, int? type, int? fromType) { ItemInfo tmp = null; - if (itemInfo.GetType() == typeof(ProcedureInfo)) + if (itemInfo.GetType() == typeof(ProcedureInfo) || itemInfo.MyContent.Type < 10000) tmp = DataPortal.Fetch(new ItemInfo.PastingPartCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID)); - else if (itemInfo.GetType() == typeof(SectionInfo)) + else if (itemInfo.GetType() == typeof(SectionInfo) || itemInfo.MyContent.Type < 20000) tmp = DataPortal.Fetch(new ItemInfo.PastingPartCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID)); else tmp = DataPortal.Fetch(new ItemInfo.PastingPartCriteria(copyStartID, itemInfo.ItemID, ItemInfo.EAddpingPart.Replace, itemInfo.MyContent.Type, itemInfo.MyContent.Type, DateTime.Now, Volian.Base.Library.VlnSettings.UserID)); diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 7713ae52..b112ba0b 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -1521,7 +1521,7 @@ namespace Volian.Controls.Library MyStepPanel.SelectedEditItem = newEditItem; //Update Screen MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OnItemPaste(this, new vlnTreeItemInfoPasteEventArgs(newItemInfo, copyStartID, ItemInfo.EAddpingPart.Replace, newItemInfo.MyContent.Type)); // MyItemInfo is the 'paste from' item, if it has enhanced need to copy and paste the steps in enhanced. - newItemInfo.EnhancedPasteItem(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Replace, GetChangeId(MyItemInfo)); + newItemInfo.PasteEnhancedItems(copyStartID, MyItemInfo, ItemInfo.EAddpingPart.Replace, GetChangeId(MyItemInfo)); return newEditItem; } private bool HandleSqlExceptionOnCopy(Exception ex) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index f1b9d668..53e0347a 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1333,8 +1333,8 @@ namespace Volian.Controls.Library StepData sd = MyItemInfo.FormatStepData; actable = sd.StepEditData.AcTable; if (actable == null) actable = 0; + btnInsHLS.Enabled = !MyItemInfo.IsEnhancedStep && !MyItemInfo.MyHLS.IsEnhancedStep; // (actable & E_AccStep.EnhancedLinkedStep) == 0; - btnInsHLS.Enabled = !MyItemInfo.IsEnhancedStep; // (actable & E_AccStep.EnhancedLinkedStep) == 0; btnInsCaut.Enabled = ((actable & E_AccStep.AddingCaution) > 0) && !MyItemInfo.IsEnhancedStep; // ((actable & E_AccStep.AddingCaution) > 0) && ((actable & E_AccStep.EnhancedLinkedStep) == 0); btnInsNote.Enabled = ((actable & E_AccStep.AddingNote) > 0) && !MyItemInfo.IsEnhancedStep; btnInsRNO.Enabled = (actable & E_AccStep.AddingRNO) > 0; diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 0af6b094..949664d4 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1985,7 +1985,7 @@ namespace Volian.Controls.Library if (replItemInfo != null) { OnOpenItem(this, new vlnTreeItemInfoEventArgs(replItemInfo)); - ItemInfo newEnhStep = replItemInfo.EnhancedPasteItem(copyStartID, ii, ItemInfo.EAddpingPart.Replace, chgId); + ItemInfo newEnhStep = replItemInfo.PasteEnhancedItems(copyStartID, ii, ItemInfo.EAddpingPart.Replace, chgId); } } SelectedNode = (VETreeNode)((prevtn != null) ? prevtn.NextNode : partn.FirstNode); @@ -2198,6 +2198,7 @@ namespace Volian.Controls.Library { ShowBrokenRules(procedure.BrokenRulesCollection); SetLastValues(ProcedureInfo.Get(procedure.ItemID)); + procedure.ProcedureConfig.CreatingNew = true; if (OnNodeOpenProperty(this, new vlnTreePropertyEventArgs("New Procedure", procedure.ProcedureConfig)) == DialogResult.OK) { procedure.Save();