From d144f8653dd96fc17a033bd74086e5219df981aa Mon Sep 17 00:00:00 2001 From: John Date: Tue, 29 Jan 2019 20:40:28 +0000 Subject: [PATCH] =?UTF-8?q?B2019-009=20Enable=20the=20Copy=20Step=20button?= =?UTF-8?q?=20when=20on=20a=20RNO=20step=20type=20B2019-010=20Don=E2=80=99?= =?UTF-8?q?t=20allow=20a=20CopyStep=20Paste=20Before=20or=20After=20when?= =?UTF-8?q?=20on=20a=20RNO=20step=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Controls.Library/EditItem.cs | 1 + PROMS/Volian.Controls.Library/StepTabRibbon.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index c4e12a12..31f11f09 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -64,6 +64,7 @@ namespace Volian.Controls.Library // do special case for cpystep button: cannot copy an enhanced step and can copy a supinfo if (MyItemInfo.IsEnhancedStep) str.SetCopyStepButton(false); if (MyItemInfo.IsSupInfoPart) str.SetCopyStepButton(allow); + if (MyItemInfo.IsRNOPart) str.SetCopyStepButton(allow); //B2019-009 allow the selection of an RNO step type for CopyStep } public EditItem(IContainer container) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 18b13e0d..3d596b13 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -1718,7 +1718,8 @@ namespace Volian.Controls.Library btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = false; // don't replace itself return; } - if (MyItemInfo.IsSupInfoPart) // before and after are always false: + // B2019-010 also don't allow paste step before/after if on an RNO step type (20040) + if (MyItemInfo.IsSupInfoPart || ((int)MyItemInfo.MyContent.Type) == 20040) // before and after are always false: { btnPasteAfter.Enabled = btnCMPasteAfter.Enabled = false; btnPasteBefore.Enabled = btnCMPasteBefore.Enabled = false;