Changeset 84546 in vbox

Timestamp:

May 26, 2020 4:18:54 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138276

Message:

FE/Qt: bugref:9743: VirtualBox Manager: Chooser pane: Moving items to another group should be followed by selection of moved items if possible, or at least one of parents of the group they were moved to.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp (modified) (4 diffs)

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

@@ -769 +769 @@
     QStringList busyGroupNames;
     QStringList busyMachineNames;
+    QList<UIChooserItem*> copiedItems;
     foreach (UIChooserItem *pItem, selectedItems())
     {
@@ -785 +786 @@
                                                                               pItem->node()->toGroupNode(),
                                                                               pTargetGroupNode->nodes().size());
-                new UIChooserItemGroup(pTargetGroupItem, pNewGroupSubNode);
+                copiedItems << new UIChooserItemGroup(pTargetGroupItem, pNewGroupSubNode);
                 delete pItem->node();
                 break;
@@ -800 +801 @@
                                                                                     pItem->node()->toMachineNode(),
                                                                                     pTargetGroupNode->nodes().size());
-                new UIChooserItemMachine(pTargetGroupItem, pNewMachineSubNode);
+                copiedItems << new UIChooserItemMachine(pTargetGroupItem, pNewMachineSubNode);
                 delete pItem->node();
                 break;
@@ -810 +811 @@
     wipeOutEmptyGroups();
     updateTreeForMainRoot();
-    setSelectedItem(pTargetGroupItem);
+
+    /* Check if we can select copied items: */
+    QList<UIChooserItem*> itemsToSelect;
+    foreach (UIChooserItem *pCopiedItem, copiedItems)
+        if (navigationItems().contains(pCopiedItem))
+            itemsToSelect << pCopiedItem;
+    if (!itemsToSelect.isEmpty())
+    {
+        setSelectedItems(itemsToSelect);
+        setCurrentItem(firstSelectedItem());
+    }
+    else
+    {
+        /* Otherwise check if we can select one of our parents: */
+        UIChooserItem *pItemToSelect = pTargetGroupItem;
+        while (   !navigationItems().contains(pItemToSelect)
+               && pItemToSelect->parentItem() != root())
+            pItemToSelect = pItemToSelect->parentItem();
+        if (navigationItems().contains(pItemToSelect))
+            setSelectedItem(pItemToSelect);
+    }
+
+    /* Save groups finally: */
     saveGroups();
 }