summaryrefslogtreecommitdiffstats
path: root/installerbuilder/installerbase/tabcontroller.cpp
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-02-28 11:33:47 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2011-03-03 14:46:58 +0100
commitde31ac1eb8ebcb41b86a31de95fbf319637680c2 (patch)
tree6c16972560be45509222bd6ab465af1bb5aa7a09 /installerbuilder/installerbase/tabcontroller.cpp
parent1d719384f6a5392392a46d08e87de59856debf43 (diff)
There's really no need to have the intro page in the base installer gui.
We now provide a method to retrieve a QInstaller::Page by Id. If we need to have a intro page, the inherited class should create them.
Diffstat (limited to 'installerbuilder/installerbase/tabcontroller.cpp')
-rw-r--r--installerbuilder/installerbase/tabcontroller.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index 249d3494d..10fde7c0b 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -308,10 +308,12 @@ int TabController::checkRepositories()
GetMetaInfoProgressWidget *metaProgress = 0;
QScopedPointer<QProgressDialog> progressDialog(0);
if (isInstaller) {
- metaProgress = new GetMetaInfoProgressWidget(d->m_gui->introductionPage());
- d->m_gui->introductionPage()->setWidget(metaProgress);
+ IntroductionPage *page =
+ qobject_cast<IntroductionPage*>(d->m_gui->page(Installer::Introduction));
+ metaProgress = new GetMetaInfoProgressWidget(page);
+ page->setWidget(metaProgress);
// disable the 'next' button while performing update
- d->m_gui->introductionPage()->setComplete(false);
+ page->setComplete(false);
metaInfoJob.connect(&metaInfoJob, SIGNAL(infoMessage(KDJob*, QString)), metaProgress,
SLOT(message(KDJob*, QString)));
@@ -513,9 +515,10 @@ int TabController::initPackageManager()
if (d->m_installer->isPackageManager())
d->preselectInstalledPackages();
+ // everything done, enable the 'next' button
if (d->m_installer->isInstaller()) {
- // everything done, enable the 'next' button
- d->m_gui->introductionPage()->setComplete(true);
+ using namespace QInstaller;
+ qobject_cast<IntroductionPage*>(d->m_gui->page(Installer::Introduction))->setComplete(true);
}
d->m_packageManagerInitialized = true;