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

Timestamp:

Apr 23, 2020 2:37:52 PM (5 years ago)

Author:

vboxsync

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

137503

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: A bit of rework for selection stuff.

Location:

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

Files:

• UIChooserModel.cpp (modified) (8 diffs)
• UIChooserModel.h (modified) (2 diffs)

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

@@ -262 +262 @@
 }
 
+const QList<UIChooserItem*> &UIChooserModel::selectedItems() const
+{
+    return m_selectedItems;
+}
+
 void UIChooserModel::addToSelectedItems(UIChooserItem *pItem)
 {
@@ -284 +289 @@
     /* Return first of selected-items, if any: */
     return selectedItems().value(0);
-}
-
-const QList<UIChooserItem*> &UIChooserModel::selectedItems() const
-{
-    return m_selectedItems;
 }
 
@@ -313 +313 @@
         currentMachineList << pItem->cache();
     return currentMachineList;
+}
+
+void UIChooserModel::makeSureAtLeastOneItemSelected()
+{
+    if (!firstSelectedItem() && !navigationItems().isEmpty())
+    {
+        setSelectedItem(navigationItems().first());
+        emit sigSelectionInvalidated();
+    }
 }
 
@@ -686 +695 @@
     {
         /* Remember first selected item definition: */
-        AssertPtrReturnVoid(firstSelectedItem());
-        const QString strDefinition = firstSelectedItem()->definition();
+        const QString strDefinition = firstSelectedItem() ? firstSelectedItem()->definition() : QString();
 
         /* Rebuild tree for main root: */
         buildTreeForMainRoot();
 
-        /* Restore selected item: */
-        setSelectedItem(strDefinition);
+        /* Restore selection if there was some item before: */
+        if (!strDefinition.isNull())
+            setSelectedItem(strDefinition);
+        /* Else make sure at least one item selected: */
+        else
+            makeSureAtLeastOneItemSelected();
     }
     /* New VM registered? */
@@ -713 +725 @@
     UIChooserAbstractModel::sltReloadMachine(uId);
 
-    /* Show machine if we should: */
+    /* Should we show this VM? */
     if (gEDataManager->showMachineInVirtualBoxManagerChooser(uId))
     {
@@ -720 +732 @@
 
         /* Select newly added item: */
-        CMachine comMachine = uiCommon().virtualBox().FindMachine(uId.toString());
-        setSelectedItem(root()->searchForItem(comMachine.GetName(),
-                                             UIChooserItemSearchFlag_Machine |
-                                             UIChooserItemSearchFlag_ExactName));
-    }
+        setSelectedItem(root()->searchForItem(uId.toString(),
+                                              UIChooserItemSearchFlag_Machine |
+                                              UIChooserItemSearchFlag_ExactId));
+    }
+    /* Else make sure at least one item selected: */
     else
-    {
-        /* Make sure at least one item selected after that: */
-        if (!firstSelectedItem() && !navigationItems().isEmpty())
-        {
-            setSelectedItem(navigationItems().first());
-            emit sigSelectionInvalidated();
-        }
-    }
+        makeSureAtLeastOneItemSelected();
 
     /* Notify listeners about selection change: */
@@ -758 +763 @@
     if (!strDefinition.isNull())
         setSelectedItem(strDefinition);
+    /* Else make sure at least one item selected: */
     else
-    {
-        /* Make sure selected-item present, if possible: */
-        if (!firstSelectedItem() && !navigationItems().isEmpty())
-        {
-            setSelectedItem(navigationItems().first());
-            emit sigSelectionInvalidated();
-        }
-        /* Make sure current-item present, if possible: */
-        else if (!currentItem() && firstSelectedItem())
-            setCurrentItem(firstSelectedItem());
-        /* Notify about selected-item change: */
-        emit sigSelectionChanged();
-    }
+        makeSureAtLeastOneItemSelected();
 }
 #endif /* VBOX_GUI_WITH_CLOUD_VMS */
@@ -1407 +1401 @@
     /* Load last selected-item (choose first if unable to load): */
     setSelectedItem(gEDataManager->selectorWindowLastItemChosen());
-    if (!firstSelectedItem() && !navigationItems().isEmpty())
-    {
-        setSelectedItem(navigationItems().first());
-        emit sigSelectionInvalidated();
-    }
+    makeSureAtLeastOneItemSelected();
 }
 

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

@@ -135 +135 @@
         void clearSelectedItems();
 
+        /** Returns a list of selected-items. */
+        const QList<UIChooserItem*> &selectedItems() const;
+
         /** Adds @a pItem to list of selected. */
         void addToSelectedItems(UIChooserItem *pItem);
@@ -142 +145 @@
         /** Returns first selected-item. */
         UIChooserItem *firstSelectedItem() const;
-        /** Returns a list of selected-items. */
-        const QList<UIChooserItem*> &selectedItems() const;
-
         /** Returns first selected machine item. */
         UIVirtualMachineItem *firstSelectedMachineItem() const;
         /** Returns a list of selected machine items. */
         QList<UIVirtualMachineItem*> selectedMachineItems() const;
+
+        /** Makes sure at least one item selected. */
+        void makeSureAtLeastOneItemSelected();
 
         /** Returns whether group item is selected. */