From f25efeed5aeadbe2f477a4330d29da52617db083 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Fri, 8 Apr 2016 10:44:48 +0300
Subject: Fix showSettingsButton functionality

showSettingsButton() called from control script had no effect.
Fixed it so that if showSettingsButton will overwrite the IFW
decision to show the settings button.

Change-Id: Ia08c03cc13db58168fd371f230517bcc83ee0e12
Task-number: QTIFW-810
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/libs/installer/packagemanagergui.cpp | 47 ++++++++++++++++++++++----------
 src/libs/installer/packagemanagergui.h   |  1 +
 src/sdk/tabcontroller.cpp                |  2 +-
 3 files changed, 34 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 9cdea0356..a83c3a094 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -210,8 +210,9 @@ Q_DECLARE_METATYPE(DynamicInstallerPage*)
 class PackageManagerGui::Private
 {
 public:
-    Private()
-        : m_currentId(-1)
+    Private(PackageManagerGui *qq)
+        : q(qq)
+        , m_currentId(-1)
         , m_modified(false)
         , m_autoSwitchPage(true)
         , m_showSettingsButton(false)
@@ -235,6 +236,20 @@ public:
             QLatin1String("unknown button"));
     }
 
+    void showSettingsButton(bool show)
+    {
+        if (m_showSettingsButton == show)
+            return;
+        q->setOption(QWizard::HaveCustomButton1, show);
+        q->setButtonText(QWizard::CustomButton1, tr("&Settings"));
+        q->button(QWizard::CustomButton1)->setToolTip(
+            PackageManagerGui::tr("Specify proxy settings and configure repositories for add-on components."));
+
+        q->updateButtonLayout();
+        m_showSettingsButton = show;
+    }
+
+    PackageManagerGui *q;
     int m_currentId;
     bool m_modified;
     bool m_autoSwitchPage;
@@ -294,7 +309,7 @@ public:
 */
 PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent)
     : QWizard(parent)
-    , d(new Private)
+    , d(new Private(this))
     , m_core(core)
 {
     if (m_core->isInstaller())
@@ -1029,16 +1044,18 @@ void PackageManagerGui::showFinishedPage()
 */
 void PackageManagerGui::showSettingsButton(bool show)
 {
-    if (d->m_showSettingsButton == show)
-        return;
-
-    d->m_showSettingsButton = show;
-    setOption(QWizard::HaveCustomButton1, show);
-    setButtonText(QWizard::CustomButton1, tr("&Settings"));
-    button(QWizard::CustomButton1)->setToolTip(
-        PackageManagerGui::tr("Specify proxy settings and configure repositories for add-on components."));
+    m_core->setValue(QLatin1String("ShowSettingsButton"), QString::number(show));
+    d->showSettingsButton(show);
+}
 
-    updateButtonLayout();
+/*!
+    Shows the \uicontrol Settings button if \a request is \c true. If script has
+    set the settings button visibility, this function has no effect.
+*/
+void PackageManagerGui::requestSettingsButtonByInstaller(bool request)
+{
+    if (m_core->value(QLatin1String("ShowSettingsButton")).isEmpty())
+        d->showSettingsButton(request);
 }
 
 /*!
@@ -1824,7 +1841,7 @@ void IntroductionPage::setUpdater(bool value)
 {
     if (value) {
         entering();
-        gui()->showSettingsButton(true);
+        gui()->requestSettingsButtonByInstaller(true);
         packageManagerCore()->setUpdater();
         emit packageManagerCoreTypeChanged();
 
@@ -1836,7 +1853,7 @@ void IntroductionPage::setUninstaller(bool value)
 {
     if (value) {
         entering();
-        gui()->showSettingsButton(true);
+        gui()->requestSettingsButtonByInstaller(true);
         packageManagerCore()->setUninstaller();
         emit packageManagerCoreTypeChanged();
 
@@ -1848,7 +1865,7 @@ void IntroductionPage::setPackageManager(bool value)
 {
     if (value) {
         entering();
-        gui()->showSettingsButton(true);
+        gui()->requestSettingsButtonByInstaller(true);
         packageManagerCore()->setPackageManager();
         emit packageManagerCoreTypeChanged();
 
diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h
index 0b804e934..764c31375 100644
--- a/src/libs/installer/packagemanagergui.h
+++ b/src/libs/installer/packagemanagergui.h
@@ -84,6 +84,7 @@ public:
     bool isButtonEnabled(int wizardButton);
 
     void showSettingsButton(bool show);
+    void requestSettingsButtonByInstaller(bool request);
     void setSettingsButtonEnabled(bool enable);
 
     void updateButtonLayout();
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index cb3242841..6edc758a5 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -222,7 +222,7 @@ void TabController::onCurrentIdChanged(int newId)
 {
     if (d->m_gui) {
         if (PackageManagerPage *page = qobject_cast<PackageManagerPage *>(d->m_gui->page(newId)))
-            d->m_gui->showSettingsButton(page->settingsButtonRequested());
+            d->m_gui->requestSettingsButtonByInstaller(page->settingsButtonRequested());
     }
 }
 
-- 
cgit v1.2.3