Changeset 86077 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 9, 2020 4:03:14 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Handle couple of new events related to cloud provider (uninstall and list_changed); This should allow to uninstall extension pack when provider's VMs shown.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (2 diffs)
• globals/UIMainEventListener.h (modified) (1 diff)
• globals/UIVirtualBoxEventHandler.cpp (modified) (4 diffs)
• globals/UIVirtualBoxEventHandler.h (modified) (1 diff)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (4 diffs)
• manager/chooser/UIChooserAbstractModel.h (modified) (1 diff)

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

@@ -29 +29 @@
 #include "CCanShowWindowEvent.h"
 #include "CClipboardModeChangedEvent.h"
+#include "CCloudProviderListChangedEvent.h"
+#include "CCloudProviderUninstallEvent.h"
 #include "CCursorPositionChangedEvent.h"
 #include "CDnDModeChangedEvent.h"
@@ -287 +289 @@
             break;
         }
+        case KVBoxEventType_OnCloudProviderListChanged:
+        {
+            emit sigCloudProviderListChanged();
+            break;
+        }
+        case KVBoxEventType_OnCloudProviderUninstall:
+        {
+            CCloudProviderUninstallEvent comEventSpecific(pEvent);
+            emit sigCloudProviderUninstall(comEventSpecific.GetId());
+            break;
+        }
 
         case KVBoxEventType_OnExtraDataCanChange:

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

@@ -96 +96 @@
         /** Notifies about snapshot with @a uSnapshotId was restored for the machine with @a uId. */
         void sigSnapshotRestore(const QUuid &uId, const QUuid &uSnapshotId);
+        /** Notifies about request to uninstall cloud provider with @a uId. */
+        void sigCloudProviderUninstall(const QUuid &uId);
+        /** Notifies about cloud provider list changed. */
+        void sigCloudProviderListChanged();
     /** @} */
 

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

@@ -56 +56 @@
     /** Notifies about snapshot with @a uSnapshotId was restored for the machine with @a uId. */
     void sigSnapshotRestore(const QUuid &uId, const QUuid &uSnapshotId);
+    /** Notifies about request to uninstall cloud provider with @a uId. */
+    void sigCloudProviderUninstall(const QUuid &uId);
+    /** Notifies about cloud provider list changed. */
+    void sigCloudProviderListChanged();
 
     /** Notifies about storage controller change.
@@ -178 +182 @@
         << KVBoxEventType_OnSnapshotChanged
         << KVBoxEventType_OnSnapshotRestored
+        << KVBoxEventType_OnCloudProviderListChanged
+        << KVBoxEventType_OnCloudProviderUninstall
         << KVBoxEventType_OnStorageControllerChanged
         << KVBoxEventType_OnStorageDeviceChanged
@@ -228 +234 @@
             this, SIGNAL(sigSnapshotRestore(QUuid, QUuid)),
             Qt::DirectConnection);
+    connect(m_pQtListener->getWrapped(), SIGNAL(sigCloudProviderListChanged()),
+            this, SIGNAL(sigCloudProviderListChanged()),
+            Qt::DirectConnection);
+    connect(m_pQtListener->getWrapped(), SIGNAL(sigCloudProviderUninstall(QUuid)),
+            this, SIGNAL(sigCloudProviderUninstall(QUuid)),
+            Qt::DirectConnection);
     connect(m_pQtListener->getWrapped(), SIGNAL(sigStorageControllerChange(QUuid, QString)),
             this, SIGNAL(sigStorageControllerChange(QUuid, QString)),
@@ -341 +353 @@
             this, SIGNAL(sigSnapshotRestore(QUuid, QUuid)),
             Qt::QueuedConnection);
+    connect(m_pProxy, SIGNAL(sigCloudProviderListChanged()),
+            this, SIGNAL(sigCloudProviderListChanged()),
+            Qt::QueuedConnection);
+    connect(m_pProxy, SIGNAL(sigCloudProviderUninstall(QUuid)),
+            this, SIGNAL(sigCloudProviderUninstall(QUuid)),
+            Qt::BlockingQueuedConnection);
     connect(m_pProxy, SIGNAL(sigStorageControllerChange(QUuid, QString)),
             this, SIGNAL(sigStorageControllerChange(QUuid, QString)),

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

@@ -63 +63 @@
     /** Notifies about snapshot with @a uSnapshotId was restored for the machine with @a uId. */
     void sigSnapshotRestore(const QUuid &uId, const QUuid &uSnapshotId);
+    /** Notifies about request to uninstall cloud provider with @a uId. */
+    void sigCloudProviderUninstall(const QUuid &uId);
+    /** Notifies about cloud provider list changed. */
+    void sigCloudProviderListChanged();
 
     /** Notifies about storage controller change.

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

@@ -687 +687 @@
     /* Update machine-nodes with passed id: */
     invisibleRoot()->updateAllNodes(uMachineId);
+}
+
+void UIChooserAbstractModel::sltHandleCloudProviderListChanged()
+{
+    /* Reload cloud tree: */
+    reloadCloudTree();
+}
+
+void UIChooserAbstractModel::sltHandleCloudProviderUninstall(const QUuid &uId)
+{
+    /* Search for top-level provider node: */
+    foreach (UIChooserNode *pNode, m_pInvisibleRootNode->nodes(UIChooserNodeType_Group))
+    {
+        /* Skip unrelated nodes: */
+        AssertPtrReturnVoid(pNode);
+        UIChooserNodeGroup *pGroupNode = pNode->toGroupNode();
+        AssertPtrReturnVoid(pGroupNode);
+        if (pGroupNode->groupType() != UIChooserNodeGroupType_Provider)
+            continue;
+        const QUuid uIteratedId = pGroupNode->property("id").toUuid();
+        AssertReturnVoid(!uIteratedId.isNull());
+        if (uIteratedId != uId)
+            continue;
+
+        /* Remove found provider node: */
+        delete pNode;
+    }
 }
 
@@ -798 +825 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigSnapshotRestore,
             this, &UIChooserAbstractModel::sltSnapshotChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProviderListChanged,
+            this, &UIChooserAbstractModel::sltHandleCloudProviderListChanged);
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProviderUninstall,
+            this, &UIChooserAbstractModel::sltHandleCloudProviderUninstall);
 
     /* Setup group saving connections: */
@@ -879 +910 @@
         /* Skip if we have nothing to populate: */
         if (comCloudProvider.isNull())
+            continue;
+
+        /* Acquire provider id: */
+        QUuid uProviderId;
+        if (!cloudProviderId(comCloudProvider, uProviderId))
             continue;
 
@@ -907 +943 @@
                                    strProviderShortName,
                                    UIChooserNodeGroupType_Provider);
+        pProviderNode->setProperty("id", uProviderId);
 
         /* Iterate through provider's profiles: */

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

@@ -154 +154 @@
         /** Handles snapshot change for machine/snapshot with certain @a uMachineId / @a uSnapshotId. */
         virtual void sltSnapshotChanged(const QUuid &uMachineId, const QUuid &uSnapshotId);
+        /** Handles event about cloud provider list changed. */
+        virtual void sltHandleCloudProviderListChanged();
+        /** Handles event about cloud provider with @a uId being uninstalled. */
+        virtual void sltHandleCloudProviderUninstall(const QUuid &uId);
     /** @} */