diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs index b8411609..fd206ea1 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.Designer.cs @@ -171,10 +171,10 @@ namespace VEPROMS this.tcFolder = new DevComponents.DotNetBar.TabControl(); this.tcpRefObjs = new DevComponents.DotNetBar.TabControlPanel(); this.tiRefObj = 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.tcpEdSettings = new DevComponents.DotNetBar.TabControlPanel(); + this.tiEditSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tcpFmtSettings = new DevComponents.DotNetBar.TabControlPanel(); this.tiFmtSettings = new DevComponents.DotNetBar.TabItem(this.components); this.tcpStMsg = new DevComponents.DotNetBar.TabControlPanel(); @@ -201,8 +201,8 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.tcFolder)).BeginInit(); this.tcFolder.SuspendLayout(); this.tcpRefObjs.SuspendLayout(); - this.tcpEdSettings.SuspendLayout(); this.tcpGeneral.SuspendLayout(); + this.tcpEdSettings.SuspendLayout(); this.tcpFmtSettings.SuspendLayout(); this.tcpStMsg.SuspendLayout(); this.tcpOutputSettings.SuspendLayout(); @@ -331,9 +331,9 @@ namespace VEPROMS this.ppLblROFldrLocDefault.ForeColor = System.Drawing.SystemColors.ControlDarkDark; this.ppLblROFldrLocDefault.Location = new System.Drawing.Point(92, 38); this.ppLblROFldrLocDefault.Name = "ppLblROFldrLocDefault"; - this.ppLblROFldrLocDefault.Size = new System.Drawing.Size(371, 17); + this.ppLblROFldrLocDefault.Size = new System.Drawing.Size(364, 17); this.ppLblROFldrLocDefault.TabIndex = 37; - this.ppLblROFldrLocDefault.Text = "(..\\RO ) - not visible right know... there is no default saved"; + this.ppLblROFldrLocDefault.Text = "(..\\RO ) - not visible right now... there is no default saved"; this.ppLblROFldrLocDefault.Visible = false; // // ppBtnFldrDlg @@ -1894,10 +1894,10 @@ namespace VEPROMS this.tcFolder.CanReorderTabs = true; this.tcFolder.Controls.Add(this.tcpRefObjs); 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.tcpStMsg); + this.tcFolder.Controls.Add(this.tcpFmtSettings); + this.tcFolder.Controls.Add(this.tcpEdSettings); this.tcFolder.Location = new System.Drawing.Point(173, 7); this.tcFolder.Name = "tcFolder"; this.tcFolder.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); @@ -1932,10 +1932,10 @@ namespace VEPROMS this.tcpRefObjs.Name = "tcpRefObjs"; this.tcpRefObjs.Padding = new System.Windows.Forms.Padding(1); this.tcpRefObjs.Size = new System.Drawing.Size(686, 283); - 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; @@ -1949,36 +1949,6 @@ namespace VEPROMS this.tiRefObj.Name = "tiRefObj"; this.tiRefObj.Text = "Referenced Objects"; // - // 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.Name = "tcpEdSettings"; - this.tcpEdSettings.Padding = new System.Windows.Forms.Padding(1); - this.tcpEdSettings.Size = new System.Drawing.Size(686, 283); - 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"; - // // tcpGeneral // this.tcpGeneral.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -1995,10 +1965,10 @@ namespace VEPROMS this.tcpGeneral.Name = "tcpGeneral"; this.tcpGeneral.Padding = new System.Windows.Forms.Padding(1); this.tcpGeneral.Size = new System.Drawing.Size(686, 283); - 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; @@ -2011,6 +1981,36 @@ 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.Name = "tcpEdSettings"; + this.tcpEdSettings.Padding = new System.Windows.Forms.Padding(1); + this.tcpEdSettings.Size = new System.Drawing.Size(686, 283); + 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"; + // // tcpFmtSettings // this.tcpFmtSettings.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -2028,10 +2028,10 @@ namespace VEPROMS this.tcpFmtSettings.Name = "tcpFmtSettings"; this.tcpFmtSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpFmtSettings.Size = new System.Drawing.Size(686, 283); - 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; @@ -2062,10 +2062,10 @@ namespace VEPROMS this.tcpStMsg.Name = "tcpStMsg"; this.tcpStMsg.Padding = new System.Windows.Forms.Padding(1); this.tcpStMsg.Size = new System.Drawing.Size(686, 283); - 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; @@ -2098,10 +2098,10 @@ namespace VEPROMS this.tcpOutputSettings.Name = "tcpOutputSettings"; this.tcpOutputSettings.Padding = new System.Windows.Forms.Padding(1); this.tcpOutputSettings.Size = new System.Drawing.Size(686, 283); - 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; @@ -2167,10 +2167,10 @@ namespace VEPROMS this.tcFolder.ResumeLayout(false); this.tcpRefObjs.ResumeLayout(false); this.tcpRefObjs.PerformLayout(); - this.tcpEdSettings.ResumeLayout(false); - this.tcpEdSettings.PerformLayout(); this.tcpGeneral.ResumeLayout(false); this.tcpGeneral.PerformLayout(); + this.tcpEdSettings.ResumeLayout(false); + this.tcpEdSettings.PerformLayout(); this.tcpFmtSettings.ResumeLayout(false); this.tcpFmtSettings.PerformLayout(); this.tcpStMsg.ResumeLayout(false); diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.resx b/PROMS/VEPROMS User Interface/frmFolderProperties.resx index e24de0ae..b9338356 100644 --- a/PROMS/VEPROMS User Interface/frmFolderProperties.resx +++ b/PROMS/VEPROMS User Interface/frmFolderProperties.resx @@ -150,9 +150,6 @@ Check "Show Default Settings" to display the "default" graphic file extension se 17, 57 - - 17, 57 - This will revert the Disable Automatic Duplexing selection back to using the parent's (default) setting. @@ -180,9 +177,6 @@ When a format other than the inherited one is selected, a button labeled "Defaul Pressing the "Default" button will revert back to using the inherited format. - - 948, 17 - This will revert the Change Bar Text Type selection back to using the parent's (default) setting. @@ -227,9 +221,6 @@ Check "Show Default Settings" to display the "default" Change Bar Custom Message Check "Show Default Settings" to display the "default" columnsr (below the Step Editor Columns selection box). - - 809, 17 - This allows you to make adjustment to the printed page.