diff options
| -rw-r--r-- | installerbuilder/installerbase/installerbasecommons.cpp | 10 | ||||
| -rw-r--r-- | installerbuilder/installerbase/installerbasecommons.h | 2 | ||||
| -rw-r--r-- | installerbuilder/installerbase/tabcontroller.cpp | 15 |
3 files changed, 14 insertions, 13 deletions
diff --git a/installerbuilder/installerbase/installerbasecommons.cpp b/installerbuilder/installerbase/installerbasecommons.cpp index b483f4adb..726c632ee 100644 --- a/installerbuilder/installerbase/installerbasecommons.cpp +++ b/installerbuilder/installerbase/installerbasecommons.cpp @@ -139,6 +139,11 @@ void IntroductionPageImpl::setMaintenanceToolsEnabled(bool enable) m_removeAllComponents->setEnabled(enable); } +void IntroductionPageImpl::setMessage(const QString &msg) +{ + m_label->setText(msg); +} + void IntroductionPageImpl::setErrorMessage(const QString &error) { QPalette palette; @@ -153,11 +158,6 @@ void IntroductionPageImpl::setErrorMessage(const QString &error) m_errorLabel->setPalette(palette); } -void IntroductionPageImpl::message(const QString &msg) -{ - m_label->setText(msg); -} - void IntroductionPageImpl::setUpdater(bool value) { if (value) { diff --git a/installerbuilder/installerbase/installerbasecommons.h b/installerbuilder/installerbase/installerbasecommons.h index 6fdf73f3a..07b2431e9 100644 --- a/installerbuilder/installerbase/installerbasecommons.h +++ b/installerbuilder/installerbase/installerbasecommons.h @@ -53,7 +53,7 @@ public: void setMaintenanceToolsEnabled(bool enable); public Q_SLOTS: - void message(const QString &msg); + void setMessage(const QString &msg); void setErrorMessage(const QString &error); Q_SIGNALS: diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp index 58f0622b0..82bc3113f 100644 --- a/installerbuilder/installerbase/tabcontroller.cpp +++ b/installerbuilder/installerbase/tabcontroller.cpp @@ -155,15 +155,15 @@ int TabController::initUpdater() { IntroductionPageImpl *introPage = introductionPage(); + introPage->setMessage(QString()); + introPage->setErrorMessage(QString()); introPage->showAll(); introPage->setComplete(false); - introPage->message(QLatin1String("")); introPage->setMaintenanceToolsEnabled(false); - introPage->setErrorMessage(QLatin1String("")); if (!d->m_introPageConnected) { d->m_introPageConnected = true; - connect(d->m_core, SIGNAL(metaJobInfoMessage(QString)), introPage, SLOT(message(QString))); + connect(d->m_core, SIGNAL(metaJobInfoMessage(QString)), introPage, SLOT(setMessage(QString))); } d->m_gui->setWindowModality(Qt::WindowModal); @@ -197,9 +197,10 @@ int TabController::initUninstaller() { IntroductionPageImpl *introPage = introductionPage(); + introPage->setMessage(QString()); + introPage->setErrorMessage(QString()); introPage->setComplete(true); introPage->showMaintenanceTools(); - introPage->setErrorMessage(QLatin1String("")); d->m_gui->setWindowModality(Qt::WindowModal); d->m_gui->show(); @@ -211,19 +212,19 @@ int TabController::initPackageManager() { IntroductionPageImpl *introPage = introductionPage(); + introPage->setMessage(QString()); + introPage->setErrorMessage(QString()); introPage->setComplete(false); introPage->showMetaInfoUdate(); - introPage->setErrorMessage(QLatin1String("")); if (d->m_core->isPackageManager()) { introPage->showAll(); - introPage->message(QLatin1String("")); introPage->setMaintenanceToolsEnabled(false); } if (!d->m_introPageConnected) { d->m_introPageConnected = true; - connect(d->m_core, SIGNAL(metaJobInfoMessage(QString)), introPage, SLOT(message(QString))); + connect(d->m_core, SIGNAL(metaJobInfoMessage(QString)), introPage, SLOT(setMessage(QString))); } d->m_gui->setWindowModality(Qt::WindowModal); |