From 015fc87c81b0f4e3ea629e4601df65cb64e141ca Mon Sep 17 00:00:00 2001 From: John Date: Mon, 30 Mar 2009 14:00:43 +0000 Subject: [PATCH] --- .../DisplaySearch.Designer.cs | 21 +------------------ .../Volian.Controls.Library/DisplaySearch.cs | 8 +++---- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 22c3d31e..10fd03b3 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -124,9 +124,9 @@ namespace Volian.Controls.Library this.tabSearchTypes.CanReorderTabs = false; this.tabSearchTypes.CloseButtonOnTabsAlwaysDisplayed = false; this.tabSearchTypes.CloseButtonPosition = DevComponents.DotNetBar.eTabCloseButtonPosition.Right; + this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Controls.Add(this.tabControlPanel4); this.tabSearchTypes.Controls.Add(this.tabControlPanel3); - this.tabSearchTypes.Controls.Add(this.tabControlPanel2); this.tabSearchTypes.Controls.Add(this.contextMenuBar1); this.tabSearchTypes.Dock = System.Windows.Forms.DockStyle.Top; this.tabSearchTypes.Location = new System.Drawing.Point(0, 0); @@ -517,7 +517,6 @@ namespace Volian.Controls.Library this.gpFindROs.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.gpFindROs.Controls.Add(this.cbxFndUnLnkROVals); this.gpFindROs.Dock = System.Windows.Forms.DockStyle.Fill; - this.gpFindROs.Enabled = false; this.gpFindROs.Location = new System.Drawing.Point(1, 24); this.gpFindROs.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.gpFindROs.Name = "gpFindROs"; @@ -566,7 +565,6 @@ namespace Volian.Controls.Library this.cmboTreeROs.BackgroundStyle.Class = "TextBoxBorder"; this.cmboTreeROs.ButtonDropDown.Visible = true; this.cmboTreeROs.Dock = System.Windows.Forms.DockStyle.Top; - this.cmboTreeROs.Enabled = false; this.cmboTreeROs.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, 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); @@ -604,7 +602,6 @@ namespace Volian.Controls.Library // btnCMIFindText // this.btnCMIFindText.AutoExpandOnClick = true; - this.btnCMIFindText.ImagePaddingHorizontal = 8; this.btnCMIFindText.Name = "btnCMIFindText"; this.btnCMIFindText.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnCMEdit, @@ -614,7 +611,6 @@ namespace Volian.Controls.Library // // btnCMEdit // - this.btnCMEdit.ImagePaddingHorizontal = 8; this.btnCMEdit.Name = "btnCMEdit"; this.btnCMEdit.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.cmFndTxtCut, @@ -626,7 +622,6 @@ namespace Volian.Controls.Library // this.cmFndTxtCut.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.cmFndTxtCut.Image = global::Volian.Controls.Library.Properties.Resources.Cut_Image; - this.cmFndTxtCut.ImagePaddingHorizontal = 8; this.cmFndTxtCut.Name = "cmFndTxtCut"; this.cmFndTxtCut.Stretch = true; this.cmFndTxtCut.Text = "Cut"; @@ -636,7 +631,6 @@ namespace Volian.Controls.Library // this.cmFndTxtCopy.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.cmFndTxtCopy.Image = global::Volian.Controls.Library.Properties.Resources.Copy_Image; - this.cmFndTxtCopy.ImagePaddingHorizontal = 8; this.cmFndTxtCopy.Name = "cmFndTxtCopy"; this.cmFndTxtCopy.Text = "Copy"; this.cmFndTxtCopy.Click += new System.EventHandler(this.cmFndTxtCopy_Click); @@ -645,14 +639,12 @@ namespace Volian.Controls.Library // this.cmFndTxtPaste.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.cmFndTxtPaste.Image = global::Volian.Controls.Library.Properties.Resources.PasteSmall_Image; - this.cmFndTxtPaste.ImagePaddingHorizontal = 8; this.cmFndTxtPaste.Name = "cmFndTxtPaste"; this.cmFndTxtPaste.Text = "Paste"; this.cmFndTxtPaste.Click += new System.EventHandler(this.cmFndTxtPaste_Click); // // btnCMInsert // - this.btnCMInsert.ImagePaddingHorizontal = 8; this.btnCMInsert.Name = "btnCMInsert"; this.btnCMInsert.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.cmFndTxtInsHardSp, @@ -665,7 +657,6 @@ namespace Volian.Controls.Library // this.cmFndTxtInsHardSp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.cmFndTxtInsHardSp.Image = global::Volian.Controls.Library.Properties.Resources.HardSpace_Image; - this.cmFndTxtInsHardSp.ImagePaddingHorizontal = 8; this.cmFndTxtInsHardSp.Name = "cmFndTxtInsHardSp"; this.cmFndTxtInsHardSp.Text = "Hard Space"; this.cmFndTxtInsHardSp.Click += new System.EventHandler(this.cmFndTxtInsHardSp_Click); @@ -674,7 +665,6 @@ namespace Volian.Controls.Library // this.cmFndTxtInsSymbol.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.cmFndTxtInsSymbol.Image = global::Volian.Controls.Library.Properties.Resources.Symbol_Image; - this.cmFndTxtInsSymbol.ImagePaddingHorizontal = 8; this.cmFndTxtInsSymbol.Name = "cmFndTxtInsSymbol"; this.cmFndTxtInsSymbol.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.galSymbols}); @@ -689,7 +679,6 @@ namespace Volian.Controls.Library // // buttonItem1 // - this.buttonItem1.ImagePaddingHorizontal = 8; this.buttonItem1.Name = "buttonItem1"; this.buttonItem1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.buttonItem2, @@ -699,28 +688,24 @@ namespace Volian.Controls.Library // // buttonItem2 // - this.buttonItem2.ImagePaddingHorizontal = 8; this.buttonItem2.Name = "buttonItem2"; this.buttonItem2.Text = "* - Anything"; this.buttonItem2.Click += new System.EventHandler(this.buttonItem2_Click); // // buttonItem3 // - this.buttonItem3.ImagePaddingHorizontal = 8; this.buttonItem3.Name = "buttonItem3"; this.buttonItem3.Text = "? - One Character"; this.buttonItem3.Click += new System.EventHandler(this.buttonItem3_Click); // // buttonItem4 // - this.buttonItem4.ImagePaddingHorizontal = 8; this.buttonItem4.Name = "buttonItem4"; this.buttonItem4.Text = "?* - One or More"; this.buttonItem4.Click += new System.EventHandler(this.buttonItem4_Click); // // btnBooleanItems // - this.btnBooleanItems.ImagePaddingHorizontal = 8; this.btnBooleanItems.Name = "btnBooleanItems"; this.btnBooleanItems.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnAND, @@ -732,28 +717,24 @@ namespace Volian.Controls.Library // // btnAND // - this.btnAND.ImagePaddingHorizontal = 8; this.btnAND.Name = "btnAND"; this.btnAND.Text = "AND"; this.btnAND.Click += new System.EventHandler(this.btnAND_Click); // // btnOR // - this.btnOR.ImagePaddingHorizontal = 8; this.btnOR.Name = "btnOR"; this.btnOR.Text = "OR"; this.btnOR.Click += new System.EventHandler(this.btnOR_Click); // // btnNOT // - this.btnNOT.ImagePaddingHorizontal = 8; this.btnNOT.Name = "btnNOT"; this.btnNOT.Text = "NOT"; this.btnNOT.Click += new System.EventHandler(this.btnNOT_Click); // // btnNear // - this.btnNear.ImagePaddingHorizontal = 8; this.btnNear.Name = "btnNear"; this.btnNear.Text = "NEAR"; this.btnNear.Click += new System.EventHandler(this.btnNear_Click); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 5d5a6f06..5e86beaf 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -968,10 +968,10 @@ namespace Volian.Controls.Library buildStepTypePannelTitle(); } } - // Enable the RO combo list only if at least one procedure set node - // is selected - cmboTreeROs.Enabled = (lstCheckedDocVersions.Count > 0); - gpFindROs.Enabled = cmboTreeROs.Enabled; + //// Enable the RO combo list only if at least one procedure set node + //// is selected + //cmboTreeROs.Enabled = (lstCheckedDocVersions.Count > 0); + //gpFindROs.Enabled = cmboTreeROs.Enabled; SetupContextMenu();