diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 9791a248..3b8961b9 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -217,7 +217,6 @@ namespace Volian.Controls.Library this.gpSrchText.Style.BorderRightWidth = 1; this.gpSrchText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpSrchText.Style.BorderTopWidth = 1; - this.gpSrchText.Style.Class = ""; this.gpSrchText.Style.CornerDiameter = 4; this.gpSrchText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpSrchText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -226,12 +225,10 @@ namespace Volian.Controls.Library // // // - this.gpSrchText.StyleMouseDown.Class = ""; this.gpSrchText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gpSrchText.StyleMouseOver.Class = ""; this.gpSrchText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.gpSrchText.TabIndex = 5; this.gpSrchText.EnabledChanged += new System.EventHandler(this.gpSrchText_EnabledChanged); @@ -300,7 +297,6 @@ namespace Volian.Controls.Library // // // - this.cbxBooleanTxtSrch.BackgroundStyle.Class = ""; this.cbxBooleanTxtSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxBooleanTxtSrch.Location = new System.Drawing.Point(169, 25); this.cbxBooleanTxtSrch.Margin = new System.Windows.Forms.Padding(4); @@ -317,7 +313,6 @@ namespace Volian.Controls.Library // // // - this.cbxIncROTextSrch.BackgroundStyle.Class = ""; this.cbxIncROTextSrch.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxIncROTextSrch.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxIncROTextSrch.Location = new System.Drawing.Point(12, 32); @@ -335,7 +330,6 @@ namespace Volian.Controls.Library // // // - this.cbxCaseSensitive.BackgroundStyle.Class = ""; this.cbxCaseSensitive.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxCaseSensitive.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbxCaseSensitive.Location = new System.Drawing.Point(12, 8); @@ -353,7 +347,6 @@ namespace Volian.Controls.Library // // // - this.rbtnSrchTxt.BackgroundStyle.Class = ""; this.rbtnSrchTxt.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.rbtnSrchTxt.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.rbtnSrchTxt.Checked = true; @@ -374,7 +367,6 @@ namespace Volian.Controls.Library // // // - this.cbxSrchTypeUsage.BackgroundStyle.Class = ""; this.cbxSrchTypeUsage.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.cbxSrchTypeUsage.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton; this.cbxSrchTypeUsage.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -442,7 +434,6 @@ namespace Volian.Controls.Library this.gpFindROs.Style.BorderRightWidth = 1; this.gpFindROs.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpFindROs.Style.BorderTopWidth = 1; - this.gpFindROs.Style.Class = ""; this.gpFindROs.Style.CornerDiameter = 4; this.gpFindROs.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpFindROs.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -451,12 +442,10 @@ namespace Volian.Controls.Library // // // - this.gpFindROs.StyleMouseDown.Class = ""; this.gpFindROs.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gpFindROs.StyleMouseOver.Class = ""; this.gpFindROs.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.gpFindROs.TabIndex = 3; this.gpFindROs.EnabledChanged += new System.EventHandler(this.gpFindROs_EnabledChanged); @@ -467,7 +456,6 @@ namespace Volian.Controls.Library // // // - this.cbxFndUnLnkROVals.BackgroundStyle.Class = ""; 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))); @@ -555,7 +543,6 @@ namespace Volian.Controls.Library this.gpSrchAnnoText.Style.BorderRightWidth = 1; this.gpSrchAnnoText.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.gpSrchAnnoText.Style.BorderTopWidth = 1; - this.gpSrchAnnoText.Style.Class = ""; this.gpSrchAnnoText.Style.CornerDiameter = 4; this.gpSrchAnnoText.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.gpSrchAnnoText.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -564,12 +551,10 @@ namespace Volian.Controls.Library // // // - this.gpSrchAnnoText.StyleMouseDown.Class = ""; this.gpSrchAnnoText.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gpSrchAnnoText.StyleMouseOver.Class = ""; this.gpSrchAnnoText.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.gpSrchAnnoText.TabIndex = 6; this.gpSrchAnnoText.EnabledChanged += new System.EventHandler(this.gpSrchAnnoText_EnabledChanged); @@ -593,7 +578,6 @@ namespace Volian.Controls.Library // // // - this.cbxBooleanAnoTxtSrch.BackgroundStyle.Class = ""; 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); @@ -611,7 +595,6 @@ namespace Volian.Controls.Library // // // - this.cbxCaseSensitiveAnnoText.BackgroundStyle.Class = ""; 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); @@ -687,6 +670,7 @@ namespace Volian.Controls.Library // contextMenuBar1 // this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top; + this.contextMenuBar1.Font = new System.Drawing.Font("Segoe UI", 9F); this.contextMenuBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.btnCMIFindText}); this.contextMenuBar1.Location = new System.Drawing.Point(300, -4); @@ -775,7 +759,6 @@ namespace Volian.Controls.Library // // // - this.galSymbols.BackgroundStyle.Class = ""; this.galSymbols.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.galSymbols.EnableGalleryPopup = false; this.galSymbols.MinimumSize = new System.Drawing.Size(150, 200); @@ -872,7 +855,6 @@ namespace Volian.Controls.Library // // elementStyle1 // - this.elementStyle1.Class = ""; this.elementStyle1.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.elementStyle1.Name = "elementStyle1"; this.elementStyle1.TextColor = System.Drawing.SystemColors.ControlText; @@ -921,7 +903,6 @@ namespace Volian.Controls.Library // // elementStyle2 // - this.elementStyle2.Class = ""; this.elementStyle2.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.elementStyle2.Name = "elementStyle2"; this.elementStyle2.TextColor = System.Drawing.SystemColors.ControlText; @@ -961,7 +942,6 @@ namespace Volian.Controls.Library this.grpPanSearchResults.Style.BorderRightWidth = 1; this.grpPanSearchResults.Style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; this.grpPanSearchResults.Style.BorderTopWidth = 1; - this.grpPanSearchResults.Style.Class = ""; this.grpPanSearchResults.Style.CornerDiameter = 4; this.grpPanSearchResults.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; this.grpPanSearchResults.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center; @@ -970,12 +950,10 @@ namespace Volian.Controls.Library // // // - this.grpPanSearchResults.StyleMouseDown.Class = ""; this.grpPanSearchResults.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.grpPanSearchResults.StyleMouseOver.Class = ""; this.grpPanSearchResults.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.grpPanSearchResults.TabIndex = 3; this.grpPanSearchResults.Text = "Search Results"; @@ -1028,6 +1006,7 @@ namespace Volian.Controls.Library this.btnClearSearchResults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnClearSearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnClearSearchResults.Enabled = false; + this.btnClearSearchResults.FocusOnLeftMouseButtonDown = true; 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); @@ -1045,6 +1024,7 @@ namespace Volian.Controls.Library this.btnCopySearchResults.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCopySearchResults.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnCopySearchResults.Enabled = false; + this.btnCopySearchResults.FocusOnLeftMouseButtonDown = true; 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); @@ -1064,7 +1044,6 @@ namespace Volian.Controls.Library // // // - this.labelX1.BackgroundStyle.Class = ""; 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); @@ -1121,7 +1100,6 @@ namespace Volian.Controls.Library // // // - this.cbSorted.BackgroundStyle.Class = ""; 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); @@ -1139,6 +1117,7 @@ namespace Volian.Controls.Library this.btnSearch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnSearch.BackColor = System.Drawing.SystemColors.Control; this.btnSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; + this.btnSearch.FocusOnLeftMouseButtonDown = true; 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); @@ -1156,6 +1135,7 @@ namespace Volian.Controls.Library this.btnPrnSrchRslts.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnPrnSrchRslts.ColorTable = DevComponents.DotNetBar.eButtonColor.Office2007WithBackground; this.btnPrnSrchRslts.Enabled = false; + this.btnPrnSrchRslts.FocusOnLeftMouseButtonDown = true; 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); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 21ac0692..6496be96 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -299,7 +299,7 @@ namespace Volian.Controls.Library // tmp = topnode.Nodes.Add(newnode); //} cntnd++; - if (fic.ChildFolderCount > 0) // allow for '+' for tree expansion + if (fic.ChildFolderCount > 0 || fic.FolderDocVersionCount > 0) // allow for '+' for tree expansion { DevComponents.AdvTree.Node tnt = new DevComponents.AdvTree.Node(); tnt.Text = "VLN_DUMMY"; diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index a71ca5cd..1da7a221 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -709,6 +709,10 @@ namespace Volian.Controls.Library btnInsBefore.Enabled = btnInsBefH.Enabled = !MyItemInfo.IsRNOPart && (actable & E_AccStep.AddingPrev) > 0; btnInsAfter.Enabled = btnInsAftH.Enabled = !MyItemInfo.IsRNOPart && (actable & E_AccStep.AddingNext) > 0; + // if this step has a table or figure, disable both of those buttons. + if (MyItemInfo.Tables != null && MyItemInfo.Tables.Count > 0) + btnInsTable.Enabled = btnInsFig.Enabled = btnCMInsFigure.Enabled = btnCMInsTable.Enabled = false; + btnInsHLS.SubItems.Clear(); btnInsCaut.SubItems.Clear(); btnInsNote.SubItems.Clear();