aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/genericprojectmanager/genericprojectwizard.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2014-05-30 11:38:08 +0200
committerTobias Hunger <tobias.hunger@digia.com>2014-06-12 16:10:03 +0200
commitce37f05297f17cadd6d73771d0ceeaa3e73080c3 (patch)
tree7c1a4e9530254046333ddee67138098f95625891 /src/plugins/genericprojectmanager/genericprojectwizard.cpp
parentd0f00cc29d1f53ab6c3378046827d8abaa844cbd (diff)
BaseFileWizard: Get rid of applyExtensionPageShortTitle(...)
That method was used to set a title in the progress view of the wizard that is different from the page title. That is used exactly once and there it adds more confusion than it helps. So get rid of the whole thing. Consistently set the "shortTitle" property instead for all wizards that want to have a separate short title. Change-Id: Ia4881e9c00891058629491f9e9de4ac421c59727 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/genericprojectmanager/genericprojectwizard.cpp')
-rw-r--r--src/plugins/genericprojectmanager/genericprojectwizard.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 89bce38ee9f..1b58948d7c9 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -69,16 +69,12 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent) :
m_firstPage->setTitle(tr("Project Name and Location"));
m_firstPage->setFileNameLabel(tr("Project name:"));
m_firstPage->setPathLabel(tr("Location:"));
+ addPage(m_firstPage);
// second page
m_secondPage = new FilesSelectionWizardPage(this);
m_secondPage->setTitle(tr("File Selection"));
-
- const int firstPageId = addPage(m_firstPage);
- wizardProgress()->item(firstPageId)->setTitle(tr("Location"));
-
- const int secondPageId = addPage(m_secondPage);
- wizardProgress()->item(secondPageId)->setTitle(tr("Files"));
+ addPage(m_secondPage);
}
QString GenericProjectWizardDialog::path() const
@@ -139,7 +135,7 @@ Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent, const Core::
wizard->setPath(parameters.defaultPath());
foreach (QWizardPage *p, parameters.extensionPages())
- BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
+ wizard->addPage(p);
return wizard;
}