utils/detailwidget: style & make stuff private

src/libs/utils/detailswidget.cpp

@@ -66,9 +66,16 @@ namespace Utils {
 
 static const int MARGIN = 8;
 
-    struct DetailsWidgetPrivate {
+class DetailsWidgetPrivate
+{
+public:
     DetailsWidgetPrivate(QWidget *parent);
 
+    QPixmap cacheBackground(const QSize &size, bool expanded);
+    void updateControls();
+    void changeHoverState(bool hovered);
+
+    QWidget *q;
     DetailsButton *m_detailsButton;
     QGridLayout *m_grid;
     QLabel *m_summaryLabel;
@@ -86,6 +93,7 @@ namespace Utils {
 };
 
 DetailsWidgetPrivate::DetailsWidgetPrivate(QWidget *parent) :
+        q(parent),
         m_detailsButton(new DetailsButton),
         m_grid(new QGridLayout),
         m_summaryLabel(new QLabel(parent)),
@@ -97,31 +105,101 @@ namespace Utils {
         m_hovered(false),
         m_useCheckBox(false)
 {
+    m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
+    m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_summaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
+
+    m_summaryCheckBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_summaryCheckBox->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
+    m_summaryCheckBox->setAttribute(Qt::WA_LayoutUsesWidgetRect); /* broken layout on mac otherwise */
+    m_summaryCheckBox->setVisible(false);
+
+    m_additionalSummaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    m_additionalSummaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
+    m_additionalSummaryLabel->setWordWrap(true);
+    m_additionalSummaryLabel->setVisible(false);
+
+    m_grid->setContentsMargins(0, 0, 0, 0);
+    m_grid->setSpacing(0);
+    m_grid->addWidget(m_summaryLabel, 0, 0);
+    m_grid->addWidget(m_detailsButton, 0, 2);
+    m_grid->addWidget(m_additionalSummaryLabel, 1, 0, 1, 3);
 }
 
+QPixmap DetailsWidgetPrivate::cacheBackground(const QSize &size, bool expanded)
+{
+    QPixmap pixmap(size);
+    pixmap.fill(Qt::transparent);
+    QPainter p(&pixmap);
+
+    int topHeight = qMax(m_detailsButton->height(),
+                         m_useCheckBox ? m_summaryCheckBox->height() : m_summaryLabel->height());
+    QRect topRect(0, 0, size.width(), topHeight);
+    QRect fullRect(0, 0, size.width(), size.height());
+#ifdef Q_WS_MAC
+    p.fillRect(fullRect, qApp->palette().window().color());
+#endif
+    p.fillRect(fullRect, QColor(255, 255, 255, 40));
+
+    QColor highlight = q->palette().highlight().color();
+    highlight.setAlpha(0.5);
+    if (expanded)
+        p.fillRect(topRect, highlight);
+
+    QLinearGradient lg(topRect.topLeft(), topRect.bottomLeft());
+    lg.setColorAt(0, QColor(255, 255, 255, 130));
+    lg.setColorAt(1, QColor(255, 255, 255, 0));
+    p.fillRect(topRect, lg);
+    p.setRenderHint(QPainter::Antialiasing, true);
+    p.translate(0.5, 0.5);
+    p.setPen(QColor(0, 0, 0, 40));
+    p.setBrush(Qt::NoBrush);
+    p.drawRoundedRect(fullRect.adjusted(0, 0, -1, -1), 2, 2);
+    p.setBrush(Qt::NoBrush);
+    p.setPen(QColor(255,255,255,140));
+    p.drawRoundedRect(fullRect.adjusted(1, 1, -2, -2), 2, 2);
+    p.setPen(QPen(q->palette().color(QPalette::Mid)));
+
+    return pixmap;
+}
+
+void DetailsWidgetPrivate::updateControls()
+{
+    if (m_widget)
+        m_widget->setVisible(m_state == DetailsWidget::Expanded || m_state == DetailsWidget::NoSummary);
+    m_detailsButton->setChecked(m_state == DetailsWidget::Expanded && m_widget);
+    //m_summaryLabel->setEnabled(m_state == DetailsWidget::Collapsed && m_widget);
+    m_detailsButton->setVisible(m_state != DetailsWidget::NoSummary);
+    m_summaryLabel->setVisible(m_state != DetailsWidget::NoSummary && !m_useCheckBox);
+    m_summaryCheckBox->setVisible(m_state != DetailsWidget::NoSummary && m_useCheckBox);
+
+    for (QWidget *w = q; w; w = w->parentWidget()) {
+        if (w->layout())
+            w->layout()->activate();
+        if (QScrollArea *area = qobject_cast<QScrollArea*>(w)) {
+            QEvent e(QEvent::LayoutRequest);
+            QCoreApplication::sendEvent(area, &e);
+        }
+    }
+}
+
+void DetailsWidgetPrivate::changeHoverState(bool hovered)
+{
+    if (!m_toolWidget)
+        return;
+#ifdef Q_OS_MAC
+    m_toolWidget->setVisible(hovered);
+#else
+    m_toolWidget->fadeTo(hovered ? 1.0 : 0);
+#endif
+    m_hovered = hovered;
+}
+
+
 DetailsWidget::DetailsWidget(QWidget *parent) :
         QWidget(parent),
         d(new DetailsWidgetPrivate(this))
 {
-        d->m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
-        d->m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        d->m_summaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
-
-        d->m_summaryCheckBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        d->m_summaryCheckBox->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
-        d->m_summaryCheckBox->setAttribute(Qt::WA_LayoutUsesWidgetRect); /* broken layout on mac otherwise */
-        d->m_summaryCheckBox->setVisible(false);
-
-        d->m_additionalSummaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-        d->m_additionalSummaryLabel->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
-        d->m_additionalSummaryLabel->setWordWrap(true);
-        d->m_additionalSummaryLabel->setVisible(false);
-
-        d->m_grid->setContentsMargins(0, 0, 0, 0);
-        d->m_grid->setSpacing(0);
-        d->m_grid->addWidget(d->m_summaryLabel, 0, 0);
-        d->m_grid->addWidget(d->m_detailsButton, 0, 2);
-        d->m_grid->addWidget(d->m_additionalSummaryLabel, 1, 0, 1, 3);
     setLayout(d->m_grid);
 
     connect(d->m_detailsButton, SIGNAL(toggled(bool)),
@@ -130,7 +208,7 @@ namespace Utils {
             this, SIGNAL(checked(bool)));
     connect(d->m_summaryLabel, SIGNAL(linkActivated(QString)),
             this, SIGNAL(linkActivated(QString)));
-        updateControls();
+    d->updateControls();
 }
 
 DetailsWidget::~DetailsWidget()
@@ -188,12 +266,12 @@ namespace Utils {
     if (d->m_state != Expanded) {
         if (d->m_collapsedPixmap.isNull() ||
             d->m_collapsedPixmap.size() != size())
-                d->m_collapsedPixmap = cacheBackground(paintArea.size(), false);
+            d->m_collapsedPixmap = d->cacheBackground(paintArea.size(), false);
         p.drawPixmap(paintArea, d->m_collapsedPixmap);
     } else {
         if (d->m_expandedPixmap.isNull() ||
             d->m_expandedPixmap.size() != size())
-                d->m_expandedPixmap = cacheBackground(paintArea.size(), true);
+            d->m_expandedPixmap = d->cacheBackground(paintArea.size(), true);
         p.drawPixmap(paintArea, d->m_expandedPixmap);
     }
 }
@@ -201,13 +279,13 @@ namespace Utils {
 void DetailsWidget::enterEvent(QEvent * event)
 {
     QWidget::enterEvent(event);
-        changeHoverState(true);
+    d->changeHoverState(true);
 }
 
 void DetailsWidget::leaveEvent(QEvent * event)
 {
     QWidget::leaveEvent(event);
-        changeHoverState(false);
+    d->changeHoverState(false);
 }
 
 void DetailsWidget::setSummaryText(const QString &text)
@@ -246,7 +324,7 @@ namespace Utils {
     if (state == d->m_state)
         return;
     d->m_state = state;
-        updateControls();
+    d->updateControls();
 }
 
 void DetailsWidget::setExpanded(bool expanded)
@@ -254,29 +332,6 @@ namespace Utils {
     setState(expanded ? Expanded : Collapsed);
 }
 
-    void DetailsWidget::updateControls()
-    {
-        if (d->m_widget)
-            d->m_widget->setVisible(d->m_state == Expanded || d->m_state == NoSummary);
-        d->m_detailsButton->setChecked(d->m_state == Expanded && d->m_widget);
-        //d->m_summaryLabel->setEnabled(d->m_state == Collapsed && d->m_widget);
-        d->m_detailsButton->setVisible(d->m_state != NoSummary);
-        d->m_summaryLabel->setVisible(d->m_state != NoSummary && !d->m_useCheckBox);
-        d->m_summaryCheckBox->setVisible(d->m_state != NoSummary && d->m_useCheckBox);
-        {
-            QWidget *w = this;
-            while (w) {
-                if (w->layout())
-                    w->layout()->activate();
-                if (QScrollArea *area = qobject_cast<QScrollArea*>(w)) {
-                    QEvent e(QEvent::LayoutRequest);
-                    QCoreApplication::sendEvent(area, &e);
-                }
-                w = w->parentWidget();
-            }
-        }
-    }
-
 QWidget *DetailsWidget::widget() const
 {
     return d->m_widget;
@@ -298,7 +353,7 @@ namespace Utils {
         d->m_widget->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
         d->m_grid->addWidget(d->m_widget, 2, 0, 1, 3);
     }
-        updateControls();
+    d->updateControls();
 }
 
 void DetailsWidget::setToolWidget(Utils::FadingPanel *widget)
@@ -317,7 +372,7 @@ namespace Utils {
 #ifdef Q_WS_MAC
     d->m_toolWidget->setOpacity(1.0);
 #endif
-        changeHoverState(d->m_hovered);
+    d->changeHoverState(d->m_hovered);
 }
 
 QWidget *DetailsWidget::toolWidget() const
@@ -325,54 +380,4 @@ namespace Utils {
     return d->m_toolWidget;
 }
 
-    QPixmap DetailsWidget::cacheBackground(const QSize &size, bool expanded)
-    {
-        QPixmap pixmap(size);
-        pixmap.fill(Qt::transparent);
-        QPainter p(&pixmap);
-
-        int topHeight = qMax(d->m_detailsButton->height(),
-                             d->m_useCheckBox ? d->m_summaryCheckBox->height() : d->m_summaryLabel->height());
-        QRect topRect(0, 0, size.width(), topHeight);
-        QRect fullRect(0, 0, size.width(), size.height());
-#ifdef Q_WS_MAC
-        p.fillRect(fullRect, qApp->palette().window().color());
-#endif
-        p.fillRect(fullRect, QColor(255, 255, 255, 40));
-
-        QColor highlight = palette().highlight().color();
-        highlight.setAlpha(0.5);
-        if (expanded) {
-            p.fillRect(topRect, highlight);
-        }
-
-        QLinearGradient lg(topRect.topLeft(), topRect.bottomLeft());
-        lg.setColorAt(0, QColor(255, 255, 255, 130));
-        lg.setColorAt(1, QColor(255, 255, 255, 0));
-        p.fillRect(topRect, lg);
-        p.setRenderHint(QPainter::Antialiasing, true);
-        p.translate(0.5, 0.5);
-        p.setPen(QColor(0, 0, 0, 40));
-        p.setBrush(Qt::NoBrush);
-        p.drawRoundedRect(fullRect.adjusted(0, 0, -1, -1), 2, 2);
-        p.setBrush(Qt::NoBrush);
-        p.setPen(QColor(255,255,255,140));
-        p.drawRoundedRect(fullRect.adjusted(1, 1, -2, -2), 2, 2);
-        p.setPen(QPen(palette().color(QPalette::Mid)));
-
-        return pixmap;
-    }
-
-    void DetailsWidget::changeHoverState(bool hovered)
-    {
-        if (!d->m_toolWidget)
-            return;
-#ifdef Q_OS_MAC
-        d->m_toolWidget->setVisible(hovered);
-#else
-        d->m_toolWidget->fadeTo(hovered ? 1.0 : 0);
-#endif
-        d->m_hovered = hovered;
-    }
-
 } // namespace Utils

src/libs/utils/detailswidget.h

@@ -37,13 +37,9 @@
 
 #include <QtGui/QWidget>
 
-QT_BEGIN_NAMESPACE
-class QPixmap;
-QT_END_NAMESPACE
-
 namespace Utils {
 
-struct DetailsWidgetPrivate;
+class DetailsWidgetPrivate;
 class FadingPanel;
 
 class QTCREATOR_UTILS_EXPORT DetailsWidget : public QWidget
@@ -94,6 +90,7 @@ public:
 signals:
     void checked(bool);
     void linkActivated(const QString &link);
+
 private slots:
     void setExpanded(bool);
 
@@ -103,12 +100,7 @@ protected:
     virtual void leaveEvent(QEvent *event);
 
 private:
-    void updateControls();
-    QPixmap cacheBackground(const QSize &size, bool expanded);
-    void changeHoverState(bool hovered);
-
     DetailsWidgetPrivate *d;
-    QString m_additionalSummaryText;
 };
 
 } // namespace Utils