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

Timestamp:

May 27, 2020 2:41:06 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: When unregistering some VM we should choose non-selected item only when unregistration event came, not instantly when user commanded to remove VM; First of all, this is required to handle removal initiated from other side, like VBoxManage; Besides that, there is a significant pause in-between otherwise.

Location:

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

Files:

• UIChooserModel.cpp (modified) (5 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -437 +437 @@
 }
 
+void UIChooserModel::makeSureNoItemWithCertainIdIsSelected(const QUuid &uId)
+{
+    /* Look for all nodes with passed uId: */
+    QList<UIChooserNode*> matchedNodes;
+    invisibleRoot()->searchForNodes(uId.toString(),
+                                    UIChooserItemSearchFlag_Machine |
+                                    UIChooserItemSearchFlag_ExactId,
+                                    matchedNodes);
+
+    /* Compose a set of items with passed uId: */
+    QSet<UIChooserItem*> matchedItems;
+    foreach (UIChooserNode *pNode, matchedNodes)
+        if (pNode && pNode->item())
+            matchedItems << pNode->item();
+
+    /* If we have at least one of those items currently selected: */
+    if (selectedItems().toSet().intersects(matchedItems))
+        setSelectedItem(findClosestUnselectedItem());
+}
+
 void UIChooserModel::setCurrentItem(UIChooserItem *pItem)
 {
@@ -1049 +1069 @@
 void UIChooserModel::sltLocalMachineRegistered(const QUuid &uId, const bool fRegistered)
 {
+    /* Make sure no item with passed uId is selected: */
+    if (!fRegistered)
+        makeSureNoItemWithCertainIdIsSelected(uId);
+
     /* Call to base-class: */
     UIChooserAbstractModel::sltLocalMachineRegistered(uId, fRegistered);
@@ -1078 +1102 @@
                                                const QUuid &uId, const bool fRegistered)
 {
+    /* Make sure no item with passed uId is selected: */
+    if (!fRegistered)
+        makeSureNoItemWithCertainIdIsSelected(uId);
+
     /* Call to base-class: */
     UIChooserAbstractModel::sltCloudMachineRegistered(strProviderName, strProfileName, uId, fRegistered);
@@ -1598 +1626 @@
         return;
 
-    /* Change selection to some close by item: */
-    setSelectedItem(findClosestUnselectedItem());
-
     /* For every selected machine: */
     foreach (CMachine comMachine, machines)
@@ -1653 +1678 @@
     if (iResultCode == AlertButton_Cancel)
         return;
-
-    /* Change selection to some close by item: */
-    setSelectedItem(findClosestUnselectedItem());
 
     /* For every selected machine: */

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

@@ -180 +180 @@
         /** Finds closest non-selected-item. */
         UIChooserItem *findClosestUnselectedItem() const;
+        /** Makes sure selection doesn't contain item with certain @a uId. */
+        void makeSureNoItemWithCertainIdIsSelected(const QUuid &uId);
 
         /** Defines current @a pItem. */