From ce37f05297f17cadd6d73771d0ceeaa3e73080c3 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 30 May 2014 11:38:08 +0200 Subject: 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 --- src/plugins/qmakeprojectmanager/addlibrarywizard.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/qmakeprojectmanager/addlibrarywizard.cpp') 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() -- cgit v1.2.1