Changeset 79205 in vbox

Timestamp:

Jun 18, 2019 10:04:17 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Enumerate media only if full medium enumeration wasn't performed before, otherwise we are listening for events.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (3 diffs)
• medium/UIMediumEnumerator.h (modified) (2 diffs)
• medium/UIMediumManager.cpp (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• widgets/UIMediaComboBox.cpp (modified) (1 diff)

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

@@ -2574 +2574 @@
 }
 
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+bool VBoxGlobal::isFullMediumEnumerationRequested() const
+{
+    /* Redirect request to medium-enumerator: */
+    return    m_pMediumEnumerator
+           && m_pMediumEnumerator->isFullMediumEnumerationRequested();
+}
+#endif
+
 UIMedium VBoxGlobal::medium(const QUuid &uMediumID) const
 {

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

@@ -484 +484 @@
         /** Returns whether medium-enumeration is in progress. */
         bool isMediumEnumerationInProgress() const;
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+        /** Returns whether full medium-enumeration is requested. */
+        bool isFullMediumEnumerationRequested() const;
+#endif
         /** Returns enumerated medium with certain @a uMediumID. */
         UIMedium medium(const QUuid &uMediumID) const;

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

@@ -89 +89 @@
 UIMediumEnumerator::UIMediumEnumerator()
     : m_fMediumEnumerationInProgress(false)
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+    , m_fMediumEnumerationRequested(false)
+#endif
 {
     /* Allow UIMedium to be used in inter-thread signals: */
@@ -195 +198 @@
     if (comMedia.isEmpty())
     {
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+        m_fMediumEnumerationRequested = true;
+#endif
         addMediaToMap(vboxGlobal().virtualBox().GetHardDisks(), media);
         addMediaToMap(vboxGlobal().host().GetDVDDrives(), media);
@@ -203 +209 @@
     else
     {
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+        m_fMediumEnumerationRequested = false;
+#endif
         addMediaToMap(vboxGlobal().host().GetDVDDrives(), media);
         addMediaToMap(vboxGlobal().virtualBox().GetDVDImages(), media);

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

@@ -82 +82 @@
     /** Returns whether consolidated medium-enumeration process is in progress. */
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+    /** Returns whether full consolidated medium-enumeration process is requested. */
+    bool isFullMediumEnumerationRequested() const { return m_fMediumEnumerationRequested; }
+#endif
     /** Makes a request to enumerate specified @a comMedia.
       * @note  Previous map will be replaced with the new one, values present in both
@@ -207 +211 @@
     /** Holds whether consolidated medium-enumeration process is in progress. */
     bool  m_fMediumEnumerationInProgress;
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+    /** Holds whether full consolidated medium-enumeration process is requested. */
+    bool  m_fMediumEnumerationRequested;
+#endif
 
     /** Holds a set of current medium-enumeration tasks. */

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

@@ -695 +695 @@
 
     /* Start medium-enumeration (if necessary): */
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     if (!vboxGlobal().isMediumEnumerationInProgress())
+#else
+    if (!vboxGlobal().isFullMediumEnumerationRequested())
+#endif
         vboxGlobal().startMediumEnumeration();
     /* Emulate medium-enumeration otherwise: */

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

@@ -80 +80 @@
     , m_strMachineGuestOSTypeId(strMachineGuestOSTypeId)
 {
+    /* Start medium-enumeration (if necessary): */
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     if (vboxGlobal().uiType() == VBoxGlobal::UIType_RuntimeUI)
+#else
+    if (!vboxGlobal().isFullMediumEnumerationRequested())
+#endif
         vboxGlobal().startMediumEnumeration();
     configure();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -167 +167 @@
     loadSettings();
 
-    /* This is needed at least for some vm to show correct storage info. For the manager UI enumeration has been done already: */
+    /* This is needed at least for some VM to show correct storage info. */
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     if (vboxGlobal().uiType() == VBoxGlobal::UIType_RuntimeUI)
+#else
+    if (!vboxGlobal().isFullMediumEnumerationRequested())
+#endif
         vboxGlobal().startMediumEnumeration();
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3708 +3708 @@
     UIIconPoolStorageSettings::create();
 
+#ifdef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
+    /* Start medium-enumeration (only if necessary): */
+    if (!vboxGlobal().isFullMediumEnumerationRequested())
+#endif
     /* Enumerate Media. We need at least the MediaList filled, so this is the
      * lasted point, where we can start. The rest of the media checking is done

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

@@ -58 +58 @@
 void UIMediaComboBox::repopulate()
 {
+    /* Start medium-enumeration (if necessary): */
+#ifndef VBOX_GUI_WITH_NEW_MEDIA_EVENTS
     if (!vboxGlobal().isMediumEnumerationInProgress())
+#else
+    if (!vboxGlobal().isFullMediumEnumerationRequested())
+#endif
         vboxGlobal().startMediumEnumeration();
     else