Changeset 84624 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 1, 2020 3:12:33 PM (5 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

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

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

@@ -321 +321 @@
 }
 
-void UIChooserModel::makeSureAtLeastOneItemSelected()
-{
-    /* If we have no item selected but at
-     * least one item in the navigation list (global item): */
-    if (!firstSelectedItem() && !navigationItems().isEmpty())
-    {
-        /* We are choosing it, selection became invalidated: */
-        setSelectedItem(navigationItems().first());
-        emit sigSelectionInvalidated();
-    }
-}
-
 bool UIChooserModel::isGroupItemSelected() const
 {
@@ -434 +422 @@
 }
 
-void UIChooserModel::makeSureNoItemWithCertainIdIsSelected(const QUuid &uId)
+void UIChooserModel::makeSureNoItemWithCertainIdSelected(const QUuid &uId)
 {
     /* Look for all nodes with passed uId: */
@@ -453 +441 @@
         setSelectedItem(findClosestUnselectedItem());
 
-    /* If global item was chosen, selection became invalidated: */
+    /* If global item is currently chosen, selection should be invalidated: */
     if (firstSelectedItem()->type() == UIChooserNodeType_Global)
         emit sigSelectionInvalidated();
+}
+
+void UIChooserModel::makeSureAtLeastOneItemSelected()
+{
+    /* If we have no item selected but
+     * at least one in the navigation list (global item): */
+    if (!firstSelectedItem() && !navigationItems().isEmpty())
+    {
+        /* We are choosing it, selection should be invalidated: */
+        setSelectedItem(navigationItems().first());
+        emit sigSelectionInvalidated();
+    }
 }
 
@@ -1072 +1072 @@
 void UIChooserModel::sltLocalMachineRegistered(const QUuid &uId, const bool fRegistered)
 {
-    /* Make sure no item with passed uId is selected: */
+    /* Existing VM unregistered => make sure no item with passed uId is selected: */
     if (!fRegistered)
-        makeSureNoItemWithCertainIdIsSelected(uId);
+        makeSureNoItemWithCertainIdSelected(uId);
 
     /* Call to base-class: */
@@ -1104 +1104 @@
                                                const QUuid &uId, const bool fRegistered)
 {
-    /* Make sure no item with passed uId is selected: */
+    /* Existing VM unregistered => make sure no item with passed uId is selected: */
     if (!fRegistered)
-        makeSureNoItemWithCertainIdIsSelected(uId);
+        makeSureNoItemWithCertainIdSelected(uId);
 
     /* Call to base-class: */

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

@@ -154 +154 @@
         QList<UIVirtualMachineItem*> selectedMachineItems() const;
 
-        /** Makes sure at least one item selected. */
-        void makeSureAtLeastOneItemSelected();
-
         /** Returns whether group item is selected. */
         bool isGroupItemSelected() const;
@@ -179 +176 @@
         UIChooserItem *findClosestUnselectedItem() const;
         /** Makes sure selection doesn't contain item with certain @a uId. */
-        void makeSureNoItemWithCertainIdIsSelected(const QUuid &uId);
+        void makeSureNoItemWithCertainIdSelected(const QUuid &uId);
+        /** Makes sure at least one item selected. */
+        void makeSureAtLeastOneItemSelected();
 
         /** Defines current @a pItem. */