Changeset 9079 in vbox for trunk/src

Timestamp:

May 23, 2008 12:57:29 PM (17 years ago)

Author:

vboxsync

Message:

VBoxMediaComboBox: Merging alphabetical order and some ordering fixes into qt4 front-end.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -45 +45 @@
     void  setUseEmptyItem (bool);
     void  setBelongsTo (const QUuid &);
-    QUuid getId();
+    QUuid getId (int aId = -1);
     QUuid getBelongsTo();
     void  setCurrentItem (const QUuid &);

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

@@ -258 +258 @@
 }
 
-QUuid VBoxMediaComboBox::getId()
-{
-    return mUuidList.isEmpty() ? QUuid() : QUuid (mUuidList [currentItem()]);
+QUuid VBoxMediaComboBox::getId (int aId)
+{
+    return mUuidList.isEmpty() ? QUuid() :
+           aId == -1 ? QUuid (mUuidList [currentItem()]) :
+           QUuid (mUuidList [aId]);
 }
 
@@ -268 +270 @@
                                     QPixmap       *aPixmap)
 {
-    aPixmap ? insertItem (*aPixmap, aName) : insertItem (aName);
-    mUuidList << aId;
-    mTipList  << aTip;
+    int currentIndex = currentItem();
+
+    int insertPosition = -1;
+    for (int i = 0; i < count(); ++ i)
+        /* Searching for the first real (non-null) vdi item
+           which have name greater than the item to be inserted.
+           This is necessary for sorting items alphabetically. */
+        if (text (i).localeAwareCompare (aName) > 0 &&
+            !getId (i).isNull())
+        {
+            insertPosition = i;
+            break;
+        }
+
+    insertPosition == -1 ? mUuidList.append (aId) :
+        mUuidList.insert (insertPosition, aId);
+
+    insertPosition == -1 ? mTipList.append (aId) :
+        mTipList.insert (insertPosition, aTip);
+
+    aPixmap ? insertItem (*aPixmap, aName, insertPosition) :
+              insertItem (aName, insertPosition);
+
+    if (insertPosition != -1 && currentIndex >= insertPosition)
+        QComboBox::setCurrentItem (currentIndex + 1);
 }