diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 9eda46b5..18e4bf37 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -50,6 +50,18 @@ namespace Volian.Controls.Library this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DisplaySearch)); this.tabSearchTypes = new DevComponents.DotNetBar.TabControl(); + this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); + this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.label1 = new System.Windows.Forms.Label(); + this.panel3 = new System.Windows.Forms.Panel(); + this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components); this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel(); this.gpFindROs = new DevComponents.DotNetBar.Controls.GroupPanel(); this.cbxFndUnLnkROVals = new DevComponents.DotNetBar.Controls.CheckBoxX(); @@ -64,18 +76,6 @@ namespace Volian.Controls.Library this.label2 = new System.Windows.Forms.Label(); this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components); - this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel(); - this.gpSrchText = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.panel1 = new System.Windows.Forms.Panel(); - this.cbxTextSearchText = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - this.label1 = new System.Windows.Forms.Label(); - this.panel3 = new System.Windows.Forms.Panel(); - this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.rbtnSrchTxt = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxSrchTypeUsage = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.tabStepTypeSearch = new DevComponents.DotNetBar.TabItem(this.components); this.contextMenuBar1 = new DevComponents.DotNetBar.ContextMenuBar(); this.btnCMIFindText = new DevComponents.DotNetBar.ButtonItem(); this.btnCMEdit = new DevComponents.DotNetBar.ButtonItem(); @@ -122,15 +122,15 @@ namespace Volian.Controls.Library this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit(); this.tabSearchTypes.SuspendLayout(); + this.tabControlPanel4.SuspendLayout(); + this.gpSrchText.SuspendLayout(); + this.panel1.SuspendLayout(); + this.panel3.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.gpFindROs.SuspendLayout(); this.tabControlPanel3.SuspendLayout(); this.gpSrchAnnoText.SuspendLayout(); this.panel4.SuspendLayout(); - this.tabControlPanel4.SuspendLayout(); - this.gpSrchText.SuspendLayout(); - this.panel1.SuspendLayout(); - this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).BeginInit(); @@ -167,6 +167,234 @@ namespace Volian.Controls.Library this.tabSearchTypes.Text = "tabControl1"; this.tabSearchTypes.ThemeAware = true; // + // tabControlPanel4 + // + 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, 24); + this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel4.Name = "tabControlPanel4"; + this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel4.Size = new System.Drawing.Size(369, 114); + this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel4.Style.GradientAngle = 90; + this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" + + "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140))); + this.tabControlPanel4.TabIndex = 4; + this.tabControlPanel4.TabItem = this.tabStepTypeSearch; + // + // gpSrchText + // + this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control; + this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSrchText.Controls.Add(this.panel1); + this.gpSrchText.Controls.Add(this.panel3); + this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill; + this.gpSrchText.Location = new System.Drawing.Point(30, 1); + this.gpSrchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gpSrchText.Name = "gpSrchText"; + this.gpSrchText.Size = new System.Drawing.Size(338, 90); + // + // + // + this.gpSrchText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpSrchText.Style.BackColorGradientAngle = 90; + this.gpSrchText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpSrchText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchText.Style.BorderBottomWidth = 1; + this.gpSrchText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpSrchText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchText.Style.BorderLeftWidth = 1; + this.gpSrchText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchText.Style.BorderRightWidth = 1; + this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchText.Style.BorderTopWidth = 1; + this.gpSrchText.Style.Class = ""; + this.gpSrchText.Style.CornerDiameter = 4; + this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + // + // + // + this.gpSrchText.StyleMouseDown.Class = ""; + this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpSrchText.StyleMouseOver.Class = ""; + this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gpSrchText.TabIndex = 5; + this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.cbxTextSearchText); + this.panel1.Controls.Add(this.label1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(0, 2); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(332, 28); + this.panel1.TabIndex = 5; + // + // cbxTextSearchText + // + this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchText, this.btnCMIFindText); + this.cbxTextSearchText.DisplayMember = "Text"; + this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Fill; + this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxTextSearchText.FormattingEnabled = true; + this.cbxTextSearchText.ItemHeight = 16; + this.cbxTextSearchText.Location = new System.Drawing.Point(39, 0); + this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTextSearchText.Name = "cbxTextSearchText"; + this.cbxTextSearchText.Size = new System.Drawing.Size(293, 22); + this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + 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); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Dock = System.Windows.Forms.DockStyle.Left; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); + this.label1.Size = new System.Drawing.Size(39, 23); + this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.label1.TabIndex = 4; + this.label1.Text = "Find:"; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.Transparent; + this.panel3.Controls.Add(this.cbxBooleanTxtSrch); + this.panel3.Controls.Add(this.cbxIncROTextSrch); + this.panel3.Controls.Add(this.cbxCaseSensitive); + this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel3.Location = new System.Drawing.Point(0, 30); + this.panel3.Margin = new System.Windows.Forms.Padding(4); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(332, 54); + this.panel3.TabIndex = 6; + // + // cbxBooleanTxtSrch + // + // + // + // + this.cbxBooleanTxtSrch.BackgroundStyle.Class = ""; + this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(12, 18); + this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch"; + this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(148, 18); + this.superTooltip1.SetSuperTooltip(this.cbxBooleanTxtSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Boolean Search", "", resources.GetString("cbxBooleanTxtSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbxBooleanTxtSrch.TabIndex = 6; + this.cbxBooleanTxtSrch.Text = "Boolean Search"; + this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged); + // + // cbxIncROTextSrch + // + // + // + // + this.cbxIncROTextSrch.BackgroundStyle.Class = ""; + this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxIncROTextSrch.Location = new System.Drawing.Point(12, 37); + this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxIncROTextSrch.Name = "cbxIncROTextSrch"; + this.cbxIncROTextSrch.Size = new System.Drawing.Size(149, 18); + this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO Text", "", "When this box is checked, Search will find matches of RO text. This finds matche" + + "s whether the matched text is an inserted RO or entered as text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.cbxIncROTextSrch.TabIndex = 5; + this.cbxIncROTextSrch.Text = "Search RO Text"; + // + // cbxCaseSensitive + // + this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxCaseSensitive.BackgroundStyle.Class = ""; + this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxCaseSensitive.Location = new System.Drawing.Point(12, 1); + this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxCaseSensitive.Name = "cbxCaseSensitive"; + this.cbxCaseSensitive.Size = new System.Drawing.Size(139, 18); + this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " + + "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); + this.cbxCaseSensitive.TabIndex = 3; + this.cbxCaseSensitive.Text = "Case Sensitive"; + // + // rbtnSrchTxt + // + this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.rbtnSrchTxt.BackgroundStyle.Class = ""; + this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.rbtnSrchTxt.Name = "rbtnSrchTxt"; + this.rbtnSrchTxt.Size = new System.Drawing.Size(29, 90); + this.rbtnSrchTxt.TabIndex = 6; + this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged); + // + // cbxSrchTypeUsage + // + this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxSrchTypeUsage.BackgroundStyle.Class = ""; + this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 91); + this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage"; + this.cbxSrchTypeUsage.Size = new System.Drawing.Size(367, 22); + this.cbxSrchTypeUsage.TabIndex = 4; + this.cbxSrchTypeUsage.Text = " Find Selected Types"; + this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged); + // + // tabStepTypeSearch + // + this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4; + this.tabStepTypeSearch.Name = "tabStepTypeSearch"; + 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); + // // tabControlPanel2 // this.tabControlPanel2.Controls.Add(this.gpFindROs); @@ -453,234 +681,6 @@ namespace Volian.Controls.Library this.tabAnnotationSearch.Text = "Annotations"; this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); // - // tabControlPanel4 - // - 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, 24); - this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.tabControlPanel4.Name = "tabControlPanel4"; - this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel4.Size = new System.Drawing.Size(369, 114); - this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel4.Style.GradientAngle = 90; - this.superTooltip1.SetSuperTooltip(this.tabControlPanel4, new DevComponents.DotNetBar.SuperTooltipInfo("Text Search", "", "Enter the text you want to search, or select from the drop down list.\r\n\r\nLeave bl" + - "ank to search for the usage of the selected types in \"Filter By Types\".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(175, 140))); - this.tabControlPanel4.TabIndex = 4; - this.tabControlPanel4.TabItem = this.tabStepTypeSearch; - // - // gpSrchText - // - this.gpSrchText.CanvasColor = System.Drawing.SystemColors.Control; - this.gpSrchText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpSrchText.Controls.Add(this.panel1); - this.gpSrchText.Controls.Add(this.panel3); - this.gpSrchText.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpSrchText.Location = new System.Drawing.Point(30, 1); - this.gpSrchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpSrchText.Name = "gpSrchText"; - this.gpSrchText.Size = new System.Drawing.Size(338, 90); - // - // - // - this.gpSrchText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpSrchText.Style.BackColorGradientAngle = 90; - this.gpSrchText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpSrchText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchText.Style.BorderBottomWidth = 1; - this.gpSrchText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpSrchText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchText.Style.BorderLeftWidth = 1; - this.gpSrchText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchText.Style.BorderRightWidth = 1; - this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchText.Style.BorderTopWidth = 1; - this.gpSrchText.Style.Class = ""; - this.gpSrchText.Style.CornerDiameter = 4; - this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpSrchText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpSrchText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - // - // - // - this.gpSrchText.StyleMouseDown.Class = ""; - this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpSrchText.StyleMouseOver.Class = ""; - this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gpSrchText.TabIndex = 5; - this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged); - // - // panel1 - // - this.panel1.BackColor = System.Drawing.Color.Transparent; - this.panel1.Controls.Add(this.cbxTextSearchText); - this.panel1.Controls.Add(this.label1); - this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 2); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(332, 28); - this.panel1.TabIndex = 5; - // - // cbxTextSearchText - // - this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchText, this.btnCMIFindText); - this.cbxTextSearchText.DisplayMember = "Text"; - this.cbxTextSearchText.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTextSearchText.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.cbxTextSearchText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTextSearchText.FormattingEnabled = true; - this.cbxTextSearchText.ItemHeight = 16; - this.cbxTextSearchText.Location = new System.Drawing.Point(39, 0); - this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxTextSearchText.Name = "cbxTextSearchText"; - this.cbxTextSearchText.Size = new System.Drawing.Size(293, 22); - this.superTooltip1.SetSuperTooltip(this.cbxTextSearchText, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Text", "", resources.GetString("cbxTextSearchText.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - 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); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Dock = System.Windows.Forms.DockStyle.Left; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); - this.label1.Size = new System.Drawing.Size(39, 23); - this.superTooltip1.SetSuperTooltip(this.label1, new DevComponents.DotNetBar.SuperTooltipInfo("Search For Text", "", resources.GetString("label1.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.label1.TabIndex = 4; - this.label1.Text = "Find:"; - // - // panel3 - // - this.panel3.BackColor = System.Drawing.Color.Transparent; - this.panel3.Controls.Add(this.cbxBooleanTxtSrch); - this.panel3.Controls.Add(this.cbxIncROTextSrch); - this.panel3.Controls.Add(this.cbxCaseSensitive); - this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 30); - this.panel3.Margin = new System.Windows.Forms.Padding(4); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(332, 54); - this.panel3.TabIndex = 6; - // - // cbxBooleanTxtSrch - // - // - // - // - this.cbxBooleanTxtSrch.BackgroundStyle.Class = ""; - this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(12, 18); - this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4); - this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch"; - this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(148, 18); - this.superTooltip1.SetSuperTooltip(this.cbxBooleanTxtSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Boolean Search", "", resources.GetString("cbxBooleanTxtSrch.SuperTooltip"), null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbxBooleanTxtSrch.TabIndex = 6; - this.cbxBooleanTxtSrch.Text = "Boolean Search"; - this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged); - // - // cbxIncROTextSrch - // - // - // - // - this.cbxIncROTextSrch.BackgroundStyle.Class = ""; - this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxIncROTextSrch.Location = new System.Drawing.Point(12, 37); - this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4); - this.cbxIncROTextSrch.Name = "cbxIncROTextSrch"; - this.cbxIncROTextSrch.Size = new System.Drawing.Size(149, 18); - this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO Text", "", "When this box is checked, Search will find matches of RO text. This finds matche" + - "s whether the matched text is an inserted RO or entered as text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); - this.cbxIncROTextSrch.TabIndex = 5; - this.cbxIncROTextSrch.Text = "Search RO Text"; - // - // cbxCaseSensitive - // - this.cbxCaseSensitive.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxCaseSensitive.BackgroundStyle.Class = ""; - this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxCaseSensitive.Location = new System.Drawing.Point(12, 1); - this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxCaseSensitive.Name = "cbxCaseSensitive"; - this.cbxCaseSensitive.Size = new System.Drawing.Size(139, 18); - this.superTooltip1.SetSuperTooltip(this.cbxCaseSensitive, new DevComponents.DotNetBar.SuperTooltipInfo("Case Sensitive", "", "When this box is checked, Search will find only exact matches of the search text " + - "you had entered.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); - this.cbxCaseSensitive.TabIndex = 3; - this.cbxCaseSensitive.Text = "Case Sensitive"; - // - // rbtnSrchTxt - // - this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.rbtnSrchTxt.BackgroundStyle.Class = ""; - this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.rbtnSrchTxt.Name = "rbtnSrchTxt"; - this.rbtnSrchTxt.Size = new System.Drawing.Size(29, 90); - this.rbtnSrchTxt.TabIndex = 6; - this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged); - // - // cbxSrchTypeUsage - // - this.cbxSrchTypeUsage.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxSrchTypeUsage.BackgroundStyle.Class = ""; - this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 91); - this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage"; - this.cbxSrchTypeUsage.Size = new System.Drawing.Size(367, 22); - this.cbxSrchTypeUsage.TabIndex = 4; - this.cbxSrchTypeUsage.Text = " Find Selected Types"; - this.cbxSrchTypeUsage.CheckedChanged += new System.EventHandler(this.cbxSrchTypeUsage_CheckedChanged); - // - // tabStepTypeSearch - // - this.tabStepTypeSearch.AttachedControl = this.tabControlPanel4; - this.tabStepTypeSearch.Name = "tabStepTypeSearch"; - 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); - // // contextMenuBar1 // this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top; @@ -1250,6 +1250,11 @@ namespace Volian.Controls.Library this.Size = new System.Drawing.Size(369, 832); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit(); this.tabSearchTypes.ResumeLayout(false); + this.tabControlPanel4.ResumeLayout(false); + this.gpSrchText.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel3.ResumeLayout(false); this.tabControlPanel2.ResumeLayout(false); this.gpFindROs.ResumeLayout(false); this.tabControlPanel3.ResumeLayout(false); @@ -1257,11 +1262,6 @@ namespace Volian.Controls.Library this.gpSrchAnnoText.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); - this.tabControlPanel4.ResumeLayout(false); - this.gpSrchText.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.panel3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit(); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 13e999c4..0ece6e48 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -986,6 +986,9 @@ namespace Volian.Controls.Library { DateTime start = DateTime.Now; Cursor savcursor = Cursor; + // keeps track of index into combo box for results style. This combo box may have 3 or 4 + // items depending on whether annotations exist. + int cmbResultsStyleIndex = -1; try { lbSrchResults.DataSource = null; @@ -1011,7 +1014,7 @@ namespace Volian.Controls.Library ReportTitle = "PROMS2010 - Search by Type"; SearchString = null; SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars); - cmbResultsStyle.SelectedIndex = 1; //display step locations in results + cmbResultsStyleIndex = 1; //display step locations in results } } else @@ -1026,7 +1029,7 @@ namespace Volian.Controls.Library ReportTitle = string.Format("PROMS2010 - {0} Search for '{1}'", cbxBooleanTxtSrch.Checked ? "Boolean" : "Text", TextSearchString); SearchString = TextSearchString; SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars); - cmbResultsStyle.SelectedIndex = 3; // display step text in results + cmbResultsStyleIndex = 3; // display step text in results //} } } @@ -1039,7 +1042,7 @@ namespace Volian.Controls.Library //SearchResults = ItemInfoList.GetListFromAnnotationSearch(dviSearchList, typeSearchList, textSearchString, srchStr, cbxCaseSensitiveAnnoText.Checked); SearchResults = ItemInfoList.GetListFromAnnotationSearch(DVISearchList, TypeSearchList, AnnotationSearchType, cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked); //UpdateAnnotationSearchResults(); - cmbResultsStyle.SelectedIndex = 2; // display annotation text in results + cmbResultsStyleIndex = 2; // display annotation text in results } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[2]) // RO Search { @@ -1048,15 +1051,17 @@ namespace Volian.Controls.Library if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked) { SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars); - cmbResultsStyle.SelectedIndex = 3; // display step text in results + cmbResultsStyleIndex = 3; // display step text in results } else { SearchResults = ItemInfoList.GetListFromROSearch(DVISearchList, TypeSearchList, ROSearchList); - cmbResultsStyle.SelectedIndex = 3; // display step text in results + cmbResultsStyleIndex = 3; // display step text in results } } AddMessageForEmptyAnnotations(); + if (cmbResultsStyleIndex == 3 && cmbResultsStyle.Items.Count == 3) cmbResultsStyleIndex--; + cmbResultsStyle.SelectedIndex = cmbResultsStyleIndex; DisplayResults(); if (SearchResults != null && SearchResults.Count == 0) { @@ -1067,7 +1072,10 @@ namespace Volian.Controls.Library { while (ex.InnerException != null) ex = ex.InnerException; - MessageBox.Show(ex.Message, "Search Error: " + ex.GetType().Name); + string tmpmsg = (cbxBooleanTxtSrch.Checked && ex.Message.Contains("Syntax error") && ex.Message.Contains("full-text search")) ? + "Place \"\" around words that you are searching for, so that parser can better understand what you are trying to find" : + ex.Message; + MessageBox.Show(tmpmsg, "Search Error: " + ex.GetType().Name); } finally { @@ -1080,8 +1088,26 @@ namespace Volian.Controls.Library private void AddMessageForEmptyAnnotations() { + bool hasAnnot = false; foreach (ItemInfo ii in SearchResults) + { + if (ii.ItemAnnotationCount > 0) + { + // RHM - can an iteminfo have an itemannotationcount>0 and not have searchannotationtext. + if (ii.SearchAnnotationText == null) ii.SearchAnnotationText = AnnotationInfo.Get(ii.ItemAnnotations[0].AnnotationID).SearchText; + } + if (ii.SearchAnnotationText == null) ii.SearchAnnotationText = "None - [" + ii.DisplayText + "]"; + else + { + hasAnnot = true; + } + } + cmbResultsStyle.Items.Clear(); + cmbResultsStyle.Items.Add(comboItem1); + cmbResultsStyle.Items.Add(comboItem2); + if (hasAnnot) cmbResultsStyle.Items.Add(comboItem3); + cmbResultsStyle.Items.Add(comboItem4); } private void cbxTextSearchText_Leave(object sender, EventArgs e) @@ -1444,6 +1470,11 @@ namespace Volian.Controls.Library } private void cbxBooleanTxtSrch_CheckedChanged(object sender, EventArgs e) { + // If the Boolean search is not working - run the following two commands in SQL: + // use veproms + // ALTER FULLTEXT INDEX ON Contents START FULL POPULATION + // ALTER FULLTEXT INDEX ON Documents START FULL POPULATION + // use master //Boolean search uses a list of noise, or STOP, words. This list can be found // in file: C:\Program Files\Microsoft SQL Server\MSSQL.1\MSSQL\FTData\noiseenu.txt. // Another file exists in that directory, tsenu.xml, this is a thesaurus. RHM tried