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

Timestamp:

May 16, 2012 11:41:06 AM (13 years ago)

Author:

vboxsync

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

78001

Message:

FE/Qt: Move some common stuff related to medium formats from wizards to VBoxGlobal.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVD.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVD.h (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic5.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.h (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageBasic1.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageBasic4.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (1 diff)

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

@@ -4477 +4477 @@
 }
 #endif /* Q_WS_MAC */
+
+/* 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;
+}
 
 // Public slots

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

@@ -743 +743 @@
 #endif /* Q_WS_MAC */
 
+    /* Returns full medium-format name for the given base medium-format name: */
+    static QString fullMediumFormatName(const QString &strBaseMediumFormatName);
+
 signals:
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp ¶

@@ -43 +43 @@
     assignBackground(":/vmw_new_harddisk_bg.png");
 #endif /* Q_WS_MAC */
-}
-
-/* static */
-QString UIWizardCloneVD::fullFormatName(const QString &strBaseFormatName)
-{
-    if (strBaseFormatName == "VDI")
-        return QApplication::translate("UIWizardCloneVD", "&VDI (VirtualBox Disk Image)");
-    else if (strBaseFormatName == "VMDK")
-        return QApplication::translate("UIWizardCloneVD", "V&MDK (Virtual Machine Disk)");
-    else if (strBaseFormatName == "VHD")
-        return QApplication::translate("UIWizardCloneVD", "V&HD (Virtual Hard Disk)");
-    else if (strBaseFormatName == "Parallels")
-        return QApplication::translate("UIWizardCloneVD", "H&DD (Parallels Hard Disk)");
-    else if (strBaseFormatName == "QED")
-        return QApplication::translate("UIWizardCloneVD", "Q&ED (QEMU enhanced disk)");
-    else if (strBaseFormatName == "QCOW")
-        return QApplication::translate("UIWizardCloneVD", "&QCOW (QEMU Copy-On-Write)");
-    return strBaseFormatName;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.h ¶

@@ -53 +53 @@
     CMedium virtualDisk() const { return m_virtualDisk; }
 
-    /* Returns full medium format name: */
-    static QString fullFormatName(const QString &strBaseFormatName);
-
 protected:
 

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

@@ -144 +144 @@
                                           "to use it with other virtualization software you can "
                                           "leave this setting unchanged."));
-    m_pFormatCnt->setTitle(UIWizardCloneVD::tr("File type"));
+    m_pFormatCnt->setTitle(UIWizardCloneVD::tr("File &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(UIWizardCloneVD::fullFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic5.cpp ¶

@@ -69 +69 @@
     )
     .arg(UIWizardCloneVD::tr("File type", "summary"), mediumFormat.isNull() ?
-             QString() : VBoxGlobal::removeAccelMark(UIWizardCloneVD::fullFormatName(mediumFormat.GetName())))
+         QString() : VBoxGlobal::removeAccelMark(VBoxGlobal::fullMediumFormatName(mediumFormat.GetName())))
     .arg(UIWizardCloneVD::tr("Details", "summary"), vboxGlobal().toString((KMediumVariant)uVariant))
     .arg(UIWizardCloneVD::tr("Location", "summary"), strMediumPath)

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

@@ -239 +239 @@
     m_pDestinationCnt->setTitle(UIWizardCloneVD::tr("&Destination virtual disk"));
     m_pDestinationDiskOpenButton->setToolTip(UIWizardCloneVD::tr("Choose a virtual hard disk file..."));
-    m_pFormatCnt->setTitle(UIWizardCloneVD::tr("File type"));
+    m_pFormatCnt->setTitle(UIWizardCloneVD::tr("File &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(UIWizardCloneVD::fullFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
     }
     m_pVariantCnt->setTitle(UIWizardCloneVD::tr("Storage details"));

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp ¶

@@ -44 +44 @@
     assignBackground(":/vmw_new_harddisk_bg.png");
 #endif /* Q_WS_MAC */
-}
-
-/* static */
-QString UIWizardNewVD::fullFormatName(const QString &strBaseFormatName)
-{
-    if (strBaseFormatName == "VDI")
-        return QApplication::translate("UIWizardNewVD", "&VDI (VirtualBox Disk Image)");
-    else if (strBaseFormatName == "VMDK")
-        return QApplication::translate("UIWizardNewVD", "V&MDK (Virtual Machine Disk)");
-    else if (strBaseFormatName == "VHD")
-        return QApplication::translate("UIWizardNewVD", "V&HD (Virtual Hard Disk)");
-    else if (strBaseFormatName == "Parallels")
-        return QApplication::translate("UIWizardNewVD", "H&DD (Parallels Hard Disk)");
-    else if (strBaseFormatName == "QED")
-        return QApplication::translate("UIWizardNewVD", "Q&ED (QEMU enhanced disk)");
-    else if (strBaseFormatName == "QCOW")
-        return QApplication::translate("UIWizardNewVD", "&QCOW (QEMU Copy-On-Write)");
-    return strBaseFormatName;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h ¶

@@ -54 +54 @@
     CMedium virtualDisk() const { return m_virtualDisk; }
 
-    /* Returns full medium format name: */
-    static QString fullFormatName(const QString &strBaseFormatName);
-
 protected:
 

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

@@ -146 +146 @@
                                                            "to use it with other virtualization software you can "
                                                            "leave this setting unchanged.</p>"));
-    m_pFormatCnt->setTitle(UIWizardNewVD::tr("File type"));
+    m_pFormatCnt->setTitle(UIWizardNewVD::tr("File &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(UIWizardNewVD::fullFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic4.cpp ¶

@@ -67 +67 @@
         "<tr><td><nobr>%7: </nobr></td><td><nobr>%8 (%9)</nobr></td></tr>"
     )
-    .arg(UIWizardNewVD::tr("File type", "summary"), mediumFormat.isNull() ? QString() : VBoxGlobal::removeAccelMark(UIWizardNewVD::fullFormatName(mediumFormat.GetName())))
+    .arg(UIWizardNewVD::tr("File type", "summary"), mediumFormat.isNull() ?
+         QString() : VBoxGlobal::removeAccelMark(VBoxGlobal::fullMediumFormatName(mediumFormat.GetName())))
     .arg(UIWizardNewVD::tr("Details", "summary"), vboxGlobal().toString((KMediumVariant)uVariant))
     .arg(UIWizardNewVD::tr("Location", "summary"), strMediumPath)

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

@@ -258 +258 @@
     m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a virtual hard disk file..."));
     m_pSizeCnt->setTitle(UIWizardNewVD::tr("&Size"));
-    m_pFormatCnt->setTitle(UIWizardNewVD::tr("File type"));
+    m_pFormatCnt->setTitle(UIWizardNewVD::tr("File &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
     {
         QAbstractButton *pButton = buttons[i];
-        pButton->setText(UIWizardNewVD::fullFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
+        pButton->setText(VBoxGlobal::fullMediumFormatName(m_formatNames[m_pFormatButtonGroup->id(pButton)]));
     }
     m_pVariantCnt->setTitle(UIWizardNewVD::tr("Storage details"));