From 000175c49e14e13b9284cbb2b1c2666ea0518ae4 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 8 Jul 2016 17:36:22 +0000 Subject: [PATCH] Disable Split and Merge Menu Items for RO Tables --- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 2d21c55b..2bbbb853 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -838,7 +838,7 @@ namespace Volian.Controls.Library // Note: the QAT menu is to the right of the V start button in the upper left _RibbonControl.AutoExpand = false; _RibbonControl.Items[0].RaiseClick(); // initially default to HOME tab - rbnBorderlistBox.Resize+=new EventHandler(rbnBorderlistBox_Resize); + rbnBorderlistBox.Resize += new EventHandler(rbnBorderlistBox_Resize); rbnBorderlistBox.SetupFontAndSize(6); // 6 Point Font // added per Harry to hide refresh buttons btnRefObjRefresh.Visible = btnTranRefresh.Visible = false; @@ -846,7 +846,6 @@ namespace Volian.Controls.Library if (!VlnSettings.DebugMode) rbnImpWrd.Visible = false; } - void _RibbonControl_SizeChanged(object sender, EventArgs e) { this.Size = _RibbonControl.Size; @@ -1086,9 +1085,9 @@ namespace Volian.Controls.Library } public void SetTableButtonsForMergeRangeSelection() { - if (MyFlexGrid != null) + if (MyFlexGrid != null ) { - btnTblDgnMergeCells.Enabled = btnCmGridMergeCells.Enabled = !MyFlexGrid.IsInMergeRange(); + btnTblDgnMergeCells.Enabled = btnCmGridMergeCells.Enabled = !MyFlexGrid.IsRoTable && !MyFlexGrid.IsInMergeRange(); } } private void SetButtonMenuEnabledDisabledOnSelection(bool setting) @@ -3213,9 +3212,11 @@ namespace Volian.Controls.Library btnTblDgnInsertColumn.Enabled = enableContent; btnTblDgnInsertRow.Enabled = enableContent; btnTblDgnMergeCells.Enabled = enableContent; + btnCmGridMergeCells.Enabled = enableContent; btnCmGridPaste.Enabled = btnTblDgnPaste.Enabled = ((VlnFlexGrid.MyCopyInfo.MyCopiedFlexGrid != null) && enableContent); btnTblDgnSplitCells.Enabled = enableContent; + btnCmGridSplitCell.Enabled = enableContent; } public void SetRibbonForGridCellIndent() {