diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index 5c043026..d2691545 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -53,30 +53,35 @@ namespace VEPROMS this.tiStUpMsg = new DevComponents.DotNetBar.TabItem(this.components); this.btnReset = new DevComponents.DotNetBar.ButtonX(); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); + this.groupPanel3 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.colorPickerButton1 = new DevComponents.DotNetBar.ColorPickerButton(); this.groupPanel1.SuspendLayout(); this.panButtons.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).BeginInit(); this.tcSysOpts.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); this.groupPanel2.SuspendLayout(); + this.groupPanel3.SuspendLayout(); this.SuspendLayout(); // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(821, 605); + this.btnCancel.Location = new System.Drawing.Point(616, 492); + this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Size = new System.Drawing.Size(56, 19); this.btnCancel.TabIndex = 0; this.btnCancel.Text = "Cancel"; // // btnOK // this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnOK.Location = new System.Drawing.Point(722, 605); + this.btnOK.Location = new System.Drawing.Point(542, 492); + this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 23); + this.btnOK.Size = new System.Drawing.Size(56, 19); this.btnOK.TabIndex = 1; this.btnOK.Text = "OK"; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); @@ -89,9 +94,10 @@ namespace VEPROMS this.groupPanel1.Controls.Add(this.cbRibonBlack); this.groupPanel1.Controls.Add(this.cbRibonSilver); this.groupPanel1.Controls.Add(this.cbRibonBlue); - this.groupPanel1.Location = new System.Drawing.Point(52, 16); + this.groupPanel1.Location = new System.Drawing.Point(39, 13); + this.groupPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(110, 119); + this.groupPanel1.Size = new System.Drawing.Size(82, 97); // // // @@ -119,9 +125,10 @@ namespace VEPROMS // this.cbRibonBlack.BackColor = System.Drawing.Color.Transparent; this.cbRibonBlack.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonBlack.Location = new System.Drawing.Point(9, 66); + this.cbRibonBlack.Location = new System.Drawing.Point(7, 54); + this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbRibonBlack.Name = "cbRibonBlack"; - this.cbRibonBlack.Size = new System.Drawing.Size(89, 23); + this.cbRibonBlack.Size = new System.Drawing.Size(67, 19); this.cbRibonBlack.TabIndex = 2; this.cbRibonBlack.Text = "Black"; this.cbRibonBlack.CheckedChanged += new System.EventHandler(this.cbRibonBlack_CheckedChanged); @@ -130,9 +137,10 @@ namespace VEPROMS // this.cbRibonSilver.BackColor = System.Drawing.Color.Transparent; this.cbRibonSilver.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonSilver.Location = new System.Drawing.Point(9, 37); + this.cbRibonSilver.Location = new System.Drawing.Point(7, 30); + this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbRibonSilver.Name = "cbRibonSilver"; - this.cbRibonSilver.Size = new System.Drawing.Size(89, 23); + this.cbRibonSilver.Size = new System.Drawing.Size(67, 19); this.cbRibonSilver.TabIndex = 1; this.cbRibonSilver.Text = "Silver"; this.cbRibonSilver.CheckedChanged += new System.EventHandler(this.cbRibonSilver_CheckedChanged); @@ -141,9 +149,10 @@ namespace VEPROMS // this.cbRibonBlue.BackColor = System.Drawing.Color.Transparent; this.cbRibonBlue.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonBlue.Location = new System.Drawing.Point(9, 8); + this.cbRibonBlue.Location = new System.Drawing.Point(7, 6); + this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbRibonBlue.Name = "cbRibonBlue"; - this.cbRibonBlue.Size = new System.Drawing.Size(89, 23); + this.cbRibonBlue.Size = new System.Drawing.Size(67, 19); this.cbRibonBlue.TabIndex = 0; this.cbRibonBlue.Text = "Blue"; this.cbRibonBlue.CheckedChanged += new System.EventHandler(this.cbRibonBlue_CheckedChanged); @@ -154,9 +163,10 @@ namespace VEPROMS this.panButtons.Controls.Add(this.btnIntrFaceStngs); this.panButtons.Controls.Add(this.btnStartMsg); this.panButtons.Controls.Add(this.btnGeneral); - this.panButtons.Location = new System.Drawing.Point(18, 17); + this.panButtons.Location = new System.Drawing.Point(14, 14); + this.panButtons.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panButtons.Name = "panButtons"; - this.panButtons.Size = new System.Drawing.Size(224, 566); + this.panButtons.Size = new System.Drawing.Size(168, 460); this.panButtons.Style.Alignment = System.Drawing.StringAlignment.Center; this.panButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -173,9 +183,10 @@ namespace VEPROMS this.btnIntrFaceStngs.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnIntrFaceStngs.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnIntrFaceStngs.Dock = System.Windows.Forms.DockStyle.Top; - this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 46); + this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 38); + this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnIntrFaceStngs.Name = "btnIntrFaceStngs"; - this.btnIntrFaceStngs.Size = new System.Drawing.Size(224, 23); + this.btnIntrFaceStngs.Size = new System.Drawing.Size(168, 19); this.btnIntrFaceStngs.TabIndex = 2; this.btnIntrFaceStngs.Text = "My Interface Settings"; this.btnIntrFaceStngs.Click += new System.EventHandler(this.btnIntrFaceStngs_Click); @@ -185,9 +196,10 @@ namespace VEPROMS this.btnStartMsg.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnStartMsg.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnStartMsg.Dock = System.Windows.Forms.DockStyle.Top; - this.btnStartMsg.Location = new System.Drawing.Point(0, 23); + this.btnStartMsg.Location = new System.Drawing.Point(0, 19); + this.btnStartMsg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnStartMsg.Name = "btnStartMsg"; - this.btnStartMsg.Size = new System.Drawing.Size(224, 23); + this.btnStartMsg.Size = new System.Drawing.Size(168, 19); this.btnStartMsg.TabIndex = 1; this.btnStartMsg.Text = "Startup Message"; this.btnStartMsg.Click += new System.EventHandler(this.btnStartMsg_Click); @@ -198,8 +210,9 @@ namespace VEPROMS this.btnGeneral.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.btnGeneral.Dock = System.Windows.Forms.DockStyle.Top; this.btnGeneral.Location = new System.Drawing.Point(0, 0); + this.btnGeneral.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnGeneral.Name = "btnGeneral"; - this.btnGeneral.Size = new System.Drawing.Size(224, 23); + this.btnGeneral.Size = new System.Drawing.Size(168, 19); this.btnGeneral.TabIndex = 0; this.btnGeneral.Text = "General"; this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); @@ -208,14 +221,15 @@ namespace VEPROMS // this.tcSysOpts.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(217)))), ((int)(((byte)(247))))); this.tcSysOpts.CanReorderTabs = true; - this.tcSysOpts.Controls.Add(this.tabControlPanel1); this.tcSysOpts.Controls.Add(this.tabControlPanel3); + this.tcSysOpts.Controls.Add(this.tabControlPanel1); this.tcSysOpts.Controls.Add(this.tabControlPanel2); - this.tcSysOpts.Location = new System.Drawing.Point(259, 21); + this.tcSysOpts.Location = new System.Drawing.Point(194, 17); + this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tcSysOpts.Name = "tcSysOpts"; this.tcSysOpts.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tcSysOpts.SelectedTabIndex = 2; - this.tcSysOpts.Size = new System.Drawing.Size(655, 562); + this.tcSysOpts.Size = new System.Drawing.Size(491, 457); this.tcSysOpts.TabIndex = 3; this.tcSysOpts.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; this.tcSysOpts.Tabs.Add(this.tiGeneral); @@ -229,13 +243,14 @@ namespace VEPROMS // this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControlPanel1.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(655, 535); + this.tabControlPanel1.Size = new System.Drawing.Size(491, 430); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 90; this.tabControlPanel1.TabIndex = 1; this.tabControlPanel1.TabItem = this.tiGeneral; @@ -249,17 +264,19 @@ namespace VEPROMS // // tabControlPanel3 // + this.tabControlPanel3.Controls.Add(this.groupPanel3); this.tabControlPanel3.Controls.Add(this.groupPanel2); this.tabControlPanel3.Controls.Add(this.groupPanel1); this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControlPanel3.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(655, 535); + this.tabControlPanel3.Size = new System.Drawing.Size(491, 430); this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel3.Style.GradientAngle = 90; this.tabControlPanel3.TabIndex = 3; this.tabControlPanel3.TabItem = this.tiIntrFaceStngs; @@ -273,9 +290,10 @@ namespace VEPROMS this.groupPanel2.Controls.Add(this.cbPropGrid); this.groupPanel2.Controls.Add(this.cbTabbedIntrFace); this.groupPanel2.Controls.Add(this.cbButtonIntrFace); - this.groupPanel2.Location = new System.Drawing.Point(207, 15); + this.groupPanel2.Location = new System.Drawing.Point(155, 12); + this.groupPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(152, 132); + this.groupPanel2.Size = new System.Drawing.Size(114, 107); // // // @@ -302,27 +320,30 @@ namespace VEPROMS // cbPropGrid // this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbPropGrid.Location = new System.Drawing.Point(11, 73); + this.cbPropGrid.Location = new System.Drawing.Point(8, 59); + this.cbPropGrid.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbPropGrid.Name = "cbPropGrid"; - this.cbPropGrid.Size = new System.Drawing.Size(110, 24); + this.cbPropGrid.Size = new System.Drawing.Size(82, 20); this.cbPropGrid.TabIndex = 2; this.cbPropGrid.Text = "Property Grid"; // // cbTabbedIntrFace // this.cbTabbedIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbTabbedIntrFace.Location = new System.Drawing.Point(11, 42); + this.cbTabbedIntrFace.Location = new System.Drawing.Point(8, 34); + this.cbTabbedIntrFace.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbTabbedIntrFace.Name = "cbTabbedIntrFace"; - this.cbTabbedIntrFace.Size = new System.Drawing.Size(130, 25); + this.cbTabbedIntrFace.Size = new System.Drawing.Size(98, 20); this.cbTabbedIntrFace.TabIndex = 1; this.cbTabbedIntrFace.Text = "Tabbed interface"; // // cbButtonIntrFace // this.cbButtonIntrFace.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbButtonIntrFace.Location = new System.Drawing.Point(11, 12); + this.cbButtonIntrFace.Location = new System.Drawing.Point(8, 10); + this.cbButtonIntrFace.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbButtonIntrFace.Name = "cbButtonIntrFace"; - this.cbButtonIntrFace.Size = new System.Drawing.Size(129, 24); + this.cbButtonIntrFace.Size = new System.Drawing.Size(97, 20); this.cbButtonIntrFace.TabIndex = 0; this.cbButtonIntrFace.Text = "Button Interface"; // @@ -336,13 +357,14 @@ namespace VEPROMS // this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControlPanel2.Location = new System.Drawing.Point(0, 27); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(655, 535); + this.tabControlPanel2.Size = new System.Drawing.Size(491, 430); this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); + | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 90; this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.tiStUpMsg; @@ -358,10 +380,11 @@ namespace VEPROMS // this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnReset.Location = new System.Drawing.Point(259, 605); + this.btnReset.Location = new System.Drawing.Point(194, 492); + this.btnReset.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnReset.Name = "btnReset"; this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.btnReset.Size = new System.Drawing.Size(105, 23); + this.btnReset.Size = new System.Drawing.Size(79, 19); this.superTooltip1.SetSuperTooltip(this.btnReset, new DevComponents.DotNetBar.SuperTooltipInfo("Default Settings", "", "This will reset saved user settings back to the VE-PROMS system default.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(140, 95))); this.btnReset.TabIndex = 3; this.btnReset.Text = "Default Settings"; @@ -371,19 +394,63 @@ namespace VEPROMS // this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; // + // groupPanel3 + // + this.groupPanel3.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanel3.Controls.Add(this.colorPickerButton1); + this.groupPanel3.Location = new System.Drawing.Point(303, 13); + this.groupPanel3.Name = "groupPanel3"; + this.groupPanel3.Size = new System.Drawing.Size(146, 62); + // + // + // + this.groupPanel3.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanel3.Style.BackColorGradientAngle = 90; + this.groupPanel3.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanel3.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel3.Style.BorderBottomWidth = 1; + this.groupPanel3.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanel3.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel3.Style.BorderLeftWidth = 1; + this.groupPanel3.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel3.Style.BorderRightWidth = 1; + this.groupPanel3.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel3.Style.BorderTopWidth = 1; + this.groupPanel3.Style.CornerDiameter = 4; + this.groupPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanel3.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanel3.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanel3.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + this.groupPanel3.TabIndex = 3; + this.groupPanel3.Text = "Transition Range Color"; + // + // colorPickerButton1 + // + this.colorPickerButton1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.colorPickerButton1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.colorPickerButton1.Image = ((System.Drawing.Image)(resources.GetObject("colorPickerButton1.Image"))); + this.colorPickerButton1.Location = new System.Drawing.Point(7, 12); + this.colorPickerButton1.Name = "colorPickerButton1"; + this.colorPickerButton1.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12); + this.colorPickerButton1.Size = new System.Drawing.Size(103, 23); + this.colorPickerButton1.TabIndex = 0; + this.colorPickerButton1.SelectedColorChanged += new System.EventHandler(this.colorPickerButton1_SelectedColorChanged); + // // frmSysOptions // this.AcceptButton = this.btnOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(932, 640); + this.ClientSize = new System.Drawing.Size(699, 520); this.Controls.Add(this.btnReset); this.Controls.Add(this.tcSysOpts); this.Controls.Add(this.panButtons); this.Controls.Add(this.btnOK); this.Controls.Add(this.btnCancel); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "frmSysOptions"; this.Text = "VE-PROMS System Options"; this.groupPanel1.ResumeLayout(false); @@ -392,6 +459,7 @@ namespace VEPROMS this.tcSysOpts.ResumeLayout(false); this.tabControlPanel3.ResumeLayout(false); this.groupPanel2.ResumeLayout(false); + this.groupPanel3.ResumeLayout(false); this.ResumeLayout(false); } @@ -421,6 +489,8 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.CheckBoxX cbButtonIntrFace; private DevComponents.DotNetBar.ButtonX btnReset; private DevComponents.DotNetBar.SuperTooltip superTooltip1; + private DevComponents.DotNetBar.Controls.GroupPanel groupPanel3; + private DevComponents.DotNetBar.ColorPickerButton colorPickerButton1; diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs index 6b711328..32e1e75f 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs @@ -52,6 +52,7 @@ namespace VEPROMS cbRibonSilver.Checked = true; break; } + colorPickerButton1.SelectedColor = Settings.Default.TransitionRangeColor; } @@ -135,6 +136,14 @@ namespace VEPROMS RibbonPredefinedColorSchemes.ChangeOffice2007ColorTable((eOffice2007ColorScheme)Settings.Default.SystemColor); } + private void colorPickerButton1_SelectedColorChanged(object sender, EventArgs e) + { + if (!_initializing) + { + Settings.Default.TransitionRangeColor = colorPickerButton1.SelectedColor; + } + } + diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.resx b/PROMS/VEPROMS User Interface/frmSysOptions.resx index 1ddae904..bded3241 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.resx +++ b/PROMS/VEPROMS User Interface/frmSysOptions.resx @@ -117,10 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAC9JREFUOE9j/P// + PwNFAGoAyBSSMVgvzAAQTQoGWThqwGgYDMd0QFFmIiUToasFAIXCaLVvIg/JAAAAAElFTkSuQmCC + + 17, 17 - AAABAAIAEBAQAAAABAAoAQAAJgAAACAgEAAAAAQA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAMAA diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 5983f70a..4bf32ff3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -2365,7 +2365,7 @@ namespace VEPROMS this.displayRO.CurItem = null; this.displayRO.Dock = System.Windows.Forms.DockStyle.Fill; this.displayRO.Location = new System.Drawing.Point(1, 1); - this.displayRO.Modify = false; + this.displayRO.CurROLink = null; this.displayRO.MyROFST = null; this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; @@ -2660,7 +2660,6 @@ namespace VEPROMS this.displayTransition.AutoSize = true; this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.displayTransition.CurTrans = null; - this.displayTransition.CurProcSet = true; this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill; this.displayTransition.Location = new System.Drawing.Point(1, 1); this.displayTransition.MyRTB = null; @@ -2983,6 +2982,7 @@ namespace VEPROMS this.tc.Size = new System.Drawing.Size(762, 571); this.tc.TabIndex = 8; this.tc.LinkModifyTran += new Volian.Controls.Library.DisplayPanelLinkEvent(this.tc_LinkModifyTran); + this.tc.LinkModifyRO += new Volian.Controls.Library.DisplayPanelLinkEvent(this.tc_LinkModifyRO); this.tc.ItemSelectedChanged += new Volian.Controls.Library.DisplayPanelEvent(this.tc_ItemSelectedChanged); // // frmVEPROMS diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 74d3de1c..f7072b33 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1074,22 +1074,14 @@ namespace VEPROMS #region InfoTabRO private void infotabRO_Click(object sender, EventArgs e) { - - //ItemInfo curitm = dtp.ItemSelected; - //DisplayRO dr = new DisplayRO(rofst, curitm, false, _MyRTB); - //infotabControlPanelRO.Controls.Add(dr); infoPanel.Expanded = true; infoTabs.SelectedTab = infotabRO; - DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel; - // if dtp == null, disable the ro & tran info tabs. if (dtp == null) return; - - //ItemInfo curitm = dtp.ItemSelected; ROFST rofst = new ROFST("g:\\vehlp\\ro\\ro.fst"); displayRO.MyROFST = rofst; displayRO.CurItem = dtp.ItemSelected; - displayRO.MyRTB = _MyRTB; + displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; } #endregion #region InfoTabTransition @@ -1098,23 +1090,19 @@ namespace VEPROMS if (tc == null || tc.SelectedTab == null) return; DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel; if (dtp == null) return; - //btnInsTrans_Click(sender, e); + displayTransition.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; + displayTransition.CurTrans = null; + displayTransition.RangeColor = Settings.Default.TransitionRangeColor; } private void btnInsTrans_Click(object sender, EventArgs e) { infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTransition; - DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel; - // if dtp == null, disable the ro & tran info tabs. if (dtp == null) return; - - //ItemInfo curitm = dtp.ItemSelected; - //displayTransition.CurItem = dtp.ItemSelected; displayTransition.MyRTB = _MyRTB; - //DisplayTransition dt = new DisplayTransition(curitm, false, _MyRTB); - //infotabControlPanelTransitions.Controls.Add(dt); - //dt.Dock = DockStyle.Fill; + displayTransition.CurTrans = null; + displayTransition.RangeColor = Settings.Default.TransitionRangeColor; } #endregion private void tc_ItemSelectedChanged(object sender, DisplayPanelEventArgs args) @@ -1126,12 +1114,10 @@ namespace VEPROMS itemAnnotationsBindingSource.DataSource = args.MyVlnCSLARTB.MyItem.ItemAnnotations; DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel; if (dtp == null) return; - //displayTransition.CurItem = dtp.ItemSelected; - //displayTransition.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; displayTransition.MyRTB = dtp.MyPanel.DisplayRTB; displayRO.CurItem = dtp.ItemSelected; displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; - displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; + displayTransition.RangeColor = Settings.Default.TransitionRangeColor; } } private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e) @@ -1152,7 +1138,7 @@ namespace VEPROMS } private void btnSave_Click(object sender, EventArgs e) { - _MyRTB.Save(); + _MyRTB.SaveText(); } private void tc_LinkModifyTran(object sender, DisplayLinkEventArgs args) @@ -1160,6 +1146,20 @@ namespace VEPROMS infoPanel.Expanded = true; infoTabs.SelectedTab = infotabTransition; displayTransition.CurTrans = args.MyTransition; + displayTransition.RangeColor = Settings.Default.TransitionRangeColor; + } + + private void tc_LinkModifyRO(object sender, DisplayLinkEventArgs args) + { + infoPanel.Expanded = true; + infoTabs.SelectedTab = infotabRO; + ROFST rofst = new ROFST("g:\\vehlp\\ro\\ro.fst"); + displayRO.MyROFST = rofst; + DisplayTabPanel dtp = ((DisplayTabItem)tc.SelectedTab).MyTabPanel; + if (dtp == null) return; + displayRO.CurItem = dtp.ItemSelected; + displayRO.MyRTB = dtp.MyPanel.DisplayItemSelected.MyDisplayRTB; + displayRO.CurROLink = args.RoUsageid; // this is wrong - use for now. } } -} \ No newline at end of file +}