Changeset 43543 in vbox

Timestamp:

Oct 4, 2012 1:38:39 PM (12 years ago)

Author:

vboxsync

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

81146

Message:

FE/Qt: VM group feature UI: Current-item handling cleanup (part 5): Fixing bug with current/focus item handling on machine unregister procedure.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItemMachine.cpp (modified) (1 diff)
• UIGChooserModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -112 +112 @@
     if (model()->focusItem() == this)
     {
-        /* Unset the focus/selection: */
-        model()->setFocusItem(0, true);
-    }
-    /* If that item is NOT focused, but selected: */
-    else if (model()->currentItems().contains(this))
+        /* Unset the focus: */
+        model()->setFocusItem(0);
+    }
+    /* If that item is selected: */
+    if (model()->currentItems().contains(this))
     {
         /* Remove item from the selection list: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -585 +585 @@
         if (!machine.isNull())
         {
-            /* Add new machine item: */
+            /* Add new machine-item: */
             addMachineIntoTheTree(machine, true);
             /* And update model: */
@@ -596 +596 @@
     else
     {
-        /* Remove machine items with passed id: */
+        /* Remove machine-items with passed id: */
         removeMachineItems(strId, mainRoot());
-        /* And update model: */
+        /* Update model: */
         updateGroupTree();
         updateNavigation();
         updateLayout();
-        if (mainRoot()->hasItems())
+        /* Make sure focus-item present, if possible: */
+        if (!focusItem() && currentItem())
+            setFocusItem(currentItem());
+        /* Make sure current-item present, if possible: */
+        if (!currentItem() && !navigationList().isEmpty())
             setCurrentItem(0);
-        else
-            unsetCurrentItem();
+        /* Notify about current-item change: */
+        notifyCurrentItemChanged();
     }
 }
@@ -808 +812 @@
 
     /* And update model: */
-    updateGroupTree();
     updateNavigation();
     updateLayout();
-    if (mainRoot()->hasItems())
-        setCurrentItem(0);
-    else
-        unsetCurrentItem();
+    setCurrentItem(0);
     saveGroupSettings();
 }