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

Timestamp:

Jul 3, 2018 11:57:53 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: Move/rework fullMediumFormatName functionality out of VBoxGlobal to UIMediumDefs and UIConverter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (3 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumDefs.h (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (2 diffs)
• wizards/clonevd/UIWizardCloneVDPageExpert.cpp (modified) (2 diffs)
• wizards/newvd/UIWizardNewVDPageBasic1.cpp (modified) (2 diffs)
• wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -28 +28 @@
 #include "UIDefs.h"
 #include "UILibraryDefs.h"
+#include "UIMediumDefs.h"
 #include "UIExtraDataDefs.h"
 
@@ -108 +109 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<InformationElementType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<MaxGuestResolutionPolicy>();
+template<> SHARED_LIBRARY_STUFF bool canConvert<UIMediumFormat>();
 
 
@@ -212 +214 @@
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const MaxGuestResolutionPolicy &enmMaxGuestResolutionPolicy);
 template<> SHARED_LIBRARY_STUFF MaxGuestResolutionPolicy fromInternalString<MaxGuestResolutionPolicy>(const QString &strMaxGuestResolutionPolicy);
+template<> SHARED_LIBRARY_STUFF QString toString(const UIMediumFormat &enmUIMediumFormat);
+template<> SHARED_LIBRARY_STUFF QString toInternalString(const UIMediumFormat &enmUIMediumFormat);
+template<> SHARED_LIBRARY_STUFF UIMediumFormat fromInternalString<UIMediumFormat>(const QString &strUIMediumFormat);
 
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -73 +73 @@
 template<> bool canConvert<InformationElementType>() { return true; }
 template<> bool canConvert<MaxGuestResolutionPolicy>() { return true; }
+template<> bool canConvert<UIMediumFormat>() { return true; }
 
 
@@ -1858 +1859 @@
 }
 
+/* QString <= UIMediumFormat: */
+template<> QString toString(const UIMediumFormat &enmUIMediumFormat)
+{
+    QString strResult;
+    switch (enmUIMediumFormat)
+    {
+        case UIMediumFormat_VDI:       strResult = QApplication::translate("VBoxGlobal", "VDI (VirtualBox Disk Image)", "UIMediumFormat"); break;
+        case UIMediumFormat_VMDK:      strResult = QApplication::translate("VBoxGlobal", "VMDK (Virtual Machine Disk)", "UIMediumFormat"); break;
+        case UIMediumFormat_VHD:       strResult = QApplication::translate("VBoxGlobal", "VHD (Virtual Hard Disk)", "UIMediumFormat"); break;
+        case UIMediumFormat_Parallels: strResult = QApplication::translate("VBoxGlobal", "HDD (Parallels Hard Disk)", "UIMediumFormat"); break;
+        case UIMediumFormat_QED:       strResult = QApplication::translate("VBoxGlobal", "QED (QEMU enhanced disk)", "UIMediumFormat"); break;
+        case UIMediumFormat_QCOW:      strResult = QApplication::translate("VBoxGlobal", "QCOW (QEMU Copy-On-Write)", "UIMediumFormat"); break;
+        default:
+        {
+            AssertMsgFailed(("No text for medium format=%d", enmUIMediumFormat));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* QString <= UIMediumFormat: */
+template<> QString toInternalString(const UIMediumFormat &enmUIMediumFormat)
+{
+    QString strResult;
+    switch (enmUIMediumFormat)
+    {
+        case UIMediumFormat_VDI:       strResult = "VDI"; break;
+        case UIMediumFormat_VMDK:      strResult = "VMDK"; break;
+        case UIMediumFormat_VHD:       strResult = "VHD"; break;
+        case UIMediumFormat_Parallels: strResult = "Parallels"; break;
+        case UIMediumFormat_QED:       strResult = "QED"; break;
+        case UIMediumFormat_QCOW:      strResult = "QCOW"; break;
+        default:
+        {
+            AssertMsgFailed(("No text for medium format=%d", enmUIMediumFormat));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* UIMediumFormat <= QString: */
+template<> UIMediumFormat fromInternalString<UIMediumFormat>(const QString &strUIMediumFormat)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;    QList<UIMediumFormat> values;
+    keys << "VDI";       values << UIMediumFormat_VDI;
+    keys << "VMDK";      values << UIMediumFormat_VMDK;
+    keys << "VHD";       values << UIMediumFormat_VHD;
+    keys << "Parallels"; values << UIMediumFormat_Parallels;
+    keys << "QED";       values << UIMediumFormat_QED;
+    keys << "QCOW";      values << UIMediumFormat_QCOW;
+    /* VDI format for unknown words: */
+    if (!keys.contains(strUIMediumFormat, Qt::CaseInsensitive))
+        return UIMediumFormat_VDI;
+    /* Corresponding format for known words: */
+    return values.at(keys.indexOf(QRegExp(strUIMediumFormat, Qt::CaseInsensitive)));
+}

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

@@ -1065 +1065 @@
 
 /* static */
-QString VBoxGlobal::fullMediumFormatName(const QString &strBaseMediumFormatName)
-{
-    if (strBaseMediumFormatName == "VDI")
-        return tr("VDI (VirtualBox Disk Image)");
-    else if (strBaseMediumFormatName == "VMDK")
-        return tr("VMDK (Virtual Machine Disk)");
-    else if (strBaseMediumFormatName == "VHD")
-        return tr("VHD (Virtual Hard Disk)");
-    else if (strBaseMediumFormatName == "Parallels")
-        return tr("HDD (Parallels Hard Disk)");
-    else if (strBaseMediumFormatName == "QED")
-        return tr("QED (QEMU enhanced disk)");
-    else if (strBaseMediumFormatName == "QCOW")
-        return tr("QCOW (QEMU Copy-On-Write)");
-    return strBaseMediumFormatName;
-}
-
-/* static */
 QStringList VBoxGlobal::COMPortNames()
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -328 +328 @@
           * @param  cDecimal  Brings the number of decimal digits in result. */
         static QString formatSize(quint64 uSize, uint cDecimal = 2, FormatSize enmMode = FormatSize_Round);
-
-        /** Returns full medium-format name for the given @a strBaseMediumFormatName. */
-        static QString fullMediumFormatName(const QString &strBaseMediumFormatName);
 
         /** Returns the list of the standard COM port names (i.e. "COMx"). */

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

@@ -31 +31 @@
 #include <VBox/com/defs.h>
 
+
+/** Medium formats. */
+enum UIMediumFormat
+{
+    UIMediumFormat_VDI,
+    UIMediumFormat_VMDK,
+    UIMediumFormat_VHD,
+    UIMediumFormat_Parallels,
+    UIMediumFormat_QED,
+    UIMediumFormat_QCOW,
+};
 
 /** UIMediumDefs namespace. */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

@@ -26 +26 @@
 
 /* GUI includes: */
+# include "UIConverter.h"
 # include "UIWizardCloneVDPageBasic2.h"
 # include "UIWizardCloneVD.h"
@@ -169 +170 @@
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+        pButton->setText(gpConverter->toString(enmFormat));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -32 +32 @@
 /* GUI includes: */
 # include "QIToolButton.h"
+# include "UIConverter.h"
 # include "UIIconPool.h"
 # include "UIMediaComboBox.h"
@@ -265 +266 @@
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+        pButton->setText(gpConverter->toString(enmFormat));
     }
     m_pVariantCnt->setTitle(UIWizardCloneVD::tr("Storage on physical hard disk"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -26 +26 @@
 
 /* GUI includes: */
+# include "UIConverter.h"
 # include "UIWizardNewVDPageBasic1.h"
 # include "UIWizardNewVD.h"
@@ -163 +164 @@
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+        pButton->setText(gpConverter->toString(enmFormat));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -33 +33 @@
 
 /* GUI includes: */
+# include "UIConverter.h"
 # include "UIWizardNewVDPageExpert.h"
 # include "UIWizardNewVD.h"
@@ -229 +230 @@
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+        pButton->setText(gpConverter->toString(enmFormat));
     }
     m_pVariantCnt->setTitle(UIWizardNewVD::tr("Storage on physical hard disk"));