Changeset 29010 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 4, 2010 12:17:43 PM (15 years ago)

Author:

vboxsync

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

61049

Message:

FE/Qt: 4396: Storage Settings UI will now sort listed attachments by storage slot.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.h (modified) (1 diff)
• settings/vm/VBoxVMSettingsHD.cpp (modified) (4 diffs)
• settings/vm/VBoxVMSettingsHD.h (modified) (2 diffs)

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

@@ -263 +263 @@
     bool operator== (const StorageSlot &aOther) const { return bus == aOther.bus && port == aOther.port && device == aOther.device; }
     bool operator!= (const StorageSlot &aOther) const { return bus != aOther.bus || port != aOther.port || device != aOther.device; }
+    bool operator< (const StorageSlot &aOther) const { return (bus < aOther.bus) ||
+                                                              (bus == aOther.bus && port < aOther.port) ||
+                                                              (bus == aOther.bus && port == aOther.port && device < aOther.device); }
+    bool operator> (const StorageSlot &aOther) const { return (bus > aOther.bus) ||
+                                                              (bus == aOther.bus && port > aOther.port) ||
+                                                              (bus == aOther.bus && port == aOther.port && device > aOther.device); }
     bool isNull() { return bus == KStorageBus_Null; }
     KStorageBus bus; LONG port; LONG device;

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.cpp

@@ -1322 +1322 @@
                     static_cast <AttachmentItem*> (item)->setAttSlot (aValue.value <StorageSlot>());
                     emit dataChanged (aIndex, aIndex);
+                    sort();
                     return true;
                 }
@@ -1428 +1429 @@
 {
     mRootItem->setMachineId (aMachineId);
+}
+
+void StorageModel::sort(int /* iColumn */, Qt::SortOrder order)
+{
+    /* Count of controller items: */
+    int iItemLevel1Count = mRootItem->childCount();
+    /* For each of controller items: */
+    for (int iItemLevel1Pos = 0; iItemLevel1Pos < iItemLevel1Count; ++iItemLevel1Pos)
+    {
+        /* Get iterated controller item: */
+        AbstractItem *pItemLevel1 = mRootItem->childByPos(iItemLevel1Pos);
+        ControllerItem *pControllerItem = static_cast<ControllerItem*>(pItemLevel1);
+        /* Count of attachment items: */
+        int iItemLevel2Count = pItemLevel1->childCount();
+        /* Prepare empty list for sorted attachments: */
+        QList<AbstractItem*> newAttachments;
+        /* For each of attachment items: */
+        for (int iItemLevel2Pos = 0; iItemLevel2Pos < iItemLevel2Count; ++iItemLevel2Pos)
+        {
+            /* Get iterated attachment item: */
+            AbstractItem *pItemLevel2 = pItemLevel1->childByPos(iItemLevel2Pos);
+            AttachmentItem *pAttachmentItem = static_cast<AttachmentItem*>(pItemLevel2);
+            /* Get iterated attachment storage slot: */
+            StorageSlot attachmentSlot = pAttachmentItem->attSlot();
+            int iInsertPosition = 0;
+            for (; iInsertPosition < newAttachments.size(); ++iInsertPosition)
+            {
+                /* Get sorted attachment item: */
+                AbstractItem *pNewItemLevel2 = newAttachments[iInsertPosition];
+                AttachmentItem *pNewAttachmentItem = static_cast<AttachmentItem*>(pNewItemLevel2);
+                /* Get sorted attachment storage slot: */
+                StorageSlot newAttachmentSlot = pNewAttachmentItem->attSlot();
+                /* Apply sorting rule: */
+                if (((order == Qt::AscendingOrder) && (attachmentSlot < newAttachmentSlot)) ||
+                    ((order == Qt::DescendingOrder) && (attachmentSlot > newAttachmentSlot)))
+                    break;
+            }
+            /* Insert iterated attachment into sorted position: */
+            newAttachments.insert(iInsertPosition, pItemLevel2);
+        }
+
+        /* If that controller has attachments: */
+        if (iItemLevel2Count)
+        {
+            /* We should update corresponding model-indexes: */
+            QModelIndex controllerIndex = index(iItemLevel1Pos, 0, root());
+            pControllerItem->setAttachments(newAttachments);
+            /* That is actually beginMoveRows() + endMoveRows() which
+             * unfortunately become available only in Qt 4.6 version. */
+            beginRemoveRows(controllerIndex, 0, iItemLevel2Count - 1);
+            endRemoveRows();
+            beginInsertRows(controllerIndex, 0, iItemLevel2Count - 1);
+            endInsertRows();
+        }
+    }
+}
+
+QModelIndex StorageModel::attachmentBySlot(QModelIndex controllerIndex, StorageSlot attachmentStorageSlot)
+{
+    /* Check what parent model index is valid, set and of 'controller' type: */
+    AssertMsg(controllerIndex.isValid(), ("Controller index should be valid!\n"));
+    AbstractItem *pParentItem = static_cast<AbstractItem*>(controllerIndex.internalPointer());
+    AssertMsg(pParentItem, ("Parent item should be set!\n"));
+    AssertMsg(pParentItem->rtti() == AbstractItem::Type_ControllerItem, ("Parent item should be of 'controller' type!\n"));
+    NOREF(pParentItem);
+
+    /* Search for suitable attachment one by one: */
+    for (int i = 0; i < rowCount(controllerIndex); ++i)
+    {
+        QModelIndex curAttachmentIndex = index(i, 0, controllerIndex);
+        StorageSlot curAttachmentStorageSlot = data(curAttachmentIndex, R_AttSlot).value<StorageSlot>();
+        if (curAttachmentStorageSlot ==  attachmentStorageSlot)
+            return curAttachmentIndex;
+    }
+    return QModelIndex();
 }
 
@@ -2195 +2271 @@
             /* Setting Attachment Slot */
             if (sdr == mCbSlot)
-                mStorageModel->setData (index, QVariant::fromValue (vboxGlobal().toStorageSlot (mCbSlot->currentText())),
-                                        StorageModel::R_AttSlot);
+            {
+                QModelIndex controllerIndex = mStorageModel->parent(index);
+                StorageSlot attachmentStorageSlot = vboxGlobal().toStorageSlot(mCbSlot->currentText());
+                mStorageModel->setData(index, QVariant::fromValue(attachmentStorageSlot), StorageModel::R_AttSlot);
+                QModelIndex theSameIndexAtNewPosition = mStorageModel->attachmentBySlot(controllerIndex, attachmentStorageSlot);
+                AssertMsg(theSameIndexAtNewPosition.isValid(), ("Current attachment disappears!\n"));
+                mTwStorageTree->setCurrentIndex(theSameIndexAtNewPosition);
+            }
             /* Setting Attachment Medium */
             else if (sdr == mCbVdi)
@@ -2556 +2638 @@
 
     mStorageModel->addAttachment (QUuid (mStorageModel->data (index, StorageModel::R_ItemId).toString()), aDevice);
+    mStorageModel->sort();
     emit storageChanged();
     if (mValidator) mValidator->revalidate();

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsHD.h

@@ -309 +309 @@
     QStringList ctrUsedMediumIds() const;
 
+    void setAttachments(const QList<AbstractItem*> &attachments) { mAttachments = attachments; }
+
 private:
 
@@ -486 +488 @@
     void setMachineId (const QString &aMachineId);
 
+    void sort(int iColumn = 0, Qt::SortOrder order = Qt::AscendingOrder);
+    QModelIndex attachmentBySlot(QModelIndex controllerIndex, StorageSlot attachmentStorageSlot);
+
 private: