Changeset 55930 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 19, 2015 11:10:48 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 6278: Machine Settings dialog: Enable use of the HiDPI icons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/machine/UIMachineSettingsNetwork.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsSF.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (1 diff)
• widgets/UIPortForwardingTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -61 +61 @@
     Ui::UIMachineSettingsNetwork::setupUi(this);
 
+    /* Determine icon metric: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize) * .625;
+
     /* Setup widgets: */
     m_pAdapterNameCombo->setInsertPolicy(QComboBox::NoInsert);
@@ -66 +70 @@
     m_pMACEditor->setMinimumWidthByText(QString().fill('0', 12));
     m_pMACButton->setIcon(UIIconPool::iconSet(":/refresh_16px.png"));
-    m_pAdvancedArrow->setIconSize(QSize(10, 10));
+    m_pAdvancedArrow->setIconSize(QSize(iIconMetric, iIconMetric));
     m_pAdvancedArrow->setIconForButtonState(QIArrowButtonSwitch::ButtonState_Collapsed,
                                             UIIconPool::iconSet(":/arrow_right_10px.png"));

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -192 +192 @@
                                             ":/sf_remove_disabled_16px.png"));
 
+    /* Determine icon metric: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+
     /* Prepare tool-bar: */
-    m_pFoldersToolBar->setIconSize(QSize(16, 16));
+    m_pFoldersToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
     m_pFoldersToolBar->setOrientation(Qt::Vertical);
     m_pFoldersToolBar->addAction(mNewAction);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -123 +123 @@
                     nullPixmap);
 
+    /* Determine icon metric: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+
     /* Return pixmap of first available size: */
-    return icon.pixmap(availableSizes.first());
+    return icon.pixmap(QSize(iIconMetric, iIconMetric));
 }
 
@@ -1419 +1423 @@
         case R_IconSize:
         {
-            return 16;
+            return QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
         }
 
@@ -2025 +2029 @@
     mTwStorageTree->setCurrentIndex (mStorageModel->root());
 
+    /* Determine icon metric: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+
     /* Storage ToolBar */
-    mTbStorageBar->setIconSize (QSize (16, 16));
+    mTbStorageBar->setIconSize (QSize (iIconMetric, iIconMetric));
     mTbStorageBar->addAction (mAddAttAction);
     mTbStorageBar->addAction (mDelAttAction);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -187 +187 @@
                                             ":/usb_movedown_disabled_16px.png"));
 
+    /* Determine icon metric: */
+    const QStyle *pStyle = QApplication::style();
+    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
+
     /* Prepare tool-bar: */
-    m_pFiltersToolBar->setIconSize(QSize(16, 16));
+    m_pFiltersToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
     m_pFiltersToolBar->setOrientation(Qt::Vertical);
     m_pFiltersToolBar->addAction(mNewAction);

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

@@ -595 +595 @@
         m_pToolBar = new UIToolBar;
         {
+            /* Determine icon metric: */
+            const QStyle *pStyle = QApplication::style();
+            const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
             /* Configure toolbar: */
-            m_pToolBar->setIconSize(QSize(16, 16));
+            m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
             m_pToolBar->setOrientation(Qt::Vertical);
             /* Create 'add' action: */