Fixed SD2-851: Pasting solution folder hangs SharpDevelop

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1510 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

AddIns/ICSharpCode.SharpDevelop.addin

@@ -196,6 +196,7 @@
 		<MenuItem id    = "Paste"
 		          label = "${res:XML.MainMenu.EditMenu.Paste}"
 		          icon  = "Icons.16x16.PasteIcon"
+		          loadclasslazy = "false"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
 		<MenuItem id       = "Rename"
 		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
@@ -212,25 +213,7 @@
 		<Include id = "CombineAddMenu" item="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionNode/CombineAddMenu"/>
 		
 		<MenuItem id = "AddSeparator" type = "Separator"/>
-		<MenuItem id    = "Cut"
+		<Include id="CutPasteRemoveRename" path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutPasteRemoveRename"/>
-		          label = "${res:XML.MainMenu.EditMenu.Cut}"
-		          type  = "Item"
-		          icon  = "Icons.16x16.CutIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
-		<MenuItem id    = "Paste"
-		          label = "${res:XML.MainMenu.EditMenu.Paste}"
-		          type  = "Item"
-		          icon  = "Icons.16x16.PasteIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.PasteProjectBrowserNode"/>
-		<MenuItem id    = "Remove"
-		          type  = "Item"
-		          label = "${res:Global.RemoveButtonText}"
-		          icon  = "Icons.16x16.DeleteIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
-		<MenuItem id       = "Rename"
-		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
-		          shortcut = "F2"
-		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
 	</Path>
 	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionItemNode">
@@ -239,25 +222,7 @@
 		          icon  = "Icons.16x16.OpenFileIcon"
 		          class = "ICSharpCode.SharpDevelop.Project.Commands.OpenFileEvent"/>
 		<MenuItem id = "OpenSeparator" type = "Separator" />
-		<MenuItem id = "Cut"
+		<Include id="CutCopyRemoveRename" path="/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutCopyRemoveRename"/>
-		          label = "${res:XML.MainMenu.EditMenu.Cut}"
-		          type = "Item"
-		          icon = "Icons.16x16.CutIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
-		<MenuItem id = "Copy"
-		          label = "${res:XML.MainMenu.EditMenu.Copy}"
-		          type = "Item"
-		          icon = "Icons.16x16.CopyIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
-		<MenuItem id = "Remove"
-		          label = "${res:Global.RemoveButtonText}"
-		          type = "Item"
-		          icon  = "Icons.16x16.DeleteIcon"
-		          class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
-		<MenuItem id       = "Rename"
-		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
-		          shortcut = "F2"
-		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
 	</Path>
 	
 	<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode">
@@ -414,6 +379,31 @@
 		</ComplexCondition>
 	</Path>
 	
+	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutCopyRemoveRename">
+		<MenuItem id = "Cut"
+		          label = "${res:XML.MainMenu.EditMenu.Cut}"
+		          type = "Item"
+		          icon = "Icons.16x16.CutIcon"
+		          loadclasslazy = "false"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.CutProjectBrowserNode"/>
+		<MenuItem id = "Copy"
+		          label = "${res:XML.MainMenu.EditMenu.Copy}"
+		          type = "Item"
+		          icon = "Icons.16x16.CopyIcon"
+		          loadclasslazy = "false"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.CopyProjectBrowserNode"/>
+		<MenuItem id = "Remove"
+		          label = "${res:Global.RemoveButtonText}"
+		          type = "Item"
+		          icon  = "Icons.16x16.DeleteIcon"
+		          loadclasslazy = "false"
+		          class = "ICSharpCode.SharpDevelop.Project.Commands.DeleteProjectBrowserNode"/>
+		<MenuItem id = "Rename"
+		          label    = "${res:ProjectComponent.ContextMenu.Rename}"
+		          shortcut = "F2"
+		          class    = "ICSharpCode.SharpDevelop.Project.Commands.RenameEntryEvent"/>
+	</Path>
+	
 	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/CutPasteRemoveRename">
 		<MenuItem id = "Cut"
 		          label = "${res:XML.MainMenu.EditMenu.Cut}"

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/SolutionFolderNode.cs

@@ -172,6 +172,11 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public static void DoPaste(ISolutionFolderNode folderNode)
 		{
+			if (!DoEnablePaste(folderNode)) {
+				LoggingService.Warn("SolutionFolderNode.DoPaste: Pasting was not enabled.");
+				return;
+			}
+			
 			ExtTreeNode folderTreeNode = (ExtTreeNode)folderNode;
 			IDataObject dataObject = ClipboardWrapper.GetDataObject();