Changeset 86651 in vbox for trunk/src

Timestamp:

Oct 20, 2020 2:33:08 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Restore full set of selected items if possible while rebuilding the tree.

File:

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

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

@@ -1658 +1658 @@
 void UIChooserModel::buildTreeForMainRoot(bool fPreserveSelection /* = false */)
 {
-    /* Remember first selected item if requested: */
-    QString strSelectedItemDefinition;
-    if (fPreserveSelection && firstSelectedItem())
-        strSelectedItemDefinition = firstSelectedItem()->definition();
+    /* Remember all selected items if requested: */
+    QStringList selectedItemDefinitions;
+    if (fPreserveSelection && !selectedItems().isEmpty())
+        foreach (UIChooserItem *pSelectedItem, selectedItems())
+            selectedItemDefinitions << pSelectedItem->definition();
 
     /* Cleanup previous tree if exists: */
@@ -1677 +1678 @@
     updateTreeForMainRoot();
 
-    /* Restore selection if requested: */
+    /* Restore all selected items if requested: */
     if (fPreserveSelection)
     {
-        setSelectedItem(strSelectedItemDefinition);
+        QList<UIChooserItem*> selectedItems;
+        foreach (const QString &strSelectedItemDefinition, selectedItemDefinitions)
+        {
+            UIChooserItem *pSelectedItem = searchItemByDefinition(strSelectedItemDefinition);
+            if (pSelectedItem)
+                selectedItems << pSelectedItem;
+        }
+        setSelectedItems(selectedItems);
+        setCurrentItem(firstSelectedItem());
         makeSureAtLeastOneItemSelected();
     }