Changeset 102838 in vbox for trunk

Timestamp:

Jan 11, 2024 12:27:44 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: VBox Manager: Make sure all cloud VMs are unconditionally updated when Activity Overview Global tool is selected.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (4 diffs)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)
• UIVirtualMachineItemCloud.cpp (modified) (5 diffs)
• UIVirtualMachineItemCloud.h (modified) (2 diffs)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserAbstractModel.cpp (modified) (3 diffs)
• chooser/UIChooserAbstractModel.h (modified) (2 diffs)

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

@@ -257 +257 @@
     /* Update toolbar: */
     updateToolbar();
+
+    /* Handle current tool type change: */
+    handleCurrentToolTypeChange(enmType);
 }
 
@@ -269 +272 @@
     /* Update toolbar: */
     updateToolbar();
+
+    /* Handle current tool type change: */
+    handleCurrentToolTypeChange(enmType);
 }
 
@@ -488 +494 @@
         case SlidingDirection_Forward:
         {
+            /* Switch stacked widget to machine tool pane: */
             m_pStackedWidget->setCurrentWidget(m_pPaneToolsMachine);
             m_pPaneToolsGlobal->setActive(false);
             m_pPaneToolsMachine->setActive(true);
+            /* Handle current tool type change: */
+            handleCurrentToolTypeChange(m_pMenuToolsMachine->toolsType());
             break;
         }
         case SlidingDirection_Reverse:
         {
+            /* Switch stacked widget to global tool pane: */
             m_pStackedWidget->setCurrentWidget(m_pPaneToolsGlobal);
             m_pPaneToolsMachine->setActive(false);
             m_pPaneToolsGlobal->setActive(true);
+            /* Handle current tool type change: */
+            handleCurrentToolTypeChange(m_pMenuToolsGlobal->toolsType());
             break;
         }
@@ -1159 +1171 @@
         m_pPaneToolsMachine->closeTool(enmRestrictedType);
 }
+
+void UIVirtualBoxManagerWidget::handleCurrentToolTypeChange(UIToolType enmType)
+{
+    /* This method's behavior depends first of all of currently selected tool class.
+     * But keep in mind, it is called for both Global and Machine type changes. */
+
+    /* If Global tools currently chosen: */
+    if (m_pStackedWidget->currentWidget() == m_pPaneToolsGlobal)
+    {
+        /* For the Global tool type changes,
+         * start unconditionally updating all cloud VMs,
+         * if Activity Overview tool currently chosen (even if VMs are not selected): */
+        if (UIToolStuff::isTypeOfClass(enmType, UIToolClass_Global))
+            m_pPaneChooser->setKeepCloudNodesUpdated(enmType == UIToolType_VMActivityOverview);
+    }
+    /* If Machine tools currently chosen: */
+    else
+    {
+        /* Stop unconditionally updating all cloud VMs,
+         * (tho they will still be updated if selected): */
+        m_pPaneChooser->setKeepCloudNodesUpdated(false);
+    }
+}

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

@@ -374 +374 @@
         /** Updates Machine tools menu for @a pItem specified. */
         void updateToolsMenuMachine(UIVirtualMachineItem *pItem);
+
+        /** Handles current tool @a enmType change. */
+        void handleCurrentToolTypeChange(UIToolType enmType);
     /** @} */
 

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

@@ -114 +114 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(enmState)
+    , m_fUpdateRequiredByGlobalReason(false)
     , m_fUpdateRequiredByLocalReason(false)
     , m_pProgressTaskRefresh(0)
@@ -125 +126 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
     , m_enmFakeCloudItemState(UIFakeCloudVirtualMachineItemState_NotApplicable)
+    , m_fUpdateRequiredByGlobalReason(false)
     , m_fUpdateRequiredByLocalReason(false)
     , m_pProgressTaskRefresh(0)
@@ -146 +148 @@
     m_strFakeCloudItemErrorMessage = strErrorMessage;
     recache();
+}
+
+void UIVirtualMachineItemCloud::setUpdateRequiredByGlobalReason(bool fRequired)
+{
+    m_fUpdateRequiredByGlobalReason = fRequired;
 }
 
@@ -173 +180 @@
 
     /* Mark update canceled in any case: */
+    m_fUpdateRequiredByGlobalReason = false;
     m_fUpdateRequiredByLocalReason = false;
 
@@ -392 +400 @@
 
     /* Refresh again if required: */
-    if (m_fUpdateRequiredByLocalReason)
+    if (   m_fUpdateRequiredByGlobalReason
+        || m_fUpdateRequiredByLocalReason)
         updateInfoAsync(true /* delayed? */);
 }

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

@@ -84 +84 @@
         QString fakeCloudItemErrorMessage() const { return m_strFakeCloudItemErrorMessage; }
 
+        /** Defines whether update is @a fRequired by global reason. */
+        void setUpdateRequiredByGlobalReason(bool fRequired);
         /** Defines whether update is @a fRequired by local reason. */
         void setUpdateRequiredByLocalReason(bool fRequired);
@@ -165 +167 @@
         QString                             m_strFakeCloudItemErrorMessage;
 
+        /** Holds whether update is required by global reason. */
+        bool            m_fUpdateRequiredByGlobalReason;
         /** Holds whether update is required by local reason. */
         bool            m_fUpdateRequiredByLocalReason;

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

@@ -55 +55 @@
     AssertPtrReturn(model(), false);
     return model()->isGroupSavingInProgress();
+}
+
+void UIChooser::setKeepCloudNodesUpdated(bool fUpdate)
+{
+    AssertPtrReturnVoid(model());
+    return model()->setKeepCloudNodesUpdated(fUpdate);
 }
 

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

@@ -123 +123 @@
     /** @name Cloud update stuff.
       * @{ */
+        /** Defines whether real cloud nodes should be kept updated. */
+        void setKeepCloudNodesUpdated(bool fUpdate);
+
         /** Returns whether at least one cloud profile currently being updated. */
         bool isCloudProfileUpdateInProgress() const;

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

@@ -386 +386 @@
     , m_pParent(pParent)
     , m_pInvisibleRootNode(0)
+    , m_fKeepCloudNodesUpdated(false)
 {
     prepare();
@@ -604 +605 @@
     }
     return QString();
+}
+
+void UIChooserAbstractModel::setKeepCloudNodesUpdated(bool fUpdate)
+{
+    /* Make sure something changed: */
+    if (m_fKeepCloudNodesUpdated == fUpdate)
+        return;
+
+    /* Holds the value: */
+    m_fKeepCloudNodesUpdated = fUpdate;
+
+    /* Search for a list of provider nodes: */
+    QList<UIChooserNode*> providerNodes;
+    invisibleRoot()->searchForNodes(QString(),
+                                    UIChooserItemSearchFlag_CloudProvider,
+                                    providerNodes);
+
+    /* Search for a list of profile nodes: */
+    QList<UIChooserNode*> profileNodes;
+    foreach (UIChooserNode *pProviderNode, providerNodes)
+        pProviderNode->searchForNodes(QString(),
+                                      UIChooserItemSearchFlag_CloudProfile,
+                                      profileNodes);
+
+    /* Search for a list of machine nodes: */
+    QList<UIChooserNode*> machineNodes;
+    foreach (UIChooserNode *pProfileNode, profileNodes)
+        pProfileNode->searchForNodes(QString(),
+                                     UIChooserItemSearchFlag_Machine,
+                                     machineNodes);
+
+    /* Update all the real cloud items: */
+    foreach (UIChooserNode *pNode, machineNodes)
+    {
+        AssertReturnVoid(pNode && pNode->type() == UIChooserNodeType_Machine);
+        UIChooserNodeMachine *pMachineNode = pNode->toMachineNode();
+        AssertReturnVoid(pMachineNode);
+        if (pMachineNode->cacheType() != UIVirtualMachineItemType_CloudReal)
+            continue;
+        UIVirtualMachineItemCloud *pCloudMachineItem = pMachineNode->cache()->toCloud();
+        pCloudMachineItem->setUpdateRequiredByGlobalReason(m_fKeepCloudNodesUpdated);
+        if (m_fKeepCloudNodesUpdated)
+            pCloudMachineItem->updateInfoAsync(false /* delayed? */);
+    }
 }
 
@@ -1644 +1689 @@
                                                            comMachine);
     /* Request for async node update if necessary: */
-    if (!comMachine.GetAccessible())
+    if (   m_fKeepCloudNodesUpdated
+        || !comMachine.GetAccessible())
     {
         AssertReturnVoid(pNode && pNode->cacheType() == UIVirtualMachineItemType_CloudReal);
         UIVirtualMachineItemCloud *pCloudMachineItem = pNode->cache()->toCloud();
+        pCloudMachineItem->setUpdateRequiredByGlobalReason(m_fKeepCloudNodesUpdated);
         pCloudMachineItem->updateInfoAsync(false /* delayed? */);
     }

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

@@ -143 +143 @@
     /** @name Cloud update stuff.
       * @{ */
+        /** Defines whether real cloud nodes should be kept updated. */
+        void setKeepCloudNodesUpdated(bool fUpdate);
+
         /** Inserts cloud entity @a key into a set of keys currently being updated. */
         void insertCloudEntityKey(const UICloudEntityKey &key);
@@ -400 +403 @@
     /** @name Cloud update stuff.
       * @{ */
+        /** Holds whether real cloud nodes should be kept updated. */
+        bool  m_fKeepCloudNodesUpdated;
+
         /** Holds the set of cloud entity keys currently being updated. */
         QSet<UICloudEntityKey>  m_cloudEntityKeysBeingUpdated;