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

Timestamp:

Mar 5, 2014 11:51:38 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium Manager rework/cleanup: Reusing enum stuff.

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

@@ -323 +323 @@
 
     /* Reset tab-widget icons: */
-    mTabWidget->setTabIcon(HDTab, m_iconHD);
-    mTabWidget->setTabIcon(CDTab, m_iconCD);
-    mTabWidget->setTabIcon(FDTab, m_iconFD);
+    mTabWidget->setTabIcon(TabIndex_HD, m_iconHD);
+    mTabWidget->setTabIcon(TabIndex_CD, m_iconCD);
+    mTabWidget->setTabIcon(TabIndex_FD, m_iconFD);
 
     /* Repopulate tree-widgets content: */
@@ -841 +841 @@
         /* Configure tab-widget: */
         mTabWidget->setFocusPolicy(Qt::TabFocus);
-        mTabWidget->setTabIcon(HDTab, m_iconHD);
-        mTabWidget->setTabIcon(CDTab, m_iconCD);
-        mTabWidget->setTabIcon(FDTab, m_iconFD);
+        mTabWidget->setTabIcon(TabIndex_HD, m_iconHD);
+        mTabWidget->setTabIcon(TabIndex_CD, m_iconCD);
+        mTabWidget->setTabIcon(TabIndex_FD, m_iconFD);
         connect(mTabWidget, SIGNAL(currentChanged(int)), this, SLOT(sltHandleCurrentTabChanged()));
     }
@@ -1067 +1067 @@
 }
 
-void UIMediumManager::updateTabIcons(UIMediumItem *pMediumItem, ItemAction action)
+void UIMediumManager::updateTabIcons(UIMediumItem *pMediumItem, Action action)
 {
     /* Make sure medium-item is valid: */
@@ -1079 +1079 @@
     {
         case UIMediumType_HardDisk:
-            iTab = HDTab;
+            iTab = TabIndex_HD;
             pIcon = &m_iconHD;
             pfInaccessible = &m_fInaccessibleHD;
             break;
         case UIMediumType_DVD:
-            iTab = CDTab;
+            iTab = TabIndex_CD;
             pIcon = &m_iconCD;
             pfInaccessible = &m_fInaccessibleCD;
             break;
         case UIMediumType_Floppy:
-            iTab = FDTab;
+            iTab = TabIndex_FD;
             pIcon = &m_iconFD;
             pfInaccessible = &m_fInaccessibleFD;
@@ -1100 +1100 @@
     switch (action)
     {
-        case ItemAction_Added:
+        case Action_Add:
         {
             /* Does it change the overall state? */
@@ -1112 +1112 @@
             break;
         }
-        case ItemAction_Updated:
-        case ItemAction_Removed:
+        case Action_Edit:
+        case Action_Remove:
         {
             bool fCheckRest = false;
 
-            if (action == ItemAction_Updated)
+            if (action == Action_Edit)
             {
                 /* Does it change the overall state? */
@@ -1409 +1409 @@
 
     /* Update tab-icons: */
-    updateTabIcons(pMediumItem, ItemAction_Added);
+    updateTabIcons(pMediumItem, Action_Add);
 
     /* If medium-enumeration is not currently in progress or
@@ -1440 +1440 @@
 
     /* Update tab-icons: */
-    updateTabIcons(pMediumItem, ItemAction_Updated);
+    updateTabIcons(pMediumItem, Action_Edit);
 
     /* Re-fetch medium-item if it is current one updated: */
@@ -1469 +1469 @@
 
     /* Update tab-icons: */
-    updateTabIcons(pMediumItem, ItemAction_Removed);
+    updateTabIcons(pMediumItem, Action_Remove);
 
     /* Delete medium-item: */
@@ -1640 +1640 @@
     switch (mTabWidget->currentIndex())
     {
-        case HDTab: return UIMediumType_HardDisk;
-        case CDTab: return UIMediumType_DVD;
-        case FDTab: return UIMediumType_Floppy;
+        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;
     }

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

@@ -50 +50 @@
     Q_OBJECT;
 
-    /* Enumerators: */
-    enum TabIndex { HDTab = 0, CDTab, FDTab };
-    enum ItemAction { ItemAction_Added, ItemAction_Updated, ItemAction_Removed };
-    enum Action { Action_Edit, Action_Copy, Action_Modify, Action_Remove, Action_Release };
+    /** Tab index enumerator. */
+    enum TabIndex { TabIndex_HD = 0, TabIndex_CD, TabIndex_FD };
+
+    /** Item action enumerator. */
+    enum Action { Action_Add, Action_Edit, Action_Copy, Action_Modify, Action_Remove, Action_Release };
 
     /* Constructor/destructor: */
@@ -129 +130 @@
     void updateActions();
     /** Update tab icons according last @a action happened with @a pItem. */
-    void updateTabIcons(UIMediumItem *pItem, ItemAction action);
+    void updateTabIcons(UIMediumItem *pItem, Action action);
     /** Update information pane of passed medium @a type. */
     void updateInformationPanes(UIMediumType type = UIMediumType_Invalid);