Changeset 9480 in vbox for trunk/src

Timestamp:

Jun 6, 2008 1:37:09 PM (17 years ago)

Author:

vboxsync

Message:

Fe/Qt4: VBoxMediaComboBox ported to qt4.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxMediaComboBox.h (modified) (1 diff)
• src/VBoxMediaComboBox.cpp (modified) (19 diffs)

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

@@ -57 +57 @@
     void mediaUpdated (const VBoxMedia &);
     void mediaRemoved (VBoxDefs::DiskType, const QUuid &);
-    void processOnItem (Q3ListBoxItem *);
+    void processOnItem (const QModelIndex&);
     void processActivated (int);
 

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

@@ -24 +24 @@
 #include "VBoxDiskImageManagerDlg.h"
 
-#include <qfileinfo.h>
-#include <qimage.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtooltip.h>
-#include <q3listbox.h>
-//Added by qt3to4:
+#include <QFileInfo>
+#include <QDir>
 #include <QPixmap>
-#include <QMessageBox>
 
 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent, int aType /* = -1 */,
                                       bool aUseEmptyItem /* = false */)
-    : QComboBox (aParent),
-    mType (aType), mRequiredId (QUuid()), mUseEmptyItem (aUseEmptyItem)
+    : QComboBox (aParent)
+    , mType (aType), mRequiredId (QUuid()), mUseEmptyItem (aUseEmptyItem)
 {
     init();
@@ -44 +38 @@
 void VBoxMediaComboBox::init()
 {
+    /* Setup default size policy */
     setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
-    /* setup enumeration handlers */
+
+    /* Setup enumeration handlers */
     connect (&vboxGlobal(), SIGNAL (mediaEnumStarted()),
              this, SLOT (mediaEnumStarted()));
@@ -51 +47 @@
              this, SLOT (mediaEnumerated (const VBoxMedia &, int)));
 
-    /* setup update handlers */
+    /* Setup update handlers */
     connect (&vboxGlobal(), SIGNAL (mediaAdded (const VBoxMedia &)),
              this, SLOT (mediaAdded (const VBoxMedia &)));
@@ -59 +55 @@
              this, SLOT (mediaRemoved (VBoxDefs::DiskType, const QUuid &)));
 
+    /* Setup connections */
     connect (this, SIGNAL (activated (int)),
              this, SLOT (processActivated (int)));
 
-    /* in some qt themes embedded list-box is not used by default, so create it */
-#warning port me
-//    if (!listBox())
-//        setListBox (new Q3ListBox (this));
-//    if (listBox())
-//        connect (listBox(), SIGNAL (onItem (Q3ListBoxItem*)),
-//                 this, SLOT (processOnItem (Q3ListBoxItem*)));
+    /* In some qt themes embedded list-box is not used by default, so create it */
+    // @todo (dsen): check it for qt4
+    // if (!listBox())
+    //     setListBox (new Q3ListBox (this));
+    if (view())
+        connect (view(), SIGNAL (entered (const QModelIndex&)),
+                 this, SLOT (processOnItem (const QModelIndex&)));
 
     /* cache pixmaps as class members */
@@ -74 +71 @@
     icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxWarning, this);
     if (!icon.isNull())
-       mPmInacc = icon.pixmap (14, 14);
+        mPmInacc = icon.pixmap (14, 14);
     icon = vboxGlobal().standardIcon (QStyle::SP_MessageBoxCritical, this);
     if (!icon.isNull())
-       mPmError = icon.pixmap (14, 14);
+        mPmError = icon.pixmap (14, 14);
 }
 
 void VBoxMediaComboBox::refresh()
 {
-    /* clearing lists */
+    /* Clearing lists */
     clear(), mUuidList.clear(), mTipList.clear();
-    /* prepend empty item if used */
+    /* Prepend empty item if used */
     if (mUseEmptyItem)
         appendItem (tr ("<no hard disk>"), QUuid(), tr ("No hard disk"), 0);
-    /* load current media list */
+    /* Load current media list */
     VBoxMediaList list = vboxGlobal().currentMediaList();
     VBoxMediaList::const_iterator it;
     for (it = list.begin(); it != list.end(); ++ it)
         mediaEnumerated (*it, 0);
-    /* activate item selected during current list loading */
-    processActivated (currentItem());
+    /* Activate item selected during current list loading */
+    processActivated (currentIndex());
 }
 
@@ -124 +121 @@
         return;
 
-    /* search & remove media */
-    int index = mUuidList.findIndex (aId);
+    /* Search & remove media */
+    int index = mUuidList.indexOf (aId);
     if (index != -1)
     {
         removeItem (index);
-        mUuidList.remove (mUuidList.at (index));
-        mTipList.remove (mTipList.at (index));
+        mUuidList.removeAt (index);
+        mTipList.removeAt (index);
         /* emit signal to ensure parent dialog process selection changes */
-        emit activated (currentItem());
+        emit activated (currentIndex());
     }
 }
@@ -146 +143 @@
         case VBoxDefs::HD:
         {
-            /* ignoring non-root disks */
+            /* Ignoring non-root disks */
             CHardDisk hd = aMedia.disk;
             if (hd.GetParent().isNull())
@@ -170 +167 @@
     QString src = hd.GetLocation();
     QUuid machineId = hd.GetMachineId();
-    /* append list only with free hd */
+    /* Append list only with free hd */
     if (machineId.isNull() || machineId == mMachineId)
     {
@@ -203 +200 @@
                                         VBoxMedia::Status aStatus)
 {
-    /* compose item's name */
+    /* Compose item's name */
     QFileInfo fi (aSrc);
     QString name = QString ("%1 (%2)").arg (fi.fileName())
-                   .arg (QDir::convertSeparators (fi.dirPath()));
-    /* update warning/error icons */
+                   .arg (QDir::convertSeparators (fi.absolutePath()));
+    /* Update warning/error icons */
     QPixmap *pixmap = 0;
     if (aStatus == VBoxMedia::Inaccessible)
@@ -214 +211 @@
         pixmap = &mPmError;
 
-    /* search media */
-    int index = mUuidList.findIndex (aId);
-    /* create or update media */
+    /* Search media */
+    int index = mUuidList.indexOf (aId);
+    /* Create or update media */
     if (index == -1)
         appendItem (name, aId, aTip, pixmap);
@@ -222 +219 @@
         replaceItem (index, name, aTip, pixmap);
 
-    /* activate required item if it was updated */
+    /* Activate required item if it was updated */
     if (aId == mRequiredId)
         setCurrentItem (aId);
-    /* select last added item if there is no item selected */
+    /* Select last added item if there is no item selected */
     else if (currentText().isEmpty())
-        QComboBox::setCurrentItem (index == -1 ? count() - 1 : index);
+        QComboBox::setCurrentIndex (index == -1 ? count() - 1 : index);
 }
 
@@ -238 +235 @@
 void VBoxMediaComboBox::updateToolTip (int aItem)
 {
-    /* combobox tooltip attaching */
-    QToolTip::remove (this);
+    /* Combobox tooltip re-attaching */
+    setToolTip (QString::null);
     if (!mTipList.isEmpty() && aItem >= 0)
-        QToolTip::add (this, mTipList [aItem]);
-}
-
-void VBoxMediaComboBox::processOnItem (Q3ListBoxItem* aItem)
-{
-    /* combobox item's tooltip attaching */
-#warning port me
-//    int index = listBox()->index (aItem);
-//    QToolTip::remove (listBox()->viewport());
-//    QToolTip::add (listBox()->viewport(), mTipList [index]);
+        setToolTip (mTipList [aItem]);
+}
+
+void VBoxMediaComboBox::processOnItem (const QModelIndex &aIndex)
+{
+    /* Combobox item's tooltip attaching */
+    int index = aIndex.row();
+    view()->viewport()->setToolTip (QString::null);
+    view()->viewport()->setToolTip (mTipList [index]);
 }
 
@@ -256 +252 @@
 {
     return mUuidList.isEmpty() ? QUuid() :
-           aId == -1 ? QUuid (mUuidList [currentItem()]) :
+           aId == -1 ? QUuid (mUuidList [currentIndex()]) :
            QUuid (mUuidList [aId]);
 }
@@ -265 +261 @@
                                     QPixmap       *aPixmap)
 {
-    int currentIndex = currentItem();
+    int currentInd = currentIndex();
 
     int insertPosition = -1;
@@ -272 +268 @@
            which have name greater than the item to be inserted.
            This is necessary for sorting items alphabetically. */
-        if (text (i).localeAwareCompare (aName) > 0 &&
+        if (itemText (i).localeAwareCompare (aName) > 0 &&
             !getId (i).isNull())
         {
@@ -282 +278 @@
         mUuidList.insert (insertPosition, aId);
 
-    insertPosition == -1 ? mTipList.append (aId) :
+    insertPosition == -1 ? mTipList.append (aTip) :
         mTipList.insert (insertPosition, aTip);
 
-    aPixmap ? insertItem (*aPixmap, aName, insertPosition) :
-              insertItem (aName, insertPosition);
-
-    if (insertPosition != -1 && currentIndex >= insertPosition)
-        QComboBox::setCurrentItem (currentIndex + 1);
+    aPixmap ? insertItem (insertPosition, *aPixmap, aName) :
+              insertItem (insertPosition, aName);
+
+    if (insertPosition != -1 && currentInd >= insertPosition)
+        QComboBox::setCurrentIndex (currentInd + 1);
 }
 
@@ -297 +293 @@
                                      QPixmap       *aPixmap)
 {
-    aPixmap ? changeItem (*aPixmap, aName, aNumber) : changeItem (aName, aNumber);
+    setItemText (aNumber, aName);
+    if (aPixmap)
+        setItemIcon (aNumber, *aPixmap);
     mTipList [aNumber] = aTip;
 }
@@ -319 +317 @@
 {
     mRequiredId = aId;
-    int index = mUuidList.findIndex (mRequiredId);
+    int index = mUuidList.indexOf (mRequiredId);
     if (index != -1)
     {
-        QComboBox::setCurrentItem (index);
+        QComboBox::setCurrentIndex (index);
         emit activated (index);
     }
@@ -331 +329 @@
     mType = aType;
 }
+