diff options
| author | Vincent Dondain <vincent.dondain@xamarin.com> | 2015-03-30 22:34:14 +0300 |
|---|---|---|
| committer | Vincent Dondain <vincent.dondain@xamarin.com> | 2015-03-30 22:34:14 +0300 |
| commit | 790056a237046df8a2abc2041c43881f2886745a (patch) | |
| tree | 076867f7625d93d22c30df0144269ab04532edf1 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects | |
| parent | 95e51df9c7c2f5a0b3d5987fbbdbd007a9bf43d3 (diff) | |
| parent | 50aff0e4849c1be87fd42ef1ec41226186b2cb86 (diff) | |
Merge branch 'watchkit-template-improvements'
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/TemplateWizard.cs
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs | 4 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs | 8 |
2 files changed, 10 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 e37990de26..a535151d68 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/FinalProjectConfigurationPage.cs @@ -38,6 +38,7 @@ namespace MonoDevelop.Ide.Projects NewProjectConfiguration config;
SolutionTemplate template;
bool valid;
+ bool projectNameIsReadOnly;
public FinalProjectConfigurationPage (NewProjectConfiguration config)
{
@@ -151,7 +152,7 @@ namespace MonoDevelop.Ide.Projects }
public bool IsProjectNameEnabled {
- get { return HasProjects; }
+ get { return HasProjects && !projectNameIsReadOnly; }
}
public bool IsSolutionNameEnabled {
@@ -227,6 +228,7 @@ namespace MonoDevelop.Ide.Projects public void UpdateFromParameters ()
{
ProjectName = Parameters ["ProjectName"];
+ projectNameIsReadOnly = Parameters.GetBoolean ("IsProjectNameReadOnly", false);
}
}
}
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 4d376a8fdd..e7518bbc99 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/NewProjectController.cs @@ -496,12 +496,16 @@ namespace MonoDevelop.Ide.Projects if (OpenSolution) {
DisposeExistingNewItems ();
+ TemplateWizard wizard = wizardProvider.CurrentWizard;
var op = OpenCreatedSolution (processedTemplate);
op.Completed += delegate {
if (op.Success) {
var sol = IdeApp.Workspace.GetAllSolutions ().FirstOrDefault ();
- if (sol != null)
+ if (sol != null) {
+ if (wizard != null)
+ wizard.ItemsCreated (new [] { sol });
InstallProjectTemplatePackages (sol);
+ }
}
};
}
@@ -510,6 +514,8 @@ namespace MonoDevelop.Ide.Projects // an existing item. In this case, it must not be disposed by the dialog.
disposeNewItem = false;
RunTemplateActions (processedTemplate);
+ if (wizardProvider.HasWizard)
+ wizardProvider.CurrentWizard.ItemsCreated (processedTemplate.WorkspaceItems);
if (ParentFolder != null)
InstallProjectTemplatePackages (ParentFolder.ParentSolution);
}
|