Changeset 50363 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 7, 2014 1:33:58 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 4397: Medium Manager cleanup/rework (part 9): Reworking create/update/remove medium-item helpers.

Location:

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

Files:

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

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

@@ -273 +273 @@
 }
 
-void UIMediumManager::refreshAll()
+void UIMediumManager::sltRefreshAll()
 {
     /* Start medium-enumeration: */
@@ -293 +293 @@
         return;
 
-    /* Create UIMediumItem for corresponding UIMedium: */
+    /* Create UIMediumItem for corresponding 'medium': */
     createMediumItem(medium);
 }
@@ -299 +299 @@
 void UIMediumManager::sltHandleMediumDeleted(const QString &strMediumID)
 {
-    /* Get tree-widget / medium-item: */
-    QList<UIMediumType> types;
-    types << UIMediumType_HardDisk << UIMediumType_DVD << UIMediumType_Floppy;
-    QTreeWidget *pTreeWidget = 0;
-    UIMediumItem *pMediumItem = 0;
-    foreach (UIMediumType type, types)
-    {
-        pTreeWidget = treeWidget(type);
-        pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID(strMediumID));
-        if (pMediumItem)
-            break;
-    }
-
-    /* Skip further actions if medium-item was not found: */
-    if (!pMediumItem)
-        return;
-
-    /* Update tab-icons: */
-    updateTabIcons(pMediumItem, ItemAction_Removed);
-
-    /* Delete medium-item: */
-    delete pMediumItem;
-
-    /* Make sure 'current' or at least 'first available' medium-item is currently selected, if any: */
-    setCurrentItem(pTreeWidget, pTreeWidget->currentItem() ? pTreeWidget->currentItem() : pTreeWidget->topLevelItem(0));
+    /* Delete UIMediumItem for corresponding 'strMediumID': */
+    deleteMediumItem(strMediumID);
 }
 
@@ -367 +344 @@
         return;
 
-    /* Update UIMediumItem for corresponding UIMedium: */
+    /* Update UIMediumItem for corresponding 'medium': */
     updateMediumItem(medium);
 
@@ -801 +778 @@
                                                           ":/refresh_22px.png", ":/refresh_16px.png",
                                                           ":/refresh_disabled_22px.png", ":/refresh_disabled_16px.png"));
-        connect(m_pActionRefresh, SIGNAL(triggered()), this, SLOT(refreshAll()));
+        connect(m_pActionRefresh, SIGNAL(triggered()), this, SLOT(sltRefreshAll()));
     }
 }
@@ -1351 +1328 @@
     /* Full refresh if there is at least one item present: */
     if (mTwHD->topLevelItemCount() || mTwCD->topLevelItemCount() || mTwFD->topLevelItemCount())
-        refreshAll();
+        sltRefreshAll();
 }
 
 void UIMediumManager::createMediumItem(const UIMedium &medium)
 {
+    /* Get medium type: */
+    UIMediumType type = medium.type();
+    /* Get corresponding tree-widget: */
+    QTreeWidget *pTreeWidget = treeWidget(type);
+
     /* Prepare medium-item: */
     UIMediumItem *pMediumItem = 0;
-    switch (medium.type())
+    switch (type)
     {
         /* Of hard-drive type: */
@@ -1398 +1380 @@
             break;
         }
-        default: AssertFailed();
+        default: AssertMsgFailed(("Medium-type unknown: %d\n", type)); break;
     }
     AssertPtrReturnVoid(pMediumItem);
@@ -1405 +1387 @@
     updateTabIcons(pMediumItem, ItemAction_Added);
 
-    /* If medium-enumeration is not currently in progress we have to select the
-     * newly added item as the 'current-item' (it seems new image was added): */
-    if (!vboxGlobal().isMediumEnumerationInProgress())
-        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())
+    /* If medium-enumeration is not currently in progress or
+     * if there is no 'current' medium-item yet selected
+     * we have to choose newly added medium-item as 'current' one: */
+    if (   !vboxGlobal().isMediumEnumerationInProgress()
+        || !pTreeWidget->currentItem())
+        setCurrentItem(pTreeWidget, pMediumItem);
+
+    /* Update linked stuff if that was current medium-item created: */
+    if (pMediumItem == currentMediumItem())
         sltHandleCurrentItemChanged(pMediumItem);
 }
@@ -1422 +1401 @@
 void UIMediumManager::updateMediumItem(const UIMedium &medium)
 {
-    /* Search for the existing medium-item: */
+    /* Search for existing medium-item: */
     UIMediumItem *pMediumItem = searchItem(treeWidget(medium.type()), CheckIfSuitableByID(medium.id()));
 
-    /* Create new if was not found: */
+    /* Create medium-item (if it was not found): */
     if (!pMediumItem)
         return createMediumItem(medium);
 
-    /* Update otherwise: */
+    /* Update medium-item: */
     pMediumItem->setMedium(medium);
     LogRel2(("UIMediumManager: Medium-item with ID={%s} updated.\n", medium.id().toAscii().constData()));
@@ -1436 +1415 @@
     updateTabIcons(pMediumItem, ItemAction_Updated);
 
-    /* Update linked stuff if that was 'current-item' updated: */
-    if (pMediumItem == currentTreeWidget()->currentItem())
+    /* Update linked stuff if that was current medium-item updated: */
+    if (pMediumItem == currentMediumItem())
         sltHandleCurrentItemChanged(pMediumItem);
+}
+
+void UIMediumManager::deleteMediumItem(const QString &strMediumID)
+{
+    /* Search for corresponding tree-widget: */
+    QList<UIMediumType> types;
+    types << UIMediumType_HardDisk << UIMediumType_DVD << UIMediumType_Floppy;
+    QTreeWidget *pTreeWidget = 0;
+    UIMediumItem *pMediumItem = 0;
+    foreach (UIMediumType type, types)
+    {
+        /* Get iterated tree-widget: */
+        pTreeWidget = treeWidget(type);
+        /* Search for existing medium-item: */
+        pMediumItem = searchItem(pTreeWidget, CheckIfSuitableByID(strMediumID));
+        if (pMediumItem)
+            break;
+    }
+
+    /* Ignore medium-item (if it was not found): */
+    if (!pMediumItem)
+        return;
+
+    /* Update tab-icons: */
+    updateTabIcons(pMediumItem, ItemAction_Removed);
+
+    /* Delete medium-item: */
+    delete pMediumItem;
+    LogRel2(("UIMediumManager: Medium-item with ID={%s} deleted.\n", strMediumID.toAscii().constData()));
+
+    /* If there is no 'current' medium-item now selected
+     * we have to choose first-available medium-item as 'current' one: */
+    if (!pTreeWidget->currentItem())
+        setCurrentItem(pTreeWidget, pTreeWidget->topLevelItem(0));
 }
 

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

@@ -65 +65 @@
     static void showModeless(QWidget *pCenterWidget, bool fRefresh = true);
 
-public slots:
-
-    /* Handler: Refresh stuff: */
-    void refreshAll();
-
 private slots:
+
+    /** Fully refreshes medium manager contents. */
+    void sltRefreshAll();
 
     /* Handlers: Medium-processing stuff: */
@@ -143 +141 @@
     void retranslateUi();
 
-    /** Creates UIMediumItem for corresponding UIMedium. */
+    /** Creates UIMediumItem for corresponding @a medium. */
     void createMediumItem(const UIMedium &medium);
-    /** Updates UIMediumItem for corresponding UIMedium. */
+    /** Updates UIMediumItem for corresponding @a medium. */
     void updateMediumItem(const UIMedium &medium);
+    /** Deletes UIMediumItem for corresponding @a strMediumID. */
+    void deleteMediumItem(const QString &strMediumID);
 
     /* Helpers: Medium-modification stuff: */