Merge remote-tracking branch 'upstream/master' into a11y

3 files changed, 9 insertions, 23 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs
index 456006faa0..0b6956b18b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs
@@ -161,7 +161,7 @@ namespace MonoDevelop.Ide.Projects
 		}

 

 		public bool IsCreateProjectDirectoryInsideSolutionDirectoryEnabled {

-			get { return HasProjects; }

+			get { return HasProjects && IsNewSolution; }

 		}

 

 		public bool IsGitIgnoreEnabled {

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
index 3f4fc315be..7086f1fd3c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs
@@ -241,7 +241,7 @@ namespace MonoDevelop.Ide.Projects
 			solutionNameTextBox.Sensitive = projectConfiguration.IsSolutionNameEnabled;

 			projectNameTextBox.Sensitive = projectConfiguration.IsProjectNameEnabled;

 			createProjectWithinSolutionDirectoryCheckBox.Sensitive = projectConfiguration.IsCreateProjectDirectoryInsideSolutionDirectoryEnabled;

-			createProjectWithinSolutionDirectoryCheckBox.Active = projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory;

+			createProjectWithinSolutionDirectoryCheckBox.Active = projectConfiguration.IsCreateProjectDirectoryInsideSolutionDirectoryEnabled ? projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory : true;

 			useGitCheckBox.Sensitive = projectConfiguration.IsUseGitEnabled;

 			useGitCheckBox.Active = projectConfiguration.UseGit;

 			createGitIgnoreFileCheckBox.Sensitive = projectConfiguration.IsGitIgnoreEnabled;

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs
index c277db2a9b..fbc65c9690 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs
@@ -58,7 +58,6 @@ namespace MonoDevelop.Ide.Projects
 		const string UseGitPropertyName = "Dialogs.NewProjectDialog.UseGit";

 		const string CreateGitIgnoreFilePropertyName = "Dialogs.NewProjectDialog.CreateGitIgnoreFile";

 		const string CreateProjectSubDirectoryPropertyName = "MonoDevelop.Core.Gui.Dialogs.NewProjectDialog.AutoCreateProjectSubdir";

-		const string CreateProjectSubDirectoryInExistingSolutionPropertyName = "Dialogs.NewProjectDialog.AutoCreateProjectSubdirInExistingSolution";

 		const string NewSolutionLastSelectedCategoryPropertyName = "Dialogs.NewProjectDialog.LastSelectedCategoryPath";

 		const string NewSolutionLastSelectedTemplatePropertyName = "Dialogs.NewProjectDialog.LastSelectedTemplate";

 		const string NewProjectLastSelectedCategoryPropertyName = "Dialogs.NewProjectDialog.AddNewProjectLastSelectedCategoryPath";

@@ -194,21 +193,14 @@ namespace MonoDevelop.Ide.Projects
 			SetDefaultLocation ();

 			SetDefaultGitSettings ();

 			SelectedLanguage = PropertyService.Get (SelectedLanguagePropertyName, "C#");

-			projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory = GetDefaultCreateProjectDirectorySetting ();

-		}

-

-		bool GetDefaultCreateProjectDirectorySetting ()

-		{

-			if (IsNewSolution) {

-				return PropertyService.Get (CreateProjectSubDirectoryPropertyName, true);

-			}

-			return PropertyService.Get (CreateProjectSubDirectoryInExistingSolutionPropertyName, true);

+			projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory = PropertyService.Get (CreateProjectSubDirectoryPropertyName, true);

 		}

 

 		void UpdateDefaultSettings ()

 		{

 			UpdateDefaultGitSettings ();

-			UpdateDefaultCreateProjectDirectorySetting ();

+			if (IsNewSolution)

+				PropertyService.Set (CreateProjectSubDirectoryPropertyName, projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory);

 			PropertyService.Set (SelectedLanguagePropertyName, GetLanguageForTemplateProcessing ());

 			DefaultSelectedCategoryPath = GetSelectedCategoryPath ();

 			DefaultSelectedTemplate = GetDefaultSelectedTemplateId ();

@@ -256,15 +248,6 @@ namespace MonoDevelop.Ide.Projects
 			return null;

 		}

 

-		void UpdateDefaultCreateProjectDirectorySetting ()

-		{

-			if (IsNewSolution) {

-				PropertyService.Set (CreateProjectSubDirectoryPropertyName, projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory);

-			} else {

-				PropertyService.Set (CreateProjectSubDirectoryInExistingSolutionPropertyName, projectConfiguration.CreateProjectDirectoryInsideSolutionDirectory);

-			}

-		}

-

 		void SetDefaultLocation ()

 		{

 			if (BasePath == null)

@@ -333,7 +316,10 @@ namespace MonoDevelop.Ide.Projects
 		{

 			Predicate<SolutionTemplate> templateMatch = GetTemplateFilter ();

 			templateCategories = IdeApp.Services.TemplatingService.GetProjectTemplateCategories (templateMatch).ToList ();

-			recentTemplates = IdeApp.Services.TemplatingService.RecentTemplates.GetTemplates ().ToList ();

+			if (IsNewSolution)

+				recentTemplates = IdeApp.Services.TemplatingService.RecentTemplates.GetTemplates ().Where ((t) => t.IsMatch (SolutionTemplateVisibility.NewSolution)).ToList ();

+			else

+				recentTemplates = IdeApp.Services.TemplatingService.RecentTemplates.GetTemplates ().ToList ();

 		}

 

 		Predicate<SolutionTemplate> GetTemplateFilter ()