Changeset 39238 in vbox

Timestamp:

Nov 8, 2011 1:12:09 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5804: Allow one operation on several VMs: Using '1st item of selection' instead of 'current item' for VM selector action handling purposes (because Qt handles 'current item' in very specific way).

Location:

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

Files:

• UIVMListView.cpp (modified) (2 diffs)
• UIVMListView.h (modified) (1 diff)

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

@@ -421 +421 @@
 UIVMItem *UIVMListView::currentItem() const
 {
-    return model()->data(currentIndex(), UIVMItemModel::UIVMItemPtrRole).value<UIVMItem*>();
+    /* Get current selection: */
+    QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
+    /* Return 1st of selected items or NULL if nothing selected: */
+    return selectedIndexes.isEmpty() ? 0 :
+           model()->data(selectedIndexes[0], UIVMItemModel::UIVMItemPtrRole).value<UIVMItem*>();
 }
 
 QList<UIVMItem*> UIVMListView::currentItems() const
 {
+    /* Prepare selected item list: */
     QList<UIVMItem*> currentItems;
-    for (int i = 0; i < selectionModel()->selectedIndexes().size(); ++i)
-        currentItems << model()->data(selectionModel()->selectedIndexes()[i], UIVMItemModel::UIVMItemPtrRole).value<UIVMItem*>();
+    /* Get current selection: */
+    QModelIndexList selectedIndexes = selectionModel()->selectedIndexes();
+    /* For every item of the selection => add it into the selected item list: */
+    for (int i = 0; i < selectedIndexes.size(); ++i)
+        currentItems << model()->data(selectedIndexes[i], UIVMItemModel::UIVMItemPtrRole).value<UIVMItem*>();
+    /* Return selected item list: */
     return currentItems;
 }
@@ -442 +451 @@
     QListView::selectionChanged(aSelected, aDeselected);
 
-    /* If selection still contains previous 'current index' =>
-     * make it the new 'current index': */
-    if (selectionModel()->selection().contains(m_previousCurrentIndex))
-        selectionModel()->setCurrentIndex(m_previousCurrentIndex, QItemSelectionModel::NoUpdate);
-    /* If selection do NOT contains previous 'current item' but contains at least something =>
-     * set first of the selected items as the new 'current item': */
-    else if (!selectionModel()->selectedIndexes().isEmpty())
-        selectionModel()->setCurrentIndex(selectionModel()->selectedIndexes()[0], QItemSelectionModel::NoUpdate);
-    /* If selection do NOT contains anything at all (is empty) =>
-     * select current index: */
-    else
+    /* If selection is empty => select 'current item': */
+    if (selectionModel()->selectedIndexes().isEmpty())
         selectionModel()->select(currentIndex(), QItemSelectionModel::SelectCurrent);
-
-    /* Remember the current item: */
-    m_previousCurrentIndex = currentIndex();
 
     /* Ensure current index is visible: */

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

@@ -127 +127 @@
 private:
     bool m_fItemInMove;
-    QModelIndex m_previousCurrentIndex;
 };