Changeset 78421 in vbox for trunk/src/VBox

Timestamp:

May 7, 2019 9:47:29 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: UIMediumEnumerator: Implement OnStorageDeviceChanged, OnMediumChanged and OnMediumConfigChanged event handlers.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumEnumerator.cpp (modified) (4 diffs)
• UIMediumEnumerator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -366 +366 @@
              fRemoved, fSilent));
 
-    Q_UNUSED(comAttachment);
+    /* Parse attachment: */
+    parseAttachment(comAttachment);
 }
 
@@ -374 +375 @@
     LogRel2(("GUI: UIMediumEnumerator: OnMediumChanged event received\n"));
 
-    Q_UNUSED(comAttachment);
+    /* Parse attachment: */
+    parseAttachment(comAttachment);
 }
 
@@ -382 +384 @@
     LogRel2(("GUI: UIMediumEnumerator: OnMediumConfigChanged event received\n"));
 
-    Q_UNUSED(comMedium);
+    /* Parse medium: */
+    parseMedium(comMedium);
 }
 
@@ -728 +731 @@
 }
 
-#endif /* !VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
+#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
+
+void UIMediumEnumerator::parseAttachment(CMediumAttachment &comAttachment)
+{
+    /* Make sure attachment is valid: */
+    if (comAttachment.isNull())
+    {
+        LogRel2(("GUI: UIMediumEnumerator:  Attachment is NULL!\n"));
+        /// @todo is this possible case?
+        AssertFailed();
+    }
+    else
+    {
+        /* Acquire attachment medium: */
+        CMedium comMedium = comAttachment.GetMedium();
+        if (!comAttachment.isOk())
+        {
+            LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire attachment medium!\n"));
+            msgCenter().cannotAcquireAttachmentMedium(comAttachment);
+        }
+        else
+        {
+            /* Parse medium: */
+            parseMedium(comMedium);
+        }
+    }
+}
+
+void UIMediumEnumerator::parseMedium(CMedium &comMedium)
+{
+    /* Make sure medium is valid: */
+    if (comMedium.isNull())
+    {
+        LogRel2(("GUI: UIMediumEnumerator:  Medium is NULL!\n"));
+        /// @todo is this possible case?
+        AssertFailed();
+    }
+    else
+    {
+        /* Acquire medium ID: */
+        const QUuid uMediumId = comMedium.GetId();
+        if (!comMedium.isOk())
+        {
+            LogRel2(("GUI: UIMediumEnumerator:  Unable to acquire medium ID!\n"));
+            msgCenter().cannotAcquireMediumAttribute(comMedium);
+        }
+        else
+        {
+            //printf(" Medium to recache: %s\n", uMediumId.toString().toUtf8().constData());
+
+            /* Make sure this medium is already cached: */
+            if (medium(uMediumId).isNull())
+            {
+                LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} isn't cached yet!\n",
+                         uMediumId.toString().toUtf8().constData()));
+                /// @todo is this valid case?
+                AssertFailed();
+            }
+            else
+            {
+                /* Enumerate corresponding UIMedium: */
+                LogRel2(("GUI: UIMediumEnumerator:  Medium {%s} will be enumerated..\n",
+                         uMediumId.toString().toUtf8().constData()));
+                createMediumEnumerationTask(m_media.value(uMediumId));
+            }
+        }
+    }
+}
+
+#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -177 +177 @@
     void recacheFromActualUsage(const CMediumMap &currentCMediums,
                                 const QList<QUuid> &currentCMediumIDs);
-#endif /* !VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
+#else /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
+    /** Parses incoming @a comAttachment. */
+    void parseAttachment(CMediumAttachment &comAttachment);
+    /** Parses incoming @a comMedium. */
+    void parseMedium(CMedium &comMedium);
+#endif /* VBOX_GUI_WITH_NEW_MEDIA_EVENTS */
 
     /** Holds whether consolidated medium-enumeration process is in progress. */