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>

2 files changed, 5 insertions, 2 deletions

diff --git a/installerbuilder/installerbase/installerbasecommons.cpp b/installerbuilder/installerbase/installerbasecommons.cpp
index 76a27cb90..5c22d9926 100644
--- a/installerbuilder/installerbase/installerbasecommons.cpp
+++ b/installerbuilder/installerbase/installerbasecommons.cpp
@@ -295,6 +295,7 @@ void IntroductionPageImpl::entering()
     showWidgets(false);
     setMessage(QString());
     setErrorMessage(QString());
+    setButtonText(QWizard::CancelButton, tr("Quit"));
 
     PackageManagerCore *core = packageManagerCore();
     if (core->isUninstaller() ||core->isUpdater() || core->isPackageManager()) {
@@ -307,6 +308,7 @@ void IntroductionPageImpl::leaving()
 {
     // TODO: force repaint on next page, keeps unpainted after fetch
     QTimer::singleShot(100, gui()->page(nextId()), SLOT(repaint()));
+    setButtonText(QWizard::CancelButton, gui()->defaultButtonText(QWizard::CancelButton));
 }
 
 void IntroductionPageImpl::showWidgets(bool show)
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();
         }