From d6c089e3113a91820b18e1a68a461e051a1454bf Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Mon, 29 Aug 2011 15:31:33 +0200
Subject: [PATCH] New project wizard: Make it clearer that it is added as a
 subproject

Task-number: QTCREATORBUG-5936
Change-Id: If06f69184f2e2754c630c7b015c78b40a9278dc1
Reviewed-on: http://codereview.qt.nokia.com/3806
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
---
 src/plugins/projectexplorer/projectfilewizardextension.cpp | 1 +
 src/plugins/projectexplorer/projectwizardpage.cpp          | 7 +++++++
 src/plugins/projectexplorer/projectwizardpage.h            | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index adf6c0c191e..394efb4908a 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -417,6 +417,7 @@ void ProjectFileWizardExtension::initProjectChoices(const QString &generatedProj
 
     m_context->page->setProjects(projectChoices);
     m_context->page->setProjectToolTips(projectToolTips);
+    m_context->page->setAddingSubProject(projectAction == ProjectNode::AddSubProject);
 }
 
 bool ProjectFileWizardExtension::processFiles(
diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp
index 0e81191d263..f78837c4b40 100644
--- a/src/plugins/projectexplorer/projectwizardpage.cpp
+++ b/src/plugins/projectexplorer/projectwizardpage.cpp
@@ -79,6 +79,13 @@ void ProjectWizardPage::setProjectToolTips(const QStringList &t)
     m_projectToolTips = t;
 }
 
+void ProjectWizardPage::setAddingSubProject(bool addingSubProject)
+{
+    m_ui->projectLabel->setText(addingSubProject ?
+                                    tr("Add as a subproject to project:")
+                                  : tr("Add to &project:"));
+}
+
 int ProjectWizardPage::currentProjectIndex() const
 {
     return m_ui->projectComboBox->currentIndex();
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index f1f127aade8..47247db4ae8 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -68,6 +68,7 @@ public:
     // Returns the common path
     void setFilesDisplay(const QString &commonPath, const QStringList &files);
 
+    void setAddingSubProject(bool addingSubProject);
 protected:
     virtual void changeEvent(QEvent *e);