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

Timestamp:

Oct 30, 2020 1:18:39 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Move refresh-subscribe logic to cloud machine item itself; This gives us an edge in control of it.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualMachineItemCloud.cpp (modified) (6 diffs)
• UIVirtualMachineItemCloud.h (modified) (2 diffs)
• chooser/UIChooserItemMachine.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -407 +407 @@
                 /* Propagate current items to update the Details-pane: */
                 m_pPaneToolsMachine->setItems(currentItems());
-                /* Repeat the task a bit delayed: */
-                pItem->toCloud()->updateInfoAsync(true /* delayed? */);
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -40 +40 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(enmState)
+    , m_fRefreshScheduled(false)
     , m_pTimer(0)
 {
@@ -50 +51 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(UIFakeCloudVirtualMachineItemState_NotApplicable)
+    , m_fRefreshScheduled(false)
     , m_pTimer(0)
 {
@@ -57 +59 @@
 UIVirtualMachineItemCloud::~UIVirtualMachineItemCloud()
 {
+    cleanup();
 }
 
@@ -71 +74 @@
 }
 
-void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed)
-{
+void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed, bool fSubscribe /* = false */)
+{
+    /* Mark update scheduled if requested: */
+    if (fSubscribe)
+        m_fRefreshScheduled = true;
+
     /* Ignore refresh request if timer or progress is already running: */
     if (m_pTimer->isActive() || m_pProgressHandler)
@@ -84 +91 @@
 void UIVirtualMachineItemCloud::waitForAsyncInfoUpdateFinished()
 {
+    /* Mark update canceled in any case: */
+    m_fRefreshScheduled = false;
+
     /* Cancel the progress-handler if any: */
     if (m_pProgressHandler)
@@ -333 +343 @@
     if (!fCanceled)
         emit sigRefreshFinished();
+
+    /* Refresh again if scheduled: */
+    if (m_fRefreshScheduled)
+        updateInfoAsync(true /* async? */);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -80 +80 @@
 
         /** Updates cloud VM info async way, @a fDelayed if requested or instant otherwise. */
-        void updateInfoAsync(bool fDelayed);
+        void updateInfoAsync(bool fDelayed, bool fSubscribe = false);
         /** Makes sure async info update is finished.
           * @note  This method creates own event-loop to avoid blocking calling thread event processing,
@@ -160 +160 @@
         QString                             m_strFakeCloudItemErrorMessage;
 
+        /** Holds whether we should update info. */
+        bool                  m_fRefreshScheduled;
         /** Holds the machine refresh timer instance. */
         QTimer               *m_pTimer;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -233 +233 @@
         AssertPtrReturnVoid(pCloudMachineItem);
         if (fSelected && pCloudMachineItem->accessible())
-            pCloudMachineItem->updateInfoAsync(false /* delayed? */);
+            pCloudMachineItem->updateInfoAsync(false /* delayed? */, true /* subscribe */);
         else
             pCloudMachineItem->waitForAsyncInfoUpdateFinished();