Merge pull request 'B2024-028 consistent paste menuing in enhanced set' (#319) from B2024-028 into Development
good to test
This commit is contained in:
commit
dfb965edbc
@ -1612,7 +1612,13 @@ namespace Volian.Controls.Library
|
|||||||
if (!docVersionIsEnhanced && !docVersionIsSource && !procIsSource) canPaste = true;
|
if (!docVersionIsEnhanced && !docVersionIsSource && !procIsSource) canPaste = true;
|
||||||
else if (docVersionIsSource && !procIsSource) canPaste = true;
|
else if (docVersionIsSource && !procIsSource) canPaste = true;
|
||||||
else if (docVersionIsSource) canPaste = (!procIsSource || (iiClipboard.MyDocVersion.ItemID == dvi.ItemID));
|
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 (iiClipboard.IsRtfRaw) canPaste = false; // never paste an equation.
|
||||||
if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click));
|
if (canPaste) cm.MenuItems.Add("Paste Procedure", new EventHandler(mi_Click));
|
||||||
}
|
}
|
||||||
@ -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");
|
"It can only be pasted before or after another document, within the set, that is linked to an Enhanced Document.", "Cannot Paste Here");
|
||||||
break;
|
break;
|
||||||
case "CANNOT PASTE HERE, Click for more information...":
|
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" +
|
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;
|
break;
|
||||||
//case "Check Out Procedure Set":
|
//case "Check Out Procedure Set":
|
||||||
// CheckOutDocVersion(SelectedNode as VETreeNode);
|
// CheckOutDocVersion(SelectedNode as VETreeNode);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user