Changeset 51474 in vbox for trunk/src/VBox

Timestamp:

May 30, 2014 1:30:33 PM (11 years ago)

Author:

vboxsync

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

94060

Message:

FE/Qt: Mac OS X: HiDPI: Integrate VirtualBox *about* image.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBoxBrand.qrc (modified) (1 diff)
• src/VBoxAboutDlg.cpp (modified) (4 diffs)
• src/VBoxAboutDlg.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -877 +877 @@
         $(QUIET)$(SED) \
                 -e 's;@VBOX_ABOUT_PNG@;$(VBOX_BRAND_GUI_ABOUT_PNG);g' \
+                -e 's;@VBOX_ABOUT_HIDPI_PNG@;$(VBOX_BRAND_GUI_ABOUT_HIDPI_PNG);g' \
                 -e 's;@VBOX_ABOUT_16PX_PNG@;$(VBOX_BRAND_GUI_ABOUT_16PX_PNG);g' \
                 -e 's;@VBOX_VBOX_16PX_PNG@;$(VBOX_BRAND_GUI_VBOX_16PX_PNG);g' \

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

@@ -2 +2 @@
  <qresource prefix="/">
     <file alias="about.png">@VBOX_ABOUT_PNG@</file>
+    <file alias="about_hidpi.png">@VBOX_ABOUT_HIDPI_PNG@</file>
     <file alias="about_16px.png">@VBOX_ABOUT_16PX_PNG@</file>
     <file alias="VirtualBox_16px.png">@VBOX_VBOX_16PX_PNG@</file>

trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp

@@ -33 +33 @@
 # include "UIConverter.h"
 # include "UIExtraDataManager.h"
+# include "UIIconPool.h"
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
@@ -56 +57 @@
     }
 
-    /* Assign image: */
-    m_bgImage.load(strPath);
+    /* Load image: */
+    QIcon icon = UIIconPool::iconSet(strPath);
+    m_size = icon.availableSizes().first();
+    m_pixmap = icon.pixmap(m_size);
 
     /* Translate: */
@@ -66 +69 @@
 {
     if (pEvent->type() == QEvent::Polish)
-        setFixedSize(m_bgImage.size());
+        setFixedSize(m_size);
     if (pEvent->type() == QEvent::WindowDeactivate)
         close();
@@ -75 +78 @@
 {
     QPainter painter(this);
-    painter.drawPixmap(0, 0, m_bgImage);
+    painter.drawPixmap(0, 0, m_pixmap);
     painter.setFont(font());
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.h

@@ -55 +55 @@
     QString m_strAboutText;
     QString m_strVersion;
-    QPixmap m_bgImage;
+    QPixmap m_pixmap;
+    QSize   m_size;
 };