diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 32488510..528ba0e9 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1211,24 +1211,20 @@ namespace Volian.Controls.Library // it can be deleted: bool allowDel = false; EnhancedDocuments eds = MyItemInfo.GetMyEnhancedDocuments(); - if (!setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0)) - { - allowDel = true; - rbSteps.Enabled = true; //just in case it was disabled, enable it so specific buttons can be turned off/on - btnDelelete.Enabled = true; - itemContainer1.Enabled = false; - btnCpyStp.Enabled = false; - btnStepPaste.Enabled = false; - } - else - { - itemContainer1.Enabled = true; // enable this back on, in case it was turned off above. Other buttons are specifically set for step that is selected. - rbSteps.Enabled = setting; - } - rbnCharacters.Enabled = rbnParagraph.Enabled = rbnSiblings.Enabled = rbnLinks.Enabled = setting; + // note in follow if statements, 'setting' == false when in enhanced document: + if (!setting && MyItemInfo.IsStep && (eds == null || eds.Count == 0)) // this step is in enhanced, but not linked + allowDel = true; // allow delete if not linked + btnCpyStp.Enabled = setting; + btnStepPaste.Enabled = setting; + rbnCharacters.Enabled = rbnParagraph.Enabled = rbnLinks.Enabled = setting; btnCMEdit.Enabled = setting; btnDelStep.Enabled = setting; // context menu item - if (allowDel) btnDelStep.Enabled = true; // enhanced step with no links can be deleted (see above) + btnDelelete.Enabled = setting; + if (allowDel) + { + btnDelStep.Enabled = true; + btnDelelete.Enabled = true; + } btnPageBreak.Enabled = setting; // context menu item btnCMHardSpace.Enabled = btnCMTransition.Enabled = btnCMRO.Enabled = btnCMSymbol.Enabled = setting; btnFindRplDlg.Enabled = setting; // no find replace button is available when in an enhanced document diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs index 20ddedaf..c7c71c86 100644 Binary files a/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs and b/PROMS/Volian.Controls.Library/StepTabRibbon.designer.cs differ diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.resx b/PROMS/Volian.Controls.Library/StepTabRibbon.resx index 2c80be53..e021848c 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.resx +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.resx @@ -163,6 +163,9 @@ SUVORK5CYII= + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -450,9 +453,6 @@ 9kWBSJuCuX9alNti8QCg2VymyS/TsYX/CgDuFyf/5MBm5HpaAAAAAElFTkSuQmCC - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8