Changeset 83896 in vbox for trunk

Timestamp:

Apr 21, 2020 3:16:32 PM (5 years ago)

Author:

vboxsync

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

137428

Message:

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

Location:

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

Files:

• UIChooserHandlerMouse.cpp (modified) (1 diff)
• UIChooserModel.cpp (modified) (6 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -136 +136 @@
                         /* Make clicked item current one: */
                         model()->setCurrentItem(pClickedItem);
-                        model()->makeSureSomeItemIsSelected();
                     }
                     /* Was no modifiers pressed? */

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

@@ -184 +184 @@
     }
 
+    /* Make sure selection list is never empty if current-item present: */
+    if (m_selectedItems.isEmpty() && currentItem() && navigationItems().contains(currentItem()))
+        m_selectedItems << currentItem();
+
     /* Is there something really changed? */
     if (oldCurrentItems == m_selectedItems)
@@ -240 +244 @@
     else if (strItemType == "m")
     {
-        /* Check if machine-item with passed descriptor (name or id) registered: */
-        CMachine comMachine = uiCommon().virtualBox().FindMachine(strItemDescriptor);
-        if (!comMachine.isNull())
-        {
-            /* Search for machine-item with required name: */
-            pItem = root()->searchForItem(comMachine.GetName(),
-                                          UIChooserItemSearchFlag_Machine |
-                                          UIChooserItemSearchFlag_ExactName);
-        }
+        /* Search for machine-item with required ID: */
+        pItem = root()->searchForItem(strItemDescriptor,
+                                      UIChooserItemSearchFlag_Machine |
+                                      UIChooserItemSearchFlag_ExactId);
     }
 
@@ -267 +266 @@
 void UIChooserModel::addToSelectedItems(UIChooserItem *pItem)
 {
+    /* Prepare updated list: */
+    QList<UIChooserItem*> list(selectedItems());
+    list << pItem;
     /* Call for wrapper above: */
-    setSelectedItems(QList<UIChooserItem*>(m_selectedItems) << pItem);
+    setSelectedItems(list);
 }
 
 void UIChooserModel::removeFromSelectedItems(UIChooserItem *pItem)
 {
-    /* Prepare filtered list: */
-    QList<UIChooserItem*> list(m_selectedItems);
+    /* Prepare updated list: */
+    QList<UIChooserItem*> list(selectedItems());
     list.removeAll(pItem);
     /* Call for wrapper above: */
@@ -283 +285 @@
 {
     /* Return first of selected-items, if any: */
-    return selectedItems().isEmpty() ? 0 : selectedItems().first();
+    return selectedItems().value(0);
 }
 
@@ -408 +410 @@
 }
 
-void UIChooserModel::makeSureSomeItemIsSelected()
-{
-    /* Make sure selection list is never empty if at
-     * least one item (for example 'current') present: */
-    if (!firstSelectedItem() && currentItem())
-        setSelectedItem(currentItem());
-}
-
 void UIChooserModel::setCurrentItem(UIChooserItem *pItem)
 {
@@ -442 +436 @@
         if (view()->window()->isVisible() && pItem)
             root()->toGroupItem()->makeSureItemIsVisible(pItem);
+
+    /* Make sure selection list is never empty if current-item present: */
+    if (!firstSelectedItem() && m_pCurrentItem)
+        setSelectedItem(m_pCurrentItem);
 }
 

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

@@ -167 +167 @@
         /** Finds closest non-selected-item. */
         UIChooserItem *findClosestUnselectedItem() const;
-
-        /** Makes sure some item is selected. */
-        void makeSureSomeItemIsSelected();
 
         /** Defines current @a pItem. */