Changeset 50968 in vbox

Timestamp:

Apr 3, 2014 3:53:37 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium Manager rework/cleanup: .ui file absorption.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• src/medium/UIMediumManager.cpp (modified) (42 diffs)
• src/medium/UIMediumManager.h (modified) (8 diffs)
• src/medium/UIMediumManager.ui (deleted)
• src/selector/UISelectorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -26 +26 @@
     src/VBoxTakeSnapshotDlg.ui \
     src/UIVMLogViewer.ui \
-    src/medium/UIMediumManager.ui \
     src/settings/UISettingsDialog.ui \
     src/settings/global/UIGlobalSettingsGeneral.ui \

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

@@ -21 +21 @@
 
 /* Qt includes: */
+#include <QFrame>
 #include <QLabel>
 #include <QMenuBar>
@@ -32 +33 @@
 #include "UIWizardCloneVD.h"
 #include "UIMessageCenter.h"
+#include "QITabWidget.h"
+#include "QITreeWidget.h"
+#include "QILabel.h"
+#include "QIDialogButtonBox.h"
 #include "UIToolBar.h"
 #include "UIIconPool.h"
@@ -650 +655 @@
     , m_fRefresh(fRefresh)
     , m_fPreventChangeCurrentItem(false)
+    , m_pTabWidget(0)
+    , m_iTabCount(3)
     , m_fInaccessibleHD(false)
     , m_fInaccessibleCD(false)
@@ -662 +669 @@
     , m_pActionRemove(0), m_pActionRelease(0)
     , m_pActionRefresh(0)
+    , m_pButtonBox(0)
     , m_pProgressBar(0)
 {
@@ -747 +755 @@
 
     /* Reset tab-widget icons: */
-    if (mTabWidget)
-    {
-        mTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
-        mTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
-        mTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
+    if (m_pTabWidget)
+    {
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
     }
 
@@ -820 +828 @@
     /* Update HD information-panes: */
     if (fResult)
-        updateInformationPanesHD();
+        updateInformationFieldsHD();
 }
 
@@ -916 +924 @@
 {
     /* Get all the tree-widgets: */
-    QList<QTreeWidget*> trees;
-    trees << treeWidget(UIMediumType_HardDisk);
-    trees << treeWidget(UIMediumType_DVD);
-    trees << treeWidget(UIMediumType_Floppy);
+    const QList<QTreeWidget*> trees = m_trees.values();
 
     /* Calculate deduction for every header: */
@@ -959 +964 @@
 
     /* Initialize information-panes: */
-    updateInformationPanes(UIMediumType_All);
+    updateInformationFields(UIMediumType_All);
 
     /* Start medium-enumeration (if necessary): */
@@ -978 +983 @@
 void UIMediumManager::prepareThis()
 {
+    /* Initial size: */
+    resize(620, 460);
+
     /* Dialog should delete itself on 'close': */
     setAttribute(Qt::WA_DeleteOnClose);
@@ -988 +996 @@
     setWindowIcon(UIIconPool::iconSetFull(QSize(32, 32), QSize(16, 16),
                                           ":/diskimage_32px.png", ":/diskimage_16px.png"));
-
-    /* Apply UI decorations: */
-    Ui::UIMediumManager::setupUi(this);
 
     /* Prepare connections: */
@@ -1104 +1109 @@
 void UIMediumManager::prepareCentralWidget()
 {
-    /* Prepare tool-bar: */
-    prepareToolBar();
-    /* Prepare tab-widget: */
-    prepareTabWidget();
-    /* Prepare button-box: */
-    prepareButtonBox();
+    /* Create central-widget: */
+    setCentralWidget(new QWidget);
+    AssertPtrReturnVoid(centralWidget());
+    {
+        /* Create main-layout: */
+        new QVBoxLayout(centralWidget());
+        AssertPtrReturnVoid(centralWidget()->layout());
+        {
+            /* Prepare tool-bar: */
+            prepareToolBar();
+            /* Prepare tab-widget: */
+            prepareTabWidget();
+            /* Prepare button-box: */
+            prepareButtonBox();
+        }
+    }
 }
 
@@ -1154 +1169 @@
 void UIMediumManager::prepareTabWidget()
 {
-    /* Tab-widget created in .ui file. */
-    {
-        /* Prepare tabs: */
-        for (int i = (int)UIMediumType_HardDisk; i <= (int)UIMediumType_Floppy; ++i)
-            prepareTab((UIMediumType)i);
+    /* Create tab-widget: */
+    m_pTabWidget = new QITabWidget;
+    AssertPtrReturnVoid(m_pTabWidget);
+    {
+        /* Create tabs: */
+        for (int i = 0; i < m_iTabCount; ++i)
+            prepareTab(mediumType(i));
         /* Configure tab-widget: */
-        mTabWidget->setFocusPolicy(Qt::TabFocus);
-        mTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
-        mTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
-        mTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
-        connect(mTabWidget, SIGNAL(currentChanged(int)), this, SLOT(sltHandleCurrentTabChanged()));
+        m_pTabWidget->setFocusPolicy(Qt::TabFocus);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
+        m_pTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
+        connect(m_pTabWidget, SIGNAL(currentChanged(int)), this, SLOT(sltHandleCurrentTabChanged()));
+        /* Add tab-widget into central layout: */
+        centralWidget()->layout()->addWidget(m_pTabWidget);
         /* Focus current tree-widget: */
         if (currentTreeWidget())
@@ -1175 +1194 @@
 void UIMediumManager::prepareTab(UIMediumType type)
 {
-    /* Tab created in .ui file. */
-    {
-        /* Tab layout created in .ui file. */
+    /* Create tab: */
+    m_pTabWidget->addTab(new QWidget, QString());
+    QWidget *pTab = tab(type);
+    AssertPtrReturnVoid(pTab);
+    {
+        /* Create tab layout: */
+        new QVBoxLayout(pTab);
+        AssertPtrReturnVoid(pTab->layout());
         {
             /* Prepare tree-widget: */
@@ -1189 +1213 @@
 void UIMediumManager::prepareTreeWidget(UIMediumType type, int iColumns)
 {
-    /* Tree-widget created in .ui file. */
+    /* Create tree-widget: */
+    m_trees.insert(tabIndex(type), new QITreeWidget);
+    QTreeWidget *pTreeWidget = treeWidget(type);
+    AssertPtrReturnVoid(pTreeWidget);
     {
         /* Configure tree-widget: */
-        QTreeWidget *pTreeWidget = treeWidget(type);
+        pTreeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+        pTreeWidget->setAlternatingRowColors(true);
+        pTreeWidget->setAllColumnsShowFocus(true);
+        pTreeWidget->setAcceptDrops(true);
         pTreeWidget->setColumnCount(iColumns);
         pTreeWidget->sortItems(0, Qt::AscendingOrder);
@@ -1213 +1244 @@
         connect(pTreeWidget->header(), SIGNAL(sectionResized(int, int, int)),
                 this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection);
+        /* Add tree-widget into tab layout: */
+        tab(type)->layout()->addWidget(pTreeWidget);
     }
 }
@@ -1218 +1251 @@
 void UIMediumManager::prepareInformationContainer(UIMediumType type, int iFields)
 {
-    /* Information-panes created in .ui file. */
-    {
-        /* Configure information-panes: */
-        for (int i = 0; i < iFields; ++i)
-        {
-            QILabel *pField = infoField(type, i);
-            if (pField)
-                pField->setFullSizeSelection(true);
-        }
+    /* Create information-container: */
+    int iIndex = tabIndex(type);
+    m_containers.insert(iIndex, new QFrame);
+    QFrame *pInformationContainer = infoContainer(type);
+    AssertPtrReturnVoid(pInformationContainer);
+    {
+        /* Configure information-container: */
+        pInformationContainer->setFrameShape(QFrame::Box);
+        pInformationContainer->setFrameShadow(QFrame::Sunken);
+        /* Create information-container layout: */
+        new QGridLayout(pInformationContainer);
+        QGridLayout *pInformationContainerLayout = qobject_cast<QGridLayout*>(pInformationContainer->layout());
+        AssertPtrReturnVoid(pInformationContainerLayout);
+        {
+            /* Configure information-container layout: */
+            pInformationContainerLayout->setVerticalSpacing(0);
+            pInformationContainerLayout->setContentsMargins(5, 5, 5, 5);
+            pInformationContainerLayout->setColumnStretch(1, 1);
+            /* Create information-container labels & fields: */
+            for (int i = 0; i < iFields; ++i)
+            {
+                /* Create information-label: */
+                m_labels[iIndex] << new QLabel;
+                QLabel *pLabel = infoLabel(type, i);
+                AssertPtrReturnVoid(pLabel);
+                /* Create information-field: */
+                m_fields[iIndex] << new QILabel;
+                QILabel *pField = infoField(type, i);
+                AssertPtrReturnVoid(pField);
+                {
+                    /* Configure information-field: */
+                    pField->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed));
+                    pField->setFullSizeSelection(true);
+                }
+                /* Add information-container labels & fields into container layout: */
+                pInformationContainerLayout->addWidget(pLabel, i, 0);
+                pInformationContainerLayout->addWidget(pField, i, 1);
+            }
+        }
+        /* Add information-container into tab layout: */
+        tab(type)->layout()->addWidget(pInformationContainer);
     }
 }
@@ -1232 +1297 @@
 void UIMediumManager::prepareButtonBox()
 {
-    /* Button-box created in .ui file. */
+    /* Create button-box: */
+    m_pButtonBox = new QIDialogButtonBox;
+    AssertPtrReturnVoid(m_pButtonBox);
     {
         /* Configure button-box: */
-        mButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-        connect(mButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
-        connect(mButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
+        m_pButtonBox->setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::Close);
+        m_pButtonBox->button(QDialogButtonBox::Close)->setDefault(true);
+        connect(m_pButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
+        connect(m_pButtonBox, SIGNAL(rejected()), this, SLOT(close()));
+        /* Add button-box into central layout: */
+        centralWidget()->layout()->addWidget(m_pButtonBox);
         /* Prepare progress-bar: */
         prepareProgressBar();
@@ -1252 +1322 @@
         m_pProgressBar->hide();
         /* Add progress-bar into button-box layout: */
-        mButtonBox->addExtraWidget(m_pProgressBar);
+        m_pButtonBox->addExtraWidget(m_pProgressBar);
     }
 }
@@ -1331 +1401 @@
 
     /* Update corresponding information-panes: */
-    updateInformationPanes(type);
+    updateInformationFields(type);
 }
 
@@ -1382 +1452 @@
 {
     QString strPrefix = "hd";
-    if (mTabWidget)
+    if (m_pTabWidget)
     {
         switch (currentMediumType())
@@ -1460 +1530 @@
             *pfInaccessible = true;
 
-            if (mTabWidget)
-                mTabWidget->setTabIcon(tabIndex(mediumType), vboxGlobal().warningIcon());
+            if (m_pTabWidget)
+                m_pTabWidget->setTabIcon(tabIndex(mediumType), vboxGlobal().warningIcon());
 
             break;
@@ -1495 +1565 @@
             }
 
-            if (mTabWidget)
+            if (m_pTabWidget)
             {
                 if (*pfInaccessible)
-                    mTabWidget->setTabIcon(tabIndex(mediumType), vboxGlobal().warningIcon());
+                    m_pTabWidget->setTabIcon(tabIndex(mediumType), vboxGlobal().warningIcon());
                 else
-                    mTabWidget->setTabIcon(tabIndex(mediumType), *pIcon);
+                    m_pTabWidget->setTabIcon(tabIndex(mediumType), *pIcon);
             }
 
@@ -1508 +1578 @@
 }
 
-void UIMediumManager::updateInformationPanes(UIMediumType type /* = UIMediumType_Invalid */)
+void UIMediumManager::updateInformationFields(UIMediumType type /* = UIMediumType_Invalid */)
 {
     /* Make sure type is valid: */
@@ -1517 +1587 @@
     switch (type)
     {
-        case UIMediumType_HardDisk: updateInformationPanesHD(); break;
-        case UIMediumType_DVD:      updateInformationPanesCD(); break;
-        case UIMediumType_Floppy:   updateInformationPanesFD(); break;
+        case UIMediumType_HardDisk: updateInformationFieldsHD(); break;
+        case UIMediumType_DVD:      updateInformationFieldsCD(); break;
+        case UIMediumType_Floppy:   updateInformationFieldsFD(); break;
         case UIMediumType_All:
-            updateInformationPanesHD();
-            updateInformationPanesCD();
-            updateInformationPanesFD();
+            updateInformationFieldsHD();
+            updateInformationFieldsCD();
+            updateInformationFieldsFD();
             break;
         default: break;
@@ -1529 +1599 @@
 }
 
-void UIMediumManager::updateInformationPanesHD()
+void UIMediumManager::updateInformationFieldsHD()
 {
     /* Get current hard-drive medium-item: */
@@ -1538 +1608 @@
     {
         /* Just clear information panes: */
-        for (int i = 0; i < 5; ++i)
+        for (int i = 0; i < m_fields[tabIndex(UIMediumType_HardDisk)].size(); ++i)
             infoField(UIMediumType_HardDisk, i)->clear();
     }
@@ -1547 +1617 @@
         QString strDetails = pCurrentItem->details();
         QString strUsage = pCurrentItem->usage().isNull() ?
-                           formatPaneText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
-                           formatPaneText(pCurrentItem->usage());
+                           formatFieldText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
+                           formatFieldText(pCurrentItem->usage());
         if (infoField(UIMediumType_HardDisk, 0))
             infoField(UIMediumType_HardDisk, 0)->setText(pCurrentItem->hardDiskType());
         if (infoField(UIMediumType_HardDisk, 1))
-            infoField(UIMediumType_HardDisk, 1)->setText(formatPaneText(pCurrentItem->location(), true, "end"));
+            infoField(UIMediumType_HardDisk, 1)->setText(formatFieldText(pCurrentItem->location(), true, "end"));
         if (infoField(UIMediumType_HardDisk, 2))
             infoField(UIMediumType_HardDisk, 2)->setText(pCurrentItem->hardDiskFormat());
@@ -1566 +1636 @@
 }
 
-void UIMediumManager::updateInformationPanesCD()
+void UIMediumManager::updateInformationFieldsCD()
 {
     /* Get current optical medium-item: */
@@ -1575 +1645 @@
     {
         /* Just clear information panes: */
-        for (int i = 0; i < 2; ++i)
+        for (int i = 0; i < m_fields[tabIndex(UIMediumType_DVD)].size(); ++i)
             infoField(UIMediumType_DVD, i)->clear();
     }
@@ -1583 +1653 @@
         /* Update required details: */
         QString strUsage = pCurrentItem->usage().isNull() ?
-                           formatPaneText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
-                           formatPaneText(pCurrentItem->usage());
+                           formatFieldText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
+                           formatFieldText(pCurrentItem->usage());
         if (infoField(UIMediumType_DVD, 0))
-            infoField(UIMediumType_DVD, 0)->setText(formatPaneText(pCurrentItem->location(), true, "end"));
+            infoField(UIMediumType_DVD, 0)->setText(formatFieldText(pCurrentItem->location(), true, "end"));
         if (infoField(UIMediumType_DVD, 1))
             infoField(UIMediumType_DVD, 1)->setText(strUsage);
@@ -1596 +1666 @@
 }
 
-void UIMediumManager::updateInformationPanesFD()
+void UIMediumManager::updateInformationFieldsFD()
 {
     /* Get current floppy medium-item: */
@@ -1605 +1675 @@
     {
         /* Just clear information panes: */
-        for (int i = 0; i < 2; ++i)
+        for (int i = 0; i < m_fields[tabIndex(UIMediumType_Floppy)].size(); ++i)
             infoField(UIMediumType_Floppy, i)->clear();
     }
@@ -1613 +1683 @@
         /* Update required details: */
         QString strUsage = pCurrentItem->usage().isNull() ?
-                           formatPaneText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
-                           formatPaneText(pCurrentItem->usage());
+                           formatFieldText(QApplication::translate("VBoxMediaManagerDlg", "<i>Not&nbsp;Attached</i>"), false) :
+                           formatFieldText(pCurrentItem->usage());
         if (infoField(UIMediumType_Floppy, 0))
-            infoField(UIMediumType_Floppy, 0)->setText(formatPaneText(pCurrentItem->location(), true, "end"));
+            infoField(UIMediumType_Floppy, 0)->setText(formatFieldText(pCurrentItem->location(), true, "end"));
         if (infoField(UIMediumType_Floppy, 1))
             infoField(UIMediumType_Floppy, 1)->setText(strUsage);
@@ -1701 +1771 @@
 
     /* Translate tab-widget: */
-    if (mTabWidget)
-    {
-        mTabWidget->setTabText(tabIndex(UIMediumType_HardDisk), tr("&Hard drives"));
-        mTabWidget->setTabText(tabIndex(UIMediumType_DVD), tr("&Optical disks"));
-        mTabWidget->setTabText(tabIndex(UIMediumType_Floppy), tr("&Floppy disks"));
+    if (m_pTabWidget)
+    {
+        m_pTabWidget->setTabText(tabIndex(UIMediumType_HardDisk), tr("&Hard drives"));
+        m_pTabWidget->setTabText(tabIndex(UIMediumType_DVD), tr("&Optical disks"));
+        m_pTabWidget->setTabText(tabIndex(UIMediumType_Floppy), tr("&Floppy disks"));
     }
 
@@ -1766 +1836 @@
         m_pProgressBar->adjustSize();
         int h = m_pProgressBar->height();
-        if (mButtonBox)
-            mButtonBox->setMinimumHeight(h + 12);
+        if (m_pButtonBox)
+            m_pButtonBox->setMinimumHeight(h + 12);
 #endif /* Q_WS_MAC */
     }
@@ -1983 +2053 @@
 }
 
+QWidget* UIMediumManager::tab(UIMediumType type) const
+{
+    /* Determine tab index for passed medium type: */
+    int iIndex = tabIndex(type);
+
+    /* Return tab for known tab index: */
+    if (iIndex >= 0 && iIndex < m_iTabCount)
+        return iIndex < m_pTabWidget->count() ? m_pTabWidget->widget(iIndex) : 0;
+
+    /* Null by default: */
+    return 0;
+}
+
 QTreeWidget* UIMediumManager::treeWidget(UIMediumType type) const
 {
-    /* Return corresponding tree-widget for known medium types: */
-    switch (type)
-    {
-        case UIMediumType_HardDisk: return mTwHD;
-        case UIMediumType_DVD:      return mTwCD;
-        case UIMediumType_Floppy:   return mTwFD;
-        default: AssertMsgFailed(("Unknown medium type: %d\n", type)); break;
-    }
+    /* Determine tab index for passed medium type: */
+    int iIndex = tabIndex(type);
+
+    /* Return tree-widget for known tab index: */
+    if (iIndex >= 0 && iIndex < m_iTabCount)
+        return m_trees.value(iIndex, 0);
+
     /* Null by default: */
     return 0;
@@ -2007 +2089 @@
 QFrame* UIMediumManager::infoContainer(UIMediumType type) const
 {
-    /* Return corresponding tree-widget for known medium types: */
-    switch (type)
-    {
-        case UIMediumType_HardDisk: return mHDContainer;
-        case UIMediumType_DVD:      return mCDContainer;
-        case UIMediumType_Floppy:   return mFDContainer;
-        default: AssertMsgFailed(("Unknown medium type: %d\n", type)); break;
-    }
+    /* Determine tab index for passed medium type: */
+    int iIndex = tabIndex(type);
+
+    /* Return information-container for known tab index: */
+    if (iIndex >= 0 && iIndex < m_iTabCount)
+        return m_containers.value(iIndex, 0);
+
     /* Null by default: */
     return 0;
@@ -2021 +2102 @@
 QLabel* UIMediumManager::infoLabel(UIMediumType type, int iLabelIndex) const
 {
-    /* Return corresponding tree-widget for known medium types: */
-    switch (type)
-    {
-        case UIMediumType_HardDisk:
-        {
-            switch (iLabelIndex)
-            {
-                case 0: return m_pTypeLabel;
-                case 1: return m_pLocationLabel;
-                case 2: return m_pFormatLabel;
-                case 3: return m_pDetailsLabel;
-                case 4: return m_pUsageLabel;
-                default: AssertMsgFailed(("Label index out of bounds: %d\n", iLabelIndex)); break;
-            }
-            break;
-        }
-        case UIMediumType_DVD:
-        {
-            switch (iLabelIndex)
-            {
-                case 0: return mLbCD1;
-                case 1: return mLbCD2;
-                default: AssertMsgFailed(("Label index out of bounds: %d\n", iLabelIndex)); break;
-            }
-            break;
-        }
-        case UIMediumType_Floppy:
-        {
-            switch (iLabelIndex)
-            {
-                case 0: return mLbFD1;
-                case 1: return mLbFD2;
-                default: AssertMsgFailed(("Label index out of bounds: %d\n", iLabelIndex)); break;
-            }
-            break;
-        }
-        default: AssertMsgFailed(("Unknown medium type: %d\n", type)); break;
-    }
+    /* Determine tab index for passed medium type: */
+    int iIndex = tabIndex(type);
+
+    /* Look for corresponding information-label list for known tab index: */
+    if (iIndex >= 0 && iIndex < m_iTabCount)
+    {
+        const QList<QLabel*> labels = m_labels.value(iIndex, QList<QLabel*>());
+
+        /* Return information-label for known index: */
+        return labels.value(iLabelIndex, 0);
+    }
+
     /* Null by default: */
     return 0;
@@ -2065 +2120 @@
 QILabel* UIMediumManager::infoField(UIMediumType type, int iFieldIndex) const
 {
-    /* Return corresponding tree-widget for known medium types: */
-    switch (type)
-    {
-        case UIMediumType_HardDisk:
-        {
-            switch (iFieldIndex)
-            {
-                case 0: return m_pTypePane;
-                case 1: return m_pLocationPane;
-                case 2: return m_pFormatPane;
-                case 3: return m_pDetailsPane;
-                case 4: return m_pUsagePane;
-                default: AssertMsgFailed(("Field index out of bounds: %d\n", iFieldIndex)); break;
-            }
-            break;
-        }
-        case UIMediumType_DVD:
-        {
-            switch (iFieldIndex)
-            {
-                case 0: return mIpCD1;
-                case 1: return mIpCD2;
-                default: AssertMsgFailed(("Field index out of bounds: %d\n", iFieldIndex)); break;
-            }
-            break;
-        }
-        case UIMediumType_Floppy:
-        {
-            switch (iFieldIndex)
-            {
-                case 0: return mIpFD1;
-                case 1: return mIpFD2;
-                default: AssertMsgFailed(("Field index out of bounds: %d\n", iFieldIndex)); break;
-            }
-            break;
-        }
-        default: AssertMsgFailed(("Unknown medium type: %d\n", type)); break;
-    }
+    /* Determine tab index for passed medium type: */
+    int iIndex = tabIndex(type);
+
+    /* Look for corresponding information-field list for known tab index: */
+    if (iIndex >= 0 && iIndex < m_iTabCount)
+    {
+        const QList<QILabel*> fields = m_fields.value(iIndex, QList<QILabel*>());
+
+        /* Return information-field for known index: */
+        return fields.value(iFieldIndex, 0);
+    }
+
     /* Null by default: */
     return 0;
@@ -2109 +2138 @@
 UIMediumType UIMediumManager::mediumType(QTreeWidget *pTreeWidget) const
 {
-    /* Hard-drive tree-widget: */
-    if (pTreeWidget == treeWidget(UIMediumType_HardDisk)) return UIMediumType_HardDisk;
-    /* Optical-image tree-widget: */
-    if (pTreeWidget == treeWidget(UIMediumType_DVD)) return UIMediumType_DVD;
-    /* Floppy-image tree-widget: */
-    if (pTreeWidget == treeWidget(UIMediumType_Floppy)) return UIMediumType_Floppy;
+    /* Determine tab index of passed tree-widget: */
+    int iIndex = m_trees.key(pTreeWidget, -1);
+
+    /* Return medium type for known tab index: */
+    if (iIndex >= 0 && iIndex < m_iTabCount)
+        return mediumType(iIndex);
+
     /* Invalid by default: */
     AssertFailedReturn(UIMediumType_Invalid);
@@ -2122 +2152 @@
 {
     /* Invalid if tab-widget doesn't exists: */
-    if (!mTabWidget)
+    if (!m_pTabWidget)
         return UIMediumType_Invalid;
 
     /* Return current medium type: */
-    return mediumType(mTabWidget->currentIndex());
+    return mediumType(m_pTabWidget->currentIndex());
 }
 
@@ -2284 +2314 @@
 
 /* static */
-QString UIMediumManager::formatPaneText(const QString &strText, bool fCompact /* = true */,
-                                        const QString &strElipsis /* = "middle" */)
+QString UIMediumManager::formatFieldText(const QString &strText, bool fCompact /* = true */,
+                                         const QString &strElipsis /* = "middle" */)
 {
     QString compactString = QString("<compact elipsis=\"%1\">").arg(strElipsis);

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

@@ -19 +19 @@
 
 /* GUI includes: */
-#include "UIMediumManager.gen.h"
+
 #include "QIWithRetranslateUI.h"
 #include "QIMainDialog.h"
@@ -29 +29 @@
 class UIToolBar;
 class UIEnumerationProgressBar;
+class QTabWidget;
+class QTreeWidget;
+class QTreeWidgetItem;
+class QFrame;
+class QLabel;
+class QILabel;
+class QIDialogButtonBox;
 
 /** Functor interface allowing to check if passed UIMediumItem is suitable. */
@@ -39 +46 @@
 
 /** Medium Manager dialog. */
-class UIMediumManager : public QIWithRetranslateUI2<QIMainDialog>, public Ui::UIMediumManager
+class UIMediumManager : public QIWithRetranslateUI2<QIMainDialog>
 {
     Q_OBJECT;
@@ -146 +153 @@
     /** Update tab icons according last @a action happened with @a pItem. */
     void updateTabIcons(UIMediumItem *pItem, Action action);
-    /** Update information pane of passed medium @a type. */
-    void updateInformationPanes(UIMediumType type = UIMediumType_Invalid);
-    /** Update information pane for hard-drive tab. */
-    void updateInformationPanesHD();
-    /** Update information pane for optical-disk tab. */
-    void updateInformationPanesCD();
-    /** Update information pane for floppy-disk tab. */
-    void updateInformationPanesFD();
+    /** Update information fields of passed medium @a type. */
+    void updateInformationFields(UIMediumType type = UIMediumType_Invalid);
+    /** Update information fields for hard-drive tab. */
+    void updateInformationFieldsHD();
+    /** Update information fields for optical-disk tab. */
+    void updateInformationFieldsCD();
+    /** Update information fields for floppy-disk tab. */
+    void updateInformationFieldsFD();
 
 #ifdef Q_WS_MAC
@@ -174 +181 @@
     void deleteMediumItem(const QString &strMediumID);
 
+    /** Returns tab for passed medium @a type. */
+    QWidget* tab(UIMediumType type) const;
     /** Returns tree-widget for passed medium @a type. */
     QTreeWidget* treeWidget(UIMediumType type) const;
@@ -214 +223 @@
     static UIMediumItem* toMediumItem(QTreeWidgetItem *pItem);
 
-    /** Format information-pane content. */
-    static QString formatPaneText(const QString &strText, bool fCompact = true, const QString &strElipsis = "middle");
+    /** Format information-field content. */
+    static QString formatFieldText(const QString &strText, bool fCompact = true, const QString &strElipsis = "middle");
 
     /** Determines if passed @a medium attached to hidden machines only. */
@@ -235 +244 @@
     /** @name Tab-widget variables.
      * @{ */
+    /** Tab-widget itself. */
+    QTabWidget *m_pTabWidget;
+    /** Tab-widget tab-count. */
+    const int m_iTabCount;
+    /** Tree-widgets. */
+    QMap<int, QTreeWidget*> m_trees;
+    /** Information-containers. */
+    QMap<int, QFrame*> m_containers;
+    /** Information-container labels. */
+    QMap<int, QList<QLabel*> > m_labels;
+    /** Information-container fields. */
+    QMap<int, QList<QILabel*> > m_fields;
     /** Holds whether hard-drive tab-widget have inaccessible item. */
     bool m_fInaccessibleHD;
@@ -275 +296 @@
     /** @} */
 
-    /** @name Progress-bar variables.
+    /** @name Button-box variables.
      * @{ */
+    /** Dialog button-box. */
+    QIDialogButtonBox *m_pButtonBox;
     /** Progress-bar widget. */
     UIEnumerationProgressBar *m_pProgressBar;

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

@@ -26 +26 @@
 #include <QDesktopServices>
 #include <QMenuBar>
+#include <QStatusBar>
 #include <QResizeEvent>
 #include <QStackedWidget>