diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index eb6f8f45..5c275b16 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -155,10 +155,10 @@ namespace VEPROMS this.btnRefObjs = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.tcFolder = new DevComponents.DotNetBar.TabControl(); - this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tcpEdSettings = new DevComponents.DotNetBar.TabControlPanel(); this.tiEditSettings = new DevComponents.DotNetBar.TabItem(this.components); + this.tcpGeneral = new DevComponents.DotNetBar.TabControlPanel(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tcpStMsg = new DevComponents.DotNetBar.TabControlPanel(); this.tiStMsg = new DevComponents.DotNetBar.TabItem(this.components); this.tcpOutputSettings = new DevComponents.DotNetBar.TabControlPanel(); @@ -185,8 +185,8 @@ namespace VEPROMS this.panButtons.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).BeginInit(); this.tcFolder.SuspendLayout(); - this.tcpGeneral.SuspendLayout(); this.tcpEdSettings.SuspendLayout(); + this.tcpGeneral.SuspendLayout(); this.tcpStMsg.SuspendLayout(); this.tcpOutputSettings.SuspendLayout(); this.tcpFmtSettings.SuspendLayout(); @@ -567,11 +567,11 @@ namespace VEPROMS // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(332, 59); + this.label12.Location = new System.Drawing.Point(307, 59); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(228, 17); + this.label12.Size = new System.Drawing.Size(252, 17); this.label12.TabIndex = 6; - this.label12.Text = "Adjust Starting Print Position (dots)"; + this.label12.Text = "Adjust Starting Position on Page (dots)"; // // ppChbxDisAutoDuplex // @@ -1356,7 +1356,7 @@ namespace VEPROMS this.procPropChangeBarPositionCombo.FormattingEnabled = true; this.procPropChangeBarPositionCombo.Location = new System.Drawing.Point(86, 39); this.procPropChangeBarPositionCombo.Name = "procPropChangeBarPositionCombo"; - this.procPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 25); + this.procPropChangeBarPositionCombo.Size = new System.Drawing.Size(248, 24); this.procPropChangeBarPositionCombo.TabIndex = 10; // // label18 @@ -1373,7 +1373,7 @@ namespace VEPROMS this.procPropChangeBarTextTypeCombo.FormattingEnabled = true; this.procPropChangeBarTextTypeCombo.Location = new System.Drawing.Point(86, 82); this.procPropChangeBarTextTypeCombo.Name = "procPropChangeBarTextTypeCombo"; - this.procPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 25); + this.procPropChangeBarTextTypeCombo.Size = new System.Drawing.Size(248, 24); this.procPropChangeBarTextTypeCombo.TabIndex = 7; // // procPropPaginationCombo @@ -1535,7 +1535,7 @@ namespace VEPROMS this.groupPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.superTooltip1.SetSuperTooltip(this.groupPanel2, new DevComponents.DotNetBar.SuperTooltipInfo("PrinterAdjustments", "", resources.GetString("groupPanel2.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(275, 180))); this.groupPanel2.TabIndex = 57; - this.groupPanel2.Text = "Printer Adjustments"; + this.groupPanel2.Text = "Output Adjustments"; // // ppGpbxUserSpecCB // @@ -1794,11 +1794,11 @@ namespace VEPROMS | System.Windows.Forms.AnchorStyles.Right))); this.tcFolder.BackColor = System.Drawing.Color.Transparent; this.tcFolder.CanReorderTabs = true; - this.tcFolder.Controls.Add(this.tcpEdSettings); this.tcFolder.Controls.Add(this.tcpGeneral); + this.tcFolder.Controls.Add(this.tcpEdSettings); + this.tcFolder.Controls.Add(this.tcpFmtSettings); this.tcFolder.Controls.Add(this.tcpStMsg); this.tcFolder.Controls.Add(this.tcpOutputSettings); - this.tcFolder.Controls.Add(this.tcpFmtSettings); this.tcFolder.Controls.Add(this.tcpRefObjs); this.tcFolder.Location = new System.Drawing.Point(173, 7); this.tcFolder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); @@ -1818,6 +1818,37 @@ namespace VEPROMS this.tcFolder.TabsVisible = false; this.tcFolder.Text = "tabControl2"; // + // tcpEdSettings + // + this.tcpEdSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.tcpEdSettings.Controls.Add(this.groupPanel6); + this.tcpEdSettings.Controls.Add(this.label31); + this.tcpEdSettings.Controls.Add(this.ppBtnDefEdCols); + this.tcpEdSettings.Controls.Add(this.ppLblStpEditorColsDefault); + this.tcpEdSettings.Controls.Add(this.ppCmbxStpEditorCols); + this.tcpEdSettings.Dock = System.Windows.Forms.DockStyle.Fill; + this.tcpEdSettings.Location = new System.Drawing.Point(0, 24); + this.tcpEdSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tcpEdSettings.Name = "tcpEdSettings"; + this.tcpEdSettings.Padding = new System.Windows.Forms.Padding(1); + this.tcpEdSettings.Size = new System.Drawing.Size(685, 282); + this.tcpEdSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpEdSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); + this.tcpEdSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tcpEdSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); + this.tcpEdSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tcpEdSettings.Style.GradientAngle = 90; + this.tcpEdSettings.TabIndex = 6; + this.tcpEdSettings.TabItem = this.tiEditSettings; + this.tcpEdSettings.Enter += new System.EventHandler(this.tabpage_Enter); + // + // tiEditSettings + // + this.tiEditSettings.AttachedControl = this.tcpEdSettings; + this.tiEditSettings.Name = "tiEditSettings"; + this.tiEditSettings.Text = "Editor Settings"; + // // tcpGeneral // this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -1835,10 +1866,10 @@ namespace VEPROMS this.tcpGeneral.Name = "tcpGeneral"; this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); this.tcpGeneral.Size = new System.Drawing.Size(685, 282); - 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; @@ -1851,37 +1882,6 @@ namespace VEPROMS this.tiGeneral.Name = "tiGeneral"; this.tiGeneral.Text = "General"; // - // tcpEdSettings - // - this.tcpEdSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.tcpEdSettings.Controls.Add(this.groupPanel6); - this.tcpEdSettings.Controls.Add(this.label31); - this.tcpEdSettings.Controls.Add(this.ppBtnDefEdCols); - this.tcpEdSettings.Controls.Add(this.ppLblStpEditorColsDefault); - this.tcpEdSettings.Controls.Add(this.ppCmbxStpEditorCols); - this.tcpEdSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.tcpEdSettings.Location = new System.Drawing.Point(0, 24); - this.tcpEdSettings.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tcpEdSettings.Name = "tcpEdSettings"; - this.tcpEdSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpEdSettings.Size = new System.Drawing.Size(685, 282); - this.tcpEdSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpEdSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tcpEdSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpEdSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tcpEdSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tcpEdSettings.Style.GradientAngle = 90; - this.tcpEdSettings.TabIndex = 6; - this.tcpEdSettings.TabItem = this.tiEditSettings; - this.tcpEdSettings.Enter += new System.EventHandler(this.tabpage_Enter); - // - // tiEditSettings - // - this.tiEditSettings.AttachedControl = this.tcpEdSettings; - this.tiEditSettings.Name = "tiEditSettings"; - this.tiEditSettings.Text = "Editor Settings"; - // // tcpStMsg // this.tcpStMsg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -1900,10 +1900,10 @@ namespace VEPROMS this.tcpStMsg.Name = "tcpStMsg"; this.tcpStMsg.Padding = new System.Windows.Forms.Padding(1); this.tcpStMsg.Size = new System.Drawing.Size(685, 282); - this.tcpStMsg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpStMsg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpStMsg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpStMsg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); this.tcpStMsg.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpStMsg.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpStMsg.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tcpStMsg.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpStMsg.Style.GradientAngle = 90; @@ -1937,10 +1937,10 @@ namespace VEPROMS this.tcpOutputSettings.Name = "tcpOutputSettings"; this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpOutputSettings.Size = new System.Drawing.Size(685, 282); - 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; @@ -1972,10 +1972,10 @@ namespace VEPROMS this.tcpFmtSettings.Name = "tcpFmtSettings"; this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpFmtSettings.Size = new System.Drawing.Size(685, 282); - this.tcpFmtSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpFmtSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpFmtSettings.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpFmtSettings.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); this.tcpFmtSettings.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpFmtSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpFmtSettings.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tcpFmtSettings.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpFmtSettings.Style.GradientAngle = 90; @@ -2002,10 +2002,10 @@ namespace VEPROMS this.tcpRefObjs.Name = "tcpRefObjs"; this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); this.tcpRefObjs.Size = new System.Drawing.Size(685, 282); - this.tcpRefObjs.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tcpRefObjs.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tcpRefObjs.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tcpRefObjs.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(195)))), ((int)(((byte)(195))))); this.tcpRefObjs.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tcpRefObjs.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tcpRefObjs.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70))))); this.tcpRefObjs.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tcpRefObjs.Style.GradientAngle = 90; @@ -2071,10 +2071,10 @@ namespace VEPROMS this.panButtons.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).EndInit(); this.tcFolder.ResumeLayout(false); - this.tcpGeneral.ResumeLayout(false); - this.tcpGeneral.PerformLayout(); this.tcpEdSettings.ResumeLayout(false); this.tcpEdSettings.PerformLayout(); + this.tcpGeneral.ResumeLayout(false); + this.tcpGeneral.PerformLayout(); this.tcpStMsg.ResumeLayout(false); this.tcpStMsg.PerformLayout(); this.tcpOutputSettings.ResumeLayout(false); diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.resx b/PROMS/VEPROMS User Interface/frmFolderProperties.resx index e01d23c2..b8430f54 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.resx +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.resx @@ -179,8 +179,8 @@ Check "Show Default Settings" to display the "default" Change Bar Custom Message iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA - CwIBm8luNgAAAr5JREFUOE+lk21IE3Ecx0/fBPUi6pVZyzELCalXhWEg0XMvipYLVOzJhyxTWlkippGl + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAQAA + CwEBNnBPWwAAAr5JREFUOE+lk21IE3Ecx0/fBPUi6pVZyzELCalXhWEg0XMvipYLVOzJhyxTWlkippGl lLjS0qEpmpBmNsnhdPRAL1SwpuFwHtO5pbGle3Duwfvf3R7a/bodTGcaBB18j+PPfT/3/X//94sAAOy/ riAgJNrZWUDpShCpLfSR+K0Aqb3jR+oLbnKupjb8vfDnMPPbakKd5qUsDT88biWERJmf/0R4ng9psq0W vPz2nyAOwH65COHX/ZSt2UG7u9EKgOO1l7K1Ohc0YtPCkMhDmqUpqxKQk8UeytYyFzRCdz5AzTkAeT6X