From 5ae2801aa215093933eb73f587e73d90567bbdec Mon Sep 17 00:00:00 2001 From: daniil-tr Date: Tue, 3 Nov 2015 17:21:16 +0300 Subject: [PATCH 1/2] Fixed bug #132 New file not selected in Project Browser --- .../Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs index c8052d49762..508c5663f5b 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs @@ -365,6 +365,7 @@ protected IEnumerable AddNewItems() FileTemplateResult result = SD.UIService.ShowNewFileDialog(node.Project, node.Directory); if (result != null) { node.RecreateSubNodes(); + ProjectBrowserPad.Instance.ProjectBrowserControl.SelectFile(result.Options.FileName); return result.NewFiles.Select(node.Project.FindFile).Where(f => f != null).ToArray(); } else { return null; From 58b6d478abc57849b0ad46cdf094a79ad9dadbe0 Mon Sep 17 00:00:00 2001 From: daniil-tr Date: Tue, 10 Nov 2015 11:35:59 +0200 Subject: [PATCH 2/2] Fixed bug #674 Unhandled Exception when Moving Folder of Classes from Project A to Project B --- .../Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs index 508c5663f5b..e0d00dbb19a 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs @@ -80,6 +80,7 @@ public static void CopyDirectory(string directoryName, DirectoryNode node, bool if (!FileUtility.IsEqualFileName(directoryName, copiedFileName)) { if (includeInProject && ProjectService.OpenSolution != null) { // get ProjectItems in source directory + FileService.CopyFile(directoryName, copiedFileName, true, false); foreach (IProject project in ProjectService.OpenSolution.Projects) { if (!FileUtility.IsBaseDirectory(project.Directory, directoryName)) continue; @@ -111,7 +112,6 @@ public static void CopyDirectory(string directoryName, DirectoryNode node, bool } } - FileService.CopyFile(directoryName, copiedFileName, true, false); DirectoryNode newNode = new DirectoryNode(copiedFileName); newNode.InsertSorted(node); if (includeInProject) {