Changeset 90755 in vbox for trunk

Timestamp:

Aug 19, 2021 4:33:03 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Refactoring medium format and medium variant pages of the clone vd wizard.

Location:

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

Files:

• clonevd/UIWizardCloneVD.cpp (modified) (3 diffs)
• clonevd/UIWizardCloneVD.h (modified) (4 diffs)
• clonevd/UIWizardCloneVDPageBasic1.cpp (modified) (4 diffs)
• clonevd/UIWizardCloneVDPageBasic1.h (modified) (4 diffs)
• clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (6 diffs)
• clonevd/UIWizardCloneVDPageBasic2.h (modified) (4 diffs)
• editors/UIWizardDiskEditors.cpp (modified) (1 diff)
• editors/UIWizardDiskEditors.h (modified) (1 diff)

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

@@ -35 +35 @@
     , m_comSourceVirtualDisk(comSourceVirtualDisk)
     , m_enmSourceVirtualDiskDeviceType(m_comSourceVirtualDisk.GetDeviceType())
+    , m_iMediumVariantPageIndex(-1)
 {
 #ifndef VBOX_WS_MAC
@@ -104 +105 @@
         {
             addPage(new UIWizardCloneVDPageBasic1(m_enmSourceVirtualDiskDeviceType));
-            addPage(new UIWizardCloneVDPageBasic2(m_enmSourceVirtualDiskDeviceType));
+            m_iMediumVariantPageIndex = addPage(new UIWizardCloneVDPageBasic2(m_enmSourceVirtualDiskDeviceType));
             addPage(new UIWizardCloneVDPageBasic3);
             break;
@@ -120 +121 @@
     }
 }
+
+const CMediumFormat &UIWizardCloneVD::mediumFormat() const
+{
+    return m_comMediumFormat;
+}
+
+void UIWizardCloneVD::setMediumFormat(const CMediumFormat &comMediumFormat)
+{
+    m_comMediumFormat = comMediumFormat;
+    if (mode() == WizardMode_Basic)
+        setMediumVariantPageVisibility();
+}
+
+qulonglong UIWizardCloneVD::mediumVariant() const
+{
+    return m_uMediumVariant;
+}
+
+void UIWizardCloneVD::setMediumVariant(qulonglong uMediumVariant)
+{
+    m_uMediumVariant = uMediumVariant;
+}
+
+void UIWizardCloneVD::setMediumVariantPageVisibility()
+{
+    AssertReturnVoid(!m_comMediumFormat.isNull());
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = m_comMediumFormat.GetCapabilities();
+    for (int i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
+    int cTest = 0;
+    if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)
+        ++cTest;
+    if (uCapabilities & KMediumFormatCapabilities_CreateFixed)
+        ++cTest;
+    if (uCapabilities & KMediumFormatCapabilities_CreateSplit2G)
+        ++cTest;
+    setPageVisible(m_iMediumVariantPageIndex, cTest > 1);
+}

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

@@ -28 +28 @@
 #include "COMEnums.h"
 #include "CMedium.h"
+#include "CMediumFormat.h"
 
 
@@ -49 +50 @@
     bool copyVirtualDisk();
 
+    const CMediumFormat &mediumFormat() const;
+    void setMediumFormat(const CMediumFormat &comMediumFormat);
+
+    qulonglong mediumVariant() const;
+    void setMediumVariant(qulonglong uMediumVariant);
+
 protected:
 
@@ -57 +64 @@
     /** Handles translation event. */
     virtual void retranslateUi() /* override */;
+    void setMediumVariantPageVisibility();
 
+    CMediumFormat m_comMediumFormat;
+    qulonglong m_uMediumVariant;
     /** Holds the source virtual disk wrapper. */
     CMedium m_comSourceVirtualDisk;
@@ -63 +73 @@
     /** Holds the source virtual-disk device type. */
     KDeviceType m_enmSourceVirtualDiskDeviceType;
+    int m_iMediumVariantPageIndex;
 };
 

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

@@ -160 +160 @@
     {
         pMainLayout->addWidget(m_pFormatGroupBox);
-        // connect(m_pFormatButtonGroup, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
-        //         this, &UIWizardCloneVDPageBasic1::sltMediumFormatChanged);
+        connect(m_pFormatGroupBox, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
+                this, &UIWizardCloneVDPageBasic1::sltMediumFormatChanged);
     }
     pMainLayout->addStretch();
@@ -189 +189 @@
     /* Translate page: */
     retranslateUi();
+    if (!m_userModifiedParameters.contains("MediumFormat"))
+    {
+        if (cloneWizard() && m_pFormatGroupBox)
+            cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
+    }
 }
 
@@ -196 +201 @@
     //return !mediumFormat().isNull();
     return true;
+}
+
+void UIWizardCloneVDPageBasic1::sltMediumFormatChanged()
+{
+    if (cloneWizard() && m_pFormatGroupBox)
+        cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
+    m_userModifiedParameters << "MediumFormat";
+    emit completeChanged();
 }
 
@@ -227 +240 @@
 //     return UIWizardCloneVD::Page3;
 // }
+
+UIWizardCloneVD *UIWizardCloneVDPageBasic1::cloneWizard() const
+{
+    return qobject_cast<UIWizardCloneVD*>(wizard());
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.h

@@ -22 +22 @@
 #endif
 
+/* Qt includes: */
+#include <QSet>
+
 /* GUI includes: */
 #include "UINativeWizardPage.h"
@@ -32 +35 @@
 class QIRichTextLabel;
 class UIDiskFormatsGroupBox;
-
+class UIWizardCloneVD;
 
 // /** 1st page of the Clone Virtual Disk Image wizard (base part): */
@@ -79 +82 @@
     UIWizardCloneVDPageBasic1(KDeviceType enmDeviceType);
 
+private slots:
+
+    void sltMediumFormatChanged();
+
 private:
+
+    UIWizardCloneVD *cloneWizard() const;
 
     /** Handles translation event. */
@@ -94 +103 @@
     QIRichTextLabel *m_pLabel;
     UIDiskFormatsGroupBox *m_pFormatGroupBox;
+
+    QSet<QString> m_userModifiedParameters;
 };
 

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

@@ -23 +23 @@
 
 /* GUI includes: */
+#include "UIWizardDiskEditors.h"
 #include "UIWizardCloneVDPageBasic2.h"
 #include "UIWizardCloneVD.h"
@@ -73 +74 @@
 
 UIWizardCloneVDPageBasic2::UIWizardCloneVDPageBasic2(KDeviceType /*enmDeviceType*/)
+    : m_pDescriptionLabel(0)
+    , m_pDynamicLabel(0)
+    , m_pFixedLabel(0)
+    , m_pSplitLabel(0)
+    , m_pVariantGroupBox(0)
 {
     prepare();
@@ -78 +84 @@
     // QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     // {
-    //     m_pDescriptionLabel = new QIRichTextLabel(this);
-    //     m_pDynamicLabel = new QIRichTextLabel(this);
-    //     m_pFixedLabel = new QIRichTextLabel(this);
-    //     m_pSplitLabel = new QIRichTextLabel(this);
     //     QVBoxLayout *pVariantLayout = new QVBoxLayout;
     //     {
@@ -125 +127 @@
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    Q_UNUSED(pMainLayout);
+    m_pDescriptionLabel = new QIRichTextLabel(this);
+    if (m_pDescriptionLabel)
+        pMainLayout->addWidget(m_pDescriptionLabel);
+    m_pDynamicLabel = new QIRichTextLabel(this);
+    if (m_pDynamicLabel)
+        pMainLayout->addWidget(m_pDynamicLabel);
+    m_pFixedLabel = new QIRichTextLabel(this);
+    if (m_pFixedLabel)
+        pMainLayout->addWidget(m_pFixedLabel);
+    m_pSplitLabel = new QIRichTextLabel(this);
+    if (m_pSplitLabel)
+        pMainLayout->addWidget(m_pSplitLabel);
+    m_pVariantGroupBox = new UIDiskVariantGroupBox(false /* expert mode */, 0);
+    if (m_pVariantGroupBox)
+        pMainLayout->addWidget(m_pVariantGroupBox);
+    retranslateUi();
 }
 
@@ -134 +151 @@
     setTitle(UIWizardCloneVD::tr("Storage on physical hard disk"));
 
-//     /* Translate widgets: */
-//     m_pDescriptionLabel->setText(UIWizardCloneVD::tr("Please choose whether the new virtual disk image file should grow as it is used "
-//                                                      "(dynamically allocated) or if it should be created at its maximum size (fixed size)."));
-//     m_pDynamicLabel->setText(UIWizardCloneVD::tr("<p>A <b>dynamically allocated</b> disk image file will only use space "
-//                                                  "on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), "
-//                                                  "although it will not shrink again automatically when space on it is freed.</p>"));
-//     m_pFixedLabel->setText(UIWizardCloneVD::tr("<p>A <b>fixed size</b> disk image file may take longer to create on some "
-//                                                "systems but is often faster to use.</p>"));
-//     m_pSplitLabel->setText(UIWizardCloneVD::tr("<p>You can also choose to <b>split</b> the disk image file into several files "
-//                                                "of up to two gigabytes each. This is mainly useful if you wish to store the "
-//                                                "virtual machine on removable USB devices or old systems, some of which cannot "
-//                                                "handle very large files."));
-//     m_pDynamicalButton->setText(UIWizardCloneVD::tr("&Dynamically allocated"));
-//     m_pFixedButton->setText(UIWizardCloneVD::tr("&Fixed size"));
-//     m_pSplitBox->setText(UIWizardCloneVD::tr("&Split into files of less than 2GB"));
+    /* Translate widgets: */
+    m_pDescriptionLabel->setText(UIWizardCloneVD::tr("Please choose whether the new virtual disk image file should grow as it is used "
+                                                     "(dynamically allocated) or if it should be created at its maximum size (fixed size)."));
+    m_pDynamicLabel->setText(UIWizardCloneVD::tr("<p>A <b>dynamically allocated</b> disk image file will only use space "
+                                                 "on your physical hard disk as it fills up (up to a maximum <b>fixed size</b>), "
+                                                 "although it will not shrink again automatically when space on it is freed.</p>"));
+    m_pFixedLabel->setText(UIWizardCloneVD::tr("<p>A <b>fixed size</b> disk image file may take longer to create on some "
+                                               "systems but is often faster to use.</p>"));
+    m_pSplitLabel->setText(UIWizardCloneVD::tr("<p>You can also choose to <b>split</b> the disk image file into several files "
+                                               "of up to two gigabytes each. This is mainly useful if you wish to store the "
+                                               "virtual machine on removable USB devices or old systems, some of which cannot "
+                                               "handle very large files."));
 }
 
 void UIWizardCloneVDPageBasic2::initializePage()
 {
+    AssertReturnVoid(cloneWizard());
     /* Translate page: */
     retranslateUi();
 
+    setWidgetVisibility(cloneWizard()->mediumFormat());
+    if (m_pVariantGroupBox)
+        cloneWizard()->setMediumVariant(m_pVariantGroupBox->mediumVariant());
     // /* Setup visibility: */
     // CMediumFormat mediumFormat = field("mediumFormat").value<CMediumFormat>();
@@ -181 +199 @@
     // return mediumVariant() != (qulonglong)KMediumVariant_Max;
 }
+
+UIWizardCloneVD *UIWizardCloneVDPageBasic2::cloneWizard() const
+{
+    return qobject_cast<UIWizardCloneVD*>(wizard());
+}
+
+void UIWizardCloneVDPageBasic2::setWidgetVisibility(const CMediumFormat &mediumFormat)
+{
+    AssertReturnVoid(m_pVariantGroupBox);
+
+    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat, true /* hide disabled widgets*/);
+
+    if (m_pDynamicLabel)
+        m_pDynamicLabel->setHidden(!m_pVariantGroupBox->isCreateDynamicPossible());
+    if (m_pFixedLabel)
+        m_pFixedLabel->setHidden(!m_pVariantGroupBox->isCreateFixedPossible());
+    if (m_pSplitLabel)
+        m_pSplitLabel->setHidden(!m_pVariantGroupBox->isCreateSplitPossible());
+}

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

@@ -33 +33 @@
 class QCheckBox;
 class QIRichTextLabel;
-
+class UIWizardCloneVD;
+class CMediumFormat;
+class UIDiskVariantGroupBox;
 
 // /** 3rd page of the Clone Virtual Disk Image wizard (base part): */
@@ -73 +75 @@
     virtual void retranslateUi() /* override */;
     void prepare();
+    UIWizardCloneVD *cloneWizard() const;
 
     /** Prepares the page. */
@@ -79 +82 @@
     /** Returns whether the page is complete. */
     virtual bool isComplete() const /* override */;
+    void setWidgetVisibility(const CMediumFormat &mediumFormat);
 
     /** Holds the description label instance. */
@@ -88 +92 @@
     /** Holds the 'Split to 2GB files' description label instance. */
     QIRichTextLabel *m_pSplitLabel;
+
+    UIDiskVariantGroupBox *m_pVariantGroupBox;
 };
 

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

@@ -410 +410 @@
         m_pSplitBox->setHidden(!m_pSplitBox->isEnabled());
     }
+    /* Deselect split box if it is disabled: */
+    if (!m_pSplitBox->isEnabled())
+        m_pSplitBox->setChecked(false);
     emit sigMediumVariantChanged(mediumVariant());
 }

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

@@ -50 +50 @@
 #include "CMediumFormat.h"
 
+/** Base class for disk related group boxes. */
 class SHARED_LIBRARY_STUFF UIDiskEditorGroupBox : public QIWithRetranslateUI<QGroupBox>
 {