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

Timestamp:

Nov 14, 2017 3:25:47 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119063

Message:

FE/Qt: bugref:8694: HiDPI support for wizards.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• VirtualBox2_hidpi.qrc (modified) (1 diff)
• VirtualBoxMac.qrc (modified) (1 diff)
• VirtualBoxOther.qrc (modified) (1 diff)
• images/hidpi/vmw_clone_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vmw_clone.png )
• images/hidpi/vmw_first_run_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vmw_first_run.png )
• images/hidpi/vmw_new_harddisk_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vmw_new_harddisk.png )
• images/hidpi/vmw_new_welcome_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vmw_new_welcome.png )
• images/hidpi/vmw_ovf_export_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vmw_ovf_export.png )
• images/hidpi/vmw_ovf_import_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/vmw_ovf_import.png )
• images/unused/vmw_new_user.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vmw_new_user.png )
• images/unused/vmw_new_user_bg.png (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/images/vmw_new_user_bg.png )
• src/wizards/UIWizard.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -276 +276 @@
         <file alias="vmw_new_harddisk.png">images/vmw_new_harddisk.png</file>
         <file alias="vmw_new_harddisk_bg.png">images/vmw_new_harddisk_bg.png</file>
-        <file alias="vmw_new_user.png">images/vmw_new_user.png</file>
-        <file alias="vmw_new_user_bg.png">images/vmw_new_user_bg.png</file>
         <file alias="vmw_new_welcome.png">images/vmw_new_welcome.png</file>
         <file alias="vmw_new_welcome_bg.png">images/vmw_new_welcome_bg.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc

@@ -278 +278 @@
         <file alias="vm_start_headless_16px_hidpi.png">images/hidpi/vm_start_headless_16px_hidpi.png</file>
         <file alias="vm_start_separate_16px_hidpi.png">images/hidpi/vm_start_separate_16px_hidpi.png</file>
+        <file alias="vmw_clone_hidpi.png">images/hidpi/vmw_clone_hidpi.png</file>
+        <file alias="vmw_first_run_hidpi.png">images/hidpi/vmw_first_run_hidpi.png</file>
+        <file alias="vmw_new_harddisk_hidpi.png">images/hidpi/vmw_new_harddisk_hidpi.png</file>
+        <file alias="vmw_new_welcome_hidpi.png">images/hidpi/vmw_new_welcome_hidpi.png</file>
+        <file alias="vmw_ovf_export_hidpi.png">images/hidpi/vmw_ovf_export_hidpi.png</file>
+        <file alias="vmw_ovf_import_hidpi.png">images/hidpi/vmw_ovf_import_hidpi.png</file>
         <file alias="vrdp_16px_hidpi.png">images/hidpi/vrdp_16px_hidpi.png</file>
         <file alias="vrdp_24px_hidpi.png">images/hidpi/vrdp_24px_hidpi.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBoxMac.qrc

@@ -4 +4 @@
     <file alias="vmw_new_harddisk_bg.png">images/vmw_new_harddisk_bg.png</file>
     <file alias="vmw_first_run_bg.png">images/vmw_first_run_bg.png</file>
-    <file alias="vmw_new_user_bg.png">images/vmw_new_user_bg.png</file>
     <file alias="vmw_ovf_import_bg.png">images/vmw_ovf_import_bg.png</file>
     <file alias="vmw_ovf_export_bg.png">images/vmw_ovf_export_bg.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBoxOther.qrc

@@ -3 +3 @@
     <file alias="vmw_new_welcome.png">images/vmw_new_welcome.png</file>
     <file alias="vmw_new_harddisk.png">images/vmw_new_harddisk.png</file>
-    <file alias="vmw_new_user.png">images/vmw_new_user.png</file>
     <file alias="vmw_first_run.png">images/vmw_first_run.png</file>
     <file alias="vmw_ovf_export.png">images/vmw_ovf_export.png</file>

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -25 +25 @@
 
 /* Local includes: */
+# include "UIIconPool.h"
 # include "UIWizard.h"
 # include "UIWizardPage.h"
@@ -248 +249 @@
         int iCurrentWizardHeight = height();
 #ifndef VBOX_WS_MAC
+        /* Calculate metric and ratio: */
+        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+        const double dRatio = (double)iIconMetric / 32;
+        /* Load pixmap to icon first: */
+        QIcon icon = UIIconPool::iconSet(m_strWatermarkName);
+        QSize size = icon.availableSizes().first();
+        size *= dRatio;
         /* We should take into account watermark like its assigned already: */
-        QPixmap watermarkPixmap(m_strWatermarkName);
-        int iWatermarkWidth = watermarkPixmap.width();
+        QPixmap watermarkPixmap(icon.pixmap(size));
+        const int iWatermarkWidth = watermarkPixmap.width() * dRatio;
         iCurrentWizardWidth += iWatermarkWidth;
 #endif /* !VBOX_WS_MAC */
@@ -478 +486 @@
 void UIWizard::assignWatermarkHelper()
 {
+    /* Calculate metric and ratio: */
+    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
+    const double dRatio = (double)iIconMetric / 32;
+    /* Load pixmap to icon first: */
+    QIcon icon = UIIconPool::iconSet(m_strWatermarkName);
+    QSize size = icon.availableSizes().first();
+    size *= dRatio;
     /* Create initial watermark: */
-    QPixmap pixWaterMark(m_strWatermarkName);
+    QPixmap pixWaterMark(icon.pixmap(size));
     /* Convert watermark to image which
      * allows to manage pixel data directly: */