SD2-582: Solution file incorrect after adding a second project

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@818 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

AddIns/ICSharpCode.SharpDevelop.addin

@@ -1391,10 +1391,10 @@
 			          class = "ICSharpCode.SharpDevelop.Commands.ViewGPL" />
 			<MenuItem id    = "ViewReadme"
 			          label = "${res:XML.MainMenu.HelpMenu.ReadMe}"
-			          link  = "home://../doc/ReadMe.rtf" />
+			          link  = "home://doc/ReadMe.rtf" />
 			<MenuItem id    = "ViewStyleguide"
 			          label = "${res:XML.MainMenu.HelpMenu.StyleGuide}"
-			          link  = "home://../doc/CodingStyleGuide.pdf" />
+			          link  = "home://doc/technotes/CodingStyleGuide.rtf" />
 			<MenuItem id = "Separator2" type = "Separator" />
 			<MenuItem id = "Web" label = "${res:XML.MainMenu.HelpMenu.WebMenu}" type="Menu">
 				<MenuItem id = "SharpDevelop" label = "SharpDevelop" type="Menu">

src/Main/Base/Project/Src/Commands/HelpCommands.cs

@@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Commands
 		public override void Run()
 		{
 			if (site.StartsWith("home://")) {
-				string file = FileUtility.Combine(FileUtility.ApplicationRootPath, "bin", site.Substring(7).Replace('/', Path.DirectorySeparatorChar));
+				string file = Path.Combine(FileUtility.ApplicationRootPath, site.Substring(7).Replace('/', Path.DirectorySeparatorChar));
 				try {
 					Process.Start(file);
 				} catch (Exception) {

src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/SolutionNodeCommands.cs

@@ -58,6 +58,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 			newProject.Location = FileUtility.GetRelativePath(solutionFolderNode.Solution.Directory, fileName);
 			ParserService.CreateProjectContentForAddedProject(newProject);
 			solutionFolderNode.Container.AddFolder(newProject);
+			solutionFolderNode.Solution.FixSolutionConfiguration(new IProject[] { newProject });
 			NodeBuilders.AddProjectNode((TreeNode)solutionFolderNode, newProject).EnsureVisible();
 		}
 		

src/Main/Base/Project/Src/Project/Solution/Solution.cs

@@ -479,14 +479,14 @@ namespace ICSharpCode.SharpDevelop.Project
 				}
 			}
 			
-			if (newSolution.FixSolutionConfiguration() || needsConversion) {
+			if (newSolution.FixSolutionConfiguration(newSolution.Projects) || needsConversion) {
 				// save in new format
 				newSolution.Save();
 			}
 			return true;
 		}
 		
-		bool FixSolutionConfiguration()
+		public bool FixSolutionConfiguration(IEnumerable<IProject> projects)
 		{
 			ProjectSection solSec = null;
 			ProjectSection prjSec = null;
@@ -511,7 +511,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				LoggingService.Warn("!! Inserted ProjectConfigurationPlatforms !!");
 				changed = true;
 			}
-			foreach (IProject project in Projects) {
+			foreach (IProject project in projects) {
 				string guid = project.IdGuid.ToUpperInvariant();
 				foreach (SolutionItem configuration in solSec.Items) {
 					string searchKey = guid + "." + configuration.Name + ".Build.0";
@@ -519,7 +519,6 @@ namespace ICSharpCode.SharpDevelop.Project
 					                         	return item.Name == searchKey;
 					                         }))
 					{
-						LoggingService.Warn("Inserting solution item");
 						prjSec.Items.Add(new SolutionItem(searchKey, configuration.Location));
 						changed = true;
 					}
@@ -528,7 +527,6 @@ namespace ICSharpCode.SharpDevelop.Project
 					                         	return item.Name == searchKey;
 					                         }))
 					{
-						LoggingService.Warn("Inserting solution item");
 						prjSec.Items.Add(new SolutionItem(searchKey, configuration.Location));
 						changed = true;
 					}