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

Timestamp:

Nov 4, 2010 3:25:25 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: make the QFileIconProvider global

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainDialog.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• widgets/VBoxFilePathSelectorWidget.cpp (modified) (6 diffs)
• widgets/VBoxFilePathSelectorWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp

@@ -28 +28 @@
 #include <QEventLoop>
 #include <QApplication>
-#include <QFileIconProvider>
 #include <QDir>
 #include <QUrl>
@@ -186 +185 @@
                       /* Create some nice looking menu out of the other
                        * directory parts. */
-                      QFileIconProvider fip;
                       QDir dir (fi.absolutePath());
                       do
@@ -194 +192 @@
                           else
                               action = menu.addAction (dir.dirName());
-                          action->setIcon (fip.icon (QFileInfo (dir, "")));
+                          action->setIcon (vboxGlobal().icon(QFileInfo (dir, "")));
                       }
                       while (dir.cdUp());

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -33 +33 @@
 #include <QProcess>
 #include <QHash>
+#include <QFileIconProvider>
 
 #ifdef Q_WS_X11
@@ -518 +519 @@
     }
 
+    QIcon icon(QFileIconProvider::IconType type) { return m_globalIconProvider.icon(type); }
+    QIcon icon(const QFileInfo &info) { return m_globalIconProvider.icon(info); }
+
     QPixmap warningIcon() const { return mWarningIcon; }
     QPixmap errorIcon() const { return mErrorIcon; }
@@ -840 +844 @@
     QPixmap mWarningIcon, mErrorIcon;
 
+    QFileIconProvider m_globalIconProvider;
+
     friend VBoxGlobal &vboxGlobal();
 };

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

@@ -24 +24 @@
 #include "UIIconPool.h"
 #include "VBoxFilePathSelectorWidget.h"
+#include "VBoxGlobal.h"
 
 /* Global includes */
@@ -31 +32 @@
 #include <QClipboard>
 #include <QDir>
-#include <QFileIconProvider>
 #include <QFocusEvent>
 #include <QHBoxLayout>
@@ -66 +66 @@
 VBoxFilePathSelectorWidget::VBoxFilePathSelectorWidget (QWidget *aParent)
     : QIWithRetranslateUI<QComboBox> (aParent)
-    , mIconProvider (new QFileIconProvider())
     , mCopyAction (new QAction (this))
     , mMode (Mode_Folder)
@@ -107 +106 @@
 VBoxFilePathSelectorWidget::~VBoxFilePathSelectorWidget()
 {
-    delete mIconProvider;
 }
 
@@ -415 +413 @@
 {
     if (mMode == Mode_Folder)
-        return mIconProvider->icon (QFileIconProvider::Folder);
+        return vboxGlobal().icon(QFileIconProvider::Folder);
     else
-        return mIconProvider->icon (QFileIconProvider::File);
+        return vboxGlobal().icon(QFileIconProvider::File);
 }
 
@@ -550 +548 @@
         /* Attach corresponding icon */
         setItemIcon (PathId, QFileInfo (mPath).exists() ?
-                             mIconProvider->icon (QFileInfo (mPath)) :
+                             vboxGlobal().icon(QFileInfo (mPath)) :
                              defaultIcon());
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.h

@@ -32 +32 @@
 /* Qt forward declarations */
 class QHBoxLayout;
-class QFileIconProvider;
 class QAction;
 class QPushButton;
@@ -111 +110 @@
 
     /* Private member vars */
-    QFileIconProvider *mIconProvider;
     QAction *mCopyAction;
     Mode mMode;