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

Timestamp:

Jun 13, 2012 3:34:06 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: COMEnumsWrapper: remove medium variants which only exist in theory, and add more which actually exist

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/COMEnumsWrapper.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMEnumsWrapper.cpp

@@ -122 +122 @@
 QString COMEnumsWrapper::toString(KMediumVariant variant) const
 {
+    /* note: KMediumVariant_Diff and KMediumVariant_Fixed are so far mutually exclusive */
     switch (variant)
     {
@@ -130 +131 @@
         case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed):
             return m_mediumVariantNames[2];
-        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed | KMediumVariant_Diff):
+        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_VmdkSplit2G):
             return m_mediumVariantNames[3];
-        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_VmdkSplit2G):
+        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_VmdkSplit2G | KMediumVariant_Diff):
             return m_mediumVariantNames[4];
-        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_VmdkSplit2G | KMediumVariant_Diff):
+        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed | KMediumVariant_VmdkSplit2G):
             return m_mediumVariantNames[5];
-        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed | KMediumVariant_VmdkSplit2G):
+        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_VmdkStreamOptimized):
             return m_mediumVariantNames[6];
-        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed | KMediumVariant_VmdkSplit2G | KMediumVariant_Diff):
+        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_VmdkStreamOptimized | KMediumVariant_Diff):
             return m_mediumVariantNames[7];
+        case (KMediumVariant)(KMediumVariant_Standard | KMediumVariant_Fixed | KMediumVariant_VmdkESX):
+            return m_mediumVariantNames[8];
         default:
             AssertMsgFailed(("No text for %d", variant));
@@ -649 +652 @@
     m_mediumVariantNames[1] = QApplication::translate("VBoxGlobal", "Dynamically allocated differencing storage", "MediumVariant");
     m_mediumVariantNames[2] = QApplication::translate("VBoxGlobal", "Fixed size storage", "MediumVariant");
-    m_mediumVariantNames[3] = QApplication::translate("VBoxGlobal", "Fixed size differencing storage", "MediumVariant");
-    m_mediumVariantNames[4] = QApplication::translate("VBoxGlobal", "Dynamically allocated storage split into files of less than 2GB", "MediumVariant");
-    m_mediumVariantNames[5] = QApplication::translate("VBoxGlobal", "Dynamically allocated differencing storage split into files of less than 2GB", "MediumVariant");
-    m_mediumVariantNames[6] = QApplication::translate("VBoxGlobal", "Fixed size storage split into files of less than 2GB", "MediumVariant");
-    m_mediumVariantNames[7] = QApplication::translate("VBoxGlobal", "Fixed size differencing storage split into files of less than 2GB", "MediumVariant");
+    m_mediumVariantNames[3] = QApplication::translate("VBoxGlobal", "Dynamically allocated storage split into files of less than 2GB", "MediumVariant");
+    m_mediumVariantNames[4] = QApplication::translate("VBoxGlobal", "Dynamically allocated differencing storage split into files of less than 2GB", "MediumVariant");
+    m_mediumVariantNames[5] = QApplication::translate("VBoxGlobal", "Fixed size storage split into files of less than 2GB", "MediumVariant");
+    m_mediumVariantNames[6] = QApplication::translate("VBoxGlobal", "Dynamically allocated compressed storage", "MediumVariant");
+    m_mediumVariantNames[7] = QApplication::translate("VBoxGlobal", "Dynamically allocated differencing compressed storage", "MediumVariant");
+    m_mediumVariantNames[8] = QApplication::translate("VBoxGlobal", "Fixed size ESX storage", "MediumVariant");
 
     /* KNetworkAttachmentType => QString: */