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

Timestamp:

Oct 28, 2020 11:43:13 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Distinguish cloud profile update from cloud machine update in model registry.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)
• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• chooser/UIChooserAbstractModel.h (modified) (1 diff)

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

@@ -2383 +2383 @@
 }
 
-bool UIVirtualBoxManager::isCloudUpdateInProgress() const
-{
-    return m_pWidget->isCloudUpdateInProgress();
+bool UIVirtualBoxManager::isCloudProfileUpdateInProgress() const
+{
+    return m_pWidget->isCloudProfileUpdateInProgress();
 }
 
@@ -3186 +3186 @@
         {
             return !isGroupSavingInProgress() &&
-                   (isItemsLocal(items) || !isCloudUpdateInProgress()) &&
+                   (isItemsLocal(items) || !isCloudProfileUpdateInProgress()) &&
                    isAtLeastOneItemRemovable(items);
         }

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

@@ -360 +360 @@
         bool isSingleCloudProfileGroupSelected() const;
 
-        /** Returns whether cloud update is in progress. */
-        bool isCloudUpdateInProgress() const;
+        /** Returns whether at least one cloud profile currently being updated. */
+        bool isCloudProfileUpdateInProgress() const;
     /** @} */
 

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

@@ -117 +117 @@
 }
 
-bool UIVirtualBoxManagerWidget::isCloudUpdateInProgress() const
-{
-    return m_pPaneChooser->isCloudUpdateInProgress();
+bool UIVirtualBoxManagerWidget::isCloudProfileUpdateInProgress() const
+{
+    return m_pPaneChooser->isCloudProfileUpdateInProgress();
 }
 

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

@@ -141 +141 @@
         /** Returns whether group saving is in progress. */
         bool isGroupSavingInProgress() const;
-        /** Returns whether cloud update is in progress. */
-        bool isCloudUpdateInProgress() const;
+        /** Returns whether at least one cloud profile currently being updated. */
+        bool isCloudProfileUpdateInProgress() const;
 
         /** Opens group name editor. */

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

@@ -46 +46 @@
 }
 
-bool UIChooser::isCloudUpdateInProgress() const
-{
-    AssertPtrReturn(model(), false);
-    return model()->isCloudUpdateInProgress();
+bool UIChooser::isCloudProfileUpdateInProgress() const
+{
+    AssertPtrReturn(model(), false);
+    return model()->isCloudProfileUpdateInProgress();
 }
 

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

@@ -113 +113 @@
     /** @name Cloud update stuff.
       * @{ */
-        /** Returns whether cloud update is in progress. */
-        bool isCloudUpdateInProgress() const;
+        /** Returns whether at least one cloud profile currently being updated. */
+        bool isCloudProfileUpdateInProgress() const;
     /** @} */
 

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

@@ -646 +646 @@
 }
 
-bool UIChooserAbstractModel::isCloudUpdateInProgress() const
-{
-    return !m_cloudEntityKeysBeingUpdated.isEmpty();
+bool UIChooserAbstractModel::isCloudProfileUpdateInProgress() const
+{
+    /* Compose RE for profile: */
+    QRegExp re("^/[^/]+/[^/]+$");
+    /* Check whether keys match profile RE: */
+    foreach (const UICloudEntityKey &key, m_cloudEntityKeysBeingUpdated)
+    {
+        const int iIndex = re.indexIn(key.toString());
+        if (iIndex != -1)
+            return true;
+    }
+    /* False by default: */
+    return false;
 }
 

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

@@ -171 +171 @@
         /** Returns whether cloud entity @a key is a part of key set currently being updated. */
         bool containsCloudEntityKey(const UICloudEntityKey &key) const;
-        /** Returns whether at least one cloud entity update is in progress. */
-        bool isCloudUpdateInProgress() const;
+
+        /** Returns whether at least one cloud profile currently being updated. */
+        bool isCloudProfileUpdateInProgress() const;
     /** @} */