diff options
| author | Vincent Dondain <vidondai@microsoft.com> | 2017-03-21 22:40:23 +0300 |
|---|---|---|
| committer | Vincent Dondain <vidondai@microsoft.com> | 2017-03-21 22:40:29 +0300 |
| commit | b421d28e60561a94813ede1a30bf00d6e7f35909 (patch) | |
| tree | 0800da7c1d76ae4a06b93ba69973ef25e6fd3072 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects | |
| parent | 9ebedc332d1c3ec9194047680fa0c97c5ec5c7f4 (diff) | |
[NewProjectDialog] Disable 'Create a project directory within the solution directory' when adding projects to existing solution
Fix bug #53670: [New Project Dialog] Remove "Create a project directory within the solution directory" when adding projects to existing solution
(https://bugzilla.xamarin.com/show_bug.cgi?id=53670)
We need to prevent users from unchecking "Create a project directory within the solution directory" when adding projects to existing solution.
This is an action that can break projects if the user chooses to override files (users mistake because we ask confirmation but still there's no point in allowing that).
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs | 2 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs | 2 |
2 files changed, 2 insertions, 2 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 a69502c279..e122304753 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GtkProjectConfigurationWidget.cs @@ -204,7 +204,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;
|