Changeset 868 in vbox

Timestamp:

Feb 13, 2007 1:26:58 PM (18 years ago)

Author:

vboxsync

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

18575

Message:

Fixed freeze during add/remove/add/remove sequence in clean MediaComboBox.
Fixed settings shortcuts update during removing all elements from MediaComboBox.
Some other minor update-bugs fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxMediaComboBox.h (modified) (2 diffs)
• src/VBoxMediaComboBox.cpp (modified) (11 diffs)
• ui/VBoxNewVMWzd.ui.h (modified) (1 diff)

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

@@ -51 +51 @@
     void mediaEnumStarted();
     void mediaEnumerated (const VBoxMedia &, int);
-    void mediaEnumFinished (const VBoxMediaList &);
     void mediaAdded (const VBoxMedia &);
     void mediaUpdated (const VBoxMedia &);
@@ -61 +60 @@
 
     void updateToolTip (int);
-    void setCurrentItem (int);
     void processMedia (const VBoxMedia &);
     void processHdMedia (const VBoxMedia &);

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

@@ -42 +42 @@
     connect (&vboxGlobal(), SIGNAL (mediaEnumerated (const VBoxMedia &, int)),
              this, SLOT (mediaEnumerated (const VBoxMedia &, int)));
-    connect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
-             this, SLOT (mediaEnumFinished (const VBoxMediaList &)));
 
     /* setup update handlers */
@@ -72 +70 @@
         mPmError.convertFromImage (img);
     }
-
-    /* media shortcuts creating */
-    refresh();
 }
 
@@ -84 +79 @@
     if (mUseEmptyItem)
         appendItem (tr ("<no hard disk>"), QUuid(), tr ("No hard disk"), 0);
-    updateToolTip (currentItem());
     /* load current media list */
     VBoxMediaList list = vboxGlobal().currentMediaList();
@@ -90 +84 @@
     for (it = list.begin(); it != list.end(); ++ it)
         mediaEnumerated (*it, 0);
+    /* activate item selected during current list loading */
+    processActivated (currentItem());
 }
 
@@ -103 +99 @@
 }
 
-void VBoxMediaComboBox::mediaEnumFinished (const VBoxMediaList &/*aList*/)
-{
-    emit activated (currentItem());
-}
-
 
 void VBoxMediaComboBox::mediaAdded (const VBoxMedia &aMedia)
@@ -120 +111 @@
 
 void VBoxMediaComboBox::mediaRemoved (VBoxDefs::DiskType aType,
-                                     const QUuid &aId)
+                                      const QUuid &aId)
 {
     if (!(aType & mType))
@@ -132 +123 @@
         mUuidList.remove (mUuidList.at (index));
         mTipList.remove (mTipList.at (index));
-        updateToolTip (currentItem());
+        /* emit signal to ensure parent dialog process selection changes */
+        emit activated (currentItem());
     }
 }
@@ -217 +209 @@
         replaceItem (index, name, aTip, pixmap);
 
+    /* activate required item if it was updated */
     if (aId == mRequiredId)
-    {
-        int activatedItem = index == -1 ? count() - 1 : index;
-        setCurrentItem (activatedItem);
-    }
+        setCurrentItem (aId);
+    /* select last added item if there is no item selected */
+    else if (currentText().isEmpty())
+        QComboBox::setCurrentItem (index == -1 ? count() - 1 : index);
 }
 
 void VBoxMediaComboBox::processActivated (int aItem)
 {
-    mRequiredId = QUuid (mUuidList [aItem]);
+    mRequiredId = mUuidList.isEmpty() || aItem < 0 ? QUuid() : QUuid (mUuidList [aItem]);
     updateToolTip (aItem);
 }
@@ -234 +227 @@
     /* combobox tooltip attaching */
     QToolTip::remove (this);
-    if (!mTipList.isEmpty())
+    if (!mTipList.isEmpty() && aItem >= 0)
         QToolTip::add (this, mTipList [aItem]);
 }
@@ -285 +278 @@
 }
 
-void VBoxMediaComboBox::setCurrentItem (int aIndex)
-{
-    QComboBox::setCurrentItem (aIndex);
-    emit activated (aIndex);
-}
-
 void VBoxMediaComboBox::setCurrentItem (const QUuid &aId)
 {
@@ -296 +283 @@
     int index = mUuidList.findIndex (mRequiredId);
     if (index != -1)
-        setCurrentItem (index);
-}
+    {
+        QComboBox::setCurrentItem (index);
+        emit activated (index);
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewVMWzd.ui.h

@@ -105 +105 @@
     connect (mediaCombo, SIGNAL (activated (int)),
              this, SLOT (currentMediaChanged (int)));
-    vboxGlobal().startEnumeratingMedia();
+    if (!vboxGlobal().isMediaEnumerationStarted())
+        vboxGlobal().startEnumeratingMedia();
+    else
+        mediaCombo->refresh();
 
     /// @todo (dmik) remove?