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

Timestamp:

Oct 28, 2020 7:14:47 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Cloud VM is now notifying model about updates as well; This process is unified with cloud profile update registry.

Location:

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

Files:

• UIVirtualMachineItemCloud.cpp (modified) (2 diffs)
• UIVirtualMachineItemCloud.h (modified) (1 diff)
• chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• chooser/UIChooserAbstractModel.h (modified) (1 diff)
• chooser/UIChooserNodeMachine.cpp (modified) (1 diff)

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

@@ -306 +306 @@
         m_pProgressHandler = new UIProgress(m_comProgress, this);
         if (m_pProgressHandler)
+        {
             connect(m_pProgressHandler.data(), &UIProgress::sigProgressEventHandlingFinished,
                     this, &UIVirtualMachineItemCloud::sltHandleRefreshCloudMachineInfoDone);
+            emit sigRefreshStarted();
+        }
     }
 }
@@ -329 +332 @@
     /* If not canceled => notify listeners: */
     if (!fCanceled)
-        emit sigStateChange();
+        emit sigRefreshFinished();
 }
 

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

@@ -44 +44 @@
 signals:
 
-    /** Notifies listeners about state change. */
-    void sigStateChange();
+    /** Notifies listeners about refresh started. */
+    void sigRefreshStarted();
+    /** Notifies listeners about refresh finished. */
+    void sigRefreshFinished();
 
 public:

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

@@ -662 +662 @@
 }
 
-void UIChooserAbstractModel::sltHandleCloudMachineStateChange()
-{
+void UIChooserAbstractModel::sltHandleCloudMachineRefreshStarted()
+{
+    /* Acquire sender: */
     UIVirtualMachineItem *pCache = qobject_cast<UIVirtualMachineItem*>(sender());
     AssertPtrReturnVoid(pCache);
-    emit sigCloudMachineStateChange(pCache->id());
+
+    /* Acquire sender's ID: */
+    const QUuid uId = pCache->id();
+
+    /* Search for a first machine node with passed ID: */
+    UIChooserNode *pMachineNode = searchMachineNode(invisibleRoot(), uId);
+
+    /* Insert cloud entity key into a list of keys currently being updated: */
+    const UICloudEntityKey cloudEntityKey = UICloudEntityKey(pMachineNode->parentNode()->parentNode()->name(),
+                                                             pMachineNode->parentNode()->name(),
+                                                             pMachineNode->toMachineNode()->id());
+    insertCloudEntityKey(cloudEntityKey);
+}
+
+void UIChooserAbstractModel::sltHandleCloudMachineRefreshFinished()
+{
+    /* Acquire sender: */
+    UIVirtualMachineItem *pCache = qobject_cast<UIVirtualMachineItem*>(sender());
+    AssertPtrReturnVoid(pCache);
+
+    /* Acquire sender's ID: */
+    const QUuid uId = pCache->id();
+
+    /* Search for a first machine node with passed ID: */
+    UIChooserNode *pMachineNode = searchMachineNode(invisibleRoot(), uId);
+
+    /* Remove cloud entity key from the list of keys currently being updated: */
+    const UICloudEntityKey cloudEntityKey = UICloudEntityKey(pMachineNode->parentNode()->parentNode()->name(),
+                                                             pMachineNode->parentNode()->name(),
+                                                             pMachineNode->toMachineNode()->id());
+    removeCloudEntityKey(cloudEntityKey);
+
+    /* Notify listeners: */
+    emit sigCloudMachineStateChange(uId);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h

@@ -180 +180 @@
     /** @name Cloud machine stuff.
       * @{ */
-        /** Handles cloud machine state change. */
-        void sltHandleCloudMachineStateChange();
+        /** Handles cloud machine refresh started. */
+        void sltHandleCloudMachineRefreshStarted();
+        /** Handles cloud machine refresh finished. */
+        void sltHandleCloudMachineRefreshFinished();
     /** @} */
 

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

@@ -48 +48 @@
 
     /* Cloud VM item can notify machine node only directly (no console), we have to setup listener: */
-    connect(static_cast<UIVirtualMachineItemCloud*>(m_pCache), &UIVirtualMachineItemCloud::sigStateChange,
+    connect(static_cast<UIVirtualMachineItemCloud*>(m_pCache), &UIVirtualMachineItemCloud::sigRefreshFinished,
             this, &UIChooserNodeMachine::sltHandleStateChange);
-    connect(static_cast<UIVirtualMachineItemCloud*>(m_pCache), &UIVirtualMachineItemCloud::sigStateChange,
-            static_cast<UIChooserAbstractModel*>(model()), &UIChooserAbstractModel::sltHandleCloudMachineStateChange);
+    connect(static_cast<UIVirtualMachineItemCloud*>(m_pCache), &UIVirtualMachineItemCloud::sigRefreshStarted,
+            static_cast<UIChooserAbstractModel*>(model()), &UIChooserAbstractModel::sltHandleCloudMachineRefreshStarted);
+    connect(static_cast<UIVirtualMachineItemCloud*>(m_pCache), &UIVirtualMachineItemCloud::sigRefreshFinished,
+            static_cast<UIChooserAbstractModel*>(model()), &UIChooserAbstractModel::sltHandleCloudMachineRefreshFinished);
 
     /* Apply language settings: */