diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-03-19 15:12:20 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-03-19 15:27:07 +0100 |
| commit | 9fd62353cf7f973d78cd2093328ac15b5c4980b6 (patch) | |
| tree | 5f49cac54ff245b08e9c216244596116eba1f93c /installerbuilder/libinstaller | |
| parent | 3bfccb51aa49cde261965867e7b4ba285208fab9 (diff) | |
Make it simpler to quit the tool.
Task-number: QTIFW-61
Do not nag on the first page with message, simply quit. Also
make the message less "harsh" when quit/ cancel has been pressed.
Change-Id: I5caa39034ab159da256ebd605fb86aa47a9ac9fe
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Diffstat (limited to 'installerbuilder/libinstaller')
| -rw-r--r-- | installerbuilder/libinstaller/packagemanagergui.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp index a041c9838..0b96e2d94 100644 --- a/installerbuilder/libinstaller/packagemanagergui.cpp +++ b/installerbuilder/libinstaller/packagemanagergui.cpp @@ -529,7 +529,8 @@ QWidget *PackageManagerGui::currentPageWidget() const void PackageManagerGui::cancelButtonClicked() { - if (currentId() != PackageManagerCore::InstallationFinished) { + if (currentId() != PackageManagerCore::Introduction + && currentId() != PackageManagerCore::InstallationFinished) { PackageManagerPage *const page = qobject_cast<PackageManagerPage*> (currentPage()); if (page && page->isInterruptible() && m_core->status() != PackageManagerCore::Canceled && m_core->status() != PackageManagerCore::Failure) { @@ -550,7 +551,7 @@ void PackageManagerGui::cancelButtonClicked() const QMessageBox::StandardButton bt = MessageBoxHandler::question(MessageBoxHandler::currentBestSuitParent(), QLatin1String("cancelInstallation"), tr("Question"), - tr("Do you want to abort the %1 application?").arg(app), QMessageBox::Yes | QMessageBox::No); + tr("Do you want to quit the %1 application?").arg(app), QMessageBox::Yes | QMessageBox::No); if (bt == QMessageBox::Yes) QDialog::reject(); } |