diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 70dea6a5..c7c6fe00 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -58,7 +58,7 @@ namespace Volian.Controls.Library this.groupBox1 = new System.Windows.Forms.GroupBox(); this.rbFromEditor = new System.Windows.Forms.RadioButton(); this.rbFromTree = new System.Windows.Forms.RadioButton(); - this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components); + this.tabNISearch = 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(); @@ -69,6 +69,7 @@ namespace Volian.Controls.Library this.cbxBooleanTxtSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxIncROTextSrch = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.cbxCaseSensitive = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxRnoOnly = 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); @@ -148,6 +149,9 @@ namespace Volian.Controls.Library this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip(); this.checkedListBox1 = new System.Windows.Forms.CheckedListBox(); + this.cbxRnoOnlyAnnot = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxRnoOnlyRO = new DevComponents.DotNetBar.Controls.CheckBoxX(); + this.cbxRnoOnlyTrans = new DevComponents.DotNetBar.Controls.CheckBoxX(); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).BeginInit(); this.tabSearchTypes.SuspendLayout(); this.tabControlPanel1.SuspendLayout(); @@ -179,21 +183,21 @@ namespace Volian.Controls.Library this.tabSearchTypes.CanReorderTabs = false; this.tabSearchTypes.CloseButtonOnTabsAlwaysDisplayed = false; this.tabSearchTypes.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; - this.tabSearchTypes.Controls.Add(this.tabControlPanel1); - this.tabSearchTypes.Controls.Add(this.tabControlPanel4); this.tabSearchTypes.Controls.Add(this.tabControlPanel5); - this.tabSearchTypes.Controls.Add(this.tabControlPanel3); this.tabSearchTypes.Controls.Add(this.tabControlPanel2); + this.tabSearchTypes.Controls.Add(this.tabControlPanel3); + this.tabSearchTypes.Controls.Add(this.tabControlPanel4); + this.tabSearchTypes.Controls.Add(this.tabControlPanel1); this.tabSearchTypes.Controls.Add(this.contextMenuBar1); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; this.tabSearchTypes.Location = new System.Drawing.Point(0, 0); - this.tabSearchTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabSearchTypes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabSearchTypes.Name = "tabSearchTypes"; this.tabSearchTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; this.tabSearchTypes.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold); this.tabSearchTypes.SelectedTabIndex = 0; this.tabSearchTypes.ShowFocusRectangle = false; - this.tabSearchTypes.Size = new System.Drawing.Size(369, 153); + this.tabSearchTypes.Size = new System.Drawing.Size(277, 124); this.tabSearchTypes.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Document; this.tabSearchTypes.TabIndex = 0; this.tabSearchTypes.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -201,7 +205,7 @@ namespace Volian.Controls.Library this.tabSearchTypes.Tabs.Add(this.tabAnnotationSearch); this.tabSearchTypes.Tabs.Add(this.tabROSearch); this.tabSearchTypes.Tabs.Add(this.tabTranSearch); - this.tabSearchTypes.Tabs.Add(this.tabIncTrans); + this.tabSearchTypes.Tabs.Add(this.tabNISearch); this.tabSearchTypes.Text = "tabControl1"; this.tabSearchTypes.ThemeAware = true; // @@ -214,11 +218,10 @@ namespace Volian.Controls.Library this.tabControlPanel1.Controls.Add(this.groupBox1); this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel1.Location = new System.Drawing.Point(0, 40); - this.tabControlPanel1.Margin = new System.Windows.Forms.Padding(4); + this.tabControlPanel1.Location = new System.Drawing.Point(0, 34); this.tabControlPanel1.Name = "tabControlPanel1"; this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel1.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel1.Size = new System.Drawing.Size(277, 90); this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -227,15 +230,14 @@ namespace Volian.Controls.Library | DevComponents.DotNetBar.eBorderSide.Bottom))); this.tabControlPanel1.Style.GradientAngle = 90; this.tabControlPanel1.TabIndex = 17; - this.tabControlPanel1.TabItem = this.tabIncTrans; + this.tabControlPanel1.TabItem = this.tabNISearch; // // btnTranCvtSelToTxt // this.btnTranCvtSelToTxt.Enabled = false; - this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(161, 78); - this.btnTranCvtSelToTxt.Margin = new System.Windows.Forms.Padding(4); + this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63); this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt"; - this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(193, 27); + this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22); this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" + "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90))); this.btnTranCvtSelToTxt.TabIndex = 3; @@ -246,20 +248,18 @@ namespace Volian.Controls.Library // lblIncTran // this.lblIncTran.AutoSize = true; - this.lblIncTran.Location = new System.Drawing.Point(5, 11); - this.lblIncTran.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblIncTran.Location = new System.Drawing.Point(4, 9); this.lblIncTran.Name = "lblIncTran"; - this.lblIncTran.Size = new System.Drawing.Size(28, 16); + this.lblIncTran.Size = new System.Drawing.Size(23, 13); this.lblIncTran.TabIndex = 2; this.lblIncTran.Text = "To:"; // // btnTranCvtAllToTxt // this.btnTranCvtAllToTxt.Enabled = false; - this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(8, 78); - this.btnTranCvtAllToTxt.Margin = new System.Windows.Forms.Padding(4); + this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63); this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt"; - this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(145, 27); + this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22); this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " + "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90))); this.btnTranCvtAllToTxt.TabIndex = 1; @@ -270,10 +270,9 @@ namespace Volian.Controls.Library // lblSrchIncTran // this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent; - this.lblSrchIncTran.Location = new System.Drawing.Point(45, 11); - this.lblSrchIncTran.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9); this.lblSrchIncTran.Name = "lblSrchIncTran"; - this.lblSrchIncTran.Size = new System.Drawing.Size(319, 49); + this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40); this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " + "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80))); this.lblSrchIncTran.TabIndex = 1; @@ -283,11 +282,9 @@ namespace Volian.Controls.Library this.groupBox1.BackColor = System.Drawing.Color.Transparent; this.groupBox1.Controls.Add(this.rbFromEditor); this.groupBox1.Controls.Add(this.rbFromTree); - this.groupBox1.Location = new System.Drawing.Point(196, 5); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4); + this.groupBox1.Location = new System.Drawing.Point(147, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(173, 70); + this.groupBox1.Size = new System.Drawing.Size(130, 57); this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "Search Selection"; @@ -296,10 +293,9 @@ namespace Volian.Controls.Library // rbFromEditor // this.rbFromEditor.AutoSize = true; - this.rbFromEditor.Location = new System.Drawing.Point(29, 42); - this.rbFromEditor.Margin = new System.Windows.Forms.Padding(4); + this.rbFromEditor.Location = new System.Drawing.Point(22, 34); this.rbFromEditor.Name = "rbFromEditor"; - this.rbFromEditor.Size = new System.Drawing.Size(95, 20); + this.rbFromEditor.Size = new System.Drawing.Size(78, 17); this.rbFromEditor.TabIndex = 1; this.rbFromEditor.TabStop = true; this.rbFromEditor.Text = "From Editor"; @@ -308,10 +304,9 @@ namespace Volian.Controls.Library // rbFromTree // this.rbFromTree.AutoSize = true; - this.rbFromTree.Location = new System.Drawing.Point(29, 20); - this.rbFromTree.Margin = new System.Windows.Forms.Padding(4); + this.rbFromTree.Location = new System.Drawing.Point(22, 16); this.rbFromTree.Name = "rbFromTree"; - this.rbFromTree.Size = new System.Drawing.Size(89, 20); + this.rbFromTree.Size = new System.Drawing.Size(73, 17); this.rbFromTree.TabIndex = 0; this.rbFromTree.TabStop = true; this.rbFromTree.Text = "From Tree"; @@ -319,11 +314,11 @@ namespace Volian.Controls.Library // // tabNISearch // - this.tabIncTrans.AttachedControl = this.tabControlPanel1; - this.tabIncTrans.Name = "tabNISearch"; - this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and " + - "convert the transition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120))); - this.tabIncTrans.Text = "Incoming\nTransitions"; + this.tabNISearch.AttachedControl = this.tabControlPanel1; + this.tabNISearch.Name = "tabNISearch"; + this.superTooltip1.SetSuperTooltip(this.tabNISearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" + + "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120))); + this.tabNISearch.Text = "Incoming\nTransitions"; // // tabControlPanel4 // @@ -333,11 +328,11 @@ namespace Volian.Controls.Library this.tabControlPanel4.Controls.Add(this.cbxSrchTypeUsage); this.tabControlPanel4.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel4.Location = new System.Drawing.Point(0, 40); - this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel4.Location = new System.Drawing.Point(0, 34); + this.tabControlPanel4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel4.Name = "tabControlPanel4"; this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel4.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel4.Size = new System.Drawing.Size(277, 90); 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; @@ -358,10 +353,10 @@ namespace Volian.Controls.Library this.gpSrchText.Controls.Add(this.panel3); this.gpSrchText.DisabledBackColor = System.Drawing.Color.Empty; 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.Location = new System.Drawing.Point(23, 1); + this.gpSrchText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpSrchText.Name = "gpSrchText"; - this.gpSrchText.Size = new System.Drawing.Size(338, 89); + this.gpSrchText.Size = new System.Drawing.Size(253, 70); // // // @@ -399,10 +394,10 @@ namespace Volian.Controls.Library 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, 1); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel1.Location = new System.Drawing.Point(0, -3); + this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(332, 28); + this.panel1.Size = new System.Drawing.Size(247, 23); this.panel1.TabIndex = 5; // // cbxTextSearchText @@ -415,9 +410,9 @@ namespace Volian.Controls.Library this.cbxTextSearchText.FormattingEnabled = true; this.cbxTextSearchText.ItemHeight = 16; this.cbxTextSearchText.Location = new System.Drawing.Point(30, 0); - this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTextSearchText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxTextSearchText.Name = "cbxTextSearchText"; - this.cbxTextSearchText.Size = new System.Drawing.Size(302, 22); + this.cbxTextSearchText.Size = new System.Drawing.Size(217, 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))); @@ -432,9 +427,10 @@ namespace Volian.Controls.Library 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.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label1.Name = "label1"; - this.label1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 0); - this.label1.Size = new System.Drawing.Size(30, 19); + this.label1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 0); + this.label1.Size = new System.Drawing.Size(30, 18); 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:"; @@ -446,11 +442,11 @@ namespace Volian.Controls.Library this.panel3.Controls.Add(this.cbxBooleanTxtSrch); this.panel3.Controls.Add(this.cbxIncROTextSrch); this.panel3.Controls.Add(this.cbxCaseSensitive); + this.panel3.Controls.Add(this.cbxRnoOnly); this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel3.Location = new System.Drawing.Point(0, 29); - this.panel3.Margin = new System.Windows.Forms.Padding(4); + this.panel3.Location = new System.Drawing.Point(0, 20); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(332, 54); + this.panel3.Size = new System.Drawing.Size(247, 44); this.panel3.TabIndex = 6; // // cbxByWord @@ -461,12 +457,12 @@ namespace Volian.Controls.Library // this.cbxByWord.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxByWord.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxByWord.Location = new System.Drawing.Point(141, 7); - this.cbxByWord.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxByWord.Location = new System.Drawing.Point(106, 6); + this.cbxByWord.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxByWord.Name = "cbxByWord"; - this.cbxByWord.Size = new System.Drawing.Size(75, 18); - this.superTooltip1.SetSuperTooltip(this.cbxByWord, 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.cbxByWord.Size = new System.Drawing.Size(56, 15); + this.superTooltip1.SetSuperTooltip(this.cbxByWord, new DevComponents.DotNetBar.SuperTooltipInfo("By Word", "", "When this box is checked, Search will find only matches of the search text as a w" + + "ord not as part of a word.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(180, 100))); this.cbxByWord.TabIndex = 7; this.cbxByWord.Text = "By Word"; // @@ -476,10 +472,9 @@ namespace Volian.Controls.Library // // this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(213, 28); - this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(160, 23); this.cbxBooleanTxtSrch.Name = "cbxBooleanTxtSrch"; - this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(115, 18); + this.cbxBooleanTxtSrch.Size = new System.Drawing.Size(86, 15); 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"; @@ -493,10 +488,9 @@ namespace Volian.Controls.Library // 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, 28); - this.cbxIncROTextSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxIncROTextSrch.Location = new System.Drawing.Point(9, 23); this.cbxIncROTextSrch.Name = "cbxIncROTextSrch"; - this.cbxIncROTextSrch.Size = new System.Drawing.Size(225, 15); + this.cbxIncROTextSrch.Size = new System.Drawing.Size(169, 12); this.superTooltip1.SetSuperTooltip(this.cbxIncROTextSrch, new DevComponents.DotNetBar.SuperTooltipInfo("Search RO and Transition Text", "", "When this box is checked, Search will include matches found in RO and Transition " + "text as well as regular text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxIncROTextSrch.TabIndex = 5; @@ -510,15 +504,31 @@ namespace Volian.Controls.Library // 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, 7); - this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxCaseSensitive.Location = new System.Drawing.Point(9, 6); + this.cbxCaseSensitive.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxCaseSensitive.Name = "cbxCaseSensitive"; - this.cbxCaseSensitive.Size = new System.Drawing.Size(139, 18); + this.cbxCaseSensitive.Size = new System.Drawing.Size(104, 15); 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"; // + // cbxRnoOnly + // + this.cbxRnoOnly.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxRnoOnly.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxRnoOnly.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxRnoOnly.Location = new System.Drawing.Point(172, 6); + this.cbxRnoOnly.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbxRnoOnly.Name = "cbxRnoOnly"; + this.cbxRnoOnly.Size = new System.Drawing.Size(71, 15); + this.superTooltip1.SetSuperTooltip(this.cbxRnoOnly, 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.cbxRnoOnly.TabIndex = 7; + this.cbxRnoOnly.Text = "RNO Only"; + // // rbtnSrchTxt // this.rbtnSrchTxt.BackColor = System.Drawing.Color.Transparent; @@ -533,9 +543,9 @@ namespace Volian.Controls.Library 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.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.rbtnSrchTxt.Name = "rbtnSrchTxt"; - this.rbtnSrchTxt.Size = new System.Drawing.Size(29, 89); + this.rbtnSrchTxt.Size = new System.Drawing.Size(22, 70); this.rbtnSrchTxt.TabIndex = 6; this.rbtnSrchTxt.CheckedChanged += new System.EventHandler(this.rbtnSrchTxt_CheckedChanged); // @@ -549,10 +559,10 @@ namespace Volian.Controls.Library 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, 90); - this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxSrchTypeUsage.Location = new System.Drawing.Point(1, 71); + this.cbxSrchTypeUsage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxSrchTypeUsage.Name = "cbxSrchTypeUsage"; - this.cbxSrchTypeUsage.Size = new System.Drawing.Size(367, 22); + this.cbxSrchTypeUsage.Size = new System.Drawing.Size(275, 18); this.superTooltip1.SetSuperTooltip(this.cbxSrchTypeUsage, new DevComponents.DotNetBar.SuperTooltipInfo("Find Selected Step Elements", "", "This option will have Search show you where the selected Step Elements are used.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxSrchTypeUsage.TabIndex = 4; this.cbxSrchTypeUsage.Text = " Find Selected Step Elements"; @@ -569,16 +579,17 @@ namespace Volian.Controls.Library // // tabControlPanel5 // + this.tabControlPanel5.Controls.Add(this.cbxRnoOnlyTrans); this.tabControlPanel5.Controls.Add(this.pnlTranCategory); this.tabControlPanel5.Controls.Add(this.pnlTranFormat); this.tabControlPanel5.Controls.Add(this.pnlTranVersion); this.tabControlPanel5.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel5.Location = new System.Drawing.Point(0, 40); - this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel5.Location = new System.Drawing.Point(0, 34); + this.tabControlPanel5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel5.Name = "tabControlPanel5"; this.tabControlPanel5.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel5.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel5.Size = new System.Drawing.Size(277, 90); this.tabControlPanel5.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel5.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -595,20 +606,20 @@ namespace Volian.Controls.Library this.pnlTranCategory.Controls.Add(this.cbxTranCategory); this.pnlTranCategory.Controls.Add(this.lblTranCategory); this.pnlTranCategory.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlTranCategory.Location = new System.Drawing.Point(1, 51); - this.pnlTranCategory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pnlTranCategory.Location = new System.Drawing.Point(1, 43); + this.pnlTranCategory.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pnlTranCategory.Name = "pnlTranCategory"; this.pnlTranCategory.Padding = new System.Windows.Forms.Padding(1); - this.pnlTranCategory.Size = new System.Drawing.Size(367, 25); + this.pnlTranCategory.Size = new System.Drawing.Size(275, 21); this.pnlTranCategory.TabIndex = 2; // // cbxTranCategory // this.cbxTranCategory.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTranCategory.Location = new System.Drawing.Point(76, 1); - this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTranCategory.Location = new System.Drawing.Point(57, 1); + this.cbxTranCategory.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxTranCategory.Name = "cbxTranCategory"; - this.cbxTranCategory.Size = new System.Drawing.Size(288, 24); + this.cbxTranCategory.Size = new System.Drawing.Size(215, 21); this.cbxTranCategory.TabIndex = 1; this.cbxTranCategory.WatermarkText = "Select Cateogry of Transitions"; // @@ -616,8 +627,9 @@ namespace Volian.Controls.Library // this.lblTranCategory.Dock = System.Windows.Forms.DockStyle.Left; this.lblTranCategory.Location = new System.Drawing.Point(1, 1); + this.lblTranCategory.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblTranCategory.Name = "lblTranCategory"; - this.lblTranCategory.Size = new System.Drawing.Size(75, 21); + this.lblTranCategory.Size = new System.Drawing.Size(56, 17); this.lblTranCategory.TabIndex = 0; this.lblTranCategory.Text = "Category"; this.lblTranCategory.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -628,20 +640,20 @@ namespace Volian.Controls.Library this.pnlTranFormat.Controls.Add(this.cbxTranFormat); this.pnlTranFormat.Controls.Add(this.lblTranFormat); this.pnlTranFormat.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlTranFormat.Location = new System.Drawing.Point(1, 26); - this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pnlTranFormat.Location = new System.Drawing.Point(1, 22); + this.pnlTranFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pnlTranFormat.Name = "pnlTranFormat"; this.pnlTranFormat.Padding = new System.Windows.Forms.Padding(1); - this.pnlTranFormat.Size = new System.Drawing.Size(367, 25); + this.pnlTranFormat.Size = new System.Drawing.Size(275, 21); this.pnlTranFormat.TabIndex = 1; // // cbxTranFormat // this.cbxTranFormat.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTranFormat.Location = new System.Drawing.Point(76, 1); - this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTranFormat.Location = new System.Drawing.Point(57, 1); + this.cbxTranFormat.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxTranFormat.Name = "cbxTranFormat"; - this.cbxTranFormat.Size = new System.Drawing.Size(288, 24); + this.cbxTranFormat.Size = new System.Drawing.Size(215, 21); this.cbxTranFormat.TabIndex = 1; this.cbxTranFormat.WatermarkText = "Select Style of Transitions"; // @@ -649,8 +661,9 @@ namespace Volian.Controls.Library // this.lblTranFormat.Dock = System.Windows.Forms.DockStyle.Left; this.lblTranFormat.Location = new System.Drawing.Point(1, 1); + this.lblTranFormat.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblTranFormat.Name = "lblTranFormat"; - this.lblTranFormat.Size = new System.Drawing.Size(75, 21); + this.lblTranFormat.Size = new System.Drawing.Size(56, 17); this.lblTranFormat.TabIndex = 0; this.lblTranFormat.Text = "Style"; this.lblTranFormat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -662,19 +675,19 @@ namespace Volian.Controls.Library this.pnlTranVersion.Controls.Add(this.lblTranVersion); this.pnlTranVersion.Dock = System.Windows.Forms.DockStyle.Top; this.pnlTranVersion.Location = new System.Drawing.Point(1, 1); - this.pnlTranVersion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pnlTranVersion.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pnlTranVersion.Name = "pnlTranVersion"; this.pnlTranVersion.Padding = new System.Windows.Forms.Padding(1); - this.pnlTranVersion.Size = new System.Drawing.Size(367, 25); + this.pnlTranVersion.Size = new System.Drawing.Size(275, 21); this.pnlTranVersion.TabIndex = 0; // // cbxTranVersion // this.cbxTranVersion.Dock = System.Windows.Forms.DockStyle.Fill; - this.cbxTranVersion.Location = new System.Drawing.Point(69, 1); - this.cbxTranVersion.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxTranVersion.Location = new System.Drawing.Point(52, 1); + this.cbxTranVersion.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxTranVersion.Name = "cbxTranVersion"; - this.cbxTranVersion.Size = new System.Drawing.Size(295, 24); + this.cbxTranVersion.Size = new System.Drawing.Size(220, 21); this.cbxTranVersion.TabIndex = 1; this.cbxTranVersion.WatermarkText = "Select Format for Transitions"; // @@ -682,8 +695,9 @@ namespace Volian.Controls.Library // this.lblTranVersion.Dock = System.Windows.Forms.DockStyle.Left; this.lblTranVersion.Location = new System.Drawing.Point(1, 1); + this.lblTranVersion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblTranVersion.Name = "lblTranVersion"; - this.lblTranVersion.Size = new System.Drawing.Size(68, 21); + this.lblTranVersion.Size = new System.Drawing.Size(51, 17); this.lblTranVersion.TabIndex = 0; this.lblTranVersion.Text = "Formats"; this.lblTranVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -702,11 +716,11 @@ namespace Volian.Controls.Library 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, 40); - this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel3.Location = new System.Drawing.Point(0, 34); + this.tabControlPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel3.Name = "tabControlPanel3"; this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel3.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel3.Size = new System.Drawing.Size(277, 90); 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; @@ -727,9 +741,9 @@ namespace Volian.Controls.Library 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(3, 2, 3, 2); + this.gpSrchAnnoText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpSrchAnnoText.Name = "gpSrchAnnoText"; - this.gpSrchAnnoText.Size = new System.Drawing.Size(367, 89); + this.gpSrchAnnoText.Size = new System.Drawing.Size(275, 66); // // // @@ -764,15 +778,16 @@ namespace Volian.Controls.Library // 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(3, 2, 3, 2); + this.panel4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(361, 76); + this.panel4.Size = new System.Drawing.Size(269, 62); this.panel4.TabIndex = 9; // // cbxBooleanAnoTxtSrch @@ -781,10 +796,9 @@ namespace Volian.Controls.Library // // this.cbxBooleanAnoTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(16, 50); - this.cbxBooleanAnoTxtSrch.Margin = new System.Windows.Forms.Padding(4); + this.cbxBooleanAnoTxtSrch.Location = new System.Drawing.Point(12, 41); this.cbxBooleanAnoTxtSrch.Name = "cbxBooleanAnoTxtSrch"; - this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(148, 21); + this.cbxBooleanAnoTxtSrch.Size = new System.Drawing.Size(111, 17); this.cbxBooleanAnoTxtSrch.TabIndex = 8; this.cbxBooleanAnoTxtSrch.Text = "Boolean Search"; this.cbxBooleanAnoTxtSrch.Visible = false; @@ -799,11 +813,11 @@ namespace Volian.Controls.Library // 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(16, 31); - this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxCaseSensitiveAnnoText.Location = new System.Drawing.Point(12, 25); + this.cbxCaseSensitiveAnnoText.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxCaseSensitiveAnnoText.Name = "cbxCaseSensitiveAnnoText"; this.cbxCaseSensitiveAnnoText.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxCaseSensitiveAnnoText.Size = new System.Drawing.Size(98, 18); + 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; @@ -819,10 +833,10 @@ namespace Volian.Controls.Library 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(3, 2, 3, 2); + this.cbxTextSearchAnnotation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxTextSearchAnnotation.Name = "cbxTextSearchAnnotation"; this.cbxTextSearchAnnotation.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxTextSearchAnnotation.Size = new System.Drawing.Size(331, 22); + 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; @@ -838,9 +852,10 @@ namespace Volian.Controls.Library 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, 6, 0, 0); - this.label2.Size = new System.Drawing.Size(30, 19); + 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:"; // @@ -854,10 +869,10 @@ namespace Volian.Controls.Library 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(3, 2, 3, 2); + this.cbxAnnoTypes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxAnnoTypes.Name = "cbxAnnoTypes"; this.cbxAnnoTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbxAnnoTypes.Size = new System.Drawing.Size(367, 22); + 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"; @@ -877,11 +892,11 @@ namespace Volian.Controls.Library this.tabControlPanel2.Controls.Add(this.cmboTreeROs); this.tabControlPanel2.DisabledBackColor = System.Drawing.Color.Empty; this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabControlPanel2.Location = new System.Drawing.Point(0, 40); - this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tabControlPanel2.Location = new System.Drawing.Point(0, 34); + this.tabControlPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tabControlPanel2.Name = "tabControlPanel2"; this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1); - this.tabControlPanel2.Size = new System.Drawing.Size(369, 113); + this.tabControlPanel2.Size = new System.Drawing.Size(277, 90); this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254))))); this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227))))); this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; @@ -896,14 +911,15 @@ namespace Volian.Controls.Library // this.gpFindROs.CanvasColor = System.Drawing.SystemColors.Control; this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; + this.gpFindROs.Controls.Add(this.cbxRnoOnlyRO); this.gpFindROs.Controls.Add(this.lblSrchRoMsg); this.gpFindROs.Controls.Add(this.cbxFndUnLnkROVals); this.gpFindROs.DisabledBackColor = System.Drawing.Color.Empty; this.gpFindROs.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpFindROs.Location = new System.Drawing.Point(1, 26); - this.gpFindROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.gpFindROs.Location = new System.Drawing.Point(1, 21); + this.gpFindROs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.gpFindROs.Name = "gpFindROs"; - this.gpFindROs.Size = new System.Drawing.Size(367, 86); + this.gpFindROs.Size = new System.Drawing.Size(275, 68); // // // @@ -944,10 +960,10 @@ namespace Volian.Controls.Library this.lblSrchRoMsg.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.lblSrchRoMsg.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblSrchRoMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); - this.lblSrchRoMsg.Location = new System.Drawing.Point(9, 28); - this.lblSrchRoMsg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lblSrchRoMsg.Location = new System.Drawing.Point(7, 23); + this.lblSrchRoMsg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.lblSrchRoMsg.Name = "lblSrchRoMsg"; - this.lblSrchRoMsg.Size = new System.Drawing.Size(349, 49); + this.lblSrchRoMsg.Size = new System.Drawing.Size(262, 40); this.lblSrchRoMsg.TabIndex = 3; this.lblSrchRoMsg.Text = "This folder(s) ROs are incompatible with the currently selected folder(s). This " + "may be due to the RO values needing to be updated."; @@ -963,10 +979,10 @@ namespace Volian.Controls.Library this.cbxFndUnLnkROVals.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxFndUnLnkROVals.Enabled = false; this.cbxFndUnLnkROVals.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 4); - this.cbxFndUnLnkROVals.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbxFndUnLnkROVals.Location = new System.Drawing.Point(0, 3); + this.cbxFndUnLnkROVals.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbxFndUnLnkROVals.Name = "cbxFndUnLnkROVals"; - this.cbxFndUnLnkROVals.Size = new System.Drawing.Size(235, 23); + this.cbxFndUnLnkROVals.Size = new System.Drawing.Size(176, 19); this.superTooltip1.SetSuperTooltip(this.cbxFndUnLnkROVals, new DevComponents.DotNetBar.SuperTooltipInfo("Find Linked Values", "", "Finding unlinked values does the search for a specific RO.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbxFndUnLnkROVals.TabIndex = 2; this.cbxFndUnLnkROVals.Text = "Find Unlinked Values of Selected RO"; @@ -984,10 +1000,10 @@ namespace Volian.Controls.Library this.cmboTreeROs.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cmboTreeROs.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; this.cmboTreeROs.Location = new System.Drawing.Point(1, 1); - this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cmboTreeROs.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cmboTreeROs.Name = "cmboTreeROs"; this.cmboTreeROs.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cmboTreeROs.Size = new System.Drawing.Size(367, 25); + this.cmboTreeROs.Size = new System.Drawing.Size(275, 20); this.superTooltip1.SetSuperTooltip(this.cmboTreeROs, new DevComponents.DotNetBar.SuperTooltipInfo("Select the RO to Search", "", "Select the Referenced Object to search for.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cmboTreeROs.TabIndex = 1; this.cmboTreeROs.ThemeAware = true; @@ -1008,10 +1024,10 @@ namespace Volian.Controls.Library this.contextMenuBar1.IsMaximized = false; this.contextMenuBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnCMIFindText}); - this.contextMenuBar1.Location = new System.Drawing.Point(300, -4); - this.contextMenuBar1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.contextMenuBar1.Location = new System.Drawing.Point(225, -3); + this.contextMenuBar1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.contextMenuBar1.Name = "contextMenuBar1"; - this.contextMenuBar1.Size = new System.Drawing.Size(75, 29); + this.contextMenuBar1.Size = new System.Drawing.Size(56, 25); this.contextMenuBar1.Stretch = true; this.contextMenuBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003; this.contextMenuBar1.TabIndex = 6; @@ -1176,8 +1192,8 @@ namespace Volian.Controls.Library this.advTreeProcSets.Dock = System.Windows.Forms.DockStyle.Fill; this.advTreeProcSets.DragDropEnabled = false; this.advTreeProcSets.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTreeProcSets.Location = new System.Drawing.Point(0, 26); - this.advTreeProcSets.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.advTreeProcSets.Location = new System.Drawing.Point(0, 21); + this.advTreeProcSets.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.advTreeProcSets.MultiSelect = true; this.advTreeProcSets.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode; this.advTreeProcSets.Name = "advTreeProcSets"; @@ -1188,7 +1204,7 @@ namespace Volian.Controls.Library this.advTreeProcSets.NodeStyleSelected = this.elementStyle1; this.advTreeProcSets.PathSeparator = ";"; this.advTreeProcSets.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.advTreeProcSets.Size = new System.Drawing.Size(369, 132); + this.advTreeProcSets.Size = new System.Drawing.Size(277, 107); this.advTreeProcSets.Styles.Add(this.elementStyle1); this.advTreeProcSets.TabIndex = 0; this.advTreeProcSets.Text = "advTree1"; @@ -1223,8 +1239,8 @@ namespace Volian.Controls.Library this.advTreeStepTypes.Dock = System.Windows.Forms.DockStyle.Fill; this.advTreeStepTypes.DragDropEnabled = false; this.advTreeStepTypes.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"; - this.advTreeStepTypes.Location = new System.Drawing.Point(0, 26); - this.advTreeStepTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.advTreeStepTypes.Location = new System.Drawing.Point(0, 21); + this.advTreeStepTypes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.advTreeStepTypes.MultiSelect = true; this.advTreeStepTypes.MultiSelectRule = DevComponents.AdvTree.eMultiSelectRule.AnyNode; this.advTreeStepTypes.Name = "advTreeStepTypes"; @@ -1236,7 +1252,7 @@ namespace Volian.Controls.Library this.advTreeStepTypes.PathSeparator = ";"; this.advTreeStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; this.advTreeStepTypes.SelectionPerCell = true; - this.advTreeStepTypes.Size = new System.Drawing.Size(369, 154); + this.advTreeStepTypes.Size = new System.Drawing.Size(277, 125); this.advTreeStepTypes.Styles.Add(this.elementStyle2); this.advTreeStepTypes.TabIndex = 0; this.advTreeStepTypes.Text = "advTree1"; @@ -1266,11 +1282,10 @@ namespace Volian.Controls.Library this.grpPanSearchResults.Controls.Add(this.lbSrchResultsIncTrans); this.grpPanSearchResults.DisabledBackColor = System.Drawing.Color.Empty; this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpPanSearchResults.Location = new System.Drawing.Point(0, 564); - this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.grpPanSearchResults.Location = new System.Drawing.Point(0, 457); + this.grpPanSearchResults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.grpPanSearchResults.Name = "grpPanSearchResults"; - this.grpPanSearchResults.Size = new System.Drawing.Size(369, 268); - this.grpPanSearchResults.MouseDown += GrpPanSearchResults_MouseDown; + this.grpPanSearchResults.Size = new System.Drawing.Size(277, 219); // // // @@ -1305,12 +1320,11 @@ namespace Volian.Controls.Library // lbSrchResults // this.lbSrchResults.Dock = System.Windows.Forms.DockStyle.Fill; - this.lbSrchResults.ItemHeight = 16; this.lbSrchResults.Location = new System.Drawing.Point(0, 0); - this.lbSrchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lbSrchResults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.lbSrchResults.Name = "lbSrchResults"; this.lbSrchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lbSrchResults.Size = new System.Drawing.Size(363, 245); + this.lbSrchResults.Size = new System.Drawing.Size(271, 198); this.lbSrchResults.TabIndex = 0; this.lbSrchResults.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged); this.lbSrchResults.MouseMove += new System.Windows.Forms.MouseEventHandler(this.lbSrchResults_MouseMove); @@ -1322,16 +1336,15 @@ 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; + this.lbSrchResultsIncTrans.DragDropSupport = true; this.lbSrchResultsIncTrans.ItemHeight = 16; this.lbSrchResultsIncTrans.Location = new System.Drawing.Point(0, 0); - this.lbSrchResultsIncTrans.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.lbSrchResultsIncTrans.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.lbSrchResultsIncTrans.Name = "lbSrchResultsIncTrans"; this.lbSrchResultsIncTrans.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(363, 200); + this.lbSrchResultsIncTrans.Size = new System.Drawing.Size(271, 198); this.lbSrchResultsIncTrans.TabIndex = 0; this.lbSrchResultsIncTrans.SelectedIndexChanged += new System.EventHandler(this.lbSrchResults_SelectedValueChanged); this.lbSrchResultsIncTrans.ItemClick += new System.EventHandler(this.lbSrchResultsIncTrans_ItemClicked); @@ -1351,10 +1364,10 @@ namespace Volian.Controls.Library this.panSearchButtons.Controls.Add(this.btnPrnSrchRslts); this.panSearchButtons.DisabledBackColor = System.Drawing.Color.Empty; this.panSearchButtons.Dock = System.Windows.Forms.DockStyle.Top; - this.panSearchButtons.Location = new System.Drawing.Point(0, 491); - this.panSearchButtons.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panSearchButtons.Location = new System.Drawing.Point(0, 398); + this.panSearchButtons.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panSearchButtons.Name = "panSearchButtons"; - this.panSearchButtons.Size = new System.Drawing.Size(369, 73); + this.panSearchButtons.Size = new System.Drawing.Size(277, 59); this.panSearchButtons.Style.Alignment = System.Drawing.StringAlignment.Center; this.panSearchButtons.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panSearchButtons.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1373,11 +1386,11 @@ namespace Volian.Controls.Library 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))); - this.btnClearSearchResults.Location = new System.Drawing.Point(316, 4); - this.btnClearSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnClearSearchResults.Location = new System.Drawing.Point(237, 3); + this.btnClearSearchResults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnClearSearchResults.Name = "btnClearSearchResults"; this.btnClearSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnClearSearchResults.Size = new System.Drawing.Size(49, 28); + this.btnClearSearchResults.Size = new System.Drawing.Size(37, 23); this.superTooltip1.SetSuperTooltip(this.btnClearSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Clear Search Results", "", "Clear Search Results just clears out the Search Results list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnClearSearchResults.TabIndex = 11; this.btnClearSearchResults.Text = "Clear"; @@ -1390,11 +1403,11 @@ namespace Volian.Controls.Library 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))); - this.btnCopySearchResults.Location = new System.Drawing.Point(140, 36); - this.btnCopySearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnCopySearchResults.Location = new System.Drawing.Point(105, 29); + this.btnCopySearchResults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnCopySearchResults.Name = "btnCopySearchResults"; this.btnCopySearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnCopySearchResults.Size = new System.Drawing.Size(57, 28); + this.btnCopySearchResults.Size = new System.Drawing.Size(43, 23); this.superTooltip1.SetSuperTooltip(this.btnCopySearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Copy Search Results", "", "This button copies the Search Results listed below into the copy/paste buffer. Th" + "e copied data can then be pasted into another tool, such as a spreadsheet.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnCopySearchResults.TabIndex = 10; @@ -1408,13 +1421,12 @@ namespace Volian.Controls.Library this.btnSaveSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnSaveSearchResults.Enabled = false; this.btnSaveSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSaveSearchResults.Location = new System.Drawing.Point(291, 36); - this.btnSaveSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnSaveSearchResults.Location = new System.Drawing.Point(218, 29); + this.btnSaveSearchResults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnSaveSearchResults.Name = "btnSaveSearchResults"; this.btnSaveSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnSaveSearchResults.Size = new System.Drawing.Size(57, 28); - this.superTooltip1.SetSuperTooltip(this.btnSaveSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Save Search Results", "", "This button saves the Search Results listed below into a named file in xml.", - null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnSaveSearchResults.Size = new System.Drawing.Size(43, 23); + this.superTooltip1.SetSuperTooltip(this.btnSaveSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Save Search Results", "", "This button saves the Search Results listed below into a named file in xml.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnSaveSearchResults.TabIndex = 10; this.btnSaveSearchResults.Text = "Save"; this.btnSaveSearchResults.ThemeAware = true; @@ -1425,13 +1437,12 @@ namespace Volian.Controls.Library this.btnLoadSearchResults.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnLoadSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnLoadSearchResults.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnLoadSearchResults.Location = new System.Drawing.Point(355, 36); - this.btnLoadSearchResults.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnLoadSearchResults.Location = new System.Drawing.Point(266, 29); + this.btnLoadSearchResults.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnLoadSearchResults.Name = "btnLoadSearchResults"; this.btnLoadSearchResults.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnLoadSearchResults.Size = new System.Drawing.Size(57, 28); - this.superTooltip1.SetSuperTooltip(this.btnLoadSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Load Search Results", "", "This button loads saved Search Results from a named file in xml.", // C2021-023: fix Load tooltip - null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); + this.btnLoadSearchResults.Size = new System.Drawing.Size(43, 23); + this.superTooltip1.SetSuperTooltip(this.btnLoadSearchResults, new DevComponents.DotNetBar.SuperTooltipInfo("Load Search Results", "", "This button loads saved Search Results from a named file in xml.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnLoadSearchResults.TabIndex = 10; this.btnLoadSearchResults.Text = "Load"; this.btnLoadSearchResults.ThemeAware = true; @@ -1445,8 +1456,8 @@ namespace Volian.Controls.Library // this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelX1.Location = new System.Drawing.Point(4, 6); - this.labelX1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.labelX1.Location = new System.Drawing.Point(3, 5); + this.labelX1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.labelX1.Name = "labelX1"; this.labelX1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.labelX1.Size = new System.Drawing.Size(66, 14); @@ -1468,11 +1479,11 @@ namespace Volian.Controls.Library this.comboItem2, this.comboItem3, this.comboItem4}); - this.cmbResultsStyle.Location = new System.Drawing.Point(93, 6); - this.cmbResultsStyle.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cmbResultsStyle.Location = new System.Drawing.Point(70, 5); + this.cmbResultsStyle.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cmbResultsStyle.Name = "cmbResultsStyle"; this.cmbResultsStyle.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cmbResultsStyle.Size = new System.Drawing.Size(145, 20); + this.cmbResultsStyle.Size = new System.Drawing.Size(110, 20); this.superTooltip1.SetSuperTooltip(this.cmbResultsStyle, new DevComponents.DotNetBar.SuperTooltipInfo("Results Style", "", "The Search Results list can be formatted in one of four styles: Document Path, St" + "ep Path, Annotation Text and Document Text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cmbResultsStyle.TabIndex = 8; @@ -1502,11 +1513,11 @@ namespace Volian.Controls.Library // this.cbSorted.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbSorted.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbSorted.Location = new System.Drawing.Point(203, 41); - this.cbSorted.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.cbSorted.Location = new System.Drawing.Point(152, 33); + this.cbSorted.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.cbSorted.Name = "cbSorted"; this.cbSorted.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.cbSorted.Size = new System.Drawing.Size(48, 18); + this.cbSorted.Size = new System.Drawing.Size(42, 15); this.superTooltip1.SetSuperTooltip(this.cbSorted, new DevComponents.DotNetBar.SuperTooltipInfo("Sort Results", "", "Sorts results that are output into the Search Results list shown below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.cbSorted.TabIndex = 7; this.cbSorted.Text = "Sort"; @@ -1518,11 +1529,11 @@ namespace Volian.Controls.Library this.btnSearch.BackColor = System.Drawing.SystemColors.Control; this.btnSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueOrb; 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); - this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnSearch.Location = new System.Drawing.Point(4, 29); + this.btnSearch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnSearch.Name = "btnSearch"; this.btnSearch.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnSearch.Size = new System.Drawing.Size(67, 28); + this.btnSearch.Size = new System.Drawing.Size(50, 23); this.superTooltip1.SetSuperTooltip(this.btnSearch, new DevComponents.DotNetBar.SuperTooltipInfo("Search Button", "", "This will perform the search and place the results below.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnSearch.TabIndex = 4; this.btnSearch.Text = "Search"; @@ -1535,11 +1546,11 @@ namespace Volian.Controls.Library 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))); - this.btnPrnSrchRslts.Location = new System.Drawing.Point(77, 36); - this.btnPrnSrchRslts.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnPrnSrchRslts.Location = new System.Drawing.Point(58, 29); + this.btnPrnSrchRslts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnPrnSrchRslts.Name = "btnPrnSrchRslts"; this.btnPrnSrchRslts.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.btnPrnSrchRslts.Size = new System.Drawing.Size(57, 28); + this.btnPrnSrchRslts.Size = new System.Drawing.Size(43, 23); this.superTooltip1.SetSuperTooltip(this.btnPrnSrchRslts, new DevComponents.DotNetBar.SuperTooltipInfo("Print Search Results", "", "This button generates a PDF of a standard formatted report regardless of what Res" + "ults Style is selected.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray)); this.btnPrnSrchRslts.TabIndex = 5; @@ -1565,11 +1576,11 @@ namespace Volian.Controls.Library this.xpSetToSearch.DisabledBackColor = System.Drawing.Color.Empty; this.xpSetToSearch.Dock = System.Windows.Forms.DockStyle.Top; this.xpSetToSearch.ExpandOnTitleClick = true; - this.xpSetToSearch.Location = new System.Drawing.Point(0, 153); - this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.xpSetToSearch.Location = new System.Drawing.Point(0, 124); + this.xpSetToSearch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.xpSetToSearch.Name = "xpSetToSearch"; this.xpSetToSearch.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.xpSetToSearch.Size = new System.Drawing.Size(369, 158); + this.xpSetToSearch.Size = new System.Drawing.Size(277, 128); this.xpSetToSearch.Style.Alignment = System.Drawing.StringAlignment.Center; this.xpSetToSearch.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSetToSearch.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1581,6 +1592,7 @@ namespace Volian.Controls.Library "rocedure sets are selected in this list, then PROMS will search All of the proce" + "dure sets.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(196, 104))); this.xpSetToSearch.TabIndex = 7; + this.xpSetToSearch.TitleHeight = 21; this.xpSetToSearch.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.xpSetToSearch.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpSetToSearch.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1599,11 +1611,11 @@ namespace Volian.Controls.Library this.xpStepTypes.DisabledBackColor = System.Drawing.Color.Empty; this.xpStepTypes.Dock = System.Windows.Forms.DockStyle.Top; this.xpStepTypes.ExpandOnTitleClick = true; - this.xpStepTypes.Location = new System.Drawing.Point(0, 311); - this.xpStepTypes.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.xpStepTypes.Location = new System.Drawing.Point(0, 252); + this.xpStepTypes.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.xpStepTypes.Name = "xpStepTypes"; this.xpStepTypes.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.xpStepTypes.Size = new System.Drawing.Size(369, 180); + this.xpStepTypes.Size = new System.Drawing.Size(277, 146); this.xpStepTypes.Style.Alignment = System.Drawing.StringAlignment.Center; this.xpStepTypes.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpStepTypes.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1616,6 +1628,7 @@ namespace Volian.Controls.Library "Step Elements are use.\r\n", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(240, 115))); this.xpStepTypes.TabIndex = 8; this.xpStepTypes.ThemeAware = true; + this.xpStepTypes.TitleHeight = 21; this.xpStepTypes.TitleStyle.Alignment = System.Drawing.StringAlignment.Center; this.xpStepTypes.TitleStyle.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.xpStepTypes.TitleStyle.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1639,19 +1652,69 @@ namespace Volian.Controls.Library this.checkedListBox1.Size = new System.Drawing.Size(120, 89); this.checkedListBox1.TabIndex = 1; // + // 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"; + // + // cbxRnoOnlyRO + // + this.cbxRnoOnlyRO.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxRnoOnlyRO.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxRnoOnlyRO.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxRnoOnlyRO.Location = new System.Drawing.Point(186, 4); + this.cbxRnoOnlyRO.Margin = new System.Windows.Forms.Padding(2); + this.cbxRnoOnlyRO.Name = "cbxRnoOnlyRO"; + this.cbxRnoOnlyRO.Size = new System.Drawing.Size(71, 15); + this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyRO, 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.cbxRnoOnlyRO.TabIndex = 8; + this.cbxRnoOnlyRO.Text = "RNO Only"; + // + // cbxRnoOnlyTrans + // + this.cbxRnoOnlyTrans.BackColor = System.Drawing.Color.Transparent; + // + // + // + this.cbxRnoOnlyTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.cbxRnoOnlyTrans.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbxRnoOnlyTrans.Location = new System.Drawing.Point(4, 68); + this.cbxRnoOnlyTrans.Margin = new System.Windows.Forms.Padding(2); + this.cbxRnoOnlyTrans.Name = "cbxRnoOnlyTrans"; + this.cbxRnoOnlyTrans.Size = new System.Drawing.Size(71, 15); + this.superTooltip1.SetSuperTooltip(this.cbxRnoOnlyTrans, 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.cbxRnoOnlyTrans.TabIndex = 8; + this.cbxRnoOnlyTrans.Text = "RNO Only"; + // // DisplaySearch // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.grpPanSearchResults); this.Controls.Add(this.panSearchButtons); this.Controls.Add(this.xpStepTypes); this.Controls.Add(this.xpSetToSearch); this.Controls.Add(this.tabSearchTypes); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "DisplaySearch"; this.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.Size = new System.Drawing.Size(369, 832); + this.Size = new System.Drawing.Size(277, 676); ((System.ComponentModel.ISupportInitialize)(this.tabSearchTypes)).EndInit(); this.tabSearchTypes.ResumeLayout(false); this.tabControlPanel1.ResumeLayout(false); @@ -1778,7 +1841,8 @@ namespace Volian.Controls.Library private System.Windows.Forms.Label lblTranCategory; private DevComponents.DotNetBar.Controls.ComboBoxEx cbxTranCategory; private DevComponents.DotNetBar.LabelX lblSrchRoMsg; - private DevComponents.DotNetBar.Controls.CheckBoxX cbxByWord; + private DevComponents.DotNetBar.Controls.CheckBoxX cbxRnoOnly; + private DevComponents.DotNetBar.Controls.CheckBoxX cbxByWord; private DevComponents.DotNetBar.TabControlPanel tabControlPanel1; //private DevComponents.DotNetBar.TabItem tabIncTrans; private System.Windows.Forms.GroupBox groupBox1; @@ -1790,6 +1854,10 @@ namespace Volian.Controls.Library private System.Windows.Forms.CheckedListBox checkedListBox1; private System.Windows.Forms.Button btnTranCvtSelToTxt; private DevComponents.DotNetBar.TabItem tabIncTrans; + private DevComponents.DotNetBar.Controls.CheckBoxX cbxRnoOnlyTrans; + private DevComponents.DotNetBar.Controls.CheckBoxX cbxRnoOnlyRO; + private DevComponents.DotNetBar.Controls.CheckBoxX cbxRnoOnlyAnnot; + private DevComponents.DotNetBar.TabItem tabNISearch; //end transition search controls } } diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 69ee55fa..07de79dd 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -194,6 +194,7 @@ namespace Volian.Controls.Library xpStepTypes.Enabled = true; lbSrchResults.Visible = true; lbSrchResultsIncTrans.Visible = false; + cbxRnoOnly.Visible = true; if (e.NewTab == tabIncTrans) // C2020-033: Incoming transitions { xpSetToSearch.Enabled = false; @@ -203,6 +204,7 @@ namespace Volian.Controls.Library lbSrchResultsIncTrans.CheckBoxesVisible = true; lbSrchResultsIncTrans.AutoScroll = true; btnSearch.Enabled = false; // C2021 - 002: disable search button - no functionality for Incoming Transitions + cbxRnoOnly.Visible = false; } else if (e.NewTab == tabROSearch) { @@ -1561,6 +1563,8 @@ namespace Volian.Controls.Library cmbResultsStyleIndex = 3; // display step text in results //} } + // C2019-001: Search in RNO steps only + if (cbxRnoOnly.Checked) GetInRNOResults(); } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[1]) // Annotation Search { @@ -1584,6 +1588,8 @@ namespace Volian.Controls.Library SearchResults = ItemInfoList.GetListFromAnnotationSearch(DVISearchList, TypeSearchList, AnnotationSearchType, cbxTextSearchAnnotation.Text, cbxCaseSensitiveAnnoText.Checked, unitPrefix); //UpdateAnnotationSearchResults(); cmbResultsStyleIndex = 2; // display annotation text in results + // C2019-001: Search in RNO steps only + if (cbxRnoOnlyAnnot.Checked) GetInRNOResults(); } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[2]) // RO Search { @@ -1601,6 +1607,8 @@ namespace Volian.Controls.Library SearchResults = ItemInfoList.GetListFromROSearch(DVISearchList, TypeSearchList, ROSearchList, unitPrefix); cmbResultsStyleIndex = 3; // display step text in results } + // C2019-001: Search in RNO steps only + if (cbxRnoOnlyRO.Checked) GetInRNOResults(); } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[3]) //Transition Search { @@ -1623,6 +1631,8 @@ namespace Volian.Controls.Library // added TypeSearchList for bug fix B2015-055 SearchResults = ItemInfoList.GetListFromTransitionSearch(docVersionList, cbxTranFormat.SelectedIndex - 1, cbxTranCategory.SelectedItem.ToString() == "All" ? "" : cbxTranCategory.SelectedItem.ToString(), TypeSearchList); cmbResultsStyleIndex = 3; // display step text in results + // C2019-001: Search in RNO steps only + if (cbxRnoOnlyTrans.Checked) GetInRNOResults(); } else if (tabSearchTypes.SelectedTab == tabSearchTypes.Tabs[4]) { @@ -1669,7 +1679,28 @@ namespace Volian.Controls.Library //if (VlnSettings.DebugMode) // MessageBox.Show(string.Format("{0} Milliseconds", TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks).TotalMilliseconds)); } - + // C2019-001: Search in RNO steps only + private void GetInRNOResults() + { + bool first = true; + ItemInfoList iil = null; + foreach (ItemInfo ii in SearchResults) + { + if (ii.SearchPath.Contains(".RNO.")) + { + if (first) + { + iil = new ItemInfoList(ii); + first = false; + } + else + { + iil.AddItem(ii); + } + } + } + SearchResults = iil; + } private void AddMessageForEmptyAnnotations() { bool hasAnnot = false;