diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-05-30 11:38:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-06-12 16:10:03 +0200 |
commit | ce37f05297f17cadd6d73771d0ceeaa3e73080c3 (patch) | |
tree | 7c1a4e9530254046333ddee67138098f95625891 /src/plugins/qmakeprojectmanager/addlibrarywizard.cpp | |
parent | d0f00cc29d1f53ab6c3378046827d8abaa844cbd (diff) | |
download | qt-creator-ce37f05297f17cadd6d73771d0ceeaa3e73080c3.tar.gz |
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/qmakeprojectmanager/addlibrarywizard.cpp')
-rw-r--r-- | src/plugins/qmakeprojectmanager/addlibrarywizard.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp index e4686ee570..f69369e4c8 100644 --- a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp +++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp @@ -90,17 +90,11 @@ AddLibraryWizard::AddLibraryWizard(const QString &fileName, QWidget *parent) : { setWindowTitle(tr("Add Library")); m_libraryTypePage = new LibraryTypePage(this); + addPage(m_libraryTypePage); m_detailsPage = new DetailsPage(this); + addPage(m_detailsPage); m_summaryPage = new SummaryPage(this); - const int libraryTypePageId = addPage(m_libraryTypePage); - const int detailsPageId = addPage(m_detailsPage); - const int summaryPageId = addPage(m_summaryPage); - - Utils::WizardProgress *progress = wizardProgress(); - - progress->item(libraryTypePageId)->setTitle(tr("Type")); - progress->item(detailsPageId)->setTitle(tr("Details")); - progress->item(summaryPageId)->setTitle(tr("Summary")); + addPage(m_summaryPage); } AddLibraryWizard::~AddLibraryWizard() @@ -184,6 +178,8 @@ LibraryTypePage::LibraryTypePage(AddLibraryWizard *parent) // select the default m_internalRadio->setChecked(true); + + setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Type")); } AddLibraryWizard::LibraryKind LibraryTypePage::libraryKind() const @@ -204,6 +200,8 @@ DetailsPage::DetailsPage(AddLibraryWizard *parent) { m_libraryDetailsWidget = new Ui::LibraryDetailsWidget(); m_libraryDetailsWidget->setupUi(this); + + setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Details")); } bool DetailsPage::isComplete() const @@ -281,6 +279,8 @@ SummaryPage::SummaryPage(AddLibraryWizard *parent) m_summaryLabel->setTextFormat(Qt::RichText); m_snippetLabel->setTextFormat(Qt::RichText); m_snippetLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); + + setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Summary")); } void SummaryPage::initializePage() |