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

Timestamp:

Apr 3, 2014 2:54:55 PM (11 years ago)

Author:

vboxsync

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

93124

Message:

FE/Qt: Medium Manager rework/cleanup: Abstract medium-type to tab-index mapping.

Location:

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

Files:

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

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

@@ -749 +749 @@
     if (mTabWidget)
     {
-        mTabWidget->setTabIcon(TabIndex_HD, m_iconHD);
-        mTabWidget->setTabIcon(TabIndex_CD, m_iconCD);
-        mTabWidget->setTabIcon(TabIndex_FD, m_iconFD);
+        mTabWidget->setTabIcon(tabIndex(UIMediumType_HardDisk), m_iconHD);
+        mTabWidget->setTabIcon(tabIndex(UIMediumType_DVD), m_iconCD);
+        mTabWidget->setTabIcon(tabIndex(UIMediumType_Floppy), m_iconFD);
     }
 
@@ -1161 +1161 @@
         /* Configure tab-widget: */
         mTabWidget->setFocusPolicy(Qt::TabFocus);
-        mTabWidget->setTabIcon(TabIndex_HD, m_iconHD);
-        mTabWidget->setTabIcon(TabIndex_CD, m_iconCD);
-        mTabWidget->setTabIcon(TabIndex_FD, m_iconFD);
+        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()));
         /* Focus current tree-widget: */
@@ -1425 +1425 @@
 
     /* Prepare data for tab: */
-    int iTab = -1;
     const QIcon *pIcon = 0;
     bool *pfInaccessible = 0;
-    switch (pMediumItem->mediumType())
+    const UIMediumType mediumType = pMediumItem->mediumType();
+    switch (mediumType)
     {
         case UIMediumType_HardDisk:
-            iTab = TabIndex_HD;
             pIcon = &m_iconHD;
             pfInaccessible = &m_fInaccessibleHD;
             break;
         case UIMediumType_DVD:
-            iTab = TabIndex_CD;
             pIcon = &m_iconCD;
             pfInaccessible = &m_fInaccessibleCD;
             break;
         case UIMediumType_Floppy:
-            iTab = TabIndex_FD;
             pIcon = &m_iconFD;
             pfInaccessible = &m_fInaccessibleFD;
@@ -1448 +1445 @@
             AssertFailed();
     }
-    AssertReturnVoid(iTab != -1 && pIcon && pfInaccessible);
+    AssertReturnVoid(pIcon && pfInaccessible);
 
     switch (action)
@@ -1461 +1458 @@
 
             if (mTabWidget)
-                mTabWidget->setTabIcon(iTab, vboxGlobal().warningIcon());
+                mTabWidget->setTabIcon(tabIndex(mediumType), vboxGlobal().warningIcon());
 
             break;
@@ -1498 +1495 @@
             {
                 if (*pfInaccessible)
-                    mTabWidget->setTabIcon(iTab, vboxGlobal().warningIcon());
+                    mTabWidget->setTabIcon(tabIndex(mediumType), vboxGlobal().warningIcon());
                 else
-                    mTabWidget->setTabIcon(iTab, *pIcon);
+                    mTabWidget->setTabIcon(tabIndex(mediumType), *pIcon);
             }
 
@@ -1715 +1712 @@
     if (mTabWidget)
     {
-        mTabWidget->setTabText(TabIndex_HD, tr("&Hard drives"));
-        mTabWidget->setTabText(TabIndex_CD, tr("&Optical disks"));
-        mTabWidget->setTabText(TabIndex_FD, tr("&Floppy disks"));
+        mTabWidget->setTabText(tabIndex(UIMediumType_HardDisk), tr("&Hard drives"));
+        mTabWidget->setTabText(tabIndex(UIMediumType_DVD), tr("&Optical disks"));
+        mTabWidget->setTabText(tabIndex(UIMediumType_Floppy), tr("&Floppy disks"));
     }
 
@@ -2036 +2033 @@
 
     /* Return current medium type: */
-    switch (mTabWidget->currentIndex())
-    {
-        case TabIndex_HD: return UIMediumType_HardDisk;
-        case TabIndex_CD: return UIMediumType_DVD;
-        case TabIndex_FD: return UIMediumType_Floppy;
-        default: AssertMsgFailed(("Unknown page type: %d\n", mTabWidget->currentIndex())); break;
-    }
-    /* Invalid by default: */
-    return UIMediumType_Invalid;
+    return mediumType(mTabWidget->currentIndex());
 }
 
@@ -2077 +2066 @@
     /* Re-fetch currently chosen medium-item: */
     refetchCurrentChosenMediumItem();
+}
+
+/* static */
+int UIMediumManager::tabIndex(UIMediumType type)
+{
+    /* Return tab index corresponding to known medium type: */
+    switch (type)
+    {
+        case UIMediumType_HardDisk: return 0;
+        case UIMediumType_DVD:      return 1;
+        case UIMediumType_Floppy:   return 2;
+        default: break;
+    }
+
+    /* -1 by default: */
+    return -1;
+}
+
+/* static */
+UIMediumType UIMediumManager::mediumType(int iIndex)
+{
+    /* Return medium type corresponding to known tab index: */
+    switch (iIndex)
+    {
+        case 0: return UIMediumType_HardDisk;
+        case 1: return UIMediumType_DVD;
+        case 2: return UIMediumType_Floppy;
+        default: break;
+    }
+
+    /* Invalid by default: */
+    return UIMediumType_Invalid;
 }
 

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

@@ -42 +42 @@
 {
     Q_OBJECT;
-
-    /** Tab index enumerator. */
-    enum TabIndex { TabIndex_HD = 0, TabIndex_CD, TabIndex_FD };
 
     /** Item action enumerator. */
@@ -195 +192 @@
     void setCurrentItem(QTreeWidget *pTreeWidget, QTreeWidgetItem *pItem);
 
+    /** Returns tab index for passed UIMediumType. */
+    static int tabIndex(UIMediumType type);
+    /** Returns UIMediumType for passed tab index. */
+    static UIMediumType mediumType(int iIndex);
+
     /** Performs search for the @a pTree child which corresponds to the @a condition but not @a pException. */
     static UIMediumItem* searchItem(QTreeWidget *pTree, const CheckIfSuitableBy &condition, CheckIfSuitableBy *pException = 0);