From c7cc69fd73b5e89ab5a1eeef80c466b29ead06ba Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Tue, 14 May 2024 10:09:20 -0400 Subject: [PATCH] B2024-028 consistent paste menuing in enhanced set --- PROMS/Volian.Controls.Library/vlnTreeView.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 28b2c6a6..1751f6ed 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1612,7 +1612,13 @@ namespace Volian.Controls.Library if (!docVersionIsEnhanced && !docVersionIsSource && !procIsSource) canPaste = true; else if (docVersionIsSource && !procIsSource) canPaste = true; else if (docVersionIsSource) canPaste = (!procIsSource || (iiClipboard.MyDocVersion.ItemID == dvi.ItemID)); - else if (docVersionIsEnhanced) canPaste = !procIsSource; + else if (docVersionIsEnhanced) + { + // B2024-028 Do not allow paste of non-enhanced into enhanced set + // (consistent with paste before/after, i.e. don't allow) + canPaste = false; + cm.MenuItems.Add("CANNOT PASTE HERE, Click for more information...", new EventHandler(mi_Click)); + } if (iiClipboard.IsRtfRaw) canPaste = false; // never paste an equation. if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click)); } @@ -1670,9 +1676,9 @@ namespace Volian.Controls.Library if (!prCanPaste) { if (prToIsEnhanced) - cm.MenuItems.Add("CANNOT PASTE HERE, Click for more information...", new EventHandler(mi_Click)); + cm.MenuItems.Add("CANNOT PASTE HERE, Click for more information...", new EventHandler(mi_Click)); else - cm.MenuItems.Add("CANNOT PASTE HERE. Click for more information...", new EventHandler(mi_Click)); + cm.MenuItems.Add("CANNOT PASTE HERE. Click for more information...", new EventHandler(mi_Click)); } } #endregion @@ -2103,8 +2109,9 @@ namespace Volian.Controls.Library "It can only be pasted before or after another document, within the set, that is linked to an Enhanced Document.", "Cannot Paste Here"); break; case "CANNOT PASTE HERE, Click for more information...": + // B2024-028 clarify message FlexibleMessageBox.Show("You have copied a document that is NOT linked to an Enhanced Document.\n\n" + - "It CANNOT be pasted before or after an Enhanced Document.", "Cannot Paste Here"); + "You cannot paste a Non-Enhanced Procedure into an Enhanced Procedure Set.", "Cannot Paste Here"); break; //case "Check Out Procedure Set": // CheckOutDocVersion(SelectedNode as VETreeNode); -- 2.47.2