Changeset 9287 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2008 9:49:38 AM (17 years ago)

Author:

vboxsync

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

31492

Message:

FE/Qt4: Use VBoxGlobal::standardIcon on all places.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -84 +84 @@
     void setDetailsShown (bool aShown);
 
+    QPixmap standardPixmap (QIMessageBox::Icon aIcon);
+
 private:
 

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

@@ -523 +523 @@
                             const char *aSmallActive = NULL);
 
-    static QIcon standardIcon (QStyle::StandardPixmap aStandard);
+    static QIcon standardIcon (QStyle::StandardPixmap aStandard, QWidget *aWidget = NULL);
 
     static void setTextLabel (QToolButton *aToolButton, const QString &aTextLabel);

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

@@ -72 +72 @@
 
     mIconLabel = new QLabel();
-        if (aIcon < GuruMeditation)
-        mIconLabel->setPixmap (QMessageBox::standardIcon ((QMessageBox::Icon) aIcon));
-    else if (aIcon == GuruMeditation)
-        mIconLabel->setPixmap (QPixmap (":/meditation_32px.png"));
+    mIconLabel->setPixmap (standardPixmap (aIcon));
     mIconLabel->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
     mIconLabel->setAlignment (Qt::AlignHCenter | Qt::AlignTop);
@@ -324 +321 @@
 }
 
+QPixmap QIMessageBox::standardPixmap (QIMessageBox::Icon aIcon)
+{
+    QIcon icon;
+    switch (aIcon) 
+    {
+        case QIMessageBox::Information:
+            icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxInformation, this);
+            break;
+        case QMessageBox::Warning:
+            icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning, this);
+            break;
+        case QIMessageBox::Critical:
+            icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxCritical, this);
+            break;
+        case QIMessageBox::Question:
+            icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxQuestion, this);
+            break;
+        case QIMessageBox::GuruMeditation:
+            icon = QIcon (":/meditation_32px.png");
+            break;
+        default:
+            break;
+    }
+    if (!icon.isNull())
+    {
+        int size = style()->pixelMetric (QStyle::PM_MessageBoxIconSize, 0, this);
+        return icon.pixmap (size, size);
+    }else
+        return QPixmap();
+}
+

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

@@ -219 +219 @@
     mType = VBoxDefs::InvalidType;
 
-    mIconInaccessible = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning);
-    mIconErroneous = vboxGlobal().standardIcon (QStyle::SP_MessageBoxCritical);
+    mIconInaccessible = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning, this);
+    mIconErroneous = vboxGlobal().standardIcon (QStyle::SP_MessageBoxCritical, this);
     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)
-{
+QIcon VBoxGlobal::standardIcon (QStyle::StandardPixmap aStandard, QWidget *aWidget /* = NULL */)
+{
+    QStyle *style = aWidget ? aWidget->style(): QApplication::style();
 #ifdef Q_WS_MAC
     /* At least in Qt 4.3.4/4.4 RC1 SP_MessageBoxWarning is the application
@@ -2756 +2757 @@
      * fixed in a later Qt version) */
     if (aStandard == QStyle::SP_MessageBoxWarning)
-        return QApplication::style()->standardIcon (QStyle::SP_MessageBoxCritical);
+        return style->standardIcon (QStyle::SP_MessageBoxCritical, 0, aWidget);
 #endif /* Q_WS_MAC */
-    return QApplication::style()->standardIcon (aStandard);
+    return style->standardIcon (aStandard, 0, aWidget);
 }
 

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

@@ -71 +71 @@
 
     /* cache pixmaps as class members */
-    QImage img;
-    img = QMessageBox::standardIcon (QMessageBox::Warning).convertToImage();
-    if (!img.isNull())
-    {
-        img = img.smoothScale (14, 14);
-        mPmInacc.convertFromImage (img);
-    }
-    img = QMessageBox::standardIcon (QMessageBox::Critical).convertToImage();
-    if (!img.isNull())
-    {
-        img = img.smoothScale (14, 14);
-        mPmError.convertFromImage (img);
-    }
+    QIcon icon;
+    icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning, this);
+    if (!icon.isNull())
+       mPmInacc = icon.pixmap (14, 14);
+    icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxCritical, this);
+    if (!icon.isNull())
+       mPmError = icon.pixmap (14, 14);
 }