From 07376b8a830b05871e621cadef2b9da4ac36a3bb Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 18 Nov 2010 15:45:16 +0000 Subject: [PATCH] --- .../DisplaySearch.Designer.cs | 14 ++++++-------- PROMS/Volian.Controls.Library/DisplaySearch.resx | 10 +++++----- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 18e4bf37..83de6706 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -146,8 +146,8 @@ namespace Volian.Controls.Library this.tabSearchTypes.CloseButtonOnTabsAlwaysDisplayed = false; this.tabSearchTypes.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; this.tabSearchTypes.Controls.Add(this.tabControlPanel4); - this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Controls.Add(this.tabControlPanel3); + this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Controls.Add(this.contextMenuBar1); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; this.tabSearchTypes.Location = new System.Drawing.Point(0, 0); @@ -302,13 +302,14 @@ namespace Volian.Controls.Library // this.cbxBooleanTxtSrch.BackgroundStyle.Class = ""; this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(12, 18); + this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(169, 25); 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.Visible = false; this.cbxBooleanTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanTxtSrch_CheckedChanged); // // cbxIncROTextSrch @@ -319,7 +320,7 @@ namespace Volian.Controls.Library 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.Location = new System.Drawing.Point(12, 32); this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4); this.cbxIncROTextSrch.Name = "cbxIncROTextSrch"; this.cbxIncROTextSrch.Size = new System.Drawing.Size(149, 18); @@ -337,7 +338,7 @@ namespace Volian.Controls.Library 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.Location = new System.Drawing.Point(12, 8); 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); @@ -599,6 +600,7 @@ namespace Volian.Controls.Library this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); this.cbxBooleanAnoTxtSrch.TabIndex = 8; this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; + this.cbxBooleanAnoTxtSrch.Visible = false; this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); // // cbxCaseSensitiveAnnoText @@ -1021,7 +1023,6 @@ namespace Volian.Controls.Library // btnClearSearchResults // this.btnClearSearchResults.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnClearSearchResults.CallBasePaintBackground = true; this.btnClearSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnClearSearchResults.Enabled = false; this.btnClearSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1039,7 +1040,6 @@ namespace Volian.Controls.Library // btnCopySearchResults // this.btnCopySearchResults.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCopySearchResults.CallBasePaintBackground = true; this.btnCopySearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnCopySearchResults.Enabled = false; this.btnCopySearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1133,7 +1133,6 @@ namespace Volian.Controls.Library // this.btnSearch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnSearch.BackColor = System.Drawing.SystemColors.Control; - this.btnSearch.CallBasePaintBackground = true; this.btnSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnSearch.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSearch.Location = new System.Drawing.Point(5, 36); @@ -1150,7 +1149,6 @@ namespace Volian.Controls.Library // btnPrnSrchRslts // this.btnPrnSrchRslts.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnPrnSrchRslts.CallBasePaintBackground = true; this.btnPrnSrchRslts.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnPrnSrchRslts.Enabled = false; this.btnPrnSrchRslts.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.resx b/PROMS/Volian.Controls.Library/DisplaySearch.resx index 7b156f87..f5e8a922 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.resx +++ b/PROMS/Volian.Controls.Library/DisplaySearch.resx @@ -120,6 +120,11 @@ 126, 17 + + Using Boolean search allows you to specify text AND other text, text OR other text, and NOT text. To find options, use the Right Mouse button on the Find Box's context menu. + +Boolean searches are case insensitive and the search finds RO data as text or within ROs (selection of optons 'Case Sensitive' & 'Search RO Text' are not available during 'Boolean Search'). + Enter the text you want to search, or select from the drop down list for which the text is added once a search is done. @@ -130,11 +135,6 @@ For additional search text options, use the Right Mouse button to get a context Enter the text you want to search, or select from the drop down list for which the text is added once a search is done. For additional search text options, use the Right Mouse button to get a context menu. - - - Using Boolean search allows you to specify text AND other text, text OR other text, and NOT text. To find options, use the Right Mouse button on the Find Box's context menu. - -Boolean searches are case insensitive and the search finds RO data as text or within ROs (selection of optons 'Case Sensitive' & 'Search RO Text' are not available during 'Boolean Search'). 17, 17