summaryrefslogtreecommitdiffstats
path: root/installerbuilder/installerbase/tabcontroller.cpp
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-02-28 14:09:34 +0100
committerTim Jenssen <tim.jenssen@nokia.com>2011-03-03 14:46:58 +0100
commitf60a9b166004a2bafd3e139fa6e124b333fe1714 (patch)
tree7d4e968fcc3e500f5a0c7552e128b9a48335708a /installerbuilder/installerbase/tabcontroller.cpp
parente2d0c624e198393692a3f002f731de7d7208007a (diff)
We would like to get rid of the tabbed ui.
Diffstat (limited to 'installerbuilder/installerbase/tabcontroller.cpp')
-rw-r--r--installerbuilder/installerbase/tabcontroller.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index cd5f25f8a..17dcadc5c 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -182,9 +182,9 @@ void TabController::setControlScript (const QString &script)
d->m_controlScript = script;
}
-void TabController::init(Tabs curTab)
+void TabController::init()
{
- if (d->m_updaterGuiWidget && !d->m_init) {
+ if (!d->m_installer->isInstaller() && !d->m_init) {
d->m_updater.reset(new Updater);
d->m_updater->setInstaller(d->m_installer);
@@ -212,7 +212,7 @@ void TabController::init(Tabs curTab)
void TabController::close()
{
- if (d->m_updaterGuiWidget && !d->m_gui.isNull())
+ if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
d->m_gui->cancelButtonClicked();
}
@@ -250,7 +250,7 @@ void TabController::updaterFinishedWithError()
d->m_installer->writeUninstaller();
d->m_state = CANCELED;
- if (d->m_updaterGuiWidget && !d->m_gui.isNull())
+ if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
d->m_gui->rejectWithoutPrompt();
finished();
@@ -396,7 +396,7 @@ void TabController::updaterFinished(bool error)
void TabController::updaterFinished(int val)
{
if (val != QDialog::Accepted) {
- if (d->m_updaterGuiWidget && !d->m_gui.isNull())
+ if (!d->m_installer->isInstaller() && !d->m_gui.isNull())
d->m_gui->rejectWithoutPrompt();
finished();
}
@@ -410,7 +410,7 @@ void TabController::canceled()
int TabController::initUpdater()
{
- init(UPDATER_TAB);
+ init();
if (d->m_repoUpdateNeeded) {
int result = checkRepositories();
@@ -433,7 +433,7 @@ int TabController::initUpdater()
int TabController::initPackageManager()
{
- init(PACKAGE_MANAGER_TAB);
+ init();
// this should called as early as possible, to handle checkRepositories error messageboxes for
// example