From 1503b3f9cc1ca7bfc48189464a0a3cf8dba17404 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 5 Feb 2009 20:51:38 +0000 Subject: [PATCH] down arrow fix search tweaks search tweeks up arrow fix --- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 2 - .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 2 +- .../DisplaySearch.Designer.cs | 172 +++++++++++------- .../Volian.Controls.Library/DisplaySearch.cs | 98 ++++++---- PROMS/Volian.Controls.Library/StepPanel.cs | 2 +- 5 files changed, 173 insertions(+), 103 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 3e7c2d6a..c399e581 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -1182,8 +1182,6 @@ namespace VEPROMS private void infotabResults_Click(object sender, EventArgs e) { toolsPanel.Expanded = true; - if (SelectedROFst!=null) - displaySearch1.MyROFSTLookup = SelectedROFst.ROFSTLookup; if (SelectedDVI != null) { displaySearch1.Mydocversion = SelectedDVI; diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index dbeb537c..985cf30a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -650,7 +650,7 @@ namespace VEPROMS.CSLA.Library { get { - return (IsHigh?0:(IsRNO?1:0)+((ItemInfo)ActiveParent).RNOLevel); + return ((IsProcedure || IsSection || IsHigh)?0:(IsRNO?1:0)+((ItemInfo)ActiveParent).RNOLevel); } } public int Columns diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 038d18e7..77ae6bf0 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -32,16 +32,18 @@ namespace Volian.Controls.Library this.tabSearchTypes = new DevComponents.DotNetBar.TabControl(); this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.label1 = new System.Windows.Forms.Label(); this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.cbSrchAnnoText = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.gpSrchAnnoText = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.label2 = new System.Windows.Forms.Label(); this.cbxTextSearchAnnotation = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.cbxCaseSensitiveAnnoText = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.cmboTreeROs = new DevComponents.DotNetBar.Controls.ComboTree(); @@ -90,8 +92,8 @@ namespace Volian.Controls.Library this.tabSearchTypes.CanReorderTabs = false; this.tabSearchTypes.CloseButtonOnTabsAlwaysDisplayed = false; this.tabSearchTypes.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; - this.tabSearchTypes.Controls.Add(this.tabControlPanel4); this.tabSearchTypes.Controls.Add(this.tabControlPanel3); + this.tabSearchTypes.Controls.Add(this.tabControlPanel4); this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; this.tabSearchTypes.Location = new System.Drawing.Point(0, 0); @@ -100,7 +102,7 @@ namespace Volian.Controls.Library this.tabSearchTypes.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tabSearchTypes.SelectedTabIndex = 0; this.tabSearchTypes.ShowFocusRectangle = false; - this.tabSearchTypes.Size = new System.Drawing.Size(364, 131); + this.tabSearchTypes.Size = new System.Drawing.Size(364, 110); this.tabSearchTypes.TabIndex = 0; this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; this.tabSearchTypes.Tabs.Add(this.tabStepTypeSearch); @@ -113,12 +115,13 @@ namespace Volian.Controls.Library // this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.tabControlPanel4.Controls.Add(this.gpSrchText); + this.tabControlPanel4.Controls.Add(this.rbtnSrchTxt); this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage); this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControlPanel4.Location = new System.Drawing.Point(0, 27); this.tabControlPanel4.Name = "tabControlPanel4"; this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel4.Size = new System.Drawing.Size(364, 104); + this.tabControlPanel4.Size = new System.Drawing.Size(364, 83); this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) @@ -134,12 +137,13 @@ namespace Volian.Controls.Library // this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control; this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSrchText.Controls.Add(this.label1); this.gpSrchText.Controls.Add(this.cbxCaseSensitive); this.gpSrchText.Controls.Add(this.cbxTextSearchText); - this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Top; - this.gpSrchText.Location = new System.Drawing.Point(1, 1); + this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill; + this.gpSrchText.Location = new System.Drawing.Point(23, 1); this.gpSrchText.Name = "gpSrchText"; - this.gpSrchText.Size = new System.Drawing.Size(362, 57); + this.gpSrchText.Size = new System.Drawing.Size(340, 57); // // // @@ -163,11 +167,22 @@ namespace Volian.Controls.Library this.gpSrchText.TabIndex = 5; this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged); // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(3, 3); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(72, 18); + this.label1.TabIndex = 4; + this.label1.Text = "Find Text:"; + // // cbxCaseSensitive // this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent; this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxCaseSensitive.Location = new System.Drawing.Point(3, 30); + this.cbxCaseSensitive.Location = new System.Drawing.Point(115, 0); this.cbxCaseSensitive.Name = "cbxCaseSensitive"; this.cbxCaseSensitive.Size = new System.Drawing.Size(131, 23); this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" + @@ -178,30 +193,47 @@ namespace Volian.Controls.Library // cbxTextSearchText // this.cbxTextSearchText.DisplayMember = "Text"; - this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Top; + this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Bottom; this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchText.FormattingEnabled = true; this.cbxTextSearchText.ItemHeight = 18; - this.cbxTextSearchText.Location = new System.Drawing.Point(0, 0); + this.cbxTextSearchText.Location = new System.Drawing.Point(0, 27); this.cbxTextSearchText.Name = "cbxTextSearchText"; - this.cbxTextSearchText.Size = new System.Drawing.Size(356, 24); + this.cbxTextSearchText.Size = new System.Drawing.Size(334, 24); this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Enter the text you want to search, or select from the drop down list.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 80))); this.cbxTextSearchText.TabIndex = 2; this.cbxTextSearchText.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchText.WatermarkText = "Enter Search Text Here"; this.cbxTextSearchText.Leave += new System.EventHandler(this.cbxTextSearchText_Leave); + this.cbxTextSearchText.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); + // + // rbtnSrchTxt + // + this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent; + this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; + this.rbtnSrchTxt.Checked = true; + this.rbtnSrchTxt.CheckState = System.Windows.Forms.CheckState.Checked; + this.rbtnSrchTxt.CheckValue = "Y"; + this.rbtnSrchTxt.Dock = System.Windows.Forms.DockStyle.Left; + this.rbtnSrchTxt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.rbtnSrchTxt.Location = new System.Drawing.Point(1, 1); + this.rbtnSrchTxt.Name = "rbtnSrchTxt"; + this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 57); + this.rbtnSrchTxt.TabIndex = 6; + this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged); // // cbxSrchTypeUsage // this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent; + this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom; this.cbxSrchTypeUsage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 80); + this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 58); this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage"; - this.cbxSrchTypeUsage.Size = new System.Drawing.Size(362, 23); + this.cbxSrchTypeUsage.Size = new System.Drawing.Size(362, 24); this.cbxSrchTypeUsage.TabIndex = 4; - this.cbxSrchTypeUsage.Text = "Find Just The Usage Of Selected Types"; + this.cbxSrchTypeUsage.Text = " Find Selected Types"; this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged); // // tabStepTypeSearch @@ -211,17 +243,17 @@ namespace Volian.Controls.Library this.superTooltip1.SetSuperTooltip(this.tabStepTypeSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", "Allows you to search for entered text in selected procedure sets and within selec" + "ted procedure text types.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); this.tabStepTypeSearch.Text = "Text"; + this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click); // // tabControlPanel3 // - this.tabControlPanel3.Controls.Add(this.cbSrchAnnoText); - this.tabControlPanel3.Controls.Add(this.cbxAnnoTypes); this.tabControlPanel3.Controls.Add(this.gpSrchAnnoText); + this.tabControlPanel3.Controls.Add(this.cbxAnnoTypes); this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControlPanel3.Location = new System.Drawing.Point(0, 27); this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(364, 104); + this.tabControlPanel3.Size = new System.Drawing.Size(364, 83); 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) @@ -231,47 +263,18 @@ namespace Volian.Controls.Library this.tabControlPanel3.TabItem = this.tabAnnotationSearch; this.tabControlPanel3.ThemeAware = true; // - // cbSrchAnnoText - // - this.cbSrchAnnoText.BackColor = System.Drawing.Color.Transparent; - this.cbSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Top; - this.cbSrchAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbSrchAnnoText.Location = new System.Drawing.Point(1, 25); - this.cbSrchAnnoText.Name = "cbSrchAnnoText"; - this.cbSrchAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbSrchAnnoText.Size = new System.Drawing.Size(362, 23); - this.cbSrchAnnoText.TabIndex = 3; - this.cbSrchAnnoText.Text = "Search The AnnotationText For:"; - this.cbSrchAnnoText.CheckedChanged += new System.EventHandler(this.cbSrchAnnoText_CheckedChanged); - // - // cbxAnnoTypes - // - this.cbxAnnoTypes.DisplayMember = "Text"; - this.cbxAnnoTypes.Dock = System.Windows.Forms.DockStyle.Top; - this.cbxAnnoTypes.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cbxAnnoTypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbxAnnoTypes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxAnnoTypes.FormattingEnabled = true; - this.cbxAnnoTypes.ItemHeight = 18; - this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); - this.cbxAnnoTypes.Name = "cbxAnnoTypes"; - this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxAnnoTypes.Size = new System.Drawing.Size(362, 24); - this.superTooltip1.SetSuperTooltip(this.cbxAnnoTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "Select the type of annotation to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(192, 61))); - this.cbxAnnoTypes.TabIndex = 0; - this.cbxAnnoTypes.WatermarkText = "Select AnnotationType to Search"; - // // gpSrchAnnoText // this.gpSrchAnnoText.CanvasColor = System.Drawing.SystemColors.Control; this.gpSrchAnnoText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSrchAnnoText.Controls.Add(this.label2); this.gpSrchAnnoText.Controls.Add(this.cbxTextSearchAnnotation); this.gpSrchAnnoText.Controls.Add(this.cbxCaseSensitiveAnnoText); - this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Bottom; + this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; this.gpSrchAnnoText.Enabled = false; - this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 50); + this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 25); this.gpSrchAnnoText.Name = "gpSrchAnnoText"; - this.gpSrchAnnoText.Size = new System.Drawing.Size(362, 53); + this.gpSrchAnnoText.Size = new System.Drawing.Size(362, 57); // // // @@ -295,37 +298,68 @@ namespace Volian.Controls.Library this.gpSrchAnnoText.TabIndex = 6; this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); // + // label2 + // + this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(3, 2); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(146, 18); + this.label2.TabIndex = 7; + this.label2.Text = "Find Annotation Text:"; + // // cbxTextSearchAnnotation // this.cbxTextSearchAnnotation.DisplayMember = "Text"; - this.cbxTextSearchAnnotation.Dock = System.Windows.Forms.DockStyle.Top; + this.cbxTextSearchAnnotation.Dock = System.Windows.Forms.DockStyle.Bottom; this.cbxTextSearchAnnotation.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.cbxTextSearchAnnotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchAnnotation.FormattingEnabled = true; this.cbxTextSearchAnnotation.ItemHeight = 18; - this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(0, 0); + this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(0, 27); this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(356, 24); - this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 76))); + this.superTooltip1.SetSuperTooltip(this.cbxTextSearchAnnotation, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Annotaion Text", "", "Enter Annotation text to search for or select from the dropdown list.\r\n\r\nLeave Bl" + + "ank to search for occurences of the selected annotation.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 140))); this.cbxTextSearchAnnotation.TabIndex = 6; this.cbxTextSearchAnnotation.WatermarkFont = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxTextSearchAnnotation.WatermarkText = "Enter Search Text Here"; this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); + this.cbxTextSearchAnnotation.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); // // cbxCaseSensitiveAnnoText // + this.cbxCaseSensitiveAnnoText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent; this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(3, 26); + this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(227, 3); this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(125, 23); + this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(125, 19); this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitiveAnnoText, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact mactches of the search text" + " you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); this.cbxCaseSensitiveAnnoText.TabIndex = 5; this.cbxCaseSensitiveAnnoText.Text = "Case Sensitive"; // + // cbxAnnoTypes + // + this.cbxAnnoTypes.DisplayMember = "Text"; + this.cbxAnnoTypes.Dock = System.Windows.Forms.DockStyle.Top; + this.cbxAnnoTypes.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbxAnnoTypes.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cbxAnnoTypes.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxAnnoTypes.FormattingEnabled = true; + this.cbxAnnoTypes.ItemHeight = 18; + this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); + this.cbxAnnoTypes.Name = "cbxAnnoTypes"; + this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxAnnoTypes.Size = new System.Drawing.Size(362, 24); + this.superTooltip1.SetSuperTooltip(this.cbxAnnoTypes, new DevComponents.DotNetBar.SuperTooltipInfo("Select Annotation Type", "", "Select the type of annotation to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(192, 61))); + this.cbxAnnoTypes.TabIndex = 0; + this.cbxAnnoTypes.WatermarkText = "Select AnnotationType to Search"; + // // tabAnnotationSearch // this.tabAnnotationSearch.AttachedControl = this.tabControlPanel3; @@ -339,7 +373,7 @@ namespace Volian.Controls.Library this.tabControlPanel2.Location = new System.Drawing.Point(0, 27); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(364, 104); + this.tabControlPanel2.Size = new System.Drawing.Size(364, 83); 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) @@ -460,7 +494,7 @@ namespace Volian.Controls.Library // this.node2.Expanded = true; this.node2.Name = "node2"; - this.node2.Text = "....you need to select a procedure set for types to appear..."; + this.node2.Text = "....select a procedure set for types to appear..."; // // nodeConnector2 // @@ -472,9 +506,9 @@ namespace Volian.Controls.Library this.grpPanSearchResults.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.grpPanSearchResults.Controls.Add(this.lbSrchResults); this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpPanSearchResults.Location = new System.Drawing.Point(0, 583); + this.grpPanSearchResults.Location = new System.Drawing.Point(0, 562); this.grpPanSearchResults.Name = "grpPanSearchResults"; - this.grpPanSearchResults.Size = new System.Drawing.Size(364, 249); + this.grpPanSearchResults.Size = new System.Drawing.Size(364, 270); // // // @@ -507,7 +541,7 @@ namespace Volian.Controls.Library this.lbSrchResults.Location = new System.Drawing.Point(0, 0); this.lbSrchResults.Name = "lbSrchResults"; this.lbSrchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lbSrchResults.Size = new System.Drawing.Size(358, 212); + this.lbSrchResults.Size = new System.Drawing.Size(358, 244); this.lbSrchResults.TabIndex = 0; this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove); this.lbSrchResults.SelectedValueChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged); @@ -535,7 +569,7 @@ namespace Volian.Controls.Library this.panSearchButtons.Controls.Add(this.btnSearch); this.panSearchButtons.Controls.Add(this.btnPrnSrchRslts); this.panSearchButtons.Dock = System.Windows.Forms.DockStyle.Top; - this.panSearchButtons.Location = new System.Drawing.Point(0, 510); + this.panSearchButtons.Location = new System.Drawing.Point(0, 489); this.panSearchButtons.Name = "panSearchButtons"; this.panSearchButtons.Size = new System.Drawing.Size(364, 73); this.panSearchButtons.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -626,7 +660,7 @@ namespace Volian.Controls.Library this.xpSetToSearch.Controls.Add(this.advTreeProcSets); this.xpSetToSearch.Dock = System.Windows.Forms.DockStyle.Top; this.xpSetToSearch.ExpandOnTitleClick = true; - this.xpSetToSearch.Location = new System.Drawing.Point(0, 131); + this.xpSetToSearch.Location = new System.Drawing.Point(0, 110); this.xpSetToSearch.Name = "xpSetToSearch"; this.xpSetToSearch.Size = new System.Drawing.Size(364, 199); this.xpSetToSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -646,7 +680,7 @@ namespace Volian.Controls.Library this.xpSetToSearch.TitleStyle.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.xpSetToSearch.TitleStyle.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.xpSetToSearch.TitleStyle.GradientAngle = 90; - this.xpSetToSearch.TitleText = "Click Here To Select Procedure Sets"; + this.xpSetToSearch.TitleText = "Select Procedure Sets"; this.xpSetToSearch.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.xpSetToSearch_ExpandedChanged); // // xpStepTypes @@ -656,7 +690,7 @@ namespace Volian.Controls.Library this.xpStepTypes.Controls.Add(this.advTreeStepTypes); this.xpStepTypes.Dock = System.Windows.Forms.DockStyle.Top; this.xpStepTypes.ExpandOnTitleClick = true; - this.xpStepTypes.Location = new System.Drawing.Point(0, 330); + this.xpStepTypes.Location = new System.Drawing.Point(0, 309); this.xpStepTypes.Name = "xpStepTypes"; this.xpStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; this.xpStepTypes.Size = new System.Drawing.Size(364, 180); @@ -679,7 +713,7 @@ namespace Volian.Controls.Library this.xpStepTypes.TitleStyle.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.xpStepTypes.TitleStyle.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.xpStepTypes.TitleStyle.GradientAngle = 90; - this.xpStepTypes.TitleText = "Click Here To Search By Types"; + this.xpStepTypes.TitleText = "Search By Types"; this.xpStepTypes.ExpandedChanged += new DevComponents.DotNetBar.ExpandChangeEventHandler(this.xpStepTypes_ExpandedChanged); // // superTooltip1 @@ -702,8 +736,10 @@ namespace Volian.Controls.Library this.tabSearchTypes.ResumeLayout(false); this.tabControlPanel4.ResumeLayout(false); this.gpSrchText.ResumeLayout(false); + this.gpSrchText.PerformLayout(); this.tabControlPanel3.ResumeLayout(false); this.gpSrchAnnoText.ResumeLayout(false); + this.gpSrchAnnoText.PerformLayout(); this.tabControlPanel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit(); @@ -751,13 +787,15 @@ namespace Volian.Controls.Library private DevComponents.Editors.ComboItem comboItem3; private DevComponents.Editors.ComboItem comboItem4; private DevComponents.DotNetBar.Controls.CheckBoxX cbxCaseSensitiveAnnoText; - private DevComponents.DotNetBar.Controls.CheckBoxX cbSrchAnnoText; private DevComponents.DotNetBar.Controls.CheckBoxX cbxSrchTypeUsage; private DevComponents.DotNetBar.Controls.GroupPanel gpSrchAnnoText; private DevComponents.DotNetBar.Controls.GroupPanel gpSrchText; private DevComponents.DotNetBar.Controls.ComboBoxEx cbxTextSearchAnnotation; private DevComponents.DotNetBar.TabControlPanel tabControlPanel3; private DevComponents.DotNetBar.TabItem tabAnnotationSearch; + private DevComponents.DotNetBar.Controls.CheckBoxX rbtnSrchTxt; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 0db5d0df..13a3d3d5 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -21,7 +21,7 @@ namespace Volian.Controls.Library private AnnotationDetails _AnnotationDetails = null; ItemInfo _ItemInfo = null; private DisplayTabControl _TabControl; - private DocVersionInfo _mydocversion; + private DocVersionInfo _MyDocVersion; private Color saveXpSetToSearchColor; private Color saveXpStepTypeTitleColor; private Color saveGpSrchAnnoTextColor; @@ -48,8 +48,18 @@ namespace Volian.Controls.Library public DocVersionInfo Mydocversion { - get { return _mydocversion; } - set { _mydocversion = value; } + get { return _MyDocVersion; } + set { + _MyDocVersion = value; + if (_MyDocVersion != null) + { + if (_MyDocVersion.DocVersionAssociationCount > 0) + { + MyROFSTLookup = _MyDocVersion.DocVersionAssociations[0].MyROFst.ROFSTLookup; + _MyRODbID = _MyDocVersion.DocVersionAssociations[0].MyROFst.RODbID; + } + } + } } private ROFSTLookup _MyROFSTLookup; @@ -79,7 +89,6 @@ namespace Volian.Controls.Library get { return _ProgressBar; } set { _ProgressBar = value; } } - private ItemInfo _CurrentProcedure; #endregion #region setup @@ -96,13 +105,15 @@ namespace Volian.Controls.Library // start out with the procedure and type selection windows colasped xpSetToSearch.Expanded = false; xpStepTypes.Expanded = false; + rbtnSrchTxt.Checked = true; + gpSrchAnnoText.Enabled = true; } private void LoadSearchTextListBox() { cbxTextSearchText.Items.Clear(); cbxTextSearchAnnotation.Items.Clear(); - //TODO: load saved search strings from user settings + //TODO: load saved search strings from user settings - if we decide to } public void advTreeStepTypesFillIn() @@ -112,7 +123,7 @@ namespace Volian.Controls.Library topnode.Text = "Types"; advTreeStepTypes.Nodes.Add(topnode); - FormatData fmtdata = _mydocversion.ActiveFormat.PlantFormat.FormatData; + FormatData fmtdata = _MyDocVersion.ActiveFormat.PlantFormat.FormatData; List lstSrchStpTypes = fmtdata.GetSearchableSteps(); // list of searchable step types if (lstSrchStpTypes != null && lstSrchStpTypes.Count > 0) { @@ -224,6 +235,7 @@ namespace Volian.Controls.Library // position to the procedure set in the tree if we have a procedure open if (Mydocversion != null) advTreeProcSetsPreSelect(); + cbxTextSearchText.Focus(); // set initial focus to enter search text } void advTreeProcSets_BeforeExpand(object sender, DevComponents.AdvTree.AdvTreeNodeCancelEventArgs e) @@ -428,10 +440,6 @@ namespace Volian.Controls.Library _TabControl = tc; } - private void cbSrchAnnoText_CheckedChanged(object sender, EventArgs e) - { - gpSrchAnnoText.Enabled = cbSrchAnnoText.Checked; - } private void cbxTextSearchAnnotation_Leave(object sender, EventArgs e) { @@ -447,7 +455,10 @@ namespace Volian.Controls.Library private void gpSrchAnnoText_EnabledChanged(object sender, EventArgs e) { if (gpSrchAnnoText.Enabled) + { gpSrchAnnoText.Style.BackColor = Color.Yellow; + cbxTextSearchAnnotation.Focus(); + } else gpSrchAnnoText.Style.BackColor = saveGpSrchAnnoTextColor; } @@ -602,19 +613,23 @@ namespace Volian.Controls.Library // get list of doc versions to search foreach (DocVersionInfo dvi in lstCheckedDocVersions) { - strRtnStr[0] += string.Format("{0},", dvi.ItemID.ToString()); + strRtnStr[0] += string.Format("{0},", dvi.VersionID.ToString()); } strRtnStr[0] = strRtnStr[0].Remove(strRtnStr[0].LastIndexOf(','), 1); } // append list of step types to search - // TODO: need type number to search in attachments (word documents) if (lstCheckedStepTypes.Count > 0) { // get list of selected types foreach (int typ in lstCheckedStepTypes) { - strRtnStr[1] += string.Format("{0},", (typ + 20000)); + int tmp = typ; + if (tmp == 0) + tmp = 10000; // this is the accessory page type + else + tmp += 20000; // step/substep types + strRtnStr[1] += string.Format("{0},", tmp); } strRtnStr[1] = strRtnStr[1].Remove(strRtnStr[1].LastIndexOf(','), 1); } @@ -629,8 +644,6 @@ namespace Volian.Controls.Library } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[2]) { // RO Search - // TODO: the "1:" is hard coded for now. This is the ID to the corresponding - // RO.FST from the Association record ROFSTLookup.rochild[] chld = null; if (cmboTreeROs.SelectedNode != null) { @@ -638,14 +651,14 @@ namespace Volian.Controls.Library if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rodbi) { ROFSTLookup.rodbi db = (ROFSTLookup.rodbi)cmboTreeROs.SelectedNode.Tag; - strRtnStr[2] += "1:" + string.Format("{0}", db.dbiID.ToString("D4")); + strRtnStr[2] += _MyRODbID.ToString()+":" + string.Format("{0}", db.dbiID.ToString("D4")); } else if (cmboTreeROs.SelectedNode.Tag is ROFSTLookup.rochild) { ch = (ROFSTLookup.rochild)cmboTreeROs.SelectedNode.Tag; chld = ch.children; // build a list of ROs to search - strRtnStr[2] += "1:" + GetROsToSearch(chld); + strRtnStr[2] += _MyRODbID.ToString() + ":" + GetROsToSearch(chld); if (strRtnStr[2].EndsWith(",")) strRtnStr[2] = strRtnStr[2].Substring(0, strRtnStr[2].Length - 2); } @@ -694,7 +707,7 @@ namespace Volian.Controls.Library bool includeSpecialChars = false; if (cbxSrchTypeUsage.Checked) // find just the usage of the selected types { - if (lstCheckedStepTypes.Count ==0) //(strSearchText[1].Equals("")) + if (lstCheckedStepTypes.Count ==0) { MessageBox.Show("Please select one or more types then press the Search button", "No Types Selected"); xpStepTypes.Expanded = true; @@ -723,17 +736,9 @@ namespace Volian.Controls.Library } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) // Annotation Search { - if (cbSrchAnnoText.Checked && cbxTextSearchAnnotation.Text.Equals(string.Empty)) - { - MessageBox.Show("Please enter some search text, then click the Search button", "No Search Text"); - cbxTextSearchAnnotation.Focus(); - } - else - { - SearchResults = ItemInfoList.GetListFromAnnotationSearch(strSearchText[0], strSearchText[1], strSearchText[2], cbSrchAnnoText.Checked ? cbxTextSearchAnnotation.Text : "", cbxCaseSensitiveAnnoText.Checked); + SearchResults = ItemInfoList.GetListFromAnnotationSearch(strSearchText[0], strSearchText[1], strSearchText[2], cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked); UpdateAnnotationSearchResults(); cmbResultsStyle.SelectedIndex = 2; // display annotation text in results - } } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[2]) // RO Search { @@ -761,16 +766,25 @@ namespace Volian.Controls.Library private void cbxSrchTypeUsage_CheckedChanged(object sender, EventArgs e) { gpSrchText.Enabled = !cbxSrchTypeUsage.Checked; - if (!cbxSrchTypeUsage.Checked && lstCheckedStepTypes.Count == 0) + if (!cbxSrchTypeUsage.Checked) xpStepTypes.TitleStyle.BackColor1.Color = saveXpStepTypeTitleColor; else { xpStepTypes.Expanded = true; if (lstCheckedStepTypes.Count == 0) xpStepTypes.TitleStyle.BackColor1.Color = Color.Crimson; + advTreeStepTypes.Focus(); + } } + private void rbtnSrchTxt_CheckedChanged(object sender, EventArgs e) + { + if (rbtnSrchTxt.Checked) + cbxTextSearchText.Focus(); + + } + private void gpSrchText_EnabledChanged(object sender, EventArgs e) { @@ -788,10 +802,25 @@ namespace Volian.Controls.Library xpSetToSearch.TitleStyle.BackColor1.Color = Color.Crimson; } } - #endregion + + private void tabStepTypeSearch_Click(object sender, EventArgs e) + { + if (rbtnSrchTxt.Checked) + cbxTextSearchText.Focus(); + } + + private void ProcessEnterKey(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == '\r') // enter key pressed + { + e.Handled = true; + btnSearch_Click(sender, e); + } + } +#endregion #region ProcSetSelection - + private int _MyRODbID; private void advTreeProcSets_AfterCheck(object sender, DevComponents.AdvTree.AdvTreeCellEventArgs e) { DevComponents.AdvTree.Node n = advTreeProcSets.SelectedNode; @@ -804,8 +833,6 @@ namespace Volian.Controls.Library Mydocversion = (DocVersionInfo)n.Tag; advTreeStepTypesFillIn(); } - if (MyROFSTLookup == null) - MyROFSTLookup = Mydocversion.DocVersionAssociations[0].MyROFst.ROFSTLookup; } else { @@ -878,7 +905,11 @@ namespace Volian.Controls.Library { if (lstCheckedStepTypes.Count == 0) if (xpStepTypes.Expanded) + { xpStepTypes.TitleText = "Select Types To Search"; + advTreeStepTypes.Focus(); + advTreeStepTypes.Nodes[0].SelectedCell = advTreeStepTypes.Nodes[0].Cells[0]; + } else { xpStepTypes.TitleText = "Click Here To Search By Types"; @@ -888,6 +919,9 @@ namespace Volian.Controls.Library #endregion + + + } #region Annoation Search Type Class diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs index 278a463a..d0fcc1c1 100644 --- a/PROMS/Volian.Controls.Library/StepPanel.cs +++ b/PROMS/Volian.Controls.Library/StepPanel.cs @@ -662,7 +662,7 @@ namespace Volian.Controls.Library // If has caution, BottomPart of last sibling of the caution if (ii.Cautions != null) return BottomPart(ii.Cautions[0].LastSibling); // If previous sibling, BottomPart of previous sibling - if (ii.MyPrevious != null) return BottomPart(ii.MyPrevious); + if (ii.MyPrevious != null && ii.IsProcedure == false) return BottomPart(ii.MyPrevious); // Go to parent until at procedure if (!ii.IsProcedure) return (ii.MyParent); return null;