Changeset 91252 in vbox

Timestamp:

Sep 15, 2021 12:50:23 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Refactoring UIDiskFormatsGroupBox. part 1.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors

Files:

• UIWizardDiskEditors.cpp (modified) (7 diffs)
• UIWizardDiskEditors.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -148 +148 @@
 }
 
+/* static */
+QString UIDiskEditorGroupBox::defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType)
+{
+    if (!mediumFormatRef.isNull())
+    {
+        /* Load extension / device list: */
+        QVector<QString> fileExtensions;
+        QVector<KDeviceType> deviceTypes;
+        CMediumFormat mediumFormat(mediumFormatRef);
+        mediumFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
+        for (int i = 0; i < fileExtensions.size(); ++i)
+            if (deviceTypes[i] == enmDeviceType)
+                return fileExtensions[i].toLower();
+    }
+    AssertMsgFailed(("Extension can't be NULL!\n"));
+    return QString();
+}
+
 
 /*********************************************************************************************************************************
@@ -155 +173 @@
 UIDiskFormatsGroupBox::UIDiskFormatsGroupBox(bool fExpertMode, KDeviceType enmDeviceType, QWidget *pParent /* = 0 */)
     : UIDiskEditorGroupBox(fExpertMode, pParent)
+    , m_enmDeviceType(enmDeviceType)
     , m_pFormatButtonGroup(0)
-{
-    prepare(enmDeviceType);
+    , m_pMainLayout(0)
+{
+    prepare();
+
 }
 
 CMediumFormat UIDiskFormatsGroupBox::mediumFormat() const
 {
-    return m_pFormatButtonGroup && m_pFormatButtonGroup->checkedButton() ? m_formats[m_pFormatButtonGroup->checkedId()] : CMediumFormat();
+    return m_pFormatButtonGroup &&
+           m_pFormatButtonGroup->checkedButton() ? m_formatList[m_pFormatButtonGroup->checkedId()].m_comFormat : CMediumFormat();
 }
 
 void UIDiskFormatsGroupBox::setMediumFormat(const CMediumFormat &mediumFormat)
 {
-    int iPosition = m_formats.indexOf(mediumFormat);
+    int iPosition = -1;
+    for (int i = 0; i < m_formatList.size(); ++i)
+    {
+        if (mediumFormat == m_formatList[i].m_comFormat)
+            iPosition = i;
+    }
     if (iPosition >= 0)
     {
@@ -180 +207 @@
 }
 
-void UIDiskFormatsGroupBox::prepare(KDeviceType enmDeviceType)
-{
-    QVBoxLayout *pContainerLayout = new QVBoxLayout(this);
-
-    m_pFormatButtonGroup = new QButtonGroup(this);
-    AssertReturnVoid(m_pFormatButtonGroup);
+void UIDiskFormatsGroupBox::prepare()
+{
+    m_pMainLayout = new QVBoxLayout(this);
+    populateFormats();
+    createFormatWidgets();
+    retranslateUi();
+}
+
+void UIDiskFormatsGroupBox::populateFormats(){
     /* Enumerate medium formats in special order: */
     CSystemProperties properties = uiCommon().virtualBox().GetSystemProperties();
@@ -209 +239 @@
     /* Create buttons for VDI, preferred and others: */
     foreach (const QString &strId, vdi.keys())
-        addFormatButton(pContainerLayout, vdi.value(strId), enmDeviceType, true);
+        addFormat(vdi.value(strId), true);
     foreach (const QString &strId, preferred.keys())
-        addFormatButton(pContainerLayout, preferred.value(strId), enmDeviceType, true);
-
-    if (m_fExpertMode || enmDeviceType == KDeviceType_DVD || enmDeviceType == KDeviceType_Floppy)
+        addFormat(preferred.value(strId), true);
+
+    if (m_fExpertMode || m_enmDeviceType == KDeviceType_DVD || m_enmDeviceType == KDeviceType_Floppy)
     {
         foreach (const QString &strId, others.keys())
-            addFormatButton(pContainerLayout, others.value(strId), enmDeviceType);
-    }
-
-    /* Select VDI: */
-    if (!m_pFormatButtonGroup->buttons().isEmpty())
-    {
-        m_pFormatButtonGroup->button(0)->click();
-        m_pFormatButtonGroup->button(0)->setFocus();
-    }
-
-    connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
-            this, &UIDiskFormatsGroupBox::sigMediumFormatChanged);
-
-    retranslateUi();
+            addFormat(others.value(strId));
+    }
 }
 
@@ -241 +259 @@
     {
         QAbstractButton *pButton = buttons[i];
-        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+        UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatList[m_pFormatButtonGroup->id(pButton)].m_strName);
         pButton->setText(gpConverter->toString(enmFormat));
     }
 }
 
-void UIDiskFormatsGroupBox::addFormatButton(QVBoxLayout *pFormatLayout, CMediumFormat medFormat,
-                                            KDeviceType enmDeviceType, bool fPreferred /* = false */)
+void UIDiskFormatsGroupBox::addFormat(CMediumFormat medFormat, bool fPreferred /* = false */)
 {
     /* Check that medium format supports creation: */
@@ -264 +281 @@
     QVector<KDeviceType> deviceTypes;
     medFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
-    if (!deviceTypes.contains(enmDeviceType))
+    if (!deviceTypes.contains(m_enmDeviceType))
         return;
-
-    /* Create/add corresponding radio-button: */
-    QRadioButton *pFormatButton = new QRadioButton;
-    AssertPtrReturnVoid(pFormatButton);
-    {
+    m_formatList << Format(medFormat, medFormat.GetName(), defaultExtension(medFormat, m_enmDeviceType), fPreferred);
+}
+
+const QStringList UIDiskFormatsGroupBox::formatExtensions() const
+{
+    QStringList extensionList;
+    foreach (const Format &format, m_formatList)
+        extensionList << format.m_strExtension;
+    return extensionList;
+}
+
+void UIDiskFormatsGroupBox::createFormatWidgets()
+{
+    AssertReturnVoid(m_pMainLayout);
+    AssertReturnVoid(!m_formatList.isEmpty());
+    m_pFormatButtonGroup = new QButtonGroup(this);
+    AssertReturnVoid(m_pFormatButtonGroup);
+
+    for (int i = 0; i < m_formatList.size(); ++i)
+    {
+        QRadioButton *pFormatButton = new QRadioButton;
+        if (!pFormatButton)
+            continue;
+
         /* Make the preferred button font bold: */
-        if (fPreferred && m_fExpertMode)
+        if (m_formatList[i].m_fPreferred && m_fExpertMode)
         {
             QFont font = pFormatButton->font();
@@ -278 +314 @@
             pFormatButton->setFont(font);
         }
-        pFormatLayout->addWidget(pFormatButton);
-        m_formats << medFormat;
-        m_formatNames << medFormat.GetName();
-        m_pFormatButtonGroup->addButton(pFormatButton, m_formatNames.size() - 1);
-        m_formatExtensions << defaultExtension(medFormat, enmDeviceType);
-    }
-}
-
-const QStringList UIDiskFormatsGroupBox::formatExtensions() const
-{
-    return m_formatExtensions;
-}
-
-/* static */
-QString UIDiskFormatsGroupBox::defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType)
-{
-    if (!mediumFormatRef.isNull())
-    {
-        /* Load extension / device list: */
-        QVector<QString> fileExtensions;
-        QVector<KDeviceType> deviceTypes;
-        CMediumFormat mediumFormat(mediumFormatRef);
-        mediumFormat.DescribeFileExtensions(fileExtensions, deviceTypes);
-        for (int i = 0; i < fileExtensions.size(); ++i)
-            if (deviceTypes[i] == enmDeviceType)
-                return fileExtensions[i].toLower();
-    }
-    AssertMsgFailed(("Extension can't be NULL!\n"));
-    return QString();
-}
-
-
+        m_pMainLayout->addWidget(pFormatButton);
+        m_pFormatButtonGroup->addButton(pFormatButton, i);
+    }
+
+    setMediumFormat(m_formatList[0].m_comFormat);
+    connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
+            this, &UIDiskFormatsGroupBox::sigMediumFormatChanged);
+}
 /*********************************************************************************************************************************
 *   UIDiskVariantGroupBox implementation.                                                                                   *

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -25 +25 @@
 #include <QIcon>
 #include <QGroupBox>
+#include <QVector>
 
 /* Local includes: */
@@ -64 +65 @@
     static QString openFileDialogForDiskFile(const QString &strInitialPath, const CMediumFormat &comMediumFormat,
                                              KDeviceType enmDeviceType, QWidget *pParent);
+    /** Attempts to find a file extention for the device type @p enmDeviceType within the extensions
+      * returned by CMediumFormat::DescribeFileExtensions(..). */
+    static QString defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType);
 
 protected:
@@ -85 +89 @@
     const CMediumFormat &VDIMediumFormat() const;
     const QStringList formatExtensions() const;
-    /** Attempts to find a file extention for the device type @p enmDeviceType within the extensions
-      * returned by CMediumFormat::DescribeFileExtensions(..). */
-    static QString defaultExtension(const CMediumFormat &mediumFormatRef, KDeviceType enmDeviceType);
 
 private:
+    struct Format
+    {
+        CMediumFormat m_comFormat;
+        QString       m_strName;
+        QString       m_strExtension;
+        bool          m_fPreferred;
+        Format(const CMediumFormat &comFormat, const QString &strName,
+               const QString &strExtension, bool fPreferred)
+               : m_comFormat(comFormat)
+               , m_strName(strName)
+               , m_strExtension(strExtension)
+               , m_fPreferred(fPreferred){}
+    };
 
-    void prepare(KDeviceType enmDeviceType);
-    void addFormatButton(QVBoxLayout *pFormatLayout, CMediumFormat medFormat, KDeviceType enmDeviceType, bool fPreferred = false);
-
+    void prepare();
+    void populateFormats();
+    void addFormat(CMediumFormat medFormat, bool fPreferred = false);
+    void createFormatWidgets();
     virtual void retranslateUi() /* override final */;
 
-    QList<CMediumFormat>  m_formats;
+    QVector<Format> m_formatList;
+
     CMediumFormat m_comVDIMediumFormat;
-    QStringList           m_formatNames;
-    QStringList m_formatExtensions;
+    KDeviceType m_enmDeviceType;
+
     QButtonGroup *m_pFormatButtonGroup;
+    QVBoxLayout *m_pMainLayout;
 };