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

Timestamp:

Feb 21, 2012 12:48:56 PM (13 years ago)

Author:

vboxsync

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

76361

Message:

FE/Qt: VM Selector: More predictable VM-list behavior on removing VM-items from VM-list.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (1 diff)
• UIVMListView.cpp (modified) (1 diff)
• UIVMListView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1037 +1037 @@
             int iRow = m_pVMModel->rowById(pItem->id());
             m_pVMModel->removeItem(pItem);
-            m_pVMListView->ensureSomeRowSelected(iRow);
+            m_pVMListView->ensureOneRowSelected(iRow);
         }
         /* item = 0 is ok (if we originated this event then the item

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.cpp

@@ -406 +406 @@
 }
 
-void UIVMListView::ensureSomeRowSelected(int aRowHint)
-{
-    UIVMItem *item = currentItem();
-    if (!item)
-    {
-        aRowHint = qBound(0, aRowHint, model()->rowCount() - 1);
-        selectItemByRow(aRowHint);
-        item = currentItem();
-        if (!item)
-            selectItemByRow(0);
+void UIVMListView::ensureOneRowSelected(int aRowHint)
+{
+    /* Calculate nearest index row: */
+    aRowHint = qBound(0, aRowHint, model()->rowCount() - 1);
+
+    /* Get current selection: */
+    QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
+
+    /* If there are less/more selected items than necessary
+     * or other than hinted row is selected: */
+    if (selectedIndexes.size() != 1 || selectedIndexes[0].row() != aRowHint)
+    {
+        /* Make sure that only necessary item is selected: */
+        setCurrentIndex(model()->index(aRowHint, 0));
+        selectionModel()->select(currentIndex(), QItemSelectionModel::Current | QItemSelectionModel::ClearAndSelect);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h

@@ -98 +98 @@
     void selectItemByRow(int row);
     void selectItemById(const QString &aID);
-    void ensureSomeRowSelected(int aRowHint);
+    void ensureOneRowSelected(int aRowHint);
     UIVMItem* currentItem() const;
     QList<UIVMItem*> currentItems() const;