Changeset 56039 in vbox for trunk/src

Timestamp:

May 22, 2015 4:40:59 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Network Operations Manager: Enable use of the HiDPI icons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• net/UINetworkManagerIndicator.cpp (modified) (2 diffs)
• widgets/UIPopupBox.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp

@@ -20 +20 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Local includes: */
+/* GUI includes: */
 # include "UINetworkManagerIndicator.h"
 # include "UINetworkRequest.h"
+# include "UIIconPool.h"
 # include "VBoxGlobal.h"
 
@@ -31 +32 @@
 {
     /* Assign state icons: */
-    setStateIcon(UINetworkManagerIndicatorState_Idle, QPixmap(":/nw_16px.png"));
-    setStateIcon(UINetworkManagerIndicatorState_Loading, QPixmap(":/nw_loading_16px.png"));
-    setStateIcon(UINetworkManagerIndicatorState_Error, QPixmap(":/nw_error_16px.png"));
+    setStateIcon(UINetworkManagerIndicatorState_Idle, UIIconPool::iconSet(":/nw_16px.png"));
+    setStateIcon(UINetworkManagerIndicatorState_Loading, UIIconPool::iconSet(":/nw_loading_16px.png"));
+    setStateIcon(UINetworkManagerIndicatorState_Error, UIIconPool::iconSet(":/nw_error_16px.png"));
 
     /* Translate content: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp

@@ -19 +19 @@
 # include <precomp.h>
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-/* Global includes: */
+
+/* Qt includes: */
+# include <QApplication>
+# include <QStyle>
 # include <QLabel>
-# include <QPaintEvent>
 # include <QPainter>
 # include <QVBoxLayout>
-
-/* Local includes: */
+# include <QPaintEvent>
+
+/* GUI includes: */
 # include "UIPopupBox.h"
 # ifdef Q_WS_MAC
 #  include "UIImageTools.h"
-# endif
+# endif /* Q_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -242 +245 @@
     painter.fillRect(QRect(QPoint(0, 0), size()), pal.brush(QPalette::Active, QPalette::Base));
     /* Top header background */
-    QLinearGradient lg(rect.x(), rect.y(), rect.x(), rect.y() + 2 * 5 + m_pTitleLabel->sizeHint().height());
+    const int iMaxHeightHint = qMax(m_pTitleLabel->sizeHint().height(),
+                                    m_pTitleIcon->sizeHint().height());
+    QLinearGradient lg(rect.x(), rect.y(), rect.x(), rect.y() + 2 * 5 + iMaxHeightHint);
     lg.setColorAt(0, base.darker(95));
     lg.setColorAt(1, base.darker(110));
     int theight = rect.height();
     if (m_fOpen)
-        theight = 2 * 5 + m_pTitleLabel->sizeHint().height();
+        theight = 2 * 5 + iMaxHeightHint;
     painter.fillRect(QRect(rect.x(), rect.y(), rect.width(), theight), lg);
     /* Outer round rectangle line */
@@ -275 +280 @@
 {
     /* Assign title-icon: */
-    m_pTitleIcon->setPixmap(m_titleIcon.pixmap(16, 16));
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+    m_pTitleIcon->setPixmap(m_titleIcon.pixmap(iIconMetric, iIconMetric));
 }
 
@@ -283 +290 @@
     m_pWarningIcon->setHidden(m_warningIcon.isNull());
     /* Assign warning-icon: */
-    m_pWarningIcon->setPixmap(m_warningIcon.pixmap(16, 16));
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+    m_pWarningIcon->setPixmap(m_warningIcon.pixmap(iIconMetric, iIconMetric));
 }