Maintenance Tool: Change text in Select Components view when selection of components is not possible

Task-number: QTIFW-1241
Change-Id: Ib3e67e26b5fd4cf856c4b95f7fe542484e4955ff
Reviewed-by: Janne Anttila <janne.anttila@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

4 files changed, 26 insertions, 4 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 78198156e..4a7f42621 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -665,6 +665,22 @@ int PackageManagerCore::downloadNeededArchives(double partProgressSize)
 }
 
 /*!
+    Returns \c true if essential component update is found.
+*/
+bool PackageManagerCore::foundEssentialUpdate() const
+{
+    return d->m_foundEssentialUpdate;
+}
+
+/*!
+    Sets the value of \a foundEssentialUpdate, defaults \c true.
+*/
+void PackageManagerCore::setFoundEssentialUpdate(bool foundEssentialUpdate)
+{
+    d->m_foundEssentialUpdate = foundEssentialUpdate;
+}
+
+/*!
     Returns \c true if a hard restart of the application is requested.
 */
 bool PackageManagerCore::needsHardRestart() const
@@ -2733,7 +2749,7 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
     data.components = &components;
     data.installedPackages = &locals;
 
-    bool foundEssentialUpdate = false;
+    setFoundEssentialUpdate(false);
     LocalPackagesHash installedPackages = locals;
     QStringList replaceMes;
 
@@ -2789,7 +2805,7 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
                 continue;
 
             if (update->data(scEssential, scFalse).toString().toLower() == scTrue)
-                foundEssentialUpdate = true;
+                setFoundEssentialUpdate(true);
 
             // this is not a dependency, it is a real update
             components.insert(name, d->m_updaterComponentsDeps.takeLast());
@@ -2840,7 +2856,7 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
                 }
             }
 
-            if (foundEssentialUpdate) {
+            if (foundEssentialUpdate()) {
                 foreach (QInstaller::Component *component, components) {
                     if (d->statusCanceledOrFailed())
                         return false;
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 9f8d1a304..4fa2f2554 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -266,6 +266,9 @@ public:
 
     int downloadNeededArchives(double partProgressSize);
 
+    bool foundEssentialUpdate() const;
+    void setFoundEssentialUpdate(bool foundEssentialUpdate = true);
+
     bool needsHardRestart() const;
     void setNeedsHardRestart(bool needsHardRestart = true);
     bool finishedWithSuccess() const;
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 21ab3fc40..e0817c573 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -247,6 +247,7 @@ private:
     bool m_updateSourcesAdded;
     qint64 m_magicBinaryMarker;
     bool m_componentsToInstallCalculated;
+    bool m_foundEssentialUpdate;
 
     mutable ScriptEngine *m_componentScriptEngine;
     mutable ScriptEngine *m_controlScriptEngine;
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index a053e9bff..db1b99d3f 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1898,7 +1898,8 @@ void ComponentSelectionPage::entering()
         QT_TR_NOOP("Please select the components you want to update."),
         QT_TR_NOOP("Please select the components you want to install."),
         QT_TR_NOOP("Please select the components you want to uninstall."),
-        QT_TR_NOOP("Select the components to install. Deselect installed components to uninstall them. Any components already installed will not be updated.")
+        QT_TR_NOOP("Select the components to install. Deselect installed components to uninstall them. Any components already installed will not be updated."),
+        QT_TR_NOOP("Mandatory components need to be updated first before you can select other components to update.")
      };
 
     int index = 0;
@@ -1906,6 +1907,7 @@ void ComponentSelectionPage::entering()
     if (core->isInstaller()) index = 1;
     if (core->isUninstaller()) index = 2;
     if (core->isPackageManager()) index = 3;
+    if (core->foundEssentialUpdate() && core->isUpdater()) index = 4;
     setColoredSubTitle(tr(strings[index]));
 
     d->updateTreeView();