summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-03-28 15:07:00 +0200
committerKarsten Heimrich <karsten.heimrich@nokia.com>2012-03-28 16:00:01 +0200
commit2b5c1055e49f5c3598f218f99e447895848b6637 (patch)
tree5fd860f2c09d0c1039411e79200b0416c80e6734 /src
parent8b68ca6f1d8840b2c2b597656f173d7334911a5d (diff)
Disable the cancel button in case we uninstall.
Change-Id: I246fca40b571e9f7b482ae81e040b952deb5ba39 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/packagemanagergui.cpp20
-rw-r--r--src/libs/installer/packagemanagergui.h4
2 files changed, 22 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 6e0909517..ede8cb12d 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1722,9 +1722,11 @@ PerformInstallationPage::PerformInstallationPage(PackageManagerCore *core)
connect(m_performInstallationForm, SIGNAL(showDetailsChanged()), this, SLOT(toggleDetailsWereChanged()));
connect(core, SIGNAL(installationStarted()), this, SLOT(installationStarted()));
- connect(core, SIGNAL(uninstallationStarted()), this, SLOT(installationStarted()));
connect(core, SIGNAL(installationFinished()), this, SLOT(installationFinished()));
- connect(core, SIGNAL(uninstallationFinished()), this, SLOT(installationFinished()));
+
+ connect(core, SIGNAL(uninstallationStarted()), this, SLOT(uninstallationStarted()));
+ connect(core, SIGNAL(uninstallationFinished()), this, SLOT(uninstallationFinished()));
+
connect(core, SIGNAL(titleMessageChanged(QString)), this, SLOT(setTitleMessage(QString)));
connect(this, SIGNAL(setAutomatedPageSwitchEnabled(bool)), core,
SIGNAL(setAutomatedPageSwitchEnabled(bool)));
@@ -1802,6 +1804,20 @@ void PerformInstallationPage::installationFinished()
}
}
+void PerformInstallationPage::uninstallationStarted()
+{
+ m_performInstallationForm->startUpdateProgress();
+ if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton))
+ cancel->setEnabled(false);
+}
+
+void PerformInstallationPage::uninstallationFinished()
+{
+ installationFinished();
+ if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton))
+ cancel->setEnabled(false);
+}
+
void PerformInstallationPage::toggleDetailsWereChanged()
{
emit setAutomatedPageSwitchEnabled(isAutoSwitching());
diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h
index b3f1bdf88..68a54eff2 100644
--- a/src/libs/installer/packagemanagergui.h
+++ b/src/libs/installer/packagemanagergui.h
@@ -364,6 +364,10 @@ Q_SIGNALS:
private Q_SLOTS:
void installationStarted();
void installationFinished();
+
+ void uninstallationStarted();
+ void uninstallationFinished();
+
void toggleDetailsWereChanged();
private: