Changeset 9261 in vbox for trunk/src/VBox

Timestamp:

May 30, 2008 4:17:33 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Add an extra standardIcon method to VBoxGlobal, cause on the mac
the warning icon is equal to the application icon and we will change this to
something different.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxDiskImageManagerDlg.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -34 +34 @@
 #include <QPixmap>
 #include <QMenu>
+#include <QStyle>
 
 class QAction;
@@ -521 +522 @@
                             const char *aActive = NULL,
                             const char *aSmallActive = NULL);
+
+    static QIcon standardIcon (QStyle::StandardPixmap aStandard);
 
     static void setTextLabel (QToolButton *aToolButton, const QString &aTextLabel);

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDiskImageManagerDlg.cpp

@@ -219 +219 @@
     mType = VBoxDefs::InvalidType;
 
-    mIconInaccessible = style()->standardIcon (QStyle::SP_MessageBoxWarning);
-    mIconErroneous = style()->standardIcon (QStyle::SP_MessageBoxCritical);
+    mIconInaccessible = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning);
+    mIconErroneous = vboxGlobal().standardIcon (QStyle::SP_MessageBoxCritical);
     mIconHD = VBoxGlobal::iconSet (":/hd_16px.png", ":/hd_disabled_16px.png");
     mIconCD = VBoxGlobal::iconSet (":/cd_16px.png", ":/cd_disabled_16px.png");

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -2749 +2749 @@
 }
 
+QIcon VBoxGlobal::standardIcon (QStyle::StandardPixmap aStandard)
+{
+#ifdef Q_WS_MAC
+    /* At least in Qt 4.3.4/4.4 RC1 SP_MessageBoxWarning is the application
+     * icon. So change this to the critical icon. (Maybe this would be
+     * fixed in a later Qt version) */
+    if (aStandard == QStyle::SP_MessageBoxWarning)
+        return QApplication::style()->standardIcon (QStyle::SP_MessageBoxCritical);
+#endif /* Q_WS_MAC */
+    return QApplication::style()->standardIcon (aStandard);
+}
+
 /**
  *  Replacement for QToolButton::setTextLabel() that handles the shortcut