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

Timestamp:

Feb 6, 2014 5:05:32 PM (11 years ago)

Author:

vboxsync

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

92095

Message:

FE/Qt: 4397: Medium Manager cleanup/rework (part 8): Reworking some of current-item magic, allowing Qt to do some stuff it should.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumManager.cpp (modified) (11 diffs)
• UIMediumManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -299 +299 @@
 void UIMediumManager::sltHandleMediumDeleted(const QString &strMediumID)
 {
-    /* Get tree/item: */
+    /* Get tree-widget / medium-item: */
     QList<UIMediumType> types;
     types << UIMediumType_HardDisk << UIMediumType_DVD << UIMediumType_Floppy;
-    QTreeWidget *pTree = 0;
+    QTreeWidget *pTreeWidget = 0;
     UIMediumItem *pMediumItem = 0;
     foreach (UIMediumType type, types)
     {
-        pTree = treeWidget(type);
-        pMediumItem = searchItem(pTree, CheckIfSuitableByID(strMediumID));
+        pTreeWidget = treeWidget(type);
+        pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID(strMediumID));
         if (pMediumItem)
             break;
     }
+
+    /* Skip further actions if medium-item was not found: */
     if (!pMediumItem)
         return;
@@ -317 +319 @@
     updateTabIcons(pMediumItem, ItemAction_Removed);
 
-    /* We need to silently delete medium-item without selecting
-     * the new one because of complex selection mechanism
-     * which could provoke a segfault choosing the new
-     * one item during last item deletion routine. So blocking
-     * the tree-view for the time of item removing. */
-    pTree->blockSignals(true);
+    /* Delete medium-item: */
     delete pMediumItem;
-    pTree->blockSignals(false);
-
-    /* Make sure current medium-item is selected: */
-    setCurrentItem(pTree, pTree->currentItem());
+
+    /* Make sure 'current' or at least 'first available' medium-item is currently selected, if any: */
+    setCurrentItem(pTreeWidget, pTreeWidget->currentItem() ? pTreeWidget->currentItem() : pTreeWidget->topLevelItem(0));
 }
 
@@ -582 +578 @@
 }
 
-void UIMediumManager::sltHandleCurrentItemChanged(QTreeWidgetItem *pItem,
-                                                  QTreeWidgetItem *pPrevItem /* = 0 */)
-{
-    /* Get current medium-item: */
+void UIMediumManager::sltHandleCurrentItemChanged(QTreeWidgetItem *pItem)
+{
+    /* If item set => make sure it's of valid type: */
     UIMediumItem *pMediumItem = toMediumItem(pItem);
-
-    /* We have to make sure some medium-item is always selected: */
-    if (!pMediumItem && pPrevItem)
-    {
-        /* If new medium-item is 0, choose the old one again. */
-        UIMediumItem *pPrevMediumItem = toMediumItem(pPrevItem);
-        setCurrentItem(currentTreeWidget(), pPrevMediumItem);
-    }
-
-    /* If item is set: */
+    AssertReturnVoid(!pItem || pMediumItem);
+
+    /* If medium-item set: */
     if (pMediumItem)
     {
@@ -621 +609 @@
 void UIMediumManager::sltHandleContextMenuCall(const QPoint &position)
 {
-    /* Get corresponding widget/item: */
-    QTreeWidget *pTree = currentTreeWidget();
-    QTreeWidgetItem *pItem = pTree->itemAt(position);
-    if (pItem)
-    {
-        /* Make sure the item is selected and current: */
-        setCurrentItem(pTree, pItem);
-        /* Show item context menu: */
-        m_pContextMenu->exec(pTree->viewport()->mapToGlobal(position));
-    }
+    /* Get corresponding tree-widget / item: */
+    QTreeWidget *pTreeWidget = currentTreeWidget();
+    QTreeWidgetItem *pItem = pTreeWidget->itemAt(position);
+
+    /* Skip further actions if item was not found: */
+    if (!pItem)
+        return;
+
+    /* Make sure that item is current one: */
+    setCurrentItem(pTreeWidget, pItem);
+    /* Show item context menu: */
+    m_pContextMenu->exec(pTreeWidget->viewport()->mapToGlobal(position));
 }
 
@@ -916 +906 @@
         mTwHD->setSortingEnabled(true);
         connect(mTwHD, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-                this, SLOT(sltHandleCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
+                this, SLOT(sltHandleCurrentItemChanged(QTreeWidgetItem*)));
         connect(mTwHD, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
                 this, SLOT(sltHandleDoubleClick()));
@@ -940 +930 @@
         mTwCD->setSortingEnabled(true);
         connect(mTwCD, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-                this, SLOT(sltHandleCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
+                this, SLOT(sltHandleCurrentItemChanged(QTreeWidgetItem*)));
         connect(mTwCD, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
                 this, SLOT(sltHandleDoubleClick()));
@@ -964 +954 @@
         mTwFD->setSortingEnabled(true);
         connect(mTwFD, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-                this, SLOT(sltHandleCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
+                this, SLOT(sltHandleCurrentItemChanged(QTreeWidgetItem*)));
         connect(mTwFD, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
                 this, SLOT(sltHandleDoubleClick()));
@@ -1029 +1019 @@
 
     /* Clear tree-widgets: */
-    mTwHD->clear();
-    mTwCD->clear();
-    mTwFD->clear();
+    QTreeWidget *pTreeWidgetHD = treeWidget(UIMediumType_HardDisk);
+    QTreeWidget *pTreeWidgetCD = treeWidget(UIMediumType_DVD);
+    QTreeWidget *pTreeWidgetFD = treeWidget(UIMediumType_Floppy);
+    setCurrentItem(pTreeWidgetHD, 0);
+    setCurrentItem(pTreeWidgetCD, 0);
+    setCurrentItem(pTreeWidgetFD, 0);
+    pTreeWidgetHD->clear();
+    pTreeWidgetCD->clear();
+    pTreeWidgetFD->clear();
 
     /* Create medium-items: */
@@ -1037 +1033 @@
         sltHandleMediumCreated(strMediumID);
 
-    /* Select first medium-item as current one if nothing selected: */
+    /* Select first item as current one if nothing selected: */
     if (!mediumItem(UIMediumType_HardDisk))
-        if (QTreeWidgetItem *pItem = mTwHD->topLevelItem(0))
-            setCurrentItem(mTwHD, pItem);
+        if (QTreeWidgetItem *pItem = pTreeWidgetHD->topLevelItem(0))
+            setCurrentItem(pTreeWidgetHD, pItem);
     if (!mediumItem(UIMediumType_DVD))
-        if (QTreeWidgetItem *pItem = mTwCD->topLevelItem(0))
-            setCurrentItem(mTwCD, pItem);
+        if (QTreeWidgetItem *pItem = pTreeWidgetCD->topLevelItem(0))
+            setCurrentItem(pTreeWidgetCD, pItem);
     if (!mediumItem(UIMediumType_Floppy))
-        if (QTreeWidgetItem *pItem = mTwFD->topLevelItem(0))
-            setCurrentItem(mTwFD, pItem);
+        if (QTreeWidgetItem *pItem = pTreeWidgetFD->topLevelItem(0))
+            setCurrentItem(pTreeWidgetFD, pItem);
 }
 
@@ -1414 +1410 @@
         setCurrentItem(treeWidget(medium.type()), pMediumItem);
 
+    /* If no 'current-item' yet selected
+     * we have to choose newly added as the 'current-item': */
+    if (!treeWidget(medium.type())->currentItem())
+        setCurrentItem(treeWidget(medium.type()), pMediumItem);
+
     /* Update linked stuff if that was 'current-item' added: */
     if (pMediumItem == currentTreeWidget()->currentItem())
@@ -1630 +1631 @@
 }
 
-void UIMediumManager::setCurrentItem(QTreeWidget *pTree, QTreeWidgetItem *pItem)
-{
-    if (pTree && pItem)
-    {
+void UIMediumManager::setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem)
+{
+    /* Make sure passed tree-widget is valid: */
+    AssertPtrReturnVoid(pTreeWidget);
+
+    /* Make passed item 'current' for passed tree-widget: */
+    pTreeWidget->setCurrentItem(pItem);
+
+    /* If non NULL item was passed: */
+    if (pItem)
+    {
+        /* Make sure it's also selected, and visible: */
         pItem->setSelected(true);
-        pTree->setCurrentItem(pItem);
-        pTree->scrollToItem(pItem, QAbstractItemView::EnsureVisible);
-        sltHandleCurrentItemChanged(pItem);
-    }
-    else
-        sltHandleCurrentTabChanged();
+        pTreeWidget->scrollToItem(pItem, QAbstractItemView::EnsureVisible);
+    }
+
+    /* Update linked stuff: */
+    sltHandleCurrentItemChanged(pItem);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -89 +89 @@
     /* Handlers: Navigation stuff: */
     void sltHandleCurrentTabChanged();
-    void sltHandleCurrentItemChanged(QTreeWidgetItem *pItem, QTreeWidgetItem *pPrevItem = 0);
+    void sltHandleCurrentItemChanged(QTreeWidgetItem *pItem);
     void sltHandleDoubleClick();
     void sltHandleContextMenuCall(const QPoint &position);
@@ -167 +167 @@
     UIMediumItem* currentMediumItem() const;
 
-    /** Defines <i>current-item</i> for passed @a pTree as @a pItem. */
-    void setCurrentItem(QTreeWidget *pTree, QTreeWidgetItem *pItem);
+    /** Defines <i>current-item</i> for passed @a pTreeWidget as @a pItem. */
+    void setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem);
 
     UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &functor) const;