diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index c1a845a3..22c3d31e 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -30,15 +30,6 @@ namespace Volian.Controls.Library { this.components = new System.ComponentModel.Container(); this.tabSearchTypes = new DevComponents.DotNetBar.TabControl(); - this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); - this.gpSrchAnnoText = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.cbxBooleanAnoTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxCaseSensitiveAnnoText = new DevComponents.DotNetBar.Controls.CheckBoxX(); - this.cbxTextSearchAnnotation = new DevComponents.DotNetBar.Controls.ComboBoxEx(); - 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(); @@ -51,6 +42,15 @@ namespace Volian.Controls.Library 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.gpSrchAnnoText = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.cbxBooleanAnoTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxCaseSensitiveAnnoText = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxTextSearchAnnotation = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.label2 = new System.Windows.Forms.Label(); + this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.tabAnnotationSearch = 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(); @@ -101,13 +101,13 @@ namespace Volian.Controls.Library this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit(); this.tabSearchTypes.SuspendLayout(); - this.tabControlPanel3.SuspendLayout(); - this.gpSrchAnnoText.SuspendLayout(); - this.panel4.SuspendLayout(); this.tabControlPanel4.SuspendLayout(); this.gpSrchText.SuspendLayout(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); + this.tabControlPanel3.SuspendLayout(); + this.gpSrchAnnoText.SuspendLayout(); + this.panel4.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.gpFindROs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit(); @@ -146,160 +146,6 @@ namespace Volian.Controls.Library this.tabSearchTypes.Text = "tabControl1"; this.tabSearchTypes.ThemeAware = true; // - // tabControlPanel3 - // - 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, 24); - 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(385, 114); - this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); - this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); - this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); - this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) - | DevComponents.DotNetBar.eBorderSide.Bottom))); - this.tabControlPanel3.Style.GradientAngle = 90; - this.tabControlPanel3.TabIndex = 5; - this.tabControlPanel3.TabItem = this.tabAnnotationSearch; - // - // gpSrchAnnoText - // - this.gpSrchAnnoText.AutoSize = true; - this.gpSrchAnnoText.CanvasColor = System.Drawing.SystemColors.Control; - this.gpSrchAnnoText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.gpSrchAnnoText.Controls.Add(this.panel4); - this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpSrchAnnoText.Enabled = false; - this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 25); - this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.gpSrchAnnoText.Name = "gpSrchAnnoText"; - this.gpSrchAnnoText.Size = new System.Drawing.Size(383, 88); - // - // - // - this.gpSrchAnnoText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.gpSrchAnnoText.Style.BackColorGradientAngle = 90; - this.gpSrchAnnoText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.gpSrchAnnoText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderBottomWidth = 1; - this.gpSrchAnnoText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.gpSrchAnnoText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderLeftWidth = 1; - this.gpSrchAnnoText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderRightWidth = 1; - this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.gpSrchAnnoText.Style.BorderTopWidth = 1; - this.gpSrchAnnoText.Style.CornerDiameter = 4; - this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; - this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; - this.gpSrchAnnoText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.gpSrchAnnoText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; - this.gpSrchAnnoText.TabIndex = 6; - this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); - // - // panel4 - // - this.panel4.BackColor = System.Drawing.Color.Transparent; - this.panel4.Controls.Add(this.cbxBooleanAnoTxtSrch); - this.panel4.Controls.Add(this.cbxCaseSensitiveAnnoText); - this.panel4.Controls.Add(this.cbxTextSearchAnnotation); - this.panel4.Controls.Add(this.label2); - this.panel4.Dock = System.Windows.Forms.DockStyle.Top; - this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(377, 76); - this.panel4.TabIndex = 9; - // - // cbxBooleanAnoTxtSrch - // - this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); - this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; - this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); - this.cbxBooleanAnoTxtSrch.TabIndex = 8; - this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; - this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); - // - // cbxCaseSensitiveAnnoText - // - this.cbxCaseSensitiveAnnoText.AutoSize = true; - 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(16, 31); - this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; - this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(123, 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"; - // - // cbxTextSearchAnnotation - // - this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchAnnotation, this.btnCMIFindText); - this.cbxTextSearchAnnotation.DisplayMember = "Text"; - this.cbxTextSearchAnnotation.Dock = System.Windows.Forms.DockStyle.Fill; - 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(40, 0); - this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; - this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(337, 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.\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); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Dock = System.Windows.Forms.DockStyle.Left; - 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(0, 0); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); - this.label2.Size = new System.Drawing.Size(40, 24); - this.label2.TabIndex = 7; - this.label2.Text = "Find:"; - // - // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.cbxAnnoTypes.Name = "cbxAnnoTypes"; - this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxAnnoTypes.Size = new System.Drawing.Size(383, 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; - this.tabAnnotationSearch.Name = "tabAnnotationSearch"; - this.tabAnnotationSearch.Text = "Annotations"; - this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); - // // tabControlPanel4 // this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -411,7 +257,7 @@ namespace Volian.Controls.Library this.panel3.Controls.Add(this.cbxCaseSensitive); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel3.Location = new System.Drawing.Point(0, 31); - this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.panel3.Margin = new System.Windows.Forms.Padding(4); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(348, 53); this.panel3.TabIndex = 6; @@ -419,7 +265,7 @@ namespace Volian.Controls.Library // cbxBooleanTxtSrch // this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(11, 28); - this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4); this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch"; this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(148, 21); this.cbxBooleanTxtSrch.TabIndex = 6; @@ -433,7 +279,7 @@ namespace Volian.Controls.Library this.cbxIncROTextSrch.CheckValue = "Y"; this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxIncROTextSrch.Location = new System.Drawing.Point(151, 1); - this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4); this.cbxIncROTextSrch.Name = "cbxIncROTextSrch"; this.cbxIncROTextSrch.Size = new System.Drawing.Size(149, 25); this.cbxIncROTextSrch.TabIndex = 5; @@ -491,6 +337,160 @@ namespace Volian.Controls.Library this.tabStepTypeSearch.Text = "Text"; this.tabStepTypeSearch.Click += new System.EventHandler(this.tabStepTypeSearch_Click); // + // tabControlPanel3 + // + 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, 24); + 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(385, 114); + this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); + this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); + this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199))))); + this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) + | DevComponents.DotNetBar.eBorderSide.Bottom))); + this.tabControlPanel3.Style.GradientAngle = 90; + this.tabControlPanel3.TabIndex = 5; + this.tabControlPanel3.TabItem = this.tabAnnotationSearch; + // + // gpSrchAnnoText + // + this.gpSrchAnnoText.AutoSize = true; + this.gpSrchAnnoText.CanvasColor = System.Drawing.SystemColors.Control; + this.gpSrchAnnoText.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpSrchAnnoText.Controls.Add(this.panel4); + this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; + this.gpSrchAnnoText.Enabled = false; + this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 25); + this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gpSrchAnnoText.Name = "gpSrchAnnoText"; + this.gpSrchAnnoText.Size = new System.Drawing.Size(383, 88); + // + // + // + this.gpSrchAnnoText.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.gpSrchAnnoText.Style.BackColorGradientAngle = 90; + this.gpSrchAnnoText.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.gpSrchAnnoText.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderBottomWidth = 1; + this.gpSrchAnnoText.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.gpSrchAnnoText.Style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderLeftWidth = 1; + this.gpSrchAnnoText.Style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderRightWidth = 1; + this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.gpSrchAnnoText.Style.BorderTopWidth = 1; + this.gpSrchAnnoText.Style.CornerDiameter = 4; + this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; + this.gpSrchAnnoText.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.gpSrchAnnoText.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near; + this.gpSrchAnnoText.TabIndex = 6; + this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.Transparent; + this.panel4.Controls.Add(this.cbxBooleanAnoTxtSrch); + this.panel4.Controls.Add(this.cbxCaseSensitiveAnnoText); + this.panel4.Controls.Add(this.cbxTextSearchAnnotation); + this.panel4.Controls.Add(this.label2); + this.panel4.Dock = System.Windows.Forms.DockStyle.Top; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(377, 76); + this.panel4.TabIndex = 9; + // + // cbxBooleanAnoTxtSrch + // + this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); + this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; + this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); + this.cbxBooleanAnoTxtSrch.TabIndex = 8; + this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; + this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); + // + // cbxCaseSensitiveAnnoText + // + this.cbxCaseSensitiveAnnoText.AutoSize = true; + 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(16, 31); + this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; + this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(123, 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"; + // + // cbxTextSearchAnnotation + // + this.contextMenuBar1.SetContextMenuEx(this.cbxTextSearchAnnotation, this.btnCMIFindText); + this.cbxTextSearchAnnotation.DisplayMember = "Text"; + this.cbxTextSearchAnnotation.Dock = System.Windows.Forms.DockStyle.Fill; + 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(40, 0); + this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; + this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(337, 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.\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); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Dock = System.Windows.Forms.DockStyle.Left; + 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(0, 0); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); + this.label2.Size = new System.Drawing.Size(40, 24); + this.label2.TabIndex = 7; + this.label2.Text = "Find:"; + // + // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxAnnoTypes.Name = "cbxAnnoTypes"; + this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxAnnoTypes.Size = new System.Drawing.Size(383, 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; + this.tabAnnotationSearch.Name = "tabAnnotationSearch"; + this.tabAnnotationSearch.Text = "Annotations"; + this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); + // // tabControlPanel2 // this.tabControlPanel2.Controls.Add(this.gpFindROs); @@ -1098,16 +1098,16 @@ namespace Volian.Controls.Library this.Size = new System.Drawing.Size(385, 832); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit(); this.tabSearchTypes.ResumeLayout(false); - this.tabControlPanel3.ResumeLayout(false); - this.tabControlPanel3.PerformLayout(); - 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); + this.tabControlPanel3.ResumeLayout(false); + this.tabControlPanel3.PerformLayout(); + this.gpSrchAnnoText.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.tabControlPanel2.ResumeLayout(false); this.gpFindROs.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit(); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 9766468d..fbe859f1 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -478,15 +478,20 @@ namespace Volian.Controls.Library private void cbxTextSearchAnnotation_Leave(object sender, EventArgs e) { - if (!cbxTextSearchAnnotation.Text.Equals(string.Empty)) - { - string tstr = cbxTextSearchAnnotation.Text; - if (!cbxTextSearchAnnotation.Items.Contains(tstr)) - cbxTextSearchAnnotation.Items.Add(tstr); - } + InsertAnnotationSearchCriteria(); } + private void InsertAnnotationSearchCriteria() + { + if (!cbxTextSearchAnnotation.Text.Equals(string.Empty)) + { + string tstr = cbxTextSearchAnnotation.Text; + if (!cbxTextSearchAnnotation.Items.Contains(tstr)) + cbxTextSearchAnnotation.Items.Insert(0, tstr); + } + } + private void gpSrchAnnoText_EnabledChanged(object sender, EventArgs e) { if (gpSrchAnnoText.Enabled) @@ -768,88 +773,105 @@ namespace Volian.Controls.Library private void btnSearch_Click(object sender, EventArgs e) { - string[] strSearchText = null; - lbSrchResults.DataSource = null; - lbSrchResults.Items.Clear(); - toolTip1.SetToolTip(lbSrchResults, null); + Cursor savcursor = Cursor; + try + { + string[] strSearchText = null; + lbSrchResults.DataSource = null; + lbSrchResults.Items.Clear(); + toolTip1.SetToolTip(lbSrchResults, null); - strSearchText = BuildSearchString(); - Cursor savcursor = Cursor; - Cursor = Cursors.WaitCursor; - SearchResults = null; - bool includeRTFformat = false; - bool includeSpecialChars = true; - if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[0]) // Text Search - { - if (cbxSrchTypeUsage.Checked) // find just the usage of the selected types - { - if (lstCheckedStepTypes.Count ==0) - { - MessageBox.Show("Please select one or more types then press the Search button", "No Types Selected"); - xpStepTypes.Expanded = true; - advTreeStepTypes.Focus(); - xpStepTypes.TitleStyle.BackColor1.Color = Color.Crimson; - } - else - { - SearchResults = ItemInfoList.GetListFromTextSearch(strSearchText[0], strSearchText[1], "", cbxCaseSensitive.Checked, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars); - cmbResultsStyle.SelectedIndex = 1; //display step locations in results - } - } - else - { - if (strSearchText[2].Equals("")) - { - MessageBox.Show("Please enter some search text, then click the Search button", "No Search Text"); - cbxTextSearchText.Focus(); - } - else - { - SearchResults = ItemInfoList.GetListFromTextSearch(strSearchText[0], strSearchText[1], strSearchText[2], cbxCaseSensitive.Checked, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars); - cmbResultsStyle.SelectedIndex = 3; // display step text in results - } - } - } - else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) // Annotation Search - { - //string srchStr = ConvertSpecialChars(cbxTextSearchAnnotation.Text);//cbxTextSearchAnnotation.Text; + strSearchText = BuildSearchString(); + Cursor = Cursors.WaitCursor; + SearchResults = null; + bool includeRTFformat = false; + bool includeSpecialChars = true; + if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[0]) // Text Search + { + if (cbxSrchTypeUsage.Checked) // find just the usage of the selected types + { + if (lstCheckedStepTypes.Count == 0) + { + MessageBox.Show("Please select one or more types then press the Search button", "No Types Selected"); + xpStepTypes.Expanded = true; + advTreeStepTypes.Focus(); + xpStepTypes.TitleStyle.BackColor1.Color = Color.Crimson; + } + else + { + SearchResults = ItemInfoList.GetListFromTextSearch(strSearchText[0], strSearchText[1], "", cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Value, includeRTFformat, includeSpecialChars); + cmbResultsStyle.SelectedIndex = 1; //display step locations in results + } + } + else + { + if (strSearchText[2].Equals("")) + { + MessageBox.Show("Please enter some search text, then click the Search button", "No Search Text"); + cbxTextSearchText.Focus(); + } + else + { + SearchResults = ItemInfoList.GetListFromTextSearch(strSearchText[0], strSearchText[1], strSearchText[2], cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars); + cmbResultsStyle.SelectedIndex = 3; // display step text in results + } + } + } + else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) // Annotation Search + { + //string srchStr = ConvertSpecialChars(cbxTextSearchAnnotation.Text);//cbxTextSearchAnnotation.Text; - //SearchResults = ItemInfoList.GetListFromAnnotationSearch(strSearchText[0], strSearchText[1], strSearchText[2], srchStr, 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 - { - if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked) - { - SearchResults = ItemInfoList.GetListFromTextSearch(strSearchText[0], strSearchText[1], strSearchText[2], cbxCaseSensitive.Checked, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars); - cmbResultsStyle.SelectedIndex = 3; // display step text in results - } - else - { - SearchResults = ItemInfoList.GetListFromROSearch(strSearchText[0], strSearchText[1], strSearchText[2]); - cmbResultsStyle.SelectedIndex = 3; // display step text in results - } - } - DisplayResults(); - Cursor = savcursor; - if (SearchResults != null && SearchResults.Count == 0) - { - MessageBox.Show("No Matches Found.", "Search"); - } - } + //SearchResults = ItemInfoList.GetListFromAnnotationSearch(strSearchText[0], strSearchText[1], strSearchText[2], srchStr, 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 + { + if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked) + { + SearchResults = ItemInfoList.GetListFromTextSearch(strSearchText[0], strSearchText[1], strSearchText[2], cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars); + cmbResultsStyle.SelectedIndex = 3; // display step text in results + } + else + { + SearchResults = ItemInfoList.GetListFromROSearch(strSearchText[0], strSearchText[1], strSearchText[2]); + cmbResultsStyle.SelectedIndex = 3; // display step text in results + } + } + DisplayResults(); + if (SearchResults != null && SearchResults.Count == 0) + { + MessageBox.Show("No Matches Found.", "Search"); + } + } + catch (Exception ex) + { + while (ex.InnerException != null) + ex = ex.InnerException; + MessageBox.Show(ex.Message, "Search Error: " + ex.GetType().Name); + } + finally + { + Cursor = savcursor; + } + } private void cbxTextSearchText_Leave(object sender, EventArgs e) { - if (!cbxTextSearchText.Text.Equals(string.Empty)) - { - string tstr = cbxTextSearchText.Text; - if (!cbxTextSearchText.Items.Contains(tstr)) - cbxTextSearchText.Items.Add(tstr); - } + InsertSearchCriteria(); } + private void InsertSearchCriteria() + { + if (!cbxTextSearchText.Text.Equals(string.Empty)) + { + string tstr = cbxTextSearchText.Text; + if (!cbxTextSearchText.Items.Contains(tstr)) + cbxTextSearchText.Items.Insert(0, tstr); + } + } + private void cbxSrchTypeUsage_CheckedChanged(object sender, EventArgs e) { gpSrchText.Enabled = !cbxSrchTypeUsage.Checked; @@ -896,7 +918,11 @@ namespace Volian.Controls.Library { e.Handled = true; btnSearch_Click(sender, e); - } + if (sender == cbxTextSearchText) + InsertSearchCriteria(); + else + InsertAnnotationSearchCriteria(); + } } #endregion @@ -963,6 +989,7 @@ namespace Volian.Controls.Library xpSetToSearch.Expanded = true; xpSetToSearch.TitleStyle.BackColor1.Color = Color.Crimson; btnSearch.Enabled = false; + tabSearchTypes.Enabled = false; // disable all the search tabs //if (xpSetToSearch.Expanded) xpSetToSearch.TitleText = "Select Procedure Sets to Search"; //else @@ -976,7 +1003,8 @@ namespace Volian.Controls.Library xpSetToSearch.TitleText = string.Format("{0} Procedure Sets Selected", lstCheckedDocVersions.Count); xpSetToSearch.TitleStyle.BackColor1.Color = Color.PapayaWhip; btnSearch.Enabled = true; - } + tabSearchTypes.Enabled = true; // enable all the search tabs + } }