From bd59c45f9f14e622892811e17a10eada09e76a8c Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 21 Aug 2013 14:29:40 +0200 Subject: fix the use of the FinishButton from script side Change-Id: I84a8d4400b202441272232fbdecf6996056362a5 Reviewed-by: Karsten Heimrich --- src/libs/installer/packagemanagergui.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 39314cc9c..62c91440b 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -306,6 +306,12 @@ QString PackageManagerGui::defaultButtonText(int wizardButton) const void PackageManagerGui::clickButton(int wb, int delay) { + // transform the FinishButton to CancelButton, because of the needed misuse of the + // CancelButton as a FinishButton to have some more control of closing the wizard + if (!m_core->isInstaller() && currentId() == PackageManagerCore::InstallationFinished && + wb == QWizard::FinishButton) { + wb = QWizard::CancelButton; + } if (QAbstractButton *b = button(static_cast(wb) )) QTimer::singleShot(delay, b, SLOT(click())); else @@ -314,6 +320,12 @@ void PackageManagerGui::clickButton(int wb, int delay) bool PackageManagerGui::isButtonEnabled(int wb) { + // transform the FinishButton to CancelButton, because of the needed misuse of the + // CancelButton as a FinishButton to have some more control of closing the wizard + if (!m_core->isInstaller() && currentId() == PackageManagerCore::InstallationFinished && + wb == QWizard::FinishButton) { + wb = QWizard::CancelButton; + } if (QAbstractButton *b = button(static_cast(wb) )) return b->isEnabled(); -- cgit v1.2.3