Changeset 50960 in vbox

Timestamp:

Apr 3, 2014 11:31:10 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium Manager rework/cleanup: Prepare for .ui file absorption (part 2).

Location:

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

Files:

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

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

@@ -22 +22 @@
 /* Qt includes: */
 #include <QLabel>
-#include <QProgressBar>
 #include <QMenuBar>
 #include <QHeaderView>
 #include <QPushButton>
+#include <QProgressBar>
 
 /* GUI includes: */
@@ -33 +33 @@
 #include "UIMessageCenter.h"
 #include "UIToolBar.h"
-#include "QILabel.h"
 #include "UIIconPool.h"
 #include "UIMediumTypeChangeDialog.h"
@@ -594 +593 @@
 
     /** Constructor on the basis of passed @a pParent. */
-    UIEnumerationProgressBar(QWidget *pParent)
+    UIEnumerationProgressBar(QWidget *pParent = 0)
         : QWidget(pParent)
     {
@@ -657 +656 @@
     , m_iconCD(UIIconPool::iconSet(":/cd_16px.png", ":/cd_disabled_16px.png"))
     , m_iconFD(UIIconPool::iconSet(":/fd_16px.png", ":/fd_disabled_16px.png"))
+    , m_pToolBar(0)
+    , m_pContextMenu(0)
+    , m_pMenu(0)
+    , m_pActionCopy(0), m_pActionModify(0)
+    , m_pActionRemove(0), m_pActionRelease(0)
+    , m_pActionRefresh(0)
+    , m_pProgressBar(0)
 {
     /* Prepare: */
@@ -1046 +1052 @@
 void UIMediumManager::prepareMenuBar()
 {
-    /* Create actions-menu for menu-bar: */
+    /* Create menu-bar-menu: */
     m_pMenu = menuBar()->addMenu(QString());
     {
-        /* Configure menu-bar menu: */
+        /* Configure menu-bar-menu: */
         m_pMenu->addAction(m_pActionCopy);
         m_pMenu->addAction(m_pActionModify);
@@ -1098 +1104 @@
         /* Integrate tool-bar into dialog: */
         QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
-        Assert(pMainLayout);
 #if MAC_LEOPARD_STYLE
         /* Enable unified tool-bars on Mac OS X. Available on Qt >= 4.3: */
@@ -1112 +1117 @@
         pMainLayout->setSpacing(5);
         pMainLayout->setContentsMargins(5, 5, 5, 5);
-#endif /* MAC_LEOPARD_STYLE */
+#endif /* !MAC_LEOPARD_STYLE */
     }
 }
@@ -1120 +1125 @@
     /* Tab-widget created in .ui file. */
     {
+        /* Prepare tabs: */
+        for (int i = (int)UIMediumType_HardDisk; i <= (int)UIMediumType_Floppy; ++i)
+            prepareTab((UIMediumType)i);
         /* Configure tab-widget: */
         mTabWidget->setFocusPolicy(Qt::TabFocus);
@@ -1126 +1134 @@
         mTabWidget->setTabIcon(TabIndex_FD, m_iconFD);
         connect(mTabWidget, SIGNAL(currentChanged(int)), this, SLOT(sltHandleCurrentTabChanged()));
-        /* Prepare tree-widgets: */
-        prepareTreeWidgets();
-        /* Prepare information-panes: */
-        prepareInformationPanes();
-    }
-}
-
-void UIMediumManager::prepareTreeWidgets()
-{
-    /* Prepare tree-widget HD: */
-    prepareTreeWidgetHD();
-    /* Prepare tree-widget CD: */
-    prepareTreeWidgetCD();
-    /* Prepare tree-widget FD: */
-    prepareTreeWidgetFD();
-
-    /* Focus current tree-widget: */
-    currentTreeWidget()->setFocus();
-}
-
-void UIMediumManager::prepareTreeWidgetHD()
-{
-    /* HD tree-widget created in .ui file. */
-    {
-        /* Configure HD tree-widget: */
-        QTreeWidget *pTreeWidget = treeWidget(UIMediumType_HardDisk);
-        pTreeWidget->setColumnCount(3);
+        /* Focus current tree-widget: */
+        if (currentTreeWidget())
+            currentTreeWidget()->setFocus();
+        /* Update other widgets according chosen tab: */
+        sltHandleCurrentTabChanged();
+    }
+}
+
+void UIMediumManager::prepareTab(UIMediumType type)
+{
+    /* Tab created in .ui file. */
+    {
+        /* Tab layout created in .ui file. */
+        {
+            /* Prepare tree-widget: */
+            prepareTreeWidget(type, type == UIMediumType_HardDisk ? 3 : 2);
+            /* Prepare information-container: */
+            prepareInformationContainer(type, type == UIMediumType_HardDisk ? 5 : 2);
+        }
+    }
+}
+
+void UIMediumManager::prepareTreeWidget(UIMediumType type, int iColumns)
+{
+    /* Tree-widget created in .ui file. */
+    {
+        /* Configure tree-widget: */
+        QTreeWidget *pTreeWidget = treeWidget(type);
+        pTreeWidget->setColumnCount(iColumns);
         pTreeWidget->sortItems(0, Qt::AscendingOrder);
-        pTreeWidget->header()->setResizeMode(0, QHeaderView::Fixed);
-        pTreeWidget->header()->setResizeMode(1, QHeaderView::ResizeToContents);
-        pTreeWidget->header()->setResizeMode(2, QHeaderView::ResizeToContents);
+        if (iColumns > 0)
+            pTreeWidget->header()->setResizeMode(0, QHeaderView::Fixed);
+        if (iColumns > 1)
+            pTreeWidget->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+        if (iColumns > 2)
+            pTreeWidget->header()->setResizeMode(2, QHeaderView::ResizeToContents);
         pTreeWidget->header()->setStretchLastSection(false);
         pTreeWidget->setSortingEnabled(true);
@@ -1172 +1185 @@
 }
 
-void UIMediumManager::prepareTreeWidgetCD()
-{
-    /* CD tree-widget created in .ui file. */
-    {
-        /* Configure CD tree-widget: */
-        QTreeWidget *pTreeWidget = treeWidget(UIMediumType_DVD);
-        pTreeWidget->setColumnCount(2);
-        pTreeWidget->sortItems(0, Qt::AscendingOrder);
-        pTreeWidget->header()->setResizeMode(0, QHeaderView::Fixed);
-        pTreeWidget->header()->setResizeMode(1, QHeaderView::ResizeToContents);
-        pTreeWidget->header()->setStretchLastSection(false);
-        pTreeWidget->setSortingEnabled(true);
-        connect(pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-                this, SLOT(sltHandleCurrentItemChanged()));
-        connect(pTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
-                this, SLOT(sltHandleDoubleClick()));
-        connect(pTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)),
-                this, SLOT(sltHandleContextMenuCall(const QPoint&)));
-        connect(pTreeWidget, SIGNAL(resized(const QSize&, const QSize&)),
-                this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection);
-        connect(pTreeWidget->header(), SIGNAL(sectionResized(int, int, int)),
-                this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection);
-    }
-}
-
-void UIMediumManager::prepareTreeWidgetFD()
-{
-    /* FD tree-widget created in .ui file. */
-    {
-        /* Configure FD tree-widget: */
-        QTreeWidget *pTreeWidget = treeWidget(UIMediumType_Floppy);
-        pTreeWidget->setColumnCount(2);
-        pTreeWidget->sortItems(0, Qt::AscendingOrder);
-        pTreeWidget->header()->setResizeMode(0, QHeaderView::Fixed);
-        pTreeWidget->header()->setResizeMode(1, QHeaderView::ResizeToContents);
-        pTreeWidget->header()->setStretchLastSection(false);
-        pTreeWidget->setSortingEnabled(true);
-        connect(pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
-                this, SLOT(sltHandleCurrentItemChanged()));
-        connect(pTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
-                this, SLOT(sltHandleDoubleClick()));
-        connect(pTreeWidget, SIGNAL(customContextMenuRequested(const QPoint&)),
-                this, SLOT(sltHandleContextMenuCall(const QPoint&)));
-        connect(pTreeWidget, SIGNAL(resized(const QSize&, const QSize&)),
-                this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection);
-        connect(pTreeWidget->header(), SIGNAL(sectionResized(int, int, int)),
-                this, SLOT(sltPerformTablesAdjustment()), Qt::QueuedConnection);
-    }
-}
-
-void UIMediumManager::prepareInformationPanes()
+void UIMediumManager::prepareInformationContainer(UIMediumType, int)
 {
     /* Information-panes created in .ui file. */
@@ -1239 +1202 @@
         /* Configure button-box: */
         mButtonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+        connect(mButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
         connect(mButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
-        connect(mButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
         /* Prepare progress-bar: */
         prepareProgressBar();
@@ -1249 +1212 @@
 {
     /* Create progress-bar: */
-    m_pProgressBar = new UIEnumerationProgressBar(this);
+    m_pProgressBar = new UIEnumerationProgressBar;
     {
         /* Configure progress-bar: */
         m_pProgressBar->hide();
+        /* Add progress-bar into button-box layout: */
         mButtonBox->addExtraWidget(m_pProgressBar);
     }
@@ -1855 +1819 @@
 }
 
+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;
+    }
+    /* Null by default: */
+    return 0;
+}
+
+UIMediumItem* UIMediumManager::mediumItem(UIMediumType type) const
+{
+    /* Get corresponding tree-widget: */
+    QTreeWidget *pTreeWidget = treeWidget(type);
+    /* Return corresponding medium-item: */
+    return pTreeWidget ? toMediumItem(pTreeWidget->currentItem()) : 0;
+}
+
 UIMediumType UIMediumManager::mediumType(QTreeWidget *pTreeWidget) const
 {
@@ -1865 +1851 @@
     /* Invalid by default: */
     AssertFailedReturn(UIMediumType_Invalid);
-}
-
-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;
-    }
-    /* Null by default: */
-    return 0;
-}
-
-UIMediumItem* UIMediumManager::mediumItem(UIMediumType type) const
-{
-    /* Get corresponding tree-widget: */
-    QTreeWidget *pTreeWidget = treeWidget(type);
-    /* Return corresponding medium-item: */
-    return pTreeWidget ? toMediumItem(pTreeWidget->currentItem()) : 0;
 }
 

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

@@ -118 +118 @@
     /** Prepare tab-widget. */
     void prepareTabWidget();
-    /** Prepare tree-widgets. */
-    void prepareTreeWidgets();
-    /** Prepare hard-drive tree-widget. */
-    void prepareTreeWidgetHD();
-    /** Prepare optical-disk tree-widget. */
-    void prepareTreeWidgetCD();
-    /** Prepare floppy-disk tree-widget. */
-    void prepareTreeWidgetFD();
-    /** Prepare information-panes. */
-    void prepareInformationPanes();
+    /** Prepare tab-widget's tab. */
+    void prepareTab(UIMediumType type);
+    /** Prepare tab-widget's tree-widget. */
+    void prepareTreeWidget(UIMediumType type, int iColumns);
+    /** Prepare tab-widget's information-container. */
+    void prepareInformationContainer(UIMediumType type, int iFields);
     /** Prepare button-box. */
     void prepareButtonBox();
@@ -181 +177 @@
     void deleteMediumItem(const QString &strMediumID);
 
-    /** Returns medium type for passed @a pTreeWidget. */
-    UIMediumType mediumType(QTreeWidget *pTreeWidget) const;
     /** Returns tree-widget for passed medium @a type. */
     QTreeWidget* treeWidget(UIMediumType type) const;
     /** Returns item for passed medium @a type. */
     UIMediumItem* mediumItem(UIMediumType type) const;
+
+    /** Returns medium type for passed @a pTreeWidget. */
+    UIMediumType mediumType(QTreeWidget *pTreeWidget) const;
 
     /** Returns current medium type. */