diff --git a/PROMS/VEPROMS User Interface/App.config b/PROMS/VEPROMS User Interface/App.config index 48a71205..fa7e7415 100644 --- a/PROMS/VEPROMS User Interface/App.config +++ b/PROMS/VEPROMS User Interface/App.config @@ -110,6 +110,9 @@ False + + True + diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs index d2691545..8b4a58cc 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.Designer.cs @@ -41,47 +41,50 @@ namespace VEPROMS this.btnStartMsg = new DevComponents.DotNetBar.ButtonX(); this.btnGeneral = new DevComponents.DotNetBar.ButtonX(); this.tcSysOpts = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); - this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.groupPanel3 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.colorPickerButton1 = new DevComponents.DotNetBar.ColorPickerButton(); this.groupPanel2 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbPropGrid = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbTabbedIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbButtonIntrFace = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.tiIntrFaceStngs = new DevComponents.DotNetBar.TabItem(this.components); + this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); + this.tiGeneral = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); 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.groupPanel4 = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.cbAnnotationPopup = new DevComponents.DotNetBar.Controls.CheckBoxX(); 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.groupPanel2.SuspendLayout(); + this.groupPanel4.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(616, 492); - this.btnCancel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnCancel.Location = new System.Drawing.Point(821, 606); + this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(56, 19); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 0; this.btnCancel.Text = "Cancel"; // // btnOK // this.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnOK.Location = new System.Drawing.Point(542, 492); - this.btnOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnOK.Location = new System.Drawing.Point(723, 606); + this.btnOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(56, 19); + this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 1; this.btnOK.Text = "OK"; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); @@ -94,10 +97,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(39, 13); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupPanel1.Location = new System.Drawing.Point(52, 16); + this.groupPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(82, 97); + this.groupPanel1.Size = new System.Drawing.Size(109, 119); // // // @@ -125,10 +128,10 @@ namespace VEPROMS // this.cbRibonBlack.BackColor = System.Drawing.Color.Transparent; this.cbRibonBlack.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonBlack.Location = new System.Drawing.Point(7, 54); - this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbRibonBlack.Location = new System.Drawing.Point(9, 66); + this.cbRibonBlack.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbRibonBlack.Name = "cbRibonBlack"; - this.cbRibonBlack.Size = new System.Drawing.Size(67, 19); + this.cbRibonBlack.Size = new System.Drawing.Size(89, 23); this.cbRibonBlack.TabIndex = 2; this.cbRibonBlack.Text = "Black"; this.cbRibonBlack.CheckedChanged += new System.EventHandler(this.cbRibonBlack_CheckedChanged); @@ -137,10 +140,10 @@ namespace VEPROMS // this.cbRibonSilver.BackColor = System.Drawing.Color.Transparent; this.cbRibonSilver.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonSilver.Location = new System.Drawing.Point(7, 30); - this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbRibonSilver.Location = new System.Drawing.Point(9, 37); + this.cbRibonSilver.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbRibonSilver.Name = "cbRibonSilver"; - this.cbRibonSilver.Size = new System.Drawing.Size(67, 19); + this.cbRibonSilver.Size = new System.Drawing.Size(89, 23); this.cbRibonSilver.TabIndex = 1; this.cbRibonSilver.Text = "Silver"; this.cbRibonSilver.CheckedChanged += new System.EventHandler(this.cbRibonSilver_CheckedChanged); @@ -149,10 +152,10 @@ namespace VEPROMS // this.cbRibonBlue.BackColor = System.Drawing.Color.Transparent; this.cbRibonBlue.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - this.cbRibonBlue.Location = new System.Drawing.Point(7, 6); - this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbRibonBlue.Location = new System.Drawing.Point(9, 7); + this.cbRibonBlue.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.cbRibonBlue.Name = "cbRibonBlue"; - this.cbRibonBlue.Size = new System.Drawing.Size(67, 19); + this.cbRibonBlue.Size = new System.Drawing.Size(89, 23); this.cbRibonBlue.TabIndex = 0; this.cbRibonBlue.Text = "Blue"; this.cbRibonBlue.CheckedChanged += new System.EventHandler(this.cbRibonBlue_CheckedChanged); @@ -163,10 +166,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(14, 14); - this.panButtons.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panButtons.Location = new System.Drawing.Point(19, 17); + this.panButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panButtons.Name = "panButtons"; - this.panButtons.Size = new System.Drawing.Size(168, 460); + this.panButtons.Size = new System.Drawing.Size(224, 566); 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; @@ -183,10 +186,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, 38); - this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnIntrFaceStngs.Location = new System.Drawing.Point(0, 46); + this.btnIntrFaceStngs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnIntrFaceStngs.Name = "btnIntrFaceStngs"; - this.btnIntrFaceStngs.Size = new System.Drawing.Size(168, 19); + this.btnIntrFaceStngs.Size = new System.Drawing.Size(224, 23); this.btnIntrFaceStngs.TabIndex = 2; this.btnIntrFaceStngs.Text = "My Interface Settings"; this.btnIntrFaceStngs.Click += new System.EventHandler(this.btnIntrFaceStngs_Click); @@ -196,10 +199,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, 19); - this.btnStartMsg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnStartMsg.Location = new System.Drawing.Point(0, 23); + this.btnStartMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnStartMsg.Name = "btnStartMsg"; - this.btnStartMsg.Size = new System.Drawing.Size(168, 19); + this.btnStartMsg.Size = new System.Drawing.Size(224, 23); this.btnStartMsg.TabIndex = 1; this.btnStartMsg.Text = "Startup Message"; this.btnStartMsg.Click += new System.EventHandler(this.btnStartMsg_Click); @@ -210,9 +213,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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnGeneral.Name = "btnGeneral"; - this.btnGeneral.Size = new System.Drawing.Size(168, 19); + this.btnGeneral.Size = new System.Drawing.Size(224, 23); this.btnGeneral.TabIndex = 0; this.btnGeneral.Text = "General"; this.btnGeneral.Click += new System.EventHandler(this.btnGeneral_Click); @@ -224,12 +227,12 @@ namespace VEPROMS 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(194, 17); - this.tcSysOpts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tcSysOpts.Location = new System.Drawing.Point(259, 21); + this.tcSysOpts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(491, 457); + this.tcSysOpts.Size = new System.Drawing.Size(655, 562); this.tcSysOpts.TabIndex = 3; this.tcSysOpts.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; this.tcSysOpts.Tabs.Add(this.tiGeneral); @@ -239,169 +242,37 @@ namespace VEPROMS this.tcSysOpts.Text = "tabControl1"; this.tcSysOpts.ThemeAware = true; // - // tabControlPanel1 - // - 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(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))); - this.tabControlPanel1.Style.GradientAngle = 90; - this.tabControlPanel1.TabIndex = 1; - this.tabControlPanel1.TabItem = this.tiGeneral; - this.tabControlPanel1.ThemeAware = true; - // - // tiGeneral - // - this.tiGeneral.AttachedControl = this.tabControlPanel1; - this.tiGeneral.Name = "tiGeneral"; - this.tiGeneral.Text = "General"; - // // tabControlPanel3 // + this.tabControlPanel3.Controls.Add(this.groupPanel4); 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(491, 430); + this.tabControlPanel3.Size = new System.Drawing.Size(655, 535); 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; this.tabControlPanel3.ThemeAware = true; // - // groupPanel2 - // - this.groupPanel2.BackColor = System.Drawing.Color.Transparent; - this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; - this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - 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(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(114, 107); - // - // - // - this.groupPanel2.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.groupPanel2.Style.BackColorGradientAngle = 90; - this.groupPanel2.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.groupPanel2.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel2.Style.BorderBottomWidth = 1; - this.groupPanel2.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.groupPanel2.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel2.Style.BorderLeftWidth = 1; - this.groupPanel2.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel2.Style.BorderRightWidth = 1; - this.groupPanel2.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.groupPanel2.Style.BorderTopWidth = 1; - this.groupPanel2.Style.CornerDiameter = 4; - this.groupPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.groupPanel2.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.groupPanel2.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.groupPanel2.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - this.groupPanel2.TabIndex = 2; - this.groupPanel2.Text = "Property Page Style"; - // - // cbPropGrid - // - this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; - 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(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(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(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(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(97, 20); - this.cbButtonIntrFace.TabIndex = 0; - this.cbButtonIntrFace.Text = "Button Interface"; - // - // tiIntrFaceStngs - // - this.tiIntrFaceStngs.AttachedControl = this.tabControlPanel3; - this.tiIntrFaceStngs.Name = "tiIntrFaceStngs"; - this.tiIntrFaceStngs.Text = "My Interface Settings"; - // - // tabControlPanel2 - // - 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(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))); - this.tabControlPanel2.Style.GradientAngle = 90; - this.tabControlPanel2.TabIndex = 2; - this.tabControlPanel2.TabItem = this.tiStUpMsg; - this.tabControlPanel2.ThemeAware = true; - // - // tiStUpMsg - // - this.tiStUpMsg.AttachedControl = this.tabControlPanel2; - this.tiStUpMsg.Name = "tiStUpMsg"; - this.tiStUpMsg.Text = "Startup Message"; - // - // btnReset - // - this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - 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(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"; - this.btnReset.Click += new System.EventHandler(this.btnReset_Click); - // - // superTooltip1 - // - this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - // // groupPanel3 // + this.groupPanel3.BackColor = System.Drawing.Color.Transparent; 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.Location = new System.Drawing.Point(404, 16); + this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(146, 62); + this.groupPanel3.Size = new System.Drawing.Size(195, 76); // // // @@ -430,27 +301,208 @@ namespace VEPROMS 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.Location = new System.Drawing.Point(9, 15); + this.colorPickerButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 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.Size = new System.Drawing.Size(137, 28); this.colorPickerButton1.TabIndex = 0; this.colorPickerButton1.SelectedColorChanged += new System.EventHandler(this.colorPickerButton1_SelectedColorChanged); // + // groupPanel2 + // + this.groupPanel2.BackColor = System.Drawing.Color.Transparent; + this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.groupPanel2.Name = "groupPanel2"; + this.groupPanel2.Size = new System.Drawing.Size(152, 132); + // + // + // + this.groupPanel2.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanel2.Style.BackColorGradientAngle = 90; + this.groupPanel2.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanel2.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel2.Style.BorderBottomWidth = 1; + this.groupPanel2.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanel2.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel2.Style.BorderLeftWidth = 1; + this.groupPanel2.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel2.Style.BorderRightWidth = 1; + this.groupPanel2.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel2.Style.BorderTopWidth = 1; + this.groupPanel2.Style.CornerDiameter = 4; + this.groupPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanel2.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanel2.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanel2.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + this.groupPanel2.TabIndex = 2; + this.groupPanel2.Text = "Property Page Style"; + // + // cbPropGrid + // + this.cbPropGrid.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.cbPropGrid.Location = new System.Drawing.Point(11, 73); + this.cbPropGrid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbPropGrid.Name = "cbPropGrid"; + this.cbPropGrid.Size = new System.Drawing.Size(109, 25); + 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbTabbedIntrFace.Name = "cbTabbedIntrFace"; + this.cbTabbedIntrFace.Size = new System.Drawing.Size(131, 25); + 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbButtonIntrFace.Name = "cbButtonIntrFace"; + this.cbButtonIntrFace.Size = new System.Drawing.Size(129, 25); + this.cbButtonIntrFace.TabIndex = 0; + this.cbButtonIntrFace.Text = "Button Interface"; + // + // tiIntrFaceStngs + // + this.tiIntrFaceStngs.AttachedControl = this.tabControlPanel3; + this.tiIntrFaceStngs.Name = "tiIntrFaceStngs"; + this.tiIntrFaceStngs.Text = "My Interface Settings"; + // + // tabControlPanel1 + // + 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(3, 2, 3, 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.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))); + this.tabControlPanel1.Style.GradientAngle = 90; + this.tabControlPanel1.TabIndex = 1; + this.tabControlPanel1.TabItem = this.tiGeneral; + this.tabControlPanel1.ThemeAware = true; + // + // tiGeneral + // + this.tiGeneral.AttachedControl = this.tabControlPanel1; + this.tiGeneral.Name = "tiGeneral"; + this.tiGeneral.Text = "General"; + // + // tabControlPanel2 + // + 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(3, 2, 3, 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.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))); + this.tabControlPanel2.Style.GradientAngle = 90; + this.tabControlPanel2.TabIndex = 2; + this.tabControlPanel2.TabItem = this.tiStUpMsg; + this.tabControlPanel2.ThemeAware = true; + // + // tiStUpMsg + // + this.tiStUpMsg.AttachedControl = this.tabControlPanel2; + this.tiStUpMsg.Name = "tiStUpMsg"; + this.tiStUpMsg.Text = "Startup Message"; + // + // btnReset + // + this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnReset.Location = new System.Drawing.Point(259, 606); + this.btnReset.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnReset.Name = "btnReset"; + this.btnReset.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.btnReset.Size = new System.Drawing.Size(105, 23); + 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"; + this.btnReset.Click += new System.EventHandler(this.btnReset_Click); + // + // superTooltip1 + // + this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; + // + // groupPanel4 + // + this.groupPanel4.BackColor = System.Drawing.Color.Transparent; + this.groupPanel4.CanvasColor = System.Drawing.SystemColors.Control; + this.groupPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.groupPanel4.Controls.Add(this.cbAnnotationPopup); + this.groupPanel4.Location = new System.Drawing.Point(52, 185); + this.groupPanel4.Name = "groupPanel4"; + this.groupPanel4.Size = new System.Drawing.Size(159, 79); + // + // + // + this.groupPanel4.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.groupPanel4.Style.BackColorGradientAngle = 90; + this.groupPanel4.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.groupPanel4.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel4.Style.BorderBottomWidth = 1; + this.groupPanel4.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.groupPanel4.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel4.Style.BorderLeftWidth = 1; + this.groupPanel4.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel4.Style.BorderRightWidth = 1; + this.groupPanel4.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.groupPanel4.Style.BorderTopWidth = 1; + this.groupPanel4.Style.CornerDiameter = 4; + this.groupPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.groupPanel4.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.groupPanel4.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.groupPanel4.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + this.groupPanel4.TabIndex = 4; + this.groupPanel4.Text = "Annotation Settings"; + // + // cbAnnotationPopup + // + this.cbAnnotationPopup.Checked = true; + this.cbAnnotationPopup.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbAnnotationPopup.CheckValue = "Y"; + this.cbAnnotationPopup.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbAnnotationPopup.Location = new System.Drawing.Point(10, 16); + this.cbAnnotationPopup.Name = "cbAnnotationPopup"; + this.cbAnnotationPopup.Size = new System.Drawing.Size(122, 23); + this.cbAnnotationPopup.TabIndex = 7; + this.cbAnnotationPopup.Text = "Auto Popup"; + this.cbAnnotationPopup.CheckedChanged += new System.EventHandler(this.cbAnnotationPopup_CheckedChanged); + // // frmSysOptions // this.AcceptButton = this.btnOK; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(699, 520); + this.ClientSize = new System.Drawing.Size(932, 640); 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmSysOptions"; this.Text = "VE-PROMS System Options"; this.groupPanel1.ResumeLayout(false); @@ -458,8 +510,9 @@ namespace VEPROMS ((System.ComponentModel.ISupportInitialize)(this.tcSysOpts)).EndInit(); this.tcSysOpts.ResumeLayout(false); this.tabControlPanel3.ResumeLayout(false); - this.groupPanel2.ResumeLayout(false); this.groupPanel3.ResumeLayout(false); + this.groupPanel2.ResumeLayout(false); + this.groupPanel4.ResumeLayout(false); this.ResumeLayout(false); } @@ -491,6 +544,8 @@ namespace VEPROMS private DevComponents.DotNetBar.SuperTooltip superTooltip1; private DevComponents.DotNetBar.Controls.GroupPanel groupPanel3; private DevComponents.DotNetBar.ColorPickerButton colorPickerButton1; + private DevComponents.DotNetBar.Controls.GroupPanel groupPanel4; + private DevComponents.DotNetBar.Controls.CheckBoxX cbAnnotationPopup; diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs index 32e1e75f..a8ec29a3 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.cs +++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs @@ -53,6 +53,7 @@ namespace VEPROMS break; } colorPickerButton1.SelectedColor = Settings.Default.TransitionRangeColor; + cbAnnotationPopup.Checked = Settings.Default.AutoPopUpAnnotations; } @@ -144,6 +145,11 @@ namespace VEPROMS } } + private void cbAnnotationPopup_CheckedChanged(object sender, EventArgs e) + { + Settings.Default.AutoPopUpAnnotations = cbAnnotationPopup.Checked; + } + diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.resx b/PROMS/VEPROMS User Interface/frmSysOptions.resx index bded3241..f7dae1dc 100644 --- a/PROMS/VEPROMS User Interface/frmSysOptions.resx +++ b/PROMS/VEPROMS User Interface/frmSysOptions.resx @@ -121,13 +121,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAC9JREFUOE9j/P// - PwNFAGoAyBSSMVgvzAAQTQoGWThqwGgYDMd0QFFmIiUToasFAIXCaLVvIg/JAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAASdAAA + EnQB3mYfeAAAAC9JREFUOE9j/P//PwNFAGoAyBSSMVgvzAAQTQoGWThqwGgYDMd0QFFmIiUToasFAIXC + aLVvIg/JAAAAAElFTkSuQmCC 17, 17 + + 17, 17 + AAABAAIAEBAQAAAABAAoAQAAJgAAACAgEAAAAAQA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAMAA diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 391c65a5..e0706be3 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -218,15 +218,19 @@ namespace VEPROMS this.labelItem14 = new DevComponents.DotNetBar.LabelItem(); this.btnGetRoVals = new DevComponents.DotNetBar.ButtonItem(); this.epAnnotations = new DevComponents.DotNetBar.ExpandablePanel(); - this.btnSaveAnnoation = new DevComponents.DotNetBar.ButtonX(); - this.cbGridAnnoType = new System.Windows.Forms.ComboBox(); - this.cbAnnotationDontPopup = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.btnAnnoationSettings = new DevComponents.DotNetBar.ButtonX(); + this.pannelAnnoEdit = new DevComponents.DotNetBar.PanelEx(); + this.rtxbComment = new System.Windows.Forms.RichTextBox(); + this.btnSaveAnnotation = new DevComponents.DotNetBar.ButtonX(); + this.btnCancelAnnoation = new DevComponents.DotNetBar.ButtonX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.cbGridAnnoType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.panelAnnoEditBtns = new DevComponents.DotNetBar.PanelEx(); this.btnRemoveAnnotation = new DevComponents.DotNetBar.ButtonX(); this.btnAddAnnotation = new DevComponents.DotNetBar.ButtonX(); + this.expandableSplitter4 = new DevComponents.DotNetBar.ExpandableSplitter(); + this.pannelAnnoGrid = new DevComponents.DotNetBar.PanelEx(); this.c1AnnotationGrid = new C1.Win.C1FlexGrid.C1FlexGrid(); this.itemAnnotationsBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.rtxbComment = new System.Windows.Forms.RichTextBox(); this.expandablePanel2 = new DevComponents.DotNetBar.ExpandablePanel(); this.tv = new Volian.Controls.Library.vlnTreeView(); this.infoPanel = new DevComponents.DotNetBar.ExpandablePanel(); @@ -254,6 +258,9 @@ namespace VEPROMS this.navigationPanePanel2 = new DevComponents.DotNetBar.NavigationPanePanel(); this.btnSimStpsRslt = new DevComponents.DotNetBar.ButtonItem(); this.infotabResults = new DevComponents.DotNetBar.TabItem(this.components); + this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); + this.displayTransition = new Volian.Controls.Library.DisplayTransition(); + this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.lbxBookMarks = new System.Windows.Forms.ListBox(); @@ -264,9 +271,6 @@ namespace VEPROMS this.infotabControlPanelRO = new DevComponents.DotNetBar.TabControlPanel(); this.displayRO = new Volian.Controls.Library.DisplayRO(); this.infotabRO = new DevComponents.DotNetBar.TabItem(this.components); - this.infotabControlPanelTransitions = new DevComponents.DotNetBar.TabControlPanel(); - this.displayTransition = new Volian.Controls.Library.DisplayTransition(); - this.infotabTransition = new DevComponents.DotNetBar.TabItem(this.components); this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter2 = new DevComponents.DotNetBar.ExpandableSplitter(); this.expandableSplitter3 = new DevComponents.DotNetBar.ExpandableSplitter(); @@ -280,6 +284,9 @@ namespace VEPROMS this.ribbonPanel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).BeginInit(); this.epAnnotations.SuspendLayout(); + this.pannelAnnoEdit.SuspendLayout(); + this.panelAnnoEditBtns.SuspendLayout(); + this.pannelAnnoGrid.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.c1AnnotationGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).BeginInit(); this.expandablePanel2.SuspendLayout(); @@ -295,10 +302,10 @@ namespace VEPROMS this.tabControlPanel3.SuspendLayout(); this.navpaneResults.SuspendLayout(); this.navpanSrchRslts.SuspendLayout(); + this.infotabControlPanelTransitions.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.panelEx4.SuspendLayout(); this.infotabControlPanelRO.SuspendLayout(); - this.infotabControlPanelTransitions.SuspendLayout(); this.SuspendLayout(); // // ribbonControl1 @@ -803,7 +810,6 @@ namespace VEPROMS // itemContainer13 // this.itemContainer13.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer13.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer13.Name = "itemContainer13"; this.itemContainer13.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnInsPgBrk, @@ -945,7 +951,6 @@ namespace VEPROMS // itemContainer12 // this.itemContainer12.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer12.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer12.Name = "itemContainer12"; this.itemContainer12.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnInsBefore, @@ -982,7 +987,6 @@ namespace VEPROMS // itemContainer11 // this.itemContainer11.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer11.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer11.Name = "itemContainer11"; this.itemContainer11.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnInsTrans, @@ -1031,7 +1035,6 @@ namespace VEPROMS // itemContainer6 // this.itemContainer6.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer6.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer6.Name = "itemContainer6"; this.itemContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer7, @@ -1039,7 +1042,6 @@ namespace VEPROMS // // itemContainer7 // - this.itemContainer7.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer7.Name = "itemContainer7"; this.itemContainer7.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnBold, @@ -1145,7 +1147,6 @@ namespace VEPROMS // itemContainer8 // this.itemContainer8.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer8.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer8.Name = "itemContainer8"; this.itemContainer8.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnClpBrdCopy, @@ -1194,7 +1195,7 @@ namespace VEPROMS this.ribbonPanel1.Location = new System.Drawing.Point(0, 55); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1028, 89); + this.ribbonPanel1.Size = new System.Drawing.Size(1114, 89); this.ribbonPanel1.TabIndex = 1; this.ribbonPanel1.Visible = false; // @@ -1217,7 +1218,6 @@ namespace VEPROMS // itemContainer10 // this.itemContainer10.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer10.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer10.Name = "itemContainer10"; this.itemContainer10.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnRepaginate, @@ -1312,7 +1312,6 @@ namespace VEPROMS // itemContainer9 // this.itemContainer9.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer9.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer9.Name = "itemContainer9"; this.itemContainer9.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnNew2, @@ -1728,7 +1727,6 @@ namespace VEPROMS // this.itemContainer1.BackgroundStyle.Class = "RibbonFileMenuContainer"; this.itemContainer1.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical; - this.itemContainer1.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer1.Name = "itemContainer1"; this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer2, @@ -1741,7 +1739,6 @@ namespace VEPROMS // this.itemContainer2.BackgroundStyle.Class = "RibbonFileMenuTwoColumnContainer"; this.itemContainer2.ItemSpacing = 0; - this.itemContainer2.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer2.Name = "itemContainer2"; this.itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.itemContainer3, @@ -1851,7 +1848,6 @@ namespace VEPROMS // this.itemContainer5.BackgroundStyle.Class = "RibbonFileMenuBottomContainer"; this.itemContainer5.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Right; - this.itemContainer5.MinimumSize = new System.Drawing.Size(0, 0); this.itemContainer5.Name = "itemContainer5"; this.itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnOptions, @@ -2157,14 +2153,9 @@ namespace VEPROMS this.epAnnotations.CanvasColor = System.Drawing.SystemColors.Control; this.epAnnotations.CollapseDirection = DevComponents.DotNetBar.eCollapseDirection.TopToBottom; this.epAnnotations.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.epAnnotations.Controls.Add(this.btnSaveAnnoation); - this.epAnnotations.Controls.Add(this.cbGridAnnoType); - this.epAnnotations.Controls.Add(this.cbAnnotationDontPopup); - this.epAnnotations.Controls.Add(this.btnAnnoationSettings); - this.epAnnotations.Controls.Add(this.btnRemoveAnnotation); - this.epAnnotations.Controls.Add(this.btnAddAnnotation); - this.epAnnotations.Controls.Add(this.c1AnnotationGrid); - this.epAnnotations.Controls.Add(this.rtxbComment); + this.epAnnotations.Controls.Add(this.pannelAnnoEdit); + this.epAnnotations.Controls.Add(this.expandableSplitter4); + this.epAnnotations.Controls.Add(this.pannelAnnoGrid); this.epAnnotations.Dock = System.Windows.Forms.DockStyle.Bottom; this.epAnnotations.ExpandOnTitleClick = true; this.epAnnotations.Location = new System.Drawing.Point(4, 547); @@ -2188,96 +2179,215 @@ namespace VEPROMS this.epAnnotations.TitleText = "Annotation Details"; this.epAnnotations.Layout += new System.Windows.Forms.LayoutEventHandler(this.epAnnotations_Layout); // - // btnSaveAnnoation + // pannelAnnoEdit // - this.btnSaveAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSaveAnnoation.Enabled = false; - this.btnSaveAnnoation.Location = new System.Drawing.Point(985, 95); - this.btnSaveAnnoation.Name = "btnSaveAnnoation"; - this.btnSaveAnnoation.Size = new System.Drawing.Size(86, 23); - this.btnSaveAnnoation.TabIndex = 8; - this.btnSaveAnnoation.Text = "Save"; - this.btnSaveAnnoation.Click += new System.EventHandler(this.buttonX1_Click); + this.pannelAnnoEdit.CanvasColor = System.Drawing.SystemColors.Control; + this.pannelAnnoEdit.Controls.Add(this.rtxbComment); + this.pannelAnnoEdit.Controls.Add(this.btnSaveAnnotation); + this.pannelAnnoEdit.Controls.Add(this.btnCancelAnnoation); + this.pannelAnnoEdit.Controls.Add(this.labelX1); + this.pannelAnnoEdit.Controls.Add(this.cbGridAnnoType); + this.pannelAnnoEdit.Controls.Add(this.panelAnnoEditBtns); + this.pannelAnnoEdit.Dock = System.Windows.Forms.DockStyle.Fill; + this.pannelAnnoEdit.Location = new System.Drawing.Point(507, 26); + this.pannelAnnoEdit.Name = "pannelAnnoEdit"; + this.pannelAnnoEdit.Size = new System.Drawing.Size(607, 176); + this.pannelAnnoEdit.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pannelAnnoEdit.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pannelAnnoEdit.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pannelAnnoEdit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pannelAnnoEdit.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pannelAnnoEdit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pannelAnnoEdit.Style.GradientAngle = 90; + this.pannelAnnoEdit.TabIndex = 13; + this.pannelAnnoEdit.Text = "panelEx2"; + this.pannelAnnoEdit.ThemeAware = true; + // + // rtxbComment + // + this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.rtxbComment.Dock = System.Windows.Forms.DockStyle.Bottom; + this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rtxbComment.Location = new System.Drawing.Point(87, 33); + this.rtxbComment.Name = "rtxbComment"; + this.rtxbComment.Size = new System.Drawing.Size(520, 143); + this.superTooltip1.SetSuperTooltip(this.rtxbComment, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation", "", "Enter the annotation information here.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.rtxbComment.TabIndex = 1; + this.rtxbComment.Text = ""; + this.rtxbComment.TextChanged += new System.EventHandler(this.rtxbComment_TextChanged); + // + // btnSaveAnnotation + // + this.btnSaveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSaveAnnotation.Enabled = false; + this.btnSaveAnnotation.Location = new System.Drawing.Point(419, 8); + this.btnSaveAnnotation.Name = "btnSaveAnnotation"; + this.btnSaveAnnotation.Size = new System.Drawing.Size(71, 20); + this.superTooltip1.SetSuperTooltip(this.btnSaveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Save Changes", "", "This will save the new annotation or changes made to an existing annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnSaveAnnotation.TabIndex = 9; + this.btnSaveAnnotation.Text = "Save"; + this.btnSaveAnnotation.Click += new System.EventHandler(this.btnSaveAnnotation_Click); + // + // btnCancelAnnoation + // + this.btnCancelAnnoation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancelAnnoation.Enabled = false; + this.btnCancelAnnoation.Location = new System.Drawing.Point(329, 8); + this.btnCancelAnnoation.Name = "btnCancelAnnoation"; + this.btnCancelAnnoation.Size = new System.Drawing.Size(70, 20); + this.superTooltip1.SetSuperTooltip(this.btnCancelAnnoation, new DevComponents.DotNetBar.SuperTooltipInfo("Cancel", "", "This will cancel the changes made to the annotation text and type selection", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(145, 100))); + this.btnCancelAnnoation.TabIndex = 8; + this.btnCancelAnnoation.Text = "Cancel"; + this.btnCancelAnnoation.Click += new System.EventHandler(this.btnCancelAnnoation_Click); + // + // labelX1 + // + this.labelX1.AutoSize = true; + this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelX1.Location = new System.Drawing.Point(93, 8); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(35, 17); + this.labelX1.TabIndex = 10; + this.labelX1.Text = "Type:"; // // cbGridAnnoType // + this.cbGridAnnoType.FlatStyle = System.Windows.Forms.FlatStyle.Standard; + this.cbGridAnnoType.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbGridAnnoType.FormattingEnabled = true; - this.cbGridAnnoType.Location = new System.Drawing.Point(342, 62); + this.cbGridAnnoType.Location = new System.Drawing.Point(134, 4); this.cbGridAnnoType.Name = "cbGridAnnoType"; - this.cbGridAnnoType.Size = new System.Drawing.Size(139, 24); + this.cbGridAnnoType.PreventEnterBeep = true; + this.cbGridAnnoType.Size = new System.Drawing.Size(165, 24); + this.superTooltip1.SetSuperTooltip(this.cbGridAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "This drop down list contains the posible annotation types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbGridAnnoType.TabIndex = 7; - this.cbGridAnnoType.Visible = false; + this.cbGridAnnoType.WatermarkText = "Select Annotation Type"; this.cbGridAnnoType.Validating += new System.ComponentModel.CancelEventHandler(this.cbGridAnnoType_Validating); + this.cbGridAnnoType.SelectedValueChanged += new System.EventHandler(this.cbGridAnnoType_SelectedValueChanged); // - // cbAnnotationDontPopup + // panelAnnoEditBtns // - this.cbAnnotationDontPopup.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbAnnotationDontPopup.Location = new System.Drawing.Point(963, 173); - this.cbAnnotationDontPopup.Name = "cbAnnotationDontPopup"; - this.cbAnnotationDontPopup.Size = new System.Drawing.Size(176, 23); - this.cbAnnotationDontPopup.TabIndex = 6; - this.cbAnnotationDontPopup.Text = "Don\'t Auto Popup"; - // - // btnAnnoationSettings - // - this.btnAnnoationSettings.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnAnnoationSettings.Location = new System.Drawing.Point(986, 144); - this.btnAnnoationSettings.Name = "btnAnnoationSettings"; - this.btnAnnoationSettings.Size = new System.Drawing.Size(85, 23); - this.btnAnnoationSettings.TabIndex = 5; - this.btnAnnoationSettings.Text = "Settings..."; + this.panelAnnoEditBtns.CanvasColor = System.Drawing.Color.Transparent; + this.panelAnnoEditBtns.Controls.Add(this.btnRemoveAnnotation); + this.panelAnnoEditBtns.Controls.Add(this.btnAddAnnotation); + this.panelAnnoEditBtns.Dock = System.Windows.Forms.DockStyle.Left; + this.panelAnnoEditBtns.Location = new System.Drawing.Point(0, 0); + this.panelAnnoEditBtns.Name = "panelAnnoEditBtns"; + this.panelAnnoEditBtns.Size = new System.Drawing.Size(87, 176); + this.panelAnnoEditBtns.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelAnnoEditBtns.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelAnnoEditBtns.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelAnnoEditBtns.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelAnnoEditBtns.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelAnnoEditBtns.Style.GradientAngle = 90; + this.panelAnnoEditBtns.TabIndex = 11; + this.panelAnnoEditBtns.Text = "panelEx2"; + this.panelAnnoEditBtns.ThemeAware = true; // // btnRemoveAnnotation // this.btnRemoveAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnRemoveAnnotation.Location = new System.Drawing.Point(986, 63); + this.btnRemoveAnnotation.Location = new System.Drawing.Point(6, 34); this.btnRemoveAnnotation.Name = "btnRemoveAnnotation"; - this.btnRemoveAnnotation.Size = new System.Drawing.Size(85, 23); + this.btnRemoveAnnotation.Size = new System.Drawing.Size(71, 20); + this.superTooltip1.SetSuperTooltip(this.btnRemoveAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Remove Annotation", "", "This will remove the currently selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnRemoveAnnotation.TabIndex = 4; this.btnRemoveAnnotation.Text = "Remove"; + this.btnRemoveAnnotation.Click += new System.EventHandler(this.btnRemoveAnnotation_Click); // // btnAddAnnotation // this.btnAddAnnotation.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnAddAnnotation.Location = new System.Drawing.Point(984, 34); + this.btnAddAnnotation.Location = new System.Drawing.Point(6, 4); this.btnAddAnnotation.Name = "btnAddAnnotation"; - this.btnAddAnnotation.Size = new System.Drawing.Size(87, 23); + this.btnAddAnnotation.Size = new System.Drawing.Size(71, 20); + this.superTooltip1.SetSuperTooltip(this.btnAddAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Add New Annotation", "", "This button will create a new annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnAddAnnotation.TabIndex = 3; this.btnAddAnnotation.Text = "Add"; + this.btnAddAnnotation.Click += new System.EventHandler(this.btnAddAnnotation_Click); + // + // expandableSplitter4 + // + this.expandableSplitter4.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.expandableSplitter4.ExpandableControl = this.epAnnotations; + this.expandableSplitter4.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter4.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter4.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter4.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter4.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter4.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.expandableSplitter4.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(151)))), ((int)(((byte)(61))))); + this.expandableSplitter4.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(184)))), ((int)(((byte)(94))))); + this.expandableSplitter4.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; + this.expandableSplitter4.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; + this.expandableSplitter4.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.expandableSplitter4.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; + this.expandableSplitter4.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(173)))), ((int)(((byte)(182))))); + this.expandableSplitter4.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.expandableSplitter4.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); + this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; + this.expandableSplitter4.Location = new System.Drawing.Point(504, 26); + this.expandableSplitter4.Name = "expandableSplitter4"; + this.expandableSplitter4.Size = new System.Drawing.Size(3, 176); + this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; + this.expandableSplitter4.TabIndex = 12; + this.expandableSplitter4.TabStop = false; + // + // pannelAnnoGrid + // + this.pannelAnnoGrid.CanvasColor = System.Drawing.SystemColors.Control; + this.pannelAnnoGrid.Controls.Add(this.c1AnnotationGrid); + this.pannelAnnoGrid.Dock = System.Windows.Forms.DockStyle.Left; + this.pannelAnnoGrid.Location = new System.Drawing.Point(0, 26); + this.pannelAnnoGrid.Name = "pannelAnnoGrid"; + this.pannelAnnoGrid.Size = new System.Drawing.Size(504, 176); + this.pannelAnnoGrid.Style.Alignment = System.Drawing.StringAlignment.Center; + this.pannelAnnoGrid.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.pannelAnnoGrid.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.pannelAnnoGrid.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.pannelAnnoGrid.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.pannelAnnoGrid.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.pannelAnnoGrid.Style.GradientAngle = 90; + this.pannelAnnoGrid.TabIndex = 11; + this.pannelAnnoGrid.Text = "panelEx2"; + this.pannelAnnoGrid.ThemeAware = true; // // c1AnnotationGrid // this.c1AnnotationGrid.AllowAddNew = true; this.c1AnnotationGrid.AllowDelete = true; + this.c1AnnotationGrid.AllowEditing = false; this.c1AnnotationGrid.AutoGenerateColumns = false; + this.c1AnnotationGrid.AutoResize = false; + this.c1AnnotationGrid.BackColor = System.Drawing.Color.Transparent; + this.c1AnnotationGrid.CausesValidation = false; this.c1AnnotationGrid.ColumnInfo = resources.GetString("c1AnnotationGrid.ColumnInfo"); this.c1AnnotationGrid.DataSource = this.itemAnnotationsBindingSource; + this.c1AnnotationGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.c1AnnotationGrid.ExtendLastCol = true; - this.c1AnnotationGrid.Location = new System.Drawing.Point(342, 34); + this.c1AnnotationGrid.Location = new System.Drawing.Point(0, 0); this.c1AnnotationGrid.Name = "c1AnnotationGrid"; this.c1AnnotationGrid.Rows.Count = 1; this.c1AnnotationGrid.Rows.DefaultSize = 20; + this.c1AnnotationGrid.SelectionMode = C1.Win.C1FlexGrid.SelectionModeEnum.Row; this.c1AnnotationGrid.ShowErrors = true; - this.c1AnnotationGrid.Size = new System.Drawing.Size(615, 162); + this.c1AnnotationGrid.Size = new System.Drawing.Size(504, 176); this.c1AnnotationGrid.StyleInfo = resources.GetString("c1AnnotationGrid.StyleInfo"); + this.superTooltip1.SetSuperTooltip(this.c1AnnotationGrid, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation List", "", "This is a list of the annotations associated with the currenly selected procedure" + + " item.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(200, 80))); this.c1AnnotationGrid.TabIndex = 2; + this.c1AnnotationGrid.EnterCell += new System.EventHandler(this.c1AnnotationGrid_EnterCell); // // itemAnnotationsBindingSource // this.itemAnnotationsBindingSource.DataSource = typeof(VEPROMS.CSLA.Library.ItemAnnotation); - this.itemAnnotationsBindingSource.DataSourceChanged += new System.EventHandler(this.itemAnnotationsBindingSource_DataSourceChanged); - // - // rtxbComment - // - this.rtxbComment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.rtxbComment.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); - this.rtxbComment.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.rtxbComment.Location = new System.Drawing.Point(0, 26); - this.rtxbComment.Name = "rtxbComment"; - this.rtxbComment.Size = new System.Drawing.Size(336, 176); - this.rtxbComment.TabIndex = 1; - this.rtxbComment.Text = ""; + //this.itemAnnotationsBindingSource.DataSourceChanged += new System.EventHandler(this.itemAnnotationsBindingSource_DataSourceChanged); // // expandablePanel2 // @@ -2287,7 +2397,7 @@ namespace VEPROMS this.expandablePanel2.Controls.Add(this.tv); this.expandablePanel2.Dock = System.Windows.Forms.DockStyle.Left; this.expandablePanel2.Expanded = false; - this.expandablePanel2.ExpandedBounds = new System.Drawing.Rectangle(4, 147, 251, 574); + this.expandablePanel2.ExpandedBounds = new System.Drawing.Rectangle(4, 147, 251, 576); this.expandablePanel2.ExpandOnTitleClick = true; this.expandablePanel2.Location = new System.Drawing.Point(4, 147); this.expandablePanel2.Name = "expandablePanel2"; @@ -2355,9 +2465,9 @@ namespace VEPROMS this.infoTabs.CanReorderTabs = true; this.infoTabs.Controls.Add(this.tabControlPanel1); this.infoTabs.Controls.Add(this.tabControlPanel3); + this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Controls.Add(this.tabControlPanel2); this.infoTabs.Controls.Add(this.infotabControlPanelRO); - this.infoTabs.Controls.Add(this.infotabControlPanelTransitions); this.infoTabs.Dock = System.Windows.Forms.DockStyle.Fill; this.infoTabs.Location = new System.Drawing.Point(0, 26); this.infoTabs.Name = "infoTabs"; @@ -2373,6 +2483,7 @@ namespace VEPROMS this.infoTabs.Tabs.Add(this.infotabRO); this.infoTabs.Tabs.Add(this.infotabTransition); this.infoTabs.Text = "tabControl1"; + this.infoTabs.ThemeAware = true; // // tabControlPanel1 // @@ -2381,16 +2492,15 @@ namespace VEPROMS this.tabControlPanel1.Location = new System.Drawing.Point(0, 0); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(204, 374); - this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(179)))), ((int)(((byte)(231))))); - this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.tabControlPanel1.Size = new System.Drawing.Size(203, 374); + this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(97)))), ((int)(((byte)(156))))); this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 180; this.tabControlPanel1.TabIndex = 1; this.tabControlPanel1.TabItem = this.infotabTags; + this.tabControlPanel1.ThemeAware = true; // // panelEx1 // @@ -2403,7 +2513,7 @@ namespace VEPROMS this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(1, 1); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(202, 372); + this.panelEx1.Size = new System.Drawing.Size(201, 372); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.SlateGray; @@ -2420,7 +2530,7 @@ namespace VEPROMS this.groupPanel4.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel4.Location = new System.Drawing.Point(0, 362); this.groupPanel4.Name = "groupPanel4"; - this.groupPanel4.Size = new System.Drawing.Size(202, 100); + this.groupPanel4.Size = new System.Drawing.Size(201, 100); // // // @@ -2465,7 +2575,7 @@ namespace VEPROMS this.groupPanel3.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel3.Location = new System.Drawing.Point(0, 262); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(202, 100); + this.groupPanel3.Size = new System.Drawing.Size(201, 100); // // // @@ -2506,7 +2616,7 @@ namespace VEPROMS this.groupPanel2.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel2.Location = new System.Drawing.Point(0, 122); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(202, 140); + this.groupPanel2.Size = new System.Drawing.Size(201, 140); // // // @@ -2555,7 +2665,7 @@ namespace VEPROMS this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(202, 122); + this.groupPanel1.Size = new System.Drawing.Size(201, 122); // // // @@ -2638,16 +2748,15 @@ namespace VEPROMS this.tabControlPanel3.Location = new System.Drawing.Point(0, 0); this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(204, 374); - this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(179)))), ((int)(((byte)(231))))); - this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.tabControlPanel3.Size = new System.Drawing.Size(203, 374); + this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(97)))), ((int)(((byte)(156))))); this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel3.Style.GradientAngle = 180; this.tabControlPanel3.TabIndex = 3; this.tabControlPanel3.TabItem = this.infotabResults; + this.tabControlPanel3.ThemeAware = true; // // navpaneResults // @@ -2663,7 +2772,7 @@ namespace VEPROMS this.navpaneResults.Name = "navpaneResults"; this.navpaneResults.NavigationBarHeight = 33; this.navpaneResults.Padding = new System.Windows.Forms.Padding(1); - this.navpaneResults.Size = new System.Drawing.Size(202, 372); + this.navpaneResults.Size = new System.Drawing.Size(201, 372); this.navpaneResults.TabIndex = 0; // // @@ -2672,7 +2781,7 @@ namespace VEPROMS this.navpaneResults.TitlePanel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.navpaneResults.TitlePanel.Location = new System.Drawing.Point(1, 1); this.navpaneResults.TitlePanel.Name = "panelTitle"; - this.navpaneResults.TitlePanel.Size = new System.Drawing.Size(200, 24); + this.navpaneResults.TitlePanel.Size = new System.Drawing.Size(199, 24); this.navpaneResults.TitlePanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.navpaneResults.TitlePanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.navpaneResults.TitlePanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -2682,7 +2791,7 @@ namespace VEPROMS this.navpaneResults.TitlePanel.Style.GradientAngle = 90; this.navpaneResults.TitlePanel.Style.MarginLeft = 4; this.navpaneResults.TitlePanel.TabIndex = 0; - this.navpaneResults.TitlePanel.Text = "Search Results"; + this.navpaneResults.TitlePanel.Text = "Annotation Search"; // // navpanSrchRslts // @@ -2692,7 +2801,7 @@ namespace VEPROMS this.navpanSrchRslts.Location = new System.Drawing.Point(1, 25); this.navpanSrchRslts.Name = "navpanSrchRslts"; this.navpanSrchRslts.ParentItem = this.btnSrchRslt; - this.navpanSrchRslts.Size = new System.Drawing.Size(200, 313); + this.navpanSrchRslts.Size = new System.Drawing.Size(199, 313); this.navpanSrchRslts.Style.Alignment = System.Drawing.StringAlignment.Center; this.navpanSrchRslts.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.navpanSrchRslts.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; @@ -2708,7 +2817,7 @@ namespace VEPROMS this.lbResults.ItemHeight = 16; this.lbResults.Location = new System.Drawing.Point(0, 23); this.lbResults.Name = "lbResults"; - this.lbResults.Size = new System.Drawing.Size(200, 276); + this.lbResults.Size = new System.Drawing.Size(199, 276); this.lbResults.TabIndex = 1; this.lbResults.SelectedValueChanged += new System.EventHandler(this.lbResults_SelectedValueChanged); // @@ -2721,7 +2830,9 @@ namespace VEPROMS this.cbAnnoType.ItemHeight = 17; this.cbAnnoType.Location = new System.Drawing.Point(0, 0); this.cbAnnoType.Name = "cbAnnoType"; - this.cbAnnoType.Size = new System.Drawing.Size(200, 23); + this.cbAnnoType.Size = new System.Drawing.Size(199, 23); + this.superTooltip1.SetSuperTooltip(this.cbAnnoType, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Type", "", "Select the annotation type.\r\n\r\nThe window below will display all of the annotatio" + + "ns of that type.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 110))); this.cbAnnoType.TabIndex = 0; this.cbAnnoType.SelectedValueChanged += new System.EventHandler(this.cbAnnoType_SelectedValueChanged); // @@ -2733,8 +2844,8 @@ namespace VEPROMS this.btnSrchRslt.ImagePaddingHorizontal = 8; this.btnSrchRslt.Name = "btnSrchRslt"; this.btnSrchRslt.OptionGroup = "navBar"; - this.superTooltip1.SetSuperTooltip(this.btnSrchRslt, new DevComponents.DotNetBar.SuperTooltipInfo("Search Results", "", "Display the results from the last search", null, null, DevComponents.DotNetBar.eTooltipColor.System)); - this.btnSrchRslt.Text = "Search Results"; + this.superTooltip1.SetSuperTooltip(this.btnSrchRslt, new DevComponents.DotNetBar.SuperTooltipInfo("Annotation Search", "", "Will display a list of all annotations of a selected type.", null, null, DevComponents.DotNetBar.eTooltipColor.System)); + this.btnSrchRslt.Text = "Annotation Search"; // // navigationPanePanel2 // @@ -2742,7 +2853,7 @@ namespace VEPROMS this.navigationPanePanel2.Location = new System.Drawing.Point(1, 1); this.navigationPanePanel2.Name = "navigationPanePanel2"; this.navigationPanePanel2.ParentItem = this.btnSimStpsRslt; - this.navigationPanePanel2.Size = new System.Drawing.Size(200, 337); + this.navigationPanePanel2.Size = new System.Drawing.Size(199, 337); this.navigationPanePanel2.Style.Alignment = System.Drawing.StringAlignment.Center; this.navigationPanePanel2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.navigationPanePanel2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2; @@ -2764,7 +2875,46 @@ namespace VEPROMS // this.infotabResults.AttachedControl = this.tabControlPanel3; this.infotabResults.Name = "infotabResults"; - this.infotabResults.Text = "Results"; + this.infotabResults.Text = "Search"; + // + // infotabControlPanelTransitions + // + this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); + this.infotabControlPanelTransitions.Dock = System.Windows.Forms.DockStyle.Fill; + this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0); + this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions"; + this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 374); + this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; + this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.infotabControlPanelTransitions.Style.GradientAngle = 180; + this.infotabControlPanelTransitions.TabIndex = 5; + this.infotabControlPanelTransitions.TabItem = this.infotabTransition; + this.infotabControlPanelTransitions.ThemeAware = true; + this.infotabControlPanelTransitions.Click += new System.EventHandler(this.infotabTransition_Click); + // + // displayTransition + // + this.displayTransition.AutoSize = true; + this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.displayTransition.CurTrans = null; + this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill; + this.displayTransition.Location = new System.Drawing.Point(1, 1); + this.displayTransition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.displayTransition.MyRTB = null; + this.displayTransition.Name = "displayTransition"; + this.displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; + this.displayTransition.Size = new System.Drawing.Size(201, 372); + this.displayTransition.TabIndex = 0; + // + // infotabTransition + // + this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions; + this.infotabTransition.Name = "infotabTransition"; + this.infotabTransition.Text = "Transition"; + this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click); // // tabControlPanel2 // @@ -2773,16 +2923,15 @@ namespace VEPROMS this.tabControlPanel2.Location = new System.Drawing.Point(0, 0); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(204, 374); - this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(179)))), ((int)(((byte)(231))))); - this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.tabControlPanel2.Size = new System.Drawing.Size(203, 374); + this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(97)))), ((int)(((byte)(156))))); this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel2.Style.GradientAngle = 180; this.tabControlPanel2.TabIndex = 2; this.tabControlPanel2.TabItem = this.infotabBookMarks; + this.tabControlPanel2.ThemeAware = true; // // panelEx4 // @@ -2796,7 +2945,7 @@ namespace VEPROMS this.panelEx4.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx4.Location = new System.Drawing.Point(1, 1); this.panelEx4.Name = "panelEx4"; - this.panelEx4.Size = new System.Drawing.Size(202, 372); + this.panelEx4.Size = new System.Drawing.Size(201, 372); this.panelEx4.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx4.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.panelEx4.Style.BackColor2.Color = System.Drawing.Color.SlateGray; @@ -2813,7 +2962,7 @@ namespace VEPROMS this.lbxBookMarks.ItemHeight = 16; this.lbxBookMarks.Location = new System.Drawing.Point(0, 87); this.lbxBookMarks.Name = "lbxBookMarks"; - this.lbxBookMarks.Size = new System.Drawing.Size(202, 276); + this.lbxBookMarks.Size = new System.Drawing.Size(201, 276); this.lbxBookMarks.TabIndex = 3; this.lbxBookMarks.Click += new System.EventHandler(this.lbxBookMarks_Click); // @@ -2823,7 +2972,7 @@ namespace VEPROMS this.btnClrBookMrks.Dock = System.Windows.Forms.DockStyle.Top; this.btnClrBookMrks.Location = new System.Drawing.Point(0, 58); this.btnClrBookMrks.Name = "btnClrBookMrks"; - this.btnClrBookMrks.Size = new System.Drawing.Size(202, 29); + this.btnClrBookMrks.Size = new System.Drawing.Size(201, 29); this.btnClrBookMrks.TabIndex = 2; this.btnClrBookMrks.Text = "Clear ALL Bookmarks"; this.btnClrBookMrks.ThemeAware = true; @@ -2835,7 +2984,7 @@ namespace VEPROMS this.btnRmvCurBookMrk.Dock = System.Windows.Forms.DockStyle.Top; this.btnRmvCurBookMrk.Location = new System.Drawing.Point(0, 29); this.btnRmvCurBookMrk.Name = "btnRmvCurBookMrk"; - this.btnRmvCurBookMrk.Size = new System.Drawing.Size(202, 29); + this.btnRmvCurBookMrk.Size = new System.Drawing.Size(201, 29); this.btnRmvCurBookMrk.TabIndex = 1; this.btnRmvCurBookMrk.Text = "Remove Bookmark"; this.btnRmvCurBookMrk.ThemeAware = true; @@ -2847,7 +2996,7 @@ namespace VEPROMS this.btnSetBookMrk.Dock = System.Windows.Forms.DockStyle.Top; this.btnSetBookMrk.Location = new System.Drawing.Point(0, 0); this.btnSetBookMrk.Name = "btnSetBookMrk"; - this.btnSetBookMrk.Size = new System.Drawing.Size(202, 29); + this.btnSetBookMrk.Size = new System.Drawing.Size(201, 29); this.btnSetBookMrk.TabIndex = 0; this.btnSetBookMrk.Text = "Set Bookmark"; this.btnSetBookMrk.ThemeAware = true; @@ -2866,16 +3015,15 @@ namespace VEPROMS this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelRO.Name = "infotabControlPanelRO"; this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelRO.Size = new System.Drawing.Size(204, 374); - this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(179)))), ((int)(((byte)(231))))); - this.infotabControlPanelRO.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 374); + this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.infotabControlPanelRO.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(97)))), ((int)(((byte)(156))))); this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) | DevComponents.DotNetBar.eBorderSide.Bottom))); this.infotabControlPanelRO.Style.GradientAngle = 180; this.infotabControlPanelRO.TabIndex = 4; this.infotabControlPanelRO.TabItem = this.infotabRO; + this.infotabControlPanelRO.ThemeAware = true; // // displayRO // @@ -2886,7 +3034,7 @@ namespace VEPROMS this.displayRO.MyROFST = null; this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; - this.displayRO.Size = new System.Drawing.Size(202, 372); + this.displayRO.Size = new System.Drawing.Size(201, 372); this.displayRO.TabIndex = 0; // // infotabRO @@ -2896,46 +3044,6 @@ namespace VEPROMS this.infotabRO.Text = "RO"; this.infotabRO.Click += new System.EventHandler(this.infotabRO_Click); // - // infotabControlPanelTransitions - // - this.infotabControlPanelTransitions.Controls.Add(this.displayTransition); - this.infotabControlPanelTransitions.Dock = System.Windows.Forms.DockStyle.Fill; - this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0); - this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions"; - this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTransitions.Size = new System.Drawing.Size(204, 374); - this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(142)))), ((int)(((byte)(179)))), ((int)(((byte)(231))))); - this.infotabControlPanelTransitions.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(237)))), ((int)(((byte)(254))))); - this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.infotabControlPanelTransitions.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(97)))), ((int)(((byte)(156))))); - this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.infotabControlPanelTransitions.Style.GradientAngle = 180; - this.infotabControlPanelTransitions.TabIndex = 5; - this.infotabControlPanelTransitions.TabItem = this.infotabTransition; - this.infotabControlPanelTransitions.Click += new System.EventHandler(this.infotabTransition_Click); - // - // displayTransition - // - this.displayTransition.AutoSize = true; - this.displayTransition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.displayTransition.CurTrans = null; - this.displayTransition.Dock = System.Windows.Forms.DockStyle.Fill; - this.displayTransition.Location = new System.Drawing.Point(1, 1); - this.displayTransition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.displayTransition.MyRTB = null; - this.displayTransition.Name = "displayTransition"; - this.displayTransition.RangeColor = global::VEPROMS.Properties.Settings.Default.TransitionRangeColor; - this.displayTransition.Size = new System.Drawing.Size(202, 372); - this.displayTransition.TabIndex = 0; - // - // infotabTransition - // - this.infotabTransition.AttachedControl = this.infotabControlPanelTransitions; - this.infotabTransition.Name = "infotabTransition"; - this.infotabTransition.Text = "Transition"; - this.infotabTransition.Click += new System.EventHandler(this.infotabTransition_Click); - // // expandableSplitter1 // this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(45)))), ((int)(((byte)(150))))); @@ -3044,7 +3152,7 @@ namespace VEPROMS this.tc.SelectedDisplayTabItem = null; this.tc.Size = new System.Drawing.Size(848, 397); this.tc.TabIndex = 8; - this.tc.ItemSelectedChanged += new Volian.Controls.Library.StepPanelEvent(this.tc_ItemSelectedChanged); + this.tc.ItemSelectedChanged += new Volian.Controls.Library.ItemSelectedChangedEvent(this.tc_ItemSelectedChanged); this.tc.LinkModifyTran += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyTran); this.tc.LinkModifyRO += new Volian.Controls.Library.StepPanelLinkEvent(this.tc_LinkModifyRO); // @@ -3076,6 +3184,10 @@ namespace VEPROMS this.ribbonPanel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bottomBar)).EndInit(); this.epAnnotations.ResumeLayout(false); + this.pannelAnnoEdit.ResumeLayout(false); + this.pannelAnnoEdit.PerformLayout(); + this.panelAnnoEditBtns.ResumeLayout(false); + this.pannelAnnoGrid.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.c1AnnotationGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.itemAnnotationsBindingSource)).EndInit(); this.expandablePanel2.ResumeLayout(false); @@ -3091,11 +3203,11 @@ namespace VEPROMS this.tabControlPanel3.ResumeLayout(false); this.navpaneResults.ResumeLayout(false); this.navpanSrchRslts.ResumeLayout(false); + this.infotabControlPanelTransitions.ResumeLayout(false); + this.infotabControlPanelTransitions.PerformLayout(); this.tabControlPanel2.ResumeLayout(false); this.panelEx4.ResumeLayout(false); this.infotabControlPanelRO.ResumeLayout(false); - this.infotabControlPanelTransitions.ResumeLayout(false); - this.infotabControlPanelTransitions.PerformLayout(); this.ResumeLayout(false); } @@ -3188,8 +3300,6 @@ namespace VEPROMS private DevComponents.DotNetBar.SuperTooltip superTooltip1; private DevComponents.DotNetBar.ButtonX btnRemoveAnnotation; private DevComponents.DotNetBar.ButtonX btnAddAnnotation; - private DevComponents.DotNetBar.Controls.CheckBoxX cbAnnotationDontPopup; - private DevComponents.DotNetBar.ButtonX btnAnnoationSettings; private DevComponents.DotNetBar.ButtonItem btnMarkPrevPos; private DevComponents.DotNetBar.ButtonItem btnPrevPos; private DevComponents.DotNetBar.LabelItem labelItem2; @@ -3344,8 +3454,15 @@ namespace VEPROMS private DevComponents.DotNetBar.Controls.ComboBoxEx cbAnnoType; private System.Windows.Forms.ListBox lbResults; private System.Windows.Forms.ToolTip toolTip1; - private System.Windows.Forms.ComboBox cbGridAnnoType; - private DevComponents.DotNetBar.ButtonX btnSaveAnnoation; + //private System.Windows.Forms.ComboBox cbGridAnnoType; + private DevComponents.DotNetBar.Controls.ComboBoxEx cbGridAnnoType; + private DevComponents.DotNetBar.ButtonX btnCancelAnnoation; + private DevComponents.DotNetBar.ButtonX btnSaveAnnotation; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter4; + private DevComponents.DotNetBar.PanelEx pannelAnnoGrid; + private DevComponents.DotNetBar.PanelEx pannelAnnoEdit; + private DevComponents.DotNetBar.PanelEx panelAnnoEditBtns; } } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 886b34e3..9fa82edd 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -106,15 +106,13 @@ namespace VEPROMS private void SetupAnnotations() { - cbAnnoType.DataSource = AnnotationTypeInfoList.Get(); cbAnnoType.DisplayMember = "Name"; + cbAnnoType.DataSource = AnnotationTypeInfoList.Get(); lbResults.MouseMove += new MouseEventHandler(lbResults_MouseMove); - //comboBox1.DataSource = AnnotationTypeInfo.AllList(); //AnnotationType.AllTypes(); - ////comboBox1.DataSource = AnnotationTypeInfoList.Get(); - //comboBox1.DisplayMember = "_Name"; - foreach (AnnotationTypeInfo item in cbAnnoType.Items) - cbGridAnnoType.Items.Add(item); - c1AnnotationGrid.Cols[0].Editor = cbGridAnnoType; + + cbGridAnnoType.DisplayMember = "Name"; + cbGridAnnoType.ValueMember = "TypeId"; + cbGridAnnoType.DataSource = AnnotationTypeInfoList.Get().Clone(); } #region MRU @@ -221,7 +219,7 @@ namespace VEPROMS tc.OpenItem((ItemInfo)_LastProcedureInfo); // Display any annotations - itemAnnotationsBindingSource.DataSource = _LastProcedureInfo.ItemAnnotations; + //itemAnnotationsBindingSource.DataSource = _LastProcedureInfo.ItemAnnotations; } else if (node.VEObject.GetType() == typeof(SectionInfo)) { @@ -229,7 +227,7 @@ namespace VEPROMS _LastSection = _LastSectionInfo.Get(); tc.OpenItem((ItemInfo)_LastSectionInfo); // Display any annotations - itemAnnotationsBindingSource.DataSource = _LastSectionInfo.ItemAnnotations; + //itemAnnotationsBindingSource.DataSource = _LastSectionInfo.ItemAnnotations; } else if (node.VEObject.GetType() == typeof(StepInfo)) { @@ -237,7 +235,7 @@ namespace VEPROMS _LastStep = _LastStepInfo.Get(); tc.OpenItem((ItemInfo)_LastStepInfo); // Display any annotations - itemAnnotationsBindingSource.DataSource = _LastStepInfo.ItemAnnotations; + //itemAnnotationsBindingSource.DataSource = _LastStepInfo.ItemAnnotations; #region Sample Display Table Code // display an exiting table in that rtf grid thing //if ((_LastStepInfo.MyContent.Type == 20007) || (_LastStepInfo.MyContent.Type == 20009)) @@ -813,8 +811,8 @@ namespace VEPROMS private void RefreshBookMarkData() { lbxBookMarks.DataSource = null; - lbxBookMarks.DataSource = _MyBookMarks; lbxBookMarks.DisplayMember = "MenuTitle"; + lbxBookMarks.DataSource = _MyBookMarks; btnClrBookMrks.Enabled = (lbxBookMarks.Items.Count > 0); } @@ -1153,81 +1151,182 @@ namespace VEPROMS displayTransition.CurTrans = null; } #endregion - private void tc_ItemSelectedChanged(object sender, StepPanelEventArgs args) +private AnnotationInfoList _Annotations; + private ItemInfo _CurrentItem = null; + + private void tc_ItemSelectedChanged(object sender,ItemSelectedChangedEventArgs args) { + //CurrentAnnotation = null; if (args == null) - itemAnnotationsBindingSource.DataSource = null; + { + _CurrentItem = null; + CurrentAnnotation = null; + _Annotations = null; + itemAnnotationsBindingSource.DataSource = _Annotations; + AnnotationPanelView(); + return; + } + if (_CurrentItem != args.MyItemInfo) + _CurrentItem = args.MyItemInfo; //tc.SelectedDisplayTabItem.MyItemInfo; + vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}",_CurrentItem); + if (args.MyStepItem == null) + { + //itemAnnotationsBindingSource.DataSource = null; + //_Annotations = null; + //UpdateAnnotationGrid(); + //_CurrentItem = args.MyItemInfo; //tc.SelectedDisplayTabItem.MyItemInfo; + //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); + } else { - itemAnnotationsBindingSource.DataSource = args.MyStepItem.MyItemInfo.ItemAnnotations; - StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; - if (dtp == null) return; - displayTransition.MyRTB = dtp.MyStepPanel.SelectedStepRTB; - displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + //_CurrentItem = args.MyItemInfo; + //vlnStackTrace.ShowStack("enter tc_ItemSelectedChanged {0}", _CurrentItem); + //UpdateAnnotationGrid(); + //StepTabPanel dtp = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; + //if (dtp == null) return; + //displayTransition.MyRTB = dtp.MyStepPanel.SelectedStepRTB; + //displayRO.MyRTB = dtp.MyStepPanel.SelectedStepItem.MyStepRTB; + displayTransition.MyRTB = args.MyStepItem.MyStepRTB; + displayRO.MyRTB = args.MyStepItem.MyStepRTB; } + UpdateAnnotationGrid(); } - private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e) + private void UpdateAnnotationGrid() { - AnnotationInfoList myAnnotations = itemAnnotationsBindingSource.DataSource as AnnotationInfoList; - AnnotationPannelView(myAnnotations); - } - - private void AnnotationPannelView(AnnotationInfoList ail) - { - int selectedAnnoID = -1; - int selectedAnno = 0; - if (ail != null && ail.Count != 0) + //ShowItemAnnotations("UpdateAnnotationGrid before RefreshItemAnnotations"); + //_CurrentItem.RefreshItemAnnotations(); + //ShowItemAnnotations("UpdateAnnotationGrid"); + _LoadingGrid = true; + _Annotations = _CurrentItem.ItemAnnotations; + itemAnnotationsBindingSource.DataSource = _Annotations; + AnnotationPanelView(); + if ((CurrentAnnotation == null || (_CurrentItem.ItemID != CurrentAnnotation.ItemID))) { - if (!cbAnnotationDontPopup.Checked) + if (_Annotations != null && _Annotations.Count > 0) + CurrentAnnotation = _Annotations[0]; + else + CurrentAnnotation = null; + //InitializeAnnotation(); + } + FindCurrentAnnotation(); + _LoadingGrid = false; + } + private void FindCurrentAnnotation() + { + int row = 0; + if (CurrentAnnotation != null) + { + if (_Annotations != null) + { + foreach (AnnotationInfo ai in _Annotations) + { + if (ai.AnnotationID == CurrentAnnotation.AnnotationID) + { + row = _Annotations.IndexOf(ai) + 1; + break; + } + } + } + } + Console.WriteLine("Row = {0}",row); + c1AnnotationGrid.Select(row, 0, true); + } + //private void ShowItemAnnotations(string title) + //{ + // Console.WriteLine("{0} CurrentItem {1} {2} ItemAnnotationsCount {3}", title, _CurrentItem.ItemID, _CurrentItem.MyItemInfoUnique, _CurrentItem.ItemAnnotationCount); + //} + //private void itemAnnotationsBindingSource_DataSourceChanged(object sender, EventArgs e) + //{ + //_LoadingGrid = true; + //Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 1"); + //AnnotationInfoList myAnnotations = itemAnnotationsBindingSource.DataSource as AnnotationInfoList; + //Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 2"); + //AnnotationPannelView(_Annotations); + //Console.WriteLine("itemAnnotationsBindingSource_DataSourceChanged 3"); + //_LoadingGrid = false; + //} + private void AnnotationPanelView() + { + if (_Annotations != null && _Annotations.Count != 0) + { + if (Settings.Default.AutoPopUpAnnotations) //cbAnnotationPopup.Checked epAnnotations.Expanded = true; else epAnnotations.TitleStyle.BackColor1.Color = Color.Yellow; - - if (lbResults != null && lbResults.SelectedIndex > -1) - { - selectedAnnoID = ((AnnotationInfo)lbResults.SelectedItem).AnnotationID; - foreach (AnnotationInfo ai in ail) - { - if (ai.AnnotationID != selectedAnnoID) - selectedAnno++; - else - break; - } - if (selectedAnno >= ail.Count) - selectedAnno = 0; - } - //rtxbComment.Text = ail[0].SearchText; - rtxbComment.Text = ail[selectedAnno].SearchText; - if (epAnnotations.Expanded) - { - //epAnnotations.PerformClick(); - //epAnnotations.SelectNextControl(rtxbComment, false, false, false, false); - //rtxbComment.Focus(); - //c1AnnotationGrid.SelectionMode = C1.Win.C1FlexGrid.SelectionModeEnum.Cell; - c1AnnotationGrid.Focus(); - //c1AnnotationGrid.Select(); - //C1.Win.C1FlexGrid.CellRange cr = c1AnnotationGrid.GetCellRange(selectedAnno, 3); - //c1AnnotationGrid.Select(cr, true); - //c1AnnotationGrid.Controls[3].Select(); - //c1AnnotationGrid.ShowCell(selectedAnno+1,3); - //SendKeys.Flush(); - c1AnnotationGrid.Select(selectedAnno + 1, 3, true); - //c1AnnotationGrid.AccessibilityObject.Select(AccessibleSelection.TakeFocus); - //SendKeys.Send("{RIGHT}"); - //SendKeys.Flush(); - rtxbComment.Focus(); - - } + rtxbComment.SelectionStart = rtxbComment.TextLength; } else { - if (!cbAnnotationDontPopup.Checked) - epAnnotations.Expanded = false; + epAnnotations.Expanded = false; epAnnotations.TitleStyle.BackColor1.Color = _CommentTitleBckColor; rtxbComment.Text = null; } } + private AnnotationInfo _CurrentAnnotation = null; + private AnnotationInfo CurrentAnnotation + { + get { return _CurrentAnnotation; } + set + { + if (_CurrentAnnotation == null && value == null) return; // No Change + if (_CurrentAnnotation != null && value != null) + if (_CurrentAnnotation.AnnotationID == value.AnnotationID) return; // No Change + vlnStackTrace.ShowStack("CurrentAnnotation = '{0}' Old = '{1}'", value, _CurrentAnnotation); + if (_CurrentAnnotation != null || _AddingAnnotation) + { + //if (_CurrentAnnotation.TypeID != (int)cbGridAnnoType.SelectedValue) SaveAnnotation(); + //else if (_CurrentAnnotation.RtfText != string.Empty && _CurrentAnnotation.RtfText != rtxbComment.Rtf) + // SaveAnnotation(); + //else if (_CurrentAnnotation.RtfText == string.Empty && _CurrentAnnotation.SearchText != rtxbComment.Text) + if (AnnotationDirty) + SaveAnnotation(); + } + _CurrentAnnotation = value; + InitializeAnnotation(); + } + } + + private void SaveAnnotation() + { + if (cbGridAnnoType.SelectedIndex == -1) return; + if (rtxbComment.Text == string.Empty) return; + using (AnnotationType annotationType = AnnotationType.Get((int)cbGridAnnoType.SelectedValue)) + { + if (_AddingAnnotation) + { + _AddingAnnotation = false; + using (Item myItem = _CurrentItem.Get()) + { + using (Annotation annotation = Annotation.MakeAnnotation(myItem, annotationType, rtxbComment.Rtf, rtxbComment.Text, "")) + { + CurrentAnnotation = AnnotationInfo.Get(annotation.AnnotationID); + annotation.DTS = DateTime.Now; + annotation.Save(); + } + } + } + else + { + using (Annotation annotation = CurrentAnnotation.Get()) + { + annotation.RtfText = rtxbComment.Rtf; + annotation.SearchText = rtxbComment.Text; + annotation.MyAnnotationType = annotationType; + annotation.DTS = DateTime.Now; + //Console.WriteLine("Before Annotation Type = {0} ({1})", CurrentAnnotation.MyAnnotationType, CurrentAnnotation.MyAnnotationType.AnnotationTypeAnnotations.Count); + //Console.WriteLine("Before Annotation Type = {0}", CurrentAnnotation.MyAnnotationType); + annotation.Save(); + //Console.WriteLine("After Annotation Type = {0} ({1})", CurrentAnnotation.MyAnnotationType, CurrentAnnotation.MyAnnotationType.AnnotationTypeAnnotations.Count); + } + } + } + AnnotationDirty = false; + UpdateAnnotationGrid(); + //UpdateAnnotationSearchResults(); + } + + private void btnSave_Click(object sender, EventArgs e) { @@ -1282,11 +1381,16 @@ namespace VEPROMS private bool _LoadingList = false; private void cbAnnoType_SelectedValueChanged(object sender, EventArgs e) + { + UpdateAnnotationSearchResults(); + } + + private void UpdateAnnotationSearchResults() { AnnotationTypeInfo ati = cbAnnoType.SelectedValue as AnnotationTypeInfo; _LoadingList = true; - lbResults.DataSource = ati.AnnotationTypeAnnotations; lbResults.DisplayMember = "SearchText"; + lbResults.DataSource = ati.AnnotationTypeAnnotations; lbResults.SelectedIndex = -1; LastResultsMouseOverIndex = -1; _LoadingList = false; @@ -1304,61 +1408,181 @@ namespace VEPROMS LastResultsMouseOverIndex = ResultsMouseOverIndex; } } - private void lbResults_SelectedValueChanged(object sender, EventArgs e) { if (!_LoadingList) { - AnnotationInfo ai = lbResults.SelectedValue as AnnotationInfo; - tc.OpenItem(ai.MyItem); + //AnnotationInfo ai = lbResults.SelectedValue as AnnotationInfo; + //if(ai != null) + // tc.OpenItem(ai.MyItem); + CurrentAnnotation = lbResults.SelectedValue as AnnotationInfo; + if (CurrentAnnotation != null) + { + tc.OpenItem(CurrentAnnotation.MyItem); + } + FindCurrentAnnotation(); } } - private void lbxBookMarks_Click(object sender, EventArgs e) { MostRecentItem itm = lbxBookMarks.SelectedValue as MostRecentItem; tc.OpenItem(itm.MyItemInfo); } - private void cbGridAnnoType_Validating(object sender, CancelEventArgs e) { - try - { - //bool test1 = c1AnnotationGrid.IsCellSelected(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); - //bool test2 = c1AnnotationGrid.IsCellValid(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); - //AnnotationTypeInfo celldat = (AnnotationTypeInfo)c1AnnotationGrid.GetData(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); - AnnotationTypeInfo newcelldat = (AnnotationTypeInfo)cbGridAnnoType.SelectedItem; - - AnnotationInfo ani = ((AnnotationInfoList)itemAnnotationsBindingSource.DataSource)[c1AnnotationGrid.RowSel - 1] as AnnotationInfo; - Annotation ano = ani.Get(); - if (ano.TypeID != newcelldat.TypeID) - { - ano.Update(newcelldat.TypeID); - btnSaveAnnoation.Enabled = true; - c1AnnotationGrid.Refresh(); - } - } - catch (Exception ex) - { - log.ErrorFormat("Error saving Annotation Type Change: {0}", ex.Message); - } + //try + //{ + // //bool test1 = c1AnnotationGrid.IsCellSelected(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); + // //bool test2 = c1AnnotationGrid.IsCellValid(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); + // //AnnotationTypeInfo celldat = (AnnotationTypeInfo)c1AnnotationGrid.GetData(c1AnnotationGrid.RowSel, c1AnnotationGrid.ColSel); + // AnnotationTypeInfo newcelldat = (AnnotationTypeInfo)cbGridAnnoType.SelectedItem; + // AnnotationInfo ani = ((AnnotationInfoList)itemAnnotationsBindingSource.DataSource)[c1AnnotationGrid.RowSel - 1] as AnnotationInfo; + // Annotation ano = ani.Get(); + // if (ano.TypeID != newcelldat.TypeID) + // { + // ano.Update(newcelldat.TypeID); + // //btnCancelAnnoation.Enabled = true; + // c1AnnotationGrid.Refresh(); + // } + //} + //catch (Exception ex) + //{ + // log.ErrorFormat("Error saving Annotation Type Change: {0}", ex.Message); + //} } - private void epAnnotations_Layout(object sender, LayoutEventArgs e) { - cbGridAnnoType.Visible = false; + //cbGridAnnoType.Visible = false; + } + //private void btnSaveAnnoation_Click(object sender, EventArgs e) + //{ + // AnnotationInfoList ail = (AnnotationInfoList)itemAnnotationsBindingSource.DataSource; + // foreach (AnnotationInfo ai in ail) + // { + // Annotation ano = ai.Get(); + // ano.CommitChanges(); + // } + // btnCancelAnnoation.Enabled = false; + //} + private bool _AddingAnnotation = false; + private void btnAddAnnotation_Click(object sender, EventArgs e) + { + c1AnnotationGrid.Row = -1; + CurrentAnnotation = null; + _AddingAnnotation = true; + //InitializeAnnotation(); + } + private bool _LoadingAnnotation = false; + private bool _LoadingGrid = false; + private void c1AnnotationGrid_EnterCell(object sender, EventArgs e) + { + if (!_LoadingGrid) // Only set the Current Annotation when not loading the grid + { + if ((_Annotations != null) && (c1AnnotationGrid.Row > 0)) + CurrentAnnotation = _Annotations[c1AnnotationGrid.Row - 1]; + else + CurrentAnnotation = null; + } + //InitializeAnnotation(); + } + private void InitializeAnnotation() + { + //vlnCSLAStackTrace.ShowStack("InitializeAnnotation - CurrentAnnotation = {0}", CurrentAnnotation); + _LoadingAnnotation = true; + if (CurrentAnnotation == null) + { + cbGridAnnoType.SelectedIndex = -1; + rtxbComment.Text = ""; + } + else + { + cbGridAnnoType.SelectedValue = CurrentAnnotation.TypeID; + if (CurrentAnnotation.RtfText != "") + rtxbComment.Rtf = CurrentAnnotation.RtfText; + else + rtxbComment.Text = CurrentAnnotation.SearchText; + } + _LoadingAnnotation = false; + AnnotationDirty = false; + if (!_LoadingGrid) + { + rtxbComment.SelectionStart = rtxbComment.TextLength; // Position the cursor at the end of the current text + rtxbComment.Focus(); // Set the focus to the comment text + } + } + private bool _AnnotationDirty = false; + private bool AnnotationDirty + { + get { return _AnnotationDirty; } + set + { + btnRemoveAnnotation.Enabled = btnAddAnnotation.Enabled = !value; + btnSaveAnnotation.Enabled = btnCancelAnnoation.Enabled = value; + _AddingAnnotation = value && (CurrentAnnotation == null); + _AnnotationDirty = value; + } } - private void buttonX1_Click(object sender, EventArgs e) + private void rtxbComment_TextChanged(object sender, EventArgs e) { - AnnotationInfoList ail = (AnnotationInfoList)itemAnnotationsBindingSource.DataSource; - foreach (AnnotationInfo ai in ail) + if (!_LoadingAnnotation) { - Annotation ano = ai.Get(); - ano.CommitChanges(); + AnnotationDirty = true; + } + } + + private void btnCancelAnnoation_Click(object sender, EventArgs e) + { + InitializeAnnotation(); + } + + private void cbGridAnnoType_SelectedValueChanged(object sender, EventArgs e) + { + if (!_LoadingAnnotation) + { + AnnotationDirty = true; + } + + } + + private void btnSaveAnnotation_Click(object sender, EventArgs e) + { + if (cbGridAnnoType.SelectedIndex == -1) + { + MessageBox.Show("You Must Select an Annotation Type", "Annotation Type Not Selected", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + cbGridAnnoType.Focus(); + return; + } + if (rtxbComment.Text == string.Empty) + { + MessageBox.Show("You Must Enter Annotation Text", "Annotation Text Is Blank", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + rtxbComment.Focus(); + return; + } + SaveAnnotation(); + } + + private void btnRemoveAnnotation_Click(object sender, EventArgs e) + { + using (Annotation annotation = CurrentAnnotation.Get()) + { + //ShowItemAnnotations("btnRemoveAnnotation_Click Start"); + //annotation.DTS = DateTime.Now; + //annotation.Save(); + //ShowItemAnnotations("btnRemoveAnnotation_Click After Change Save"); + annotation.Delete(); + _LoadingList = true; + annotation.Save(); + _LoadingList = false; + CurrentAnnotation = null; + //ShowItemAnnotations("btnRemoveAnnotation_Click After Delete Save"); + //c1AnnotationGrid.Row = -1; + //ShowItemAnnotations("btnRemoveAnnotation_Click Before Update Grid"); + UpdateAnnotationGrid(); + //ShowItemAnnotations("After UpdateAnnotationGrid After Update Grid"); + UpdateAnnotationSearchResults(); } - btnSaveAnnoation.Enabled = false; } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index 7dea4e94..7ec5b387 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -122,10 +122,10 @@ Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/8DAwP+AgID/AAD//wD/AP8A/////wAA//8A/////wD//////3d3 - d3d3d3d3d3dOBnd3d3d3d3d3d3dOBnd3d3d3d3d3d3dOBnd3d3R3d3d3d3dOBnd3d0RHd3d3d3dOBnd3 - dERHd3d3d3dOBnd3REdEd3d3d3dOBnd0RHd0R3d3d3dOBnd3R3d3R3d3d3dOBnd3d3d3dHd3d3dOBnd3 - d3d3d0d3d3dOBnd3d3d3d3R3d3dOBndwcHAHdwBHd3dOBndwcHBwcHd0d3dOBndwAHAHcHd3R3dOBndw - cHBwcHd3d3dOBnd3B3AHdwB3d3dOBnd3d3d3d3d3d3dOBnd3d3d3d3d3d3dOBnd3d3d3d3d3d3dOBg== + d3d3d3d3d3eAP3d3d3d3d3d3d3eAP3d3d3d3d3d3d3eAP3d3d3R3d3d3d3eAP3d3d0RHd3d3d3eAP3d3 + dERHd3d3d3eAP3d3REdEd3d3d3eAP3d0RHd0R3d3d3eAP3d3R3d3R3d3d3eAP3d3d3d3dHd3d3eAP3d3 + d3d3d0d3d3eAP3d3d3d3d3R3d3eAP3dwcHAHdwBHd3eAP3dwcHBwcHd0d3eAP3dwAHAHcHd3R3eAP3dw + cHBwcHd3d3eAP3d3B3AHdwB3d3eAP3d3d3d3d3d3d3eAP3d3d3d3d3d3d3eAP3d3d3d3d3d3d3eAPw== @@ -795,6 +795,114 @@ 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 + lJCQA3IYpUQA76epNf0QgmEAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA + CxMBAJqcGAAAAdBJREFUOE+lk90rQ2Ecx/mL5MKFG7lSXLiUa3IjKS4okpS4UFJelmnY2GbeLcPYbOZt + mKERQmFnmMyFmdnOtq/ndzizJ1zg1K/O83Q+35fn6aQDSPvXQwJto/dInRbdPRrVftT03aGi6xYl7Tco + bvWhsElAXr2AnBovsquvGcrMZQGNAxiwJ6C0xtFjjqHDJKJtOormsQga9K+o1bygShVCeW8IZd1BZJbt + 8gJygmatH3UDflQq3p2LWnwoaPAi98OVnGkySpyfAvo5FxKJRHLW3RfcemHtUFpHxTiC4ThGTE5k5Zd+ + CgwZnRyw4jrj1rP2A0QY/MzgQDAGrXGdF+ifXMX+iQByXnGdw7Z1CsvmMciZ4BmrG+PmHRiYM8GDkw5e + QGlY5hyXGCxXotgEB4IifIEozm+jUI3ZeIEe7SInYF47SnZ+DsdgmHNCeBQl2HMdgXLEygt0auax7bmE + ZYPFXj2EKTU2gym2esoB1bgNSoMVCt3iV4HUW5i2uKXTfniKsdgi1Kyz5yqC7bMw7EchdA+bfxagzhPU + mcECg+XO7/AL5vdCoMTcNdKGY+dUOm2C5dMm536KzTordEuSM337rQAp/naS/wK9/HX+DMqGb0lL76AI + wx7nAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA + CxMBAJqcGAAAAklJREFUOE+lk11I02EUxusuIogugqALIyK6iJpEEIUZIQWSK8kLQ/pAqUApKbEsl4kL + srQwQYeOVmp+VGamlo1lMUVJ+9DmdCbNBVqkzvyiD9vmr51/rP8IoqgXzuXzO88553nnAnP+6wmg8FY7 + wZVf0UbO9WbOFTehy39ISk4difpq4tMriUstJSbZxK4ko1/qbx4AeLzwu/r0FcamZxkam6X/vY9Ol49V + 2zP/DuC2O3AcCMW+X4Ot1a6IyxoHWLnt7J8B0lnEDJmZeXycZ7uX0eLwca3+NSsiggAy86/2A7bt+zQ/ + xLkRtEWHYO7yUnzHxvKtGaoDWVgwIHhmsS2dRXz33itqO7wUVHYQsuWMCpBtBwB9A8McyzIq1d77UZlZ + bEtnEVe1esgraWZpmE4FyKkE4BwcU4TOoXFs/aNsjkrAWPOS8J0HlSqq7aPU6iHXaGHJpnQVIHcOiN+N + TDL44TNPu91UmXuIjE2k7lEnjdZuSRxFD9ycL2xg8YbTKkBCIp2H3VNMTs9gc05gqnvDTYsLg39ebdwR + Sm4/Ie9qvQLRX6lh0fpTKkAS9s3jY3Ryhl7XFGX3nVwu7yHb9IIcUxvJ+ko04TEk6/JJTLukQBauS1MB + Es+R8S8873VT3fT2pzizwErqxXqSMsqJjtcrkMg9RwnXJrAg9KQKkGw7XBNUNHSRZWhBl2chNbvWL7xB + fIqB2MMX0O7VEbbjEKs3Rik1f20QQD6GZFviKQmTkMid5VSybVmYzCy2pbOI5605oTqQD/Wv9R1FPMYf + N743kwAAAABJRU5ErkJggg== @@ -990,30 +1098,30 @@ Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/4CAgP/AwMD/AAD//wD/AP8A/////wAA//8A/////wD//////4iI - iIiIiIiIiIhOBoiId4iIiIiIh3hOBoiHAIiIiIiIcAhOBohw8IiIiIiHDwhOBocP8IiIiIhw+whOBoD/ - 8IiIiIgPvwhOBoDw8IiIiIgLCwhOBoAP8IiICIgAvwhOBoD/8IiIAIgL+whOBoAA8IAAAAgADwhOBoD/ - 8IAAAAgL+whOBoAA8IiIAIgADwhOBoD/8IiICIgL+whOBoAP8IiIiIgAvwhOBoDw8IiIiIgPCwhOBogP - 8IiIiIiAvwhOBoiA8IiIiIiICwhOBoiIAIiIiIiIgAhOBoiIh4iIiIiIiHhOBoiIiIiIiIiIiIhOBg== + iIiIiIiIiIiAP4iId4iIiIiIh3iAP4iHAIiIiIiIcAiAP4hw8IiIiIiHDwiAP4cP8IiIiIhw+wiAP4D/ + 8IiIiIgPvwiAP4Dw8IiIiIgLCwiAP4AP8IiICIgAvwiAP4D/8IiIAIgL+wiAP4AA8IAAAAgADwiAP4D/ + 8IAAAAgL+wiAP4AA8IiIAIgADwiAP4D/8IiICIgL+wiAP4AP8IiIiIgAvwiAP4Dw8IiIiIgPCwiAP4gP + 8IiIiIiAvwiAP4iA8IiIiIiICwiAP4iIAIiIiIiIgAiAP4iIh4iIiIiIiHiAP4iIiIiIiIiIiIiAPw== Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/4CAgP/AwMD/AAD//wD/AP8A/////wAA//8A/////wD//////4iI - iIiIiIiIiIhOBoiEREiIiIRESIhOBoh0/0SIiET/R4hOBoh0iPSIiE+IR4hOBoh0iISIiEiIR4hOBoiH - SIRIh0iEeIhOBoiIdERHdERHiIhOBoiIiERERESIiIhOBoiIiIRP9EiIiIhOBoiIiIcERHiIiIhOBoiI - iHD/DweIiIhOBoiIhw/wT/B4iIhOBoiIcP8IgP8HiIhOBoiHD/CIiA/weIhOBohw/wiIiID/B4hOBocP - 8IiIiIgP8HhOBoD/CIiIiIiA/whOBoDwiIiIiIiIDwhOBoAIiIiIiIiIgAhOBoiIiIiIiIiIiIhOBg== + iIiIiIiIiIiAP4iEREiIiIRESIiAP4h0/0SIiET/R4iAP4h0iPSIiE+IR4iAP4h0iISIiEiIR4iAP4iH + SIRIh0iEeIiAP4iIdERHdERHiIiAP4iIiERERESIiIiAP4iIiIRP9EiIiIiAP4iIiIcERHiIiIiAP4iI + iHD/DweIiIiAP4iIhw/wT/B4iIiAP4iIcP8IgP8HiIiAP4iHD/CIiA/weIiAP4hw/wiIiID/B4iAP4cP + 8IiIiIgP8HiAP4D/CIiIiIiA/wiAP4DwiIiIiIiIDwiAP4AIiIiIiIiIgAiAP4iIiIiIiIiIiIiAPw== Qk1mAQAAAAAAAHYAAAAoAAAAFAAAABQAAAABAAQAAAAAAAAAAAB0EgAAdBIAABAAAAAQAAAAAAAA/wAA gP8AgAD/AICA/4AAAP+AAID/gIAA/4CAgP/AwMD/AAD//wD/AP8A/////wAA//8A/////wD//////4iI - iIiIiIiIiIhOBoiIiIiIgAAAAAhOBoiHd3d3cO/v7whOBogAAAAAAPRETghOBoD4iIiIgO/v7whOBoD4 - iIiIgPRETghOBoD4iIiIgO/v7whOBoD4iAAAgPROAAhOBoD4iIAAgO/vAIhOBoD4iAAAgAAACIhOBoD4 - gACAiAeIiIhOBoD4AAiIiAeIiIhOBoD4gIiIiAeIiIhOBoD4iIiIiAeIiIhOBoD4iIiIiAeIiIhOBoD/ - AAAA/wiIiIhOBogATExAAIiIiIhOBoiIxMTAiIiIiIhOBoiIjEwIiIiIiIhOBoiIiIiIiIiIiIhOBg== + iIiIiIiIiIiAP4iIiIiIgAAAAAiAP4iHd3d3cO/v7wiAP4gAAAAAAPRETgiAP4D4iIiIgO/v7wiAP4D4 + iIiIgPRETgiAP4D4iIiIgO/v7wiAP4D4iAAAgPROAAiAP4D4iIAAgO/vAIiAP4D4iAAAgAAACIiAP4D4 + gACAiAeIiIiAP4D4AAiIiAeIiIiAP4D4gIiIiAeIiIiAP4D4iIiIiAeIiIiAP4D4iIiIiAeIiIiAP4D/ + AAAA/wiIiIiAP4gATExAAIiIiIiAP4iIxMTAiIiIiIiAP4iIjEwIiIiIiIiAP4iIiIiIiIiIiIiAPw== @@ -3274,114 +3382,6 @@ KuwwgBaXoDAELNOlkQoVJS60AQIgADJAKafMUMAPQRhxSyvrlRiADAIYIEQogrjAgAWSeDDCGTUydAgD MjwhCwoLgOCFH1xEIWGVuhxAAAlbLKLCAHsAAEkNJdxVpQ5YOEICA0EwgAodXYRFJk4cjECCA38cgUYS YRTZUEAAOw== - - - - - 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 - lJCQA3IYpUQA76epNf0QgmEAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAdBJREFUOE+lk90rQ2Ecx/mL5MKFG7lSXLiUa3IjKS4okpS4UFJelmnY2GbeLcPYbOZt - mKERQmFnmMyFmdnOtq/ndzizJ1zg1K/O83Q+35fn6aQDSPvXQwJto/dInRbdPRrVftT03aGi6xYl7Tco - bvWhsElAXr2AnBovsquvGcrMZQGNAxiwJ6C0xtFjjqHDJKJtOormsQga9K+o1bygShVCeW8IZd1BZJbt - 8gJygmatH3UDflQq3p2LWnwoaPAi98OVnGkySpyfAvo5FxKJRHLW3RfcemHtUFpHxTiC4ThGTE5k5Zd+ - CgwZnRyw4jrj1rP2A0QY/MzgQDAGrXGdF+ifXMX+iQByXnGdw7Z1CsvmMciZ4BmrG+PmHRiYM8GDkw5e - QGlY5hyXGCxXotgEB4IifIEozm+jUI3ZeIEe7SInYF47SnZ+DsdgmHNCeBQl2HMdgXLEygt0auax7bmE - ZYPFXj2EKTU2gym2esoB1bgNSoMVCt3iV4HUW5i2uKXTfniKsdgi1Kyz5yqC7bMw7EchdA+bfxagzhPU - mcECg+XO7/AL5vdCoMTcNdKGY+dUOm2C5dMm536KzTordEuSM337rQAp/naS/wK9/HX+DMqGb0lL76AI - wx7nAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA - CxMBAJqcGAAAAklJREFUOE+lk11I02EUxusuIogugqALIyK6iJpEEIUZIQWSK8kLQ/pAqUApKbEsl4kL - srQwQYeOVmp+VGamlo1lMUVJ+9DmdCbNBVqkzvyiD9vmr51/rP8IoqgXzuXzO88553nnAnP+6wmg8FY7 - wZVf0UbO9WbOFTehy39ISk4difpq4tMriUstJSbZxK4ko1/qbx4AeLzwu/r0FcamZxkam6X/vY9Ol49V - 2zP/DuC2O3AcCMW+X4Ot1a6IyxoHWLnt7J8B0lnEDJmZeXycZ7uX0eLwca3+NSsiggAy86/2A7bt+zQ/ - xLkRtEWHYO7yUnzHxvKtGaoDWVgwIHhmsS2dRXz33itqO7wUVHYQsuWMCpBtBwB9A8McyzIq1d77UZlZ - bEtnEVe1esgraWZpmE4FyKkE4BwcU4TOoXFs/aNsjkrAWPOS8J0HlSqq7aPU6iHXaGHJpnQVIHcOiN+N - TDL44TNPu91UmXuIjE2k7lEnjdZuSRxFD9ycL2xg8YbTKkBCIp2H3VNMTs9gc05gqnvDTYsLg39ebdwR - Sm4/Ie9qvQLRX6lh0fpTKkAS9s3jY3Ryhl7XFGX3nVwu7yHb9IIcUxvJ+ko04TEk6/JJTLukQBauS1MB - Es+R8S8873VT3fT2pzizwErqxXqSMsqJjtcrkMg9RwnXJrAg9KQKkGw7XBNUNHSRZWhBl2chNbvWL7xB - fIqB2MMX0O7VEbbjEKs3Rik1f20QQD6GZFviKQmTkMid5VSybVmYzCy2pbOI5605oTqQD/Wv9R1FPMYf - N743kwAAAABJRU5ErkJggg== @@ -3633,18 +3633,15 @@ 4xKQjJsoHR+xHFGs4t+go2biAc5DB03uX5vZMUQuZEGBAAAAAElFTkSuQmCC - - 156, 17 - - 5,0,0,0,0,100,Columns:0{Width:157;Name:"MyAnnotationType";Caption:"Annotation Type";Style:"TextAlign:GeneralCenter;";} 1{Width:39;Name:"DTS";Caption:"Date";Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 2{Width:55;Name:"UserID";Caption:"User";AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 4{Width:82;Name:"SearchText";Caption:"Description";AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} - - - Normal{Font:Microsoft Sans Serif, 8pt;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;} Focus{} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{} EmptyArea{BackColor:AppWorkspace;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} + 5,0,0,0,0,100,Columns:0{Width:109;Name:"MyAnnotationType";Caption:"Type";AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 1{Width:66;Name:"DTS";Caption:"Date";AllowEditing:False;Style:"Format:""d"";DataType:System.DateTime;TextAlign:LeftCenter;";} 2{Width:91;Name:"UserID";Caption:"User";AllowEditing:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Name:"BrokenRules";Caption:"BrokenRules";Visible:False;AllowEditing:False;Style:"TextAlign:GeneralCenter;";} 4{Width:82;Name:"SearchText";Caption:"Description";AllowEditing:False;Style:"DataType:System.String;TextAlign:GeneralCenter;";} 156, 17 + + Normal{Font:Microsoft Sans Serif, 8pt;BackColor:Transparent;WordWrap:False;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;} Focus{} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} NewRow{} EmptyArea{BackColor:Transparent;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs index d13e401c..6bb4beea 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.Designer.cs @@ -591,9 +591,9 @@ namespace VEPROMS this.label8.BackColor = System.Drawing.Color.Transparent; this.label8.Location = new System.Drawing.Point(12, 75); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(153, 17); + this.label8.Size = new System.Drawing.Size(134, 17); this.label8.TabIndex = 17; - this.label8.Text = "Default Graphics Prefix"; + this.label8.Text = "Default Image Prefix"; // // ppLblROPrefixDefault // @@ -977,9 +977,9 @@ namespace VEPROMS this.ppCmbxPagination.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.ppCmbxPagination.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.ppCmbxPagination.FormattingEnabled = true; - this.ppCmbxPagination.Location = new System.Drawing.Point(83, 53); + this.ppCmbxPagination.Location = new System.Drawing.Point(88, 53); this.ppCmbxPagination.Name = "ppCmbxPagination"; - this.ppCmbxPagination.Size = new System.Drawing.Size(168, 23); + this.ppCmbxPagination.Size = new System.Drawing.Size(163, 23); this.superTooltip1.SetSuperTooltip(this.ppCmbxPagination, new DevComponents.DotNetBar.SuperTooltipInfo("Procedure Pagination", "", resources.GetString("ppCmbxPagination.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, false, new System.Drawing.Size(400, 220))); this.ppCmbxPagination.TabIndex = 58; this.ppCmbxPagination.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1233,11 +1233,11 @@ namespace VEPROMS | System.Windows.Forms.AnchorStyles.Right))); this.tcVersions.BackColor = System.Drawing.Color.Transparent; this.tcVersions.CanReorderTabs = true; + this.tcVersions.Controls.Add(this.tabControlPanel3); this.tcVersions.Controls.Add(this.tabControlPanel2); this.tcVersions.Controls.Add(this.tabControlPanel1); this.tcVersions.Controls.Add(this.tabControlPanel5); this.tcVersions.Controls.Add(this.tabControlPanel4); - this.tcVersions.Controls.Add(this.tabControlPanel3); this.tcVersions.Location = new System.Drawing.Point(174, 4); this.tcVersions.Name = "tcVersions"; this.tcVersions.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.resx b/PROMS/VEPROMS User Interface/frmVersionsProperties.resx index d0b7ba36..afca2ae3 100644 --- a/PROMS/VEPROMS User Interface/frmVersionsProperties.resx +++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.resx @@ -123,9 +123,15 @@ 269, 17 + + 269, 17 + 660, 17 + + 521, 17 + Allows you to specify the default format to use for all procedures in this set. @@ -183,6 +189,9 @@ Check "Show Default Settings" to display the "default" graphic file extension se 17, 57 + + 17, 57 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/PROMS/Volian.Controls.Library/DSOTabPanel.cs b/PROMS/Volian.Controls.Library/DSOTabPanel.cs index e50dedca..5d085b51 100644 --- a/PROMS/Volian.Controls.Library/DSOTabPanel.cs +++ b/PROMS/Volian.Controls.Library/DSOTabPanel.cs @@ -122,7 +122,17 @@ namespace Volian.Controls.Library //this._MyDSOFramer.OnActivationChange += new AxDSOFramer._DFramerCtlEvents_OnActivationChangeEventHandler(_MyDSOFramer_OnActivationChange); this.Enter += new EventHandler(DSOTabPanel_Enter); this.Leave += new EventHandler(DSOTabPanel_Leave); + //this.GotFocus += new EventHandler(DSOTabPanel_GotFocus); + //this.LostFocus += new EventHandler(DSOTabPanel_LostFocus); } + //void DSOTabPanel_LostFocus(object sender, EventArgs e) + //{ + // vlnStackTrace.ShowStack("DSOTabPanel_LostFocus {0} DocID {1} Index {2} {3}", _In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName); + //} + //void DSOTabPanel_GotFocus(object sender, EventArgs e) + //{ + // vlnStackTrace.ShowStack("DSOTabPanel_GotFocus {0} DocID {1} Index {2} {3}", _In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName); + //} #endregion #region Event Handlers /// @@ -132,6 +142,7 @@ namespace Volian.Controls.Library /// void DSOTabPanel_Leave(object sender, EventArgs e) { + //vlnStackTrace.ShowStack("DSOTabPanel_Leave {0} DocID {1} Index {2} {3}", _In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName); _MyTransparentPanel.BringToFront(); } /// @@ -161,6 +172,8 @@ namespace Volian.Controls.Library { try { + this.Enter -= new EventHandler(DSOTabPanel_Enter); + this.Leave -= new EventHandler(DSOTabPanel_Leave); SaveDirty(); } catch (Exception ex) @@ -168,6 +181,8 @@ namespace Volian.Controls.Library _MyLog.Warn("Before Closing Document ", ex); } } + public static bool IgnoreEnter = false; + private bool _In_DSOTabPanel_Enter=false; /// /// When a Word document is selected make sure it's tab is activated and /// the SelectedItem for the DisplayTabControl is updated. @@ -176,6 +191,7 @@ namespace Volian.Controls.Library /// void DSOTabPanel_Enter(object sender, EventArgs e) { + if (IgnoreEnter) return; _MyTransparentPanel.SendToBack(); try { @@ -186,8 +202,12 @@ namespace Volian.Controls.Library { if (_MyLog.IsErrorEnabled) _MyLog.ErrorFormat("DSOTabPage_Enter", ex); } - _MyDisplayTabControl.OnItemSelectedChanged(this, null); + if (_In_DSOTabPanel_Enter) return; + vlnStackTrace.ShowStack("DSOTabPanel_Enter {0} DocID {1} Index {2} {3}",_In_DSOTabPanel_Enter, this._MyDocumentInfo.DocID, _MyDisplayTabControl.MyBar.SelectedDockTab, sender.GetType().FullName); + _In_DSOTabPanel_Enter = true; + _MyDisplayTabControl.OnItemSelectedChanged(this,new ItemSelectedChangedEventArgs(MyDisplayTabItem.MyItemInfo)); _MyDSOFramer.Focus(); + _In_DSOTabPanel_Enter = false; } #endregion #region Public Methods diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 334cf969..2da28c2a 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -122,13 +122,13 @@ namespace Volian.Controls.Library /// /// Occurs when the user selects a different item or page /// - public event StepPanelEvent ItemSelectedChanged; + public event ItemSelectedChangedEvent ItemSelectedChanged; /// /// Checks to see if the 'ItemSelectedChanged' event is handled and launches it /// /// /// - internal void OnItemSelectedChanged(object sender, StepPanelEventArgs args) + internal void OnItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) { if (ItemSelectedChanged != null) ItemSelectedChanged(sender, args); } diff --git a/PROMS/Volian.Controls.Library/DisplayTabItem.cs b/PROMS/Volian.Controls.Library/DisplayTabItem.cs index fe37afa5..e6085fe5 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabItem.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabItem.cs @@ -89,7 +89,7 @@ namespace Volian.Controls.Library if(myTabItem == null)return; StepTabPanel myTabPanel = myTabItem.MyStepTabPanel as StepTabPanel; if(myTabPanel == null) return; - _MyDisplayTabControl.OnItemSelectedChanged(this,new StepPanelEventArgs(MyStepTabPanel.SelectedStepItem,null)); + _MyDisplayTabControl.OnItemSelectedChanged(this,new ItemSelectedChangedEventArgs(MyStepTabPanel.SelectedStepItem)); } #endregion #region private Methods @@ -133,14 +133,27 @@ namespace Volian.Controls.Library Text = _MyItemInfo.TabTitle; Tooltip = _MyItemInfo.TabToolTip; // + //Console.WriteLine("this.Focus {0}", Name); + //this.Focus(); + //Console.WriteLine("Controls.Add {0}", Name); _MyDisplayTabControl.Controls.Add(_MyDSOTabPanel); + //Console.WriteLine("Enabled = false {0}", Name); + //_MyDisplayTabControl.MyBar.Enabled = false; + DSOTabPanel.IgnoreEnter = true; + Console.WriteLine("AddRange {0}", Name); _MyDisplayTabControl.MyBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this}); // // tabPanel // + //Console.WriteLine("Enabled = true {0}", Name); + //_MyDisplayTabControl.MyBar.Enabled = true; + Console.WriteLine("SelectedDisplayTabItem {0}", Name); _MyDisplayTabControl.SelectedDisplayTabItem = this; + Console.WriteLine("MyDisplayTabItem {0}", Name); _MyDSOTabPanel.MyDisplayTabItem = this; + DSOTabPanel.IgnoreEnter = false; + _MyDisplayTabControl.OnItemSelectedChanged(this, new ItemSelectedChangedEventArgs(MyItemInfo)); } #endregion } diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs index 00708747..203dc238 100644 --- a/PROMS/Volian.Controls.Library/StepPanel.cs +++ b/PROMS/Volian.Controls.Library/StepPanel.cs @@ -72,13 +72,13 @@ namespace Volian.Controls.Library /// /// Occurs when the selected StepItem changes /// - public event StepPanelEvent ItemSelectedChanged; + public event ItemSelectedChangedEvent ItemSelectedChanged; /// /// Checks to see if the 'ItemSelectedChanged' event is handled and launches it /// /// /// - internal void OnItemSelectedChanged(object sender, StepPanelEventArgs args) + internal void OnItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) { if (ItemSelectedChanged != null) ItemSelectedChanged(sender, args); } @@ -308,7 +308,7 @@ namespace Volian.Controls.Library ExpandAsNeeded(value); StepItem itm = _LookupStepItems[id]; itm.ItemSelect(); - OnItemSelectedChanged(this, new StepPanelEventArgs(itm, null)); + OnItemSelectedChanged(this, new ItemSelectedChangedEventArgs(itm)); //vlnStackTrace.ShowStack("_ItemSelected = {0}", _ItemSelected.ItemID);// Show StackTrace } } @@ -736,6 +736,30 @@ namespace Volian.Controls.Library _MyMouseEventArgs = myMouseEventArgs; } } + public partial class ItemSelectedChangedEventArgs + { + private ItemInfo _MyItemInfo; + public ItemInfo MyItemInfo + { + get { return _MyItemInfo; } + set { _MyItemInfo = value; } + } + private StepItem _MyStepItem = null; + public StepItem MyStepItem + { + get { return _MyStepItem; } + set { _MyStepItem = value; } + } + public ItemSelectedChangedEventArgs(ItemInfo myItemInfo) + { + _MyItemInfo = myItemInfo; + } + public ItemSelectedChangedEventArgs(StepItem myStepItem) + { + _MyItemInfo = myStepItem.MyItemInfo; + _MyStepItem = myStepItem; + } + } public partial class StepPanelAttachmentEventArgs { private StepItem _MyStepItem; @@ -777,6 +801,7 @@ namespace Volian.Controls.Library } } public delegate void StepPanelEvent(object sender, StepPanelEventArgs args); + public delegate void ItemSelectedChangedEvent(object sender, ItemSelectedChangedEventArgs args); public delegate void StepPanelLinkEvent(object sender, StepPanelLinkEventArgs args); public delegate void StepPanelAttachmentEvent(object sender, StepPanelAttachmentEventArgs args); public delegate void StepRTBLinkEvent(object sender, StepPanelLinkEventArgs args); diff --git a/PROMS/Volian.Controls.Library/StepTabPanel.cs b/PROMS/Volian.Controls.Library/StepTabPanel.cs index 68f01ec5..1e6a8cf6 100644 --- a/PROMS/Volian.Controls.Library/StepTabPanel.cs +++ b/PROMS/Volian.Controls.Library/StepTabPanel.cs @@ -120,7 +120,7 @@ namespace Volian.Controls.Library _MyStepPanel.LinkModifyRO += new StepPanelLinkEvent(_MyStepPanel_LinkModifyRO); _MyStepPanel.ItemClick +=new Volian.Controls.Library.StepPanelEvent(_MyStepPanel_ItemClick); _MyStepPanel.AttachmentClicked += new Volian.Controls.Library.StepPanelAttachmentEvent(_MyStepPanel_AttachmentClicked); - _MyStepPanel.ItemSelectedChanged += new StepPanelEvent(_MyStepPanel_ItemSelectedChanged); + _MyStepPanel.ItemSelectedChanged += new ItemSelectedChangedEvent(_MyStepPanel_ItemSelectedChanged); } #endregion #region Event Handlers @@ -184,7 +184,7 @@ namespace Volian.Controls.Library /// /// /// - void _MyStepPanel_ItemSelectedChanged(object sender, StepPanelEventArgs args) + void _MyStepPanel_ItemSelectedChanged(object sender, ItemSelectedChangedEventArgs args) { //_MyTabRibbon.MyDisplayRTB = args.MyDisplayItem.MyDisplayRTB; _MyStepTabRibbon.MyStepItem = args.MyStepItem; diff --git a/PROMS/Volian.Controls.Library/StepTabPanel.resx b/PROMS/Volian.Controls.Library/StepTabPanel.resx new file mode 100644 index 00000000..52a9ad3e --- /dev/null +++ b/PROMS/Volian.Controls.Library/StepTabPanel.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + \ No newline at end of file diff --git a/PROMS/Volian.Controls.Library/vlnStackTrace.cs b/PROMS/Volian.Controls.Library/vlnStackTrace.cs index c96de2e3..43ef5a81 100644 --- a/PROMS/Volian.Controls.Library/vlnStackTrace.cs +++ b/PROMS/Volian.Controls.Library/vlnStackTrace.cs @@ -29,13 +29,62 @@ namespace Volian.Controls.Library StackTrace st = new StackTrace(true); StackFrame[] sfs = st.GetFrames(); int ii = 0; + string sLast = ""; + string sThis = ""; + int imax = MatchingStackFrame(sfs); foreach (StackFrame sf in sfs) { + if (imax == 0) + sb.Append(string.Format("\r\n{0}---------", "".PadLeft(ii++ * 2))); + imax--; if (ii < 2) ii++; - else if (sf.GetFileLineNumber() != 0) - sb.Append(string.Format("\r\n{0}{1}", "".PadLeft(ii++ * 2), sf.ToString().TrimEnd(" \r\n".ToCharArray()))); + else + { + string sMethod = sf.GetMethod().Name; + string sNamespace = sf.GetMethod().ReflectedType.Namespace; + string sType = sf.GetMethod().ReflectedType.Name; + if (sf.GetFileLineNumber() != 0) + { + sMethod += string.Format(" {0}[{1}]", sf.GetFileName(), sf.GetFileLineNumber()); + sThis = ""; + } + else + { + sThis = sNamespace; + } + if (sLast == sThis && sThis != "") + sb.Append(string.Format("\t*.{0}.{1}", sType, sMethod)); + else + sb.Append(string.Format("\r\n{0}{1}.{2}.{3}", "".PadLeft(ii++ * 2), sNamespace, sType, sMethod)); + } + sLast = sThis; } return sb.ToString(); } + private static StackFrame [] _LastSFS; + private static int MatchingStackFrame(StackFrame[] sfs) + { + int iFound = -1; + if (_LastSFS != null) + { + // start at the far end and work backward + for (int i = 1; iFound < 0 && i <= sfs.Length && i <= _LastSFS.Length; i++) + { + if (!Match(sfs[sfs.Length - i],_LastSFS[_LastSFS.Length - i])) + iFound = 1+ sfs.Length - i; + } + } + if (iFound < 0) iFound = sfs.Length; + _LastSFS = (StackFrame[])sfs.Clone(); + return iFound; + } + + private static bool Match(StackFrame stackFrame1, StackFrame stackFrame2) + { + if (stackFrame1.GetMethod().Name != stackFrame2.GetMethod().Name) return false; + if (stackFrame1.GetMethod().DeclaringType.FullName != stackFrame2.GetMethod().DeclaringType.FullName) return false; + if (stackFrame1.GetILOffset() != stackFrame2.GetILOffset()) return false; + return true; + } } }