diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs index 7fa5af81..27cf0b8d 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.Designer.cs @@ -38,11 +38,11 @@ namespace VEPROMS this.ppLblStpEditorColsDefault = new System.Windows.Forms.Label(); this.label43 = new System.Windows.Forms.Label(); this.ppCmbxStpEditorCols = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.procedureConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); this.ppTxtBxUserID = new System.Windows.Forms.TextBox(); this.label21 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); - this.procedureConfigBindingSource = new System.Windows.Forms.BindingSource(this.components); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.ppBtnDefaultChgBar = new DevComponents.DotNetBar.ButtonX(); @@ -149,12 +149,12 @@ namespace VEPROMS this.btnFmtStngs = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.tcProcProp = new DevComponents.DotNetBar.TabControl(); - this.tcpFormatSettings = new DevComponents.DotNetBar.TabControlPanel(); - this.tiFmtStngs = new DevComponents.DotNetBar.TabItem(this.components); this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); this.ppProcNumStpRTB = new Volian.Controls.Library.StepRTB(this.components); this.ppProcTitleStpRTB = new Volian.Controls.Library.StepRTB(this.components); this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpFormatSettings = new DevComponents.DotNetBar.TabControlPanel(); + this.tiFmtStngs = new DevComponents.DotNetBar.TabItem(this.components); this.tcpOutputSettings = new DevComponents.DotNetBar.TabControlPanel(); this.ppGrpbxPrnAdj = new DevComponents.DotNetBar.Controls.GroupPanel(); this.tiOutputStngs = new DevComponents.DotNetBar.TabItem(this.components); @@ -175,8 +175,8 @@ namespace VEPROMS this.panProcBtns.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcProcProp)).BeginInit(); this.tcProcProp.SuspendLayout(); - this.tcpFormatSettings.SuspendLayout(); this.tcpGeneral.SuspendLayout(); + this.tcpFormatSettings.SuspendLayout(); this.tcpOutputSettings.SuspendLayout(); this.ppGrpbxPrnAdj.SuspendLayout(); this.tabControlPanel4.SuspendLayout(); @@ -274,6 +274,10 @@ namespace VEPROMS this.ppCmbxStpEditorCols.WatermarkText = "select column mode"; this.ppCmbxStpEditorCols.SelectedValueChanged += new System.EventHandler(this.ppCmbxStpEditorCols_SelectedValueChanged); // + // procedureConfigBindingSource + // + this.procedureConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ProcedureConfig); + // // ppTxtBxUserID // this.ppTxtBxUserID.Enabled = false; @@ -316,10 +320,6 @@ namespace VEPROMS this.label3.Text = "Last Modified"; this.label3.Visible = false; // - // procedureConfigBindingSource - // - this.procedureConfigBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ProcedureConfig); - // // label2 // this.label2.AutoSize = true; @@ -708,11 +708,11 @@ namespace VEPROMS // label42 // this.label42.AutoSize = true; - this.label42.Location = new System.Drawing.Point(334, 59); + this.label42.Location = new System.Drawing.Point(310, 59); this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(228, 17); + this.label42.Size = new System.Drawing.Size(252, 17); this.label42.TabIndex = 6; - this.label42.Text = "Adjust Starting Print Position (dots)"; + this.label42.Text = "Adjust Starting Position on Page (dots)"; // // ppBtnDeftDisAutoDuplx // @@ -996,7 +996,7 @@ namespace VEPROMS this.versionsPropChangeBarPositionCombo.FormattingEnabled = true; this.versionsPropChangeBarPositionCombo.Location = new System.Drawing.Point(86, 39); this.versionsPropChangeBarPositionCombo.Name = "versionsPropChangeBarPositionCombo"; - this.versionsPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 25); + this.versionsPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 24); this.versionsPropChangeBarPositionCombo.TabIndex = 10; // // label12 @@ -1013,7 +1013,7 @@ namespace VEPROMS this.versionsPropChangeBarTextTypeCombo.FormattingEnabled = true; this.versionsPropChangeBarTextTypeCombo.Location = new System.Drawing.Point(86, 82); this.versionsPropChangeBarTextTypeCombo.Name = "versionsPropChangeBarTextTypeCombo"; - this.versionsPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 25); + this.versionsPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 24); this.versionsPropChangeBarTextTypeCombo.TabIndex = 7; // // versionsPropPaginationCombo @@ -1581,9 +1581,9 @@ namespace VEPROMS | System.Windows.Forms.AnchorStyles.Right))); this.tcProcProp.BackColor = System.Drawing.Color.Transparent; this.tcProcProp.CanReorderTabs = true; - this.tcProcProp.Controls.Add(this.tcpGeneral); - this.tcProcProp.Controls.Add(this.tcpFormatSettings); this.tcProcProp.Controls.Add(this.tcpOutputSettings); + this.tcProcProp.Controls.Add(this.tcpFormatSettings); + this.tcProcProp.Controls.Add(this.tcpGeneral); this.tcProcProp.Controls.Add(this.tabControlPanel4); this.tcProcProp.Location = new System.Drawing.Point(180, 7); this.tcProcProp.Name = "tcProcProp"; @@ -1599,39 +1599,6 @@ namespace VEPROMS this.tcProcProp.TabsVisible = false; this.tcProcProp.Text = "tabControl2"; // - // tcpFormatSettings - // - this.tcpFormatSettings.Controls.Add(this.ppGpbxUserSpecCB); - this.tcpFormatSettings.Controls.Add(this.ppBtnDefaultChgBar); - this.tcpFormatSettings.Controls.Add(this.label19); - this.tcpFormatSettings.Controls.Add(this.ppCmbxChangeBarType); - this.tcpFormatSettings.Controls.Add(this.label20); - this.tcpFormatSettings.Controls.Add(this.ppBtnDefaultFmt); - this.tcpFormatSettings.Controls.Add(this.ppCmbxFormat); - this.tcpFormatSettings.Controls.Add(this.ppLblFormatDefault); - this.tcpFormatSettings.Controls.Add(this.ppLblChangeBarTypeDefault); - this.tcpFormatSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpFormatSettings.Location = new System.Drawing.Point(0, 24); - this.tcpFormatSettings.Name = "tcpFormatSettings"; - this.tcpFormatSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpFormatSettings.Size = new System.Drawing.Size(672, 332); - 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; - this.tcpFormatSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tcpFormatSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpFormatSettings.Style.GradientAngle = 90; - this.tcpFormatSettings.TabIndex = 2; - this.tcpFormatSettings.TabItem = this.tiFmtStngs; - this.tcpFormatSettings.Enter += new System.EventHandler(this.tabpage_Enter); - // - // tiFmtStngs - // - this.tiFmtStngs.AttachedControl = this.tcpFormatSettings; - this.tiFmtStngs.Name = "tiFmtStngs"; - this.tiFmtStngs.Text = "Format Settings"; - // // tcpGeneral // this.tcpGeneral.Controls.Add(this.ppProcNumStpRTB); @@ -1653,10 +1620,10 @@ namespace VEPROMS this.tcpGeneral.Name = "tcpGeneral"; this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); this.tcpGeneral.Size = new System.Drawing.Size(672, 332); - 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.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpGeneral.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); 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.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tcpGeneral.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpGeneral.Style.GradientAngle = 90; @@ -1729,6 +1696,39 @@ namespace VEPROMS this.tiGeneral.Name = "tiGeneral"; this.tiGeneral.Text = "General"; // + // tcpFormatSettings + // + this.tcpFormatSettings.Controls.Add(this.ppGpbxUserSpecCB); + this.tcpFormatSettings.Controls.Add(this.ppBtnDefaultChgBar); + this.tcpFormatSettings.Controls.Add(this.label19); + this.tcpFormatSettings.Controls.Add(this.ppCmbxChangeBarType); + this.tcpFormatSettings.Controls.Add(this.label20); + this.tcpFormatSettings.Controls.Add(this.ppBtnDefaultFmt); + this.tcpFormatSettings.Controls.Add(this.ppCmbxFormat); + this.tcpFormatSettings.Controls.Add(this.ppLblFormatDefault); + this.tcpFormatSettings.Controls.Add(this.ppLblChangeBarTypeDefault); + this.tcpFormatSettings.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpFormatSettings.Location = new System.Drawing.Point(0, 24); + this.tcpFormatSettings.Name = "tcpFormatSettings"; + this.tcpFormatSettings.Padding = new System.Windows.Forms.Padding(1); + this.tcpFormatSettings.Size = new System.Drawing.Size(672, 332); + this.tcpFormatSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpFormatSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + this.tcpFormatSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpFormatSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.tcpFormatSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpFormatSettings.Style.GradientAngle = 90; + this.tcpFormatSettings.TabIndex = 2; + this.tcpFormatSettings.TabItem = this.tiFmtStngs; + this.tcpFormatSettings.Enter += new System.EventHandler(this.tabpage_Enter); + // + // tiFmtStngs + // + this.tiFmtStngs.AttachedControl = this.tcpFormatSettings; + this.tiFmtStngs.Name = "tiFmtStngs"; + this.tiFmtStngs.Text = "Format Settings"; + // // tcpOutputSettings // this.tcpOutputSettings.Controls.Add(this.ppGrpbxPrnAdj); @@ -1748,10 +1748,10 @@ namespace VEPROMS this.tcpOutputSettings.Name = "tcpOutputSettings"; this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpOutputSettings.Size = new System.Drawing.Size(672, 332); - 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.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpOutputSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); 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.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tcpOutputSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpOutputSettings.Style.GradientAngle = 90; @@ -1807,7 +1807,7 @@ namespace VEPROMS this.ppGrpbxPrnAdj.StyleMouseOver.Class = ""; this.ppGrpbxPrnAdj.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ppGrpbxPrnAdj.TabIndex = 65; - this.ppGrpbxPrnAdj.Text = "Printer Adjustments"; + this.ppGrpbxPrnAdj.Text = "Output Adjustments"; // // tiOutputStngs // @@ -1827,10 +1827,10 @@ namespace VEPROMS this.tabControlPanel4.Name = "tabControlPanel4"; this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); this.tabControlPanel4.Size = new System.Drawing.Size(672, 332); - this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel4.Style.GradientAngle = 90; @@ -1887,10 +1887,10 @@ namespace VEPROMS this.panProcBtns.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tcProcProp)).EndInit(); this.tcProcProp.ResumeLayout(false); - this.tcpFormatSettings.ResumeLayout(false); - this.tcpFormatSettings.PerformLayout(); this.tcpGeneral.ResumeLayout(false); this.tcpGeneral.PerformLayout(); + this.tcpFormatSettings.ResumeLayout(false); + this.tcpFormatSettings.PerformLayout(); this.tcpOutputSettings.ResumeLayout(false); this.tcpOutputSettings.PerformLayout(); this.ppGrpbxPrnAdj.ResumeLayout(false); diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.resx b/PROMS/VEPROMS User Interface/frmProcedureProperties.resx index 7c1a13d2..0be64fe0 100644 --- a/PROMS/VEPROMS User Interface/frmProcedureProperties.resx +++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.resx @@ -120,6 +120,12 @@ 273, 17 + + 273, 17 + + + 752, 17 + 752, 17