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

Timestamp:

Sep 4, 2013 1:44:43 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium combo-box: Cleanup/rework (part 1).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp (modified) (2 diffs)

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

@@ -173 +173 @@
     UIMedium medium = vboxGlobal().medium(strMediumID);
 
-    if (medium.isNull() || medium.type() == mType)
-    {
-        if (!mShowDiffs && medium.type() == UIMediumType_HardDisk)
-        {
-            if (medium.parent() != NULL)
-            {
-                /* In !mShowDiffs mode, we ignore all diffs except ones that are
-                 * directly attached to the related VM in the current state */
-                if (!medium.isAttachedInCurStateTo (mMachineId))
-                    return;
-            }
-        }
-
-        appendItem(medium);
-
-        /* Activate the required item if there is any: */
-        if (medium.id() == mLastId)
-            setCurrentItem(medium.id());
-        /* Select last added item if there is no item selected: */
-        else if (currentText().isEmpty())
-            QComboBox::setCurrentIndex(count() - 1);
-    }
+    /* Add only 1. NULL medium and 2. mediums of required type: */
+    if (!medium.isNull() && medium.type() != mType)
+        return;
+
+    /* In !mShowDiffs mode, we ignore all diffs: */
+    if (!mShowDiffs && medium.type() == UIMediumType_HardDisk && medium.parent())
+        return;
+
+    /* Append medium into combo-box: */
+    appendItem(medium);
+
+    /* Activate the required item if any: */
+    if (medium.id() == mLastId)
+        setCurrentItem(medium.id());
+    /* Select last added item if there is no item selected: */
+    else if (currentText().isEmpty())
+        QComboBox::setCurrentIndex(count() - 1);
 }
 
@@ -202 +197 @@
     UIMedium medium = vboxGlobal().medium(strMediumID);
 
-    if (medium.isNull() || medium.type() == mType)
-    {
-        int index;
-        if (!findMediaIndex(medium.id(), index))
-            return;
-
-        replaceItem(index, medium);
-
-        /* Emit the signal to ensure the parent dialog handles the change of
-         * the selected item's data: */
-        emit activated(currentIndex());
-    }
+    /* Add only 1. NULL medium and 2. mediums of required type: */
+    if (!medium.isNull() && medium.type() != mType)
+        return;
+
+    /* Search for corresponding item index: */
+    int index;
+    if (!findMediaIndex(medium.id(), index))
+        return;
+
+    /* Replace medium in combo-box: */
+    replaceItem(index, medium);
+
+    /* Emit the signal to ensure the parent dialog handles the change of
+     * the selected item's data: */
+    emit activated(currentIndex());
 }
 
 void VBoxMediaComboBox::sltHandleMediumDeleted(const QString &strMediumID)
 {
+    /* Search for corresponding item index: */
     int index;
     if (!findMediaIndex(strMediumID, index))
         return;
 
+    /* Replace medium from combo-box: */
     removeItem(index);
     mMedia.erase(mMedia.begin() + index);