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

Timestamp:

Feb 21, 2012 3:39:22 PM (13 years ago)

Author:

vboxsync

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

76368

Message:

FE/Qt: VM selector: Multi-selection mechanism cleanup.

Location:

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

Files:

• UISelectorWindow.cpp (modified) (5 diffs)
• UIVMListView.cpp (modified) (4 diffs)

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

@@ -273 +273 @@
     /* Show New Machine wizard: */
     UINewVMWzd wizard(this);
-    if (wizard.exec() == QDialog::Accepted)
-    {
-        /* Wait until the list is updated by OnMachineRegistered(): */
-        const CMachine &machine = wizard.machine();
-        QModelIndex index;
-        while(!index.isValid())
-        {
-            qApp->processEvents();
-            index = m_pVMModel->indexById(machine.GetId());
-        }
-        /* Choose newly created item: */
-        m_pVMListView->setCurrentIndex(index);
-    }
+    wizard.exec();
 }
 
@@ -326 +314 @@
                 /* Register that machine: */
                 vbox.RegisterMachine(newMachine);
-                /* Wait until the list is updated by OnMachineRegistered(): */
-                QModelIndex index;
-                while(!index.isValid())
-                {
-                    qApp->processEvents();
-                    index = m_pVMModel->indexById(newMachine.GetId());
-                }
-                /* And choose added item: */
-                m_pVMListView->setCurrentIndex(index);
             }
             else
@@ -1014 +993 @@
 void UISelectorWindow::sltMachineRegistered(QString strMachineId, bool fRegistered)
 {
+    /* Add/remove VM: */
     if (fRegistered)
     {
-        CVirtualBox vbox = vboxGlobal().virtualBox();
-        CMachine m = vbox.FindMachine(strMachineId);
+        CMachine m = vboxGlobal().virtualBox().FindMachine(strMachineId);
         if (!m.isNull())
         {
             m_pVMModel->addItem(m);
-            /* Make sure the description, ... pages are properly updated.
-             * Actually we haven't call the next method, but unfortunately Qt
-             * seems buggy if the new item is on the same position as the
-             * previous one. So go on the safe side and call this by our self. */
-            sltCurrentVMItemChanged();
+            int iRow = m_pVMModel->rowById(strMachineId);
+            m_pVMListView->ensureOneRowSelected(iRow);
         }
         /* m.isNull() is ok (theoretically, the machine could have been
@@ -1035 +1011 @@
         if (pItem)
         {
-            int iRow = m_pVMModel->rowById(pItem->id());
+            int iRow = m_pVMModel->rowById(strMachineId);
             m_pVMModel->removeItem(pItem);
             m_pVMListView->ensureOneRowSelected(iRow);
@@ -1042 +1018 @@
          * has been already removed) */
     }
+    /* Make sure all updated: */
+    sltCurrentVMItemChanged();
 }
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -394 +394 @@
 {
     setCurrentIndex(model()->index(row, 0));
+    selectionModel()->select(currentIndex(), QItemSelectionModel::Current | QItemSelectionModel::ClearAndSelect);
 }
 
@@ -417 +418 @@
      * 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);
-    }
+        selectItemByRow(aRowHint);
 }
 
@@ -458 +455 @@
     /* If selection is empty => select 'current item': */
     if (selectionModel()->selectedIndexes().isEmpty())
-        selectionModel()->select(currentIndex(), QItemSelectionModel::SelectCurrent);
+        selectionModel()->select(currentIndex(), QItemSelectionModel::Current | QItemSelectionModel::ClearAndSelect);
 
     /* Ensure current index is visible: */