Toggle details on ReadyForInstallation page with verbose mode

Removed the Details button, as it only confused people,
especially with the internal component names being shown
there. As it is essentially debugging output, it should
be toggled with the verbose switch, as is the rest of the
debugging output.

Task-number: QTIFW-140
Change-Id: I23dc5bd033a52cffc7cf811b6ec886a9db3a6a63
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

2 files changed, 5 insertions, 21 deletions

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 4cbd6cabf..2c3f91988 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1939,13 +1939,6 @@ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core)
     topLayout->addWidget(m_msgLabel);
     baseLayout->addLayout(topLayout);
 
-    m_taskDetailsButton = new QPushButton(tr("&Show Details"), this);
-    m_taskDetailsButton->setFocusPolicy(Qt::NoFocus);
-    m_taskDetailsButton->setObjectName(QLatin1String("TaskDetailsButton"));
-    m_taskDetailsButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-    connect(m_taskDetailsButton, SIGNAL(clicked()), this, SLOT(toggleDetails()));
-    topLayout->addWidget(m_taskDetailsButton);
-
     QVBoxLayout *bottomLayout = new QVBoxLayout();
     bottomLayout->setObjectName(QLatin1String("BottomLayout"));
     bottomLayout->addStretch();
@@ -1970,8 +1963,12 @@ void ReadyForInstallationPage::entering()
 {
     setCommitPage(false);
 
+    if (isVerbose())
+        m_taskDetailsBrowser->setVisible(true);
+    else
+        m_taskDetailsBrowser->setVisible(false);
+
     if (packageManagerCore()->isUninstaller()) {
-        m_taskDetailsButton->setVisible(false);
         m_taskDetailsBrowser->setVisible(false);
         setButtonText(QWizard::CommitButton, tr("U&ninstall"));
         setColoredTitle(tr("Ready to Uninstall"));
@@ -2103,8 +2100,6 @@ void ReadyForInstallationPage::refreshTaskDetailsBrowser()
             }
             htmlOutput.append(QLatin1String("</ul>"));
             m_taskDetailsBrowser->setHtml(htmlOutput);
-            if (!m_taskDetailsBrowser->isVisible())
-                toggleDetails();
             setCommitPage(false);
             return;
     }
@@ -2134,13 +2129,6 @@ void ReadyForInstallationPage::refreshTaskDetailsBrowser()
     m_taskDetailsBrowser->setHtml(htmlOutput);
 }
 
-void ReadyForInstallationPage::toggleDetails()
-{
-    const bool visible = !m_taskDetailsBrowser->isVisible();
-    m_taskDetailsBrowser->setVisible(visible);
-    m_taskDetailsButton->setText(visible ? tr("&Hide Details") : tr("&Show Details"));
-}
-
 void ReadyForInstallationPage::leaving()
 {
     setButtonText(QWizard::CommitButton, gui()->defaultButtonText(QWizard::CommitButton));
diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h
index a2cf23139..322252719 100644
--- a/src/libs/installer/packagemanagergui.h
+++ b/src/libs/installer/packagemanagergui.h
@@ -395,9 +395,6 @@ public:
 
     bool isComplete() const;
 
-private slots:
-    void toggleDetails();
-
 protected:
     void entering();
     void leaving();
@@ -407,7 +404,6 @@ private:
 
 private:
     QLabel *m_msgLabel;
-    QPushButton *m_taskDetailsButton;
     QTextBrowser* m_taskDetailsBrowser;
 };