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

Timestamp:

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

Author:

vboxsync

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

93116

Message:

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

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

@@ -921 +921 @@
     /* Prepare this: */
     prepareThis();
-    /* Prepare actions: */
-    prepareActions();
-    /* Prepare menu-bar: */
-    prepareMenuBar();
-    /* Prepare tool-bar: */
-    prepareToolBar();
-    /* Prepare context-menu: */
-    prepareContextMenu();
-    /* Prepare tab-widget: */
-    prepareTabWidget();
-    /* Prepare tree-widgets: */
-    prepareTreeWidgets();
-    /* Prepare information-panes: */
-    prepareInformationPanes();
-    /* Prepare button-box: */
-    prepareButtonBox();
-    /* Prepare progress-bar: */
-    prepareProgressBar();
 
     /* Translate dialog: */
@@ -974 +956 @@
     /* Dialog should delete itself on 'close': */
     setAttribute(Qt::WA_DeleteOnClose);
-
     /* And no need to count it as important for application.
      * This way it will NOT be taken into account
@@ -987 +968 @@
     Ui::UIMediumManager::setupUi(this);
 
+    /* Prepare connections: */
+    prepareConnections();
+    /* Prepare actions: */
+    prepareActions();
+    /* Prepare central-widget: */
+    prepareCentralWidget();
+}
+
+void UIMediumManager::prepareConnections()
+{
     /* Configure medium-processing connections: */
     connect(&vboxGlobal(), SIGNAL(sigMediumCreated(const QString&)),
@@ -1046 +1037 @@
     /* Update action icons: */
     updateActionIcons();
+
+    /* Prepare menu-bar: */
+    prepareMenuBar();
+    /* Prepare context-menu: */
+    prepareContextMenu();
 }
 
@@ -1060 +1056 @@
         m_pMenu->addAction(m_pActionRefresh);
     }
+}
+
+void UIMediumManager::prepareContextMenu()
+{
+    /* Create context-menu: */
+    m_pContextMenu = new QMenu(this);
+    {
+        /* Configure contex-menu: */
+        m_pContextMenu->addAction(m_pActionCopy);
+        m_pContextMenu->addAction(m_pActionModify);
+        m_pContextMenu->addAction(m_pActionRemove);
+        m_pContextMenu->addAction(m_pActionRelease);
+    }
+}
+
+void UIMediumManager::prepareCentralWidget()
+{
+    /* Prepare tool-bar: */
+    prepareToolBar();
+    /* Prepare tab-widget: */
+    prepareTabWidget();
+    /* Prepare button-box: */
+    prepareButtonBox();
 }
 
@@ -1097 +1116 @@
 }
 
-void UIMediumManager::prepareContextMenu()
-{
-    /* Create context-menu: */
-    m_pContextMenu = new QMenu(this);
-    {
-        /* Configure contex-menu: */
-        m_pContextMenu->addAction(m_pActionCopy);
-        m_pContextMenu->addAction(m_pActionModify);
-        m_pContextMenu->addAction(m_pActionRemove);
-        m_pContextMenu->addAction(m_pActionRelease);
-    }
-}
-
 void UIMediumManager::prepareTabWidget()
 {
@@ -1120 +1126 @@
         mTabWidget->setTabIcon(TabIndex_FD, m_iconFD);
         connect(mTabWidget, SIGNAL(currentChanged(int)), this, SLOT(sltHandleCurrentTabChanged()));
+        /* Prepare tree-widgets: */
+        prepareTreeWidgets();
+        /* Prepare information-panes: */
+        prepareInformationPanes();
     }
 }
@@ -1231 +1241 @@
         connect(mButtonBox, SIGNAL(accepted()), this, SLOT(accept()));
         connect(mButtonBox, SIGNAL(helpRequested()), &msgCenter(), SLOT(sltShowHelpHelpDialog()));
+        /* Prepare progress-bar: */
+        prepareProgressBar();
     }
 }
@@ -1855 +1867 @@
 }
 
+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::currentMediumType() const
 {
@@ -1869 +1903 @@
 }
 
-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;
-}
-
 QTreeWidget* UIMediumManager::currentTreeWidget() const
 {
     /* Return current tree-widget: */
     return treeWidget(currentMediumType());
-}
-
-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

@@ -104 +104 @@
     /** Prepare dialog. */
     void prepareThis();
+    /** Prepare connections. */
+    void prepareConnections();
     /** Prepare actions. */
     void prepareActions();
     /** Prepare menu-bar. */
     void prepareMenuBar();
+    /** Prepare context-menu. */
+    void prepareContextMenu();
+    /** Prepare central-widget. */
+    void prepareCentralWidget();
     /** Prepare tool-bar. */
     void prepareToolBar();
-    /** Prepare context-menu. */
-    void prepareContextMenu();
     /** Prepare tab-widget. */
     void prepareTabWidget();
@@ -177 +181 @@
     void deleteMediumItem(const QString &strMediumID);
 
-    /** Determines medium type for passed @a pTreeWidget. */
+    /** 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 current medium type. */
     UIMediumType currentMediumType() const;
-
-    /** Returns tree-widget for passed medium @a type. */
-    QTreeWidget* treeWidget(UIMediumType type) const;
     /** Returns current tree-widget. */
     QTreeWidget* currentTreeWidget() const;
-
-    /** Returns item for passed medium @a type. */
-    UIMediumItem* mediumItem(UIMediumType type) const;
     /** Returns current item. */
     UIMediumItem* currentMediumItem() const;