EO-11399 - Remove the show/hide details button

Author: hjaltisan

src/libs/installer/packagemanagercore.cpp

@@ -2620,6 +2620,16 @@ bool PackageManagerCore::noCancelButton() const
     return d->noCancelButton();
 }
 
+/*!
+    Returns \c true if no details should be available in the installer/uninstaller.
+
+    \sa {installer::noDetails}{installer.noDetails}
+*/
+bool PackageManagerCore::noDetails() const
+{
+    return d->noDetails();
+}
+
 /*!
     \sa {installer::setUninstaller}{installer.setUninstaller}
     \sa isUninstaller(), setUpdater(), setPackageManager()

src/libs/installer/packagemanagercore.h

@@ -228,6 +228,7 @@ class INSTALLER_EXPORT PackageManagerCore : public QObject
     Q_INVOKABLE bool useCustomIntroductionPage() const;
     Q_INVOKABLE bool preloadPackages() const;
     Q_INVOKABLE bool noCancelButton() const;
+    Q_INVOKABLE bool noDetails() const;
 
     Q_INVOKABLE void setUninstaller();
     Q_INVOKABLE bool isUninstaller() const;

src/libs/installer/packagemanagercore_p.cpp

@@ -649,6 +649,11 @@ bool PackageManagerCorePrivate::noCancelButton() const
     return getConfigValueAsBool(QLatin1String("noCancelButton"));
 }
 
+bool PackageManagerCorePrivate::noDetails() const
+{
+    return getConfigValueAsBool(QLatin1String("noDetails"));
+}
+
 QString PackageManagerCorePrivate::installerBinaryPath() const
 {
     return qApp->applicationFilePath();

src/libs/installer/packagemanagercore_p.h

@@ -90,6 +90,7 @@ class PackageManagerCorePrivate : public QObject
     bool useCustomIntroductionPage() const;
     bool preloadPackages() const;
     bool noCancelButton() const;
+    bool noDetails() const;
 
     bool statusCanceledOrFailed() const;
     void setStatus(int status, const QString &error = QString());

src/libs/installer/packagemanagergui.cpp

@@ -3431,6 +3431,11 @@ PerformInstallationPage::PerformInstallationPage(PackageManagerCore *core)
 
     m_performInstallationForm->setupUi(this);
 
+    if (core->noDetails())
+    {
+        m_performInstallationForm->noDetails();
+    }
+
     connect(ProgressCoordinator::instance(), &ProgressCoordinator::detailTextChanged,
         m_performInstallationForm, &PerformInstallationForm::appendProgressDetails);
     connect(ProgressCoordinator::instance(), &ProgressCoordinator::detailTextResetNeeded,
@@ -3453,7 +3458,10 @@ PerformInstallationPage::PerformInstallationPage(PackageManagerCore *core)
     connect(this, &PerformInstallationPage::setAutomatedPageSwitchEnabled,
             core, &PackageManagerCore::setAutomatedPageSwitchEnabled);
 
-    m_performInstallationForm->setDetailsWidgetVisible(true);
+    if (!core->noDetails())
+    {
+        m_performInstallationForm->setDetailsWidgetVisible(true);
+    }
 
     setCommitPage(true);
 }
@@ -3502,10 +3510,13 @@ void PerformInstallationPage::entering()
         QTimer::singleShot(30, packageManagerCore(), SLOT(runInstaller()));
     }
 
-    m_performInstallationForm->enableDetails();
+    if (!packageManagerCore()->noDetails())
+    {
+        m_performInstallationForm->enableDetails();
+    }
     emit setAutomatedPageSwitchEnabled(true);
 
-    if (isVerbose())
+    if (isVerbose() && !packageManagerCore()->noDetails())
         m_performInstallationForm->toggleDetails();
 }
 

src/libs/installer/performinstallationform.cpp

@@ -273,3 +273,12 @@ void PerformInstallationForm::onDownloadStatusChanged(const QString &status)
     m_downloadStatus->setText(m_downloadStatus->fontMetrics().elidedText(status, Qt::ElideRight,
         m_downloadStatus->width()));
 }
+
+/*!
+    Removes the show/hide details button along with the details browser
+*/
+void PerformInstallationForm::noDetails() const
+{
+    m_detailsButton->setVisible(false);
+    m_detailsBrowser->setVisible(false);
+}

src/libs/installer/performinstallationform.h

@@ -69,6 +69,7 @@ public slots:
     void toggleDetails();
     void clearDetailsBrowser();
     void onDownloadStatusChanged(const QString &status);
+    void noDetails() const;
 
 private:
     QProgressBar *m_progressBar;

tools/binarycreator/binarycreator.cpp

@@ -661,6 +661,8 @@ static void printUsage()
 
     std::cout << " -xc|--no-cancel            Remove all cancel buttons from the installer/uninstaller" << std::endl;
 
+    std::cout << " -xd|--no-details           Don't offer any details in installer/uninstaller " << std::endl;
+
     std::cout << "  -r|--resources r1,.,rn    include the given resource files into the binary" << std::endl;
 
     std::cout << "  -v|--verbose              Verbose output" << std::endl;
@@ -793,6 +795,7 @@ int main(int argc, char **argv)
     bool customIntroductionPage = false;
     bool preloadPackages = false;
     bool noCancelButton = false;
+    bool noDetails = false;
     QStringList resources;
     QStringList filteredPackages;
     QInstallerTools::FilterType ftype = QInstallerTools::Exclude;
@@ -859,6 +862,8 @@ int main(int argc, char **argv)
             preloadPackages = true;
         } else if (*it == QLatin1String("-xc") || *it == QLatin1String("--no-cancel")) {
             noCancelButton = true;
+        } else if (*it == QLatin1String("-xd") || *it == QLatin1String("--no-details")) {
+            noDetails = true;
         } else if (*it == QLatin1String("-t") || *it == QLatin1String("--template")) {
             ++it;
             if (it == args.end()) {
@@ -1006,6 +1011,8 @@ int main(int argc, char **argv)
             confInternal.setValue(QLatin1String("preloadPackages"), preloadPackages);
             // assume cancel button if --no-cancel not set
             confInternal.setValue(QLatin1String("noCancelButton"), noCancelButton);
+            // assume details are available if --no-details not set
+            confInternal.setValue(QLatin1String("noDetails"), noDetails);
         }
 
 #ifdef Q_OS_MACOS