Changeset 86215 in vbox

Timestamp:

Sep 22, 2020 10:40:19 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UIVirtualMachineItemCloud: Rework refresh timer to be more controllable.

Location:

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

Files:

• UIVirtualMachineItemCloud.cpp (modified) (4 diffs)
• UIVirtualMachineItemCloud.h (modified) (3 diffs)

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

@@ -40 +40 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(enmState)
-{
-    recache();
+    , m_pTimer(0)
+{
+    prepare();
 }
 
@@ -49 +50 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(UIFakeCloudVirtualMachineItemState_NotApplicable)
-{
-    recache();
+    , m_pTimer(0)
+{
+    prepare();
 }
 
@@ -71 +73 @@
 void UIVirtualMachineItemCloud::updateInfoAsync(bool fDelayed)
 {
-    QTimer::singleShot(fDelayed ? 10000 : 0, this, SLOT(sltRefreshCloudMachineInfo()));
+    /* Ignore refresh request if timer or progress is already running: */
+    if (m_pTimer->isActive() || m_pProgressHandler)
+        return;
+
+    /* Schedule refresh request in a 10 or 0 seconds: */
+    m_pTimer->setInterval(fDelayed ? 10000 : 0);
+    m_pTimer->start();
 }
 
@@ -305 +313 @@
 void UIVirtualMachineItemCloud::sltHandleRefreshCloudMachineInfoDone()
 {
+    /* Was the progress canceled? */
+    const bool fCanceled = m_comProgress.GetCanceled();
+
     /* If not canceled => check progress result: */
-    if (   !m_comProgress.GetCanceled()
-        && (!m_comProgress.isOk() || m_comProgress.GetResultCode() != 0))
-            msgCenter().cannotAcquireCloudMachineParameter(m_comProgress);
+    if (!fCanceled && (!m_comProgress.isOk() || m_comProgress.GetResultCode() != 0))
+        msgCenter().cannotAcquireCloudMachineParameter(m_comProgress);
 
     /* Recache: */
     recache();
 
-    /* If not canceled => notify listeners: */
-    if (!m_comProgress.GetCanceled())
-        emit sigStateChange();
-
     /* Cleanup the handler and the progress: */
     delete m_pProgressHandler;
-    m_pProgressHandler = 0;
     m_comProgress = CProgress();
-}
+
+    /* If not canceled => notify listeners: */
+    if (!fCanceled)
+        emit sigStateChange();
+}
+
+void UIVirtualMachineItemCloud::prepare()
+{
+    /* Prepare timer: */
+    m_pTimer = new QTimer(this);
+    if (m_pTimer)
+    {
+        m_pTimer->setSingleShot(true);
+        connect(m_pTimer, &QTimer::timeout,
+                this, &UIVirtualMachineItemCloud::sltRefreshCloudMachineInfo);
+    }
+
+    /* Recache finally: */
+    recache();
+}
+
+void UIVirtualMachineItemCloud::cleanup()
+{
+    /* Cleanup timer: */
+    delete m_pTimer;
+    m_pTimer = 0;
+}

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

@@ -34 +34 @@
 
 /* Forward declarations: */
+class QTimer;
 class UIProgress;
 
@@ -133 +134 @@
 private:
 
+    /** @name Prepare/Cleanup cascade.
+      * @{ */
+        /** Prepares all. */
+        void prepare();
+        /** Cleanups all. */
+        void cleanup();
+    /** @} */
+
     /** @name Arguments.
       * @{ */
@@ -149 +158 @@
         QString                             m_strFakeCloudItemErrorMessage;
 
+        /** Holds the machine refresh timer instance. */
+        QTimer               *m_pTimer;
         /** Holds the machine refresh progress object instance. */
         CProgress             m_comProgress;