From 18d9d1274ed1ff309bf8952c99291744d499712f Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Sat, 3 May 2025 23:27:40 -0400 Subject: [PATCH] C2025-027-Develop-a-way-to-filter-annotations-so-the-user-can-view-only-the-types-they-want-to-see-EP --- .../Minimal/AnnotationstypeSelections.cs | 38 +- .../DisplaySearch.Designer.cs | 425 +++++++++--------- PROMS/Volian.Controls.Library/DisplayTags.cs | 2 +- 3 files changed, 243 insertions(+), 222 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs index dc817901..3af1e191 100644 --- a/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs +++ b/PROMS/VEPROMS.CSLA.Library/Minimal/AnnotationstypeSelections.cs @@ -44,19 +44,39 @@ namespace VEPROMS.CSLA.Library //dt.Rows.Add(DataPortal.Fetch()); //DataPortal.Fetch(); DataRow row; + int rowflg = 0; foreach (AnnotationTypeInfo annosel in DataPortal.Fetch()) { // C2025-027 need to use a datatable instead of AnnotationTypeInfoList so the global search Annotations will not be effected by the Annotation select list selections - row = dt.NewRow(); - row["TypeID"] = annosel.TypeID; - row["ItemID"] = ItemID; - row["Name"] = annosel.Name; - row["Config"] = annosel.Config; - row["DTS"] = annosel.DTS; - row["UserID"] = annosel.UserID; - row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; + if (rowflg == 0) + { + row = dt.NewRow(); + dt.Rows.Add(row); + rowflg = 1; + } + else + { + row = dt.NewRow(); + row["TypeID"] = annosel.TypeID; + row["ItemID"] = ItemID; + row["Name"] = annosel.Name; + row["Config"] = annosel.Config; + row["DTS"] = annosel.DTS; + row["UserID"] = annosel.UserID; + row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; + dt.Rows.Add(row); + } - dt.Rows.Add(row); + //row = dt.NewRow(); + //row["TypeID"] = annosel.TypeID; + //row["ItemID"] = ItemID; + //row["Name"] = annosel.Name; + //row["Config"] = annosel.Config; + //row["DTS"] = annosel.DTS; + //row["UserID"] = annosel.UserID; + //row["IsEPAnnotationType"] = annosel.IsEPAnnotationType; + + //dt.Rows.Add(row); //dt.Rows.Add(0,annosel.TypeID, ItemID, annosel.Name, annosel.Config, annosel.DTS, annosel.UserID, 0x0000000000000000, annosel.IsEPAnnotationType); }; diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 8adf9fb3..98db555a 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -50,6 +50,16 @@ 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.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel(); + this.gpSrchAnnoText = new DevComponents.DotNetBar.Controls.GroupPanel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.cbxRnoOnlyAnnot = new DevComponents.DotNetBar.Controls.CheckBoxX(); + 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(); @@ -84,16 +94,6 @@ namespace Volian.Controls.Library this.cbxFndUnLnkROVals = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cmboTreeROs = new DevComponents.DotNetBar.Controls.ComboTree(); this.tabROSearch = 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.cbxRnoOnlyAnnot = new DevComponents.DotNetBar.Controls.CheckBoxX(); - 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.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel(); this.btnTranCvtSelToTxt = new System.Windows.Forms.Button(); this.lblIncTran = new System.Windows.Forms.Label(); @@ -155,6 +155,9 @@ namespace Volian.Controls.Library this.checkedListBox1 = new System.Windows.Forms.CheckedListBox(); ((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(); @@ -165,9 +168,6 @@ namespace Volian.Controls.Library this.pnlTranVersion.SuspendLayout(); this.tabControlPanel2.SuspendLayout(); this.gpFindROs.SuspendLayout(); - this.tabControlPanel3.SuspendLayout(); - this.gpSrchAnnoText.SuspendLayout(); - this.panel4.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit(); @@ -184,8 +184,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.tabControlPanel3); this.tabSearchTypes.Controls.Add(this.tabControlPanel4); + this.tabSearchTypes.Controls.Add(this.tabControlPanel3); this.tabSearchTypes.Controls.Add(this.tabControlPanel5); this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Controls.Add(this.tabControlPanel1); @@ -210,6 +210,199 @@ 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.DisabledBackColor = System.Drawing.Color.Empty; + this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabControlPanel3.Location = new System.Drawing.Point(0, 34); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); + this.tabControlPanel3.Name = "tabControlPanel3"; + this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); + this.tabControlPanel3.Size = new System.Drawing.Size(277, 113); + 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.DisabledBackColor = System.Drawing.Color.Empty; + this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; + this.gpSrchAnnoText.Enabled = false; + this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23); + this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(2); + this.gpSrchAnnoText.Name = "gpSrchAnnoText"; + this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 89); + // + // + // + 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.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gpSrchAnnoText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + 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.cbxRnoOnlyAnnot); + 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(2); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(269, 62); + this.panel4.TabIndex = 9; + // + // cbxRnoOnlyAnnot + // + this.cbxRnoOnlyAnnot.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxRnoOnlyAnnot.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxRnoOnlyAnnot.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxRnoOnlyAnnot.Location = new System.Drawing.Point(105, 24); + this.cbxRnoOnlyAnnot.Margin = new System.Windows.Forms.Padding(2); + this.cbxRnoOnlyAnnot.Name = "cbxRnoOnlyAnnot"; + this.cbxRnoOnlyAnnot.Size = new System.Drawing.Size(71, 15); + this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyAnnot, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" + + ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); + this.cbxRnoOnlyAnnot.TabIndex = 9; + this.cbxRnoOnlyAnnot.Text = "RNO Only"; + // + // cbxBooleanAnoTxtSrch + // + // + // + // + this.cbxBooleanAnoTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(12, 41); + this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; + this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(111, 17); + this.cbxBooleanAnoTxtSrch.TabIndex = 8; + this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; + this.cbxBooleanAnoTxtSrch.Visible = false; + this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); + // + // cbxCaseSensitiveAnnoText + // + this.cbxCaseSensitiveAnnoText.AutoSize = true; + this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxCaseSensitiveAnnoText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(12, 25); + this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(2); + this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; + this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(92, 15); + 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxTextSearchAnnotation.FormattingEnabled = true; + this.cbxTextSearchAnnotation.ItemHeight = 16; + this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(30, 0); + this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(2); + this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; + this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(239, 22); + 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.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); + this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); + // + // 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(0, 0); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Name = "label2"; + this.label2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); + this.label2.Size = new System.Drawing.Size(30, 18); + 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxAnnoTypes.FormattingEnabled = true; + this.cbxAnnoTypes.ItemHeight = 16; + this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); + this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(2); + this.cbxAnnoTypes.Name = "cbxAnnoTypes"; + this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.cbxAnnoTypes.Size = new System.Drawing.Size(275, 22); + 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.superTooltip1.SetSuperTooltip(this.tabAnnotationSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Annotations", "", "Allows you to search for types and text for annotations in the selected procedure" + + " set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); + this.tabAnnotationSearch.Text = "Annotations"; + this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); + // // tabControlPanel4 // this.tabControlPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; @@ -782,199 +975,6 @@ namespace Volian.Controls.Library this.superTooltip1.SetSuperTooltip(this.tabROSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Referenced Objects", "", "Allows you to search for referenced objects used in selected procedure set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); this.tabROSearch.Text = "Reference\nObjects"; // - // tabControlPanel3 - // - this.tabControlPanel3.Controls.Add(this.gpSrchAnnoText); - this.tabControlPanel3.Controls.Add(this.cbxAnnoTypes); - this.tabControlPanel3.DisabledBackColor = System.Drawing.Color.Empty; - this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel3.Location = new System.Drawing.Point(0, 34); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2); - this.tabControlPanel3.Name = "tabControlPanel3"; - this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(277, 113); - 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.DisabledBackColor = System.Drawing.Color.Empty; - this.gpSrchAnnoText.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpSrchAnnoText.Enabled = false; - this.gpSrchAnnoText.Location = new System.Drawing.Point(1, 23); - this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(2); - this.gpSrchAnnoText.Name = "gpSrchAnnoText"; - this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 89); - // - // - // - 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.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gpSrchAnnoText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - 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.cbxRnoOnlyAnnot); - 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(2); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(269, 62); - this.panel4.TabIndex = 9; - // - // cbxRnoOnlyAnnot - // - this.cbxRnoOnlyAnnot.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxRnoOnlyAnnot.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxRnoOnlyAnnot.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxRnoOnlyAnnot.Location = new System.Drawing.Point(105, 24); - this.cbxRnoOnlyAnnot.Margin = new System.Windows.Forms.Padding(2); - this.cbxRnoOnlyAnnot.Name = "cbxRnoOnlyAnnot"; - this.cbxRnoOnlyAnnot.Size = new System.Drawing.Size(71, 15); - this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyAnnot, new DevComponents.DotNetBar.SuperTooltipInfo("RNO Only", "", "When this box is checked, Search will find only the matches that are in RNO steps" + - ".", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); - this.cbxRnoOnlyAnnot.TabIndex = 9; - this.cbxRnoOnlyAnnot.Text = "RNO Only"; - // - // cbxBooleanAnoTxtSrch - // - // - // - // - this.cbxBooleanAnoTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(12, 41); - this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; - this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(111, 17); - this.cbxBooleanAnoTxtSrch.TabIndex = 8; - this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; - this.cbxBooleanAnoTxtSrch.Visible = false; - this.cbxBooleanAnoTxtSrch.CheckedChanged += new System.EventHandler(this.cbxBooleanAnoTxtSrch_CheckedChanged); - // - // cbxCaseSensitiveAnnoText - // - this.cbxCaseSensitiveAnnoText.AutoSize = true; - this.cbxCaseSensitiveAnnoText.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.cbxCaseSensitiveAnnoText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxCaseSensitiveAnnoText.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(12, 25); - this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(2); - this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; - this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(92, 15); - 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxTextSearchAnnotation.FormattingEnabled = true; - this.cbxTextSearchAnnotation.ItemHeight = 16; - this.cbxTextSearchAnnotation.Location = new System.Drawing.Point(30, 0); - this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(2); - this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; - this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(239, 22); - 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.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.ProcessEnterKey); - this.cbxTextSearchAnnotation.Leave += new System.EventHandler(this.cbxTextSearchAnnotation_Leave); - // - // 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); - this.label2.Size = new System.Drawing.Size(30, 18); - 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", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxAnnoTypes.FormattingEnabled = true; - this.cbxAnnoTypes.ItemHeight = 16; - this.cbxAnnoTypes.Location = new System.Drawing.Point(1, 1); - this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(2); - this.cbxAnnoTypes.Name = "cbxAnnoTypes"; - this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxAnnoTypes.Size = new System.Drawing.Size(275, 22); - 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.superTooltip1.SetSuperTooltip(this.tabAnnotationSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Annotations", "", "Allows you to search for types and text for annotations in the selected procedure" + - " set(s).", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 110))); - this.tabAnnotationSearch.Text = "Annotations"; - this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click); - // // tabControlPanel1 // this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt); @@ -1406,6 +1406,7 @@ namespace Volian.Controls.Library // this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lbSrchResultsIncTrans.CheckBoxesVisible = true; + this.lbSrchResultsIncTrans.CheckStateMember = null; this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true; this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill; this.lbSrchResultsIncTrans.DragDropSupport = true; @@ -1737,6 +1738,11 @@ namespace Volian.Controls.Library this.Size = new System.Drawing.Size(277, 676); ((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); @@ -1748,11 +1754,6 @@ namespace Volian.Controls.Library this.pnlTranVersion.ResumeLayout(false); this.tabControlPanel2.ResumeLayout(false); this.gpFindROs.ResumeLayout(false); - this.tabControlPanel3.ResumeLayout(false); - this.tabControlPanel3.PerformLayout(); - this.gpSrchAnnoText.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); this.tabControlPanel1.ResumeLayout(false); this.tabControlPanel1.PerformLayout(); this.groupBox1.ResumeLayout(false); diff --git a/PROMS/Volian.Controls.Library/DisplayTags.cs b/PROMS/Volian.Controls.Library/DisplayTags.cs index a582db36..c4c71d23 100644 --- a/PROMS/Volian.Controls.Library/DisplayTags.cs +++ b/PROMS/Volian.Controls.Library/DisplayTags.cs @@ -109,7 +109,7 @@ namespace Volian.Controls.Library public string TbFSht { get { return tbFSHt.Text; } - set { tbFSHt.Text = value; tbFSHt.Refresh(); _origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); } + set { tbFSHt.Text = value; tbFSHt.Refresh(); } //_origFigureSizeRatio = float.Parse(value) / float.Parse(tbFSWd.Text); } } #endregion