Changeset 90854 in vbox for trunk/src

Timestamp:

Aug 24, 2021 5:34:35 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Handling medium format change a bit better in term of medium variant widgets.

Location:

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

Files:

• clonevd/UIWizardCloneVDPageExpert.cpp (modified) (4 diffs)
• clonevd/UIWizardCloneVDPageExpert.h (modified) (1 diff)
• clonevd/UIWizardCloneVDPageVariant.cpp (modified) (1 diff)
• editors/UIWizardDiskEditors.cpp (modified) (3 diffs)
• editors/UIWizardDiskEditors.h (modified) (1 diff)
• newvd/UIWizardNewVDPageVariant.cpp (modified) (1 diff)

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

@@ -34 +34 @@
     , m_pVariantGroupBox(0)
     , m_pMediumSizePathGroupBox(0)
-
+    , m_enmDeviceType(enmDeviceType)
 {
     prepare(enmDeviceType, uSourceDiskLogicaSize);
@@ -77 +77 @@
     if (cloneWizard() && m_pFormatGroupBox)
         cloneWizard()->setMediumFormat(m_pFormatGroupBox->mediumFormat());
+    updateDiskWidgetsAfterMediumFormatChange();
     emit completeChanged();
 }
@@ -134 +135 @@
 
     pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
-    m_pVariantGroupBox->setWidgetVisibility(pWizard->mediumFormat());
+    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(pWizard->mediumFormat());
 
     /* Initialize medium size widget and wizard's medium size parameter: */
@@ -188 +189 @@
     return qobject_cast<UIWizardCloneVD*>(wizard());
 }
+
+void UIWizardCloneVDPageExpert::updateDiskWidgetsAfterMediumFormatChange()
+{
+    UIWizardCloneVD *pWizard = qobject_cast<UIWizardCloneVD*>(wizard());
+    AssertReturnVoid(pWizard && m_pVariantGroupBox && m_pMediumSizePathGroupBox && m_pFormatGroupBox);
+    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
+    AssertReturnVoid(!comMediumFormat.isNull());
+
+    m_pVariantGroupBox->blockSignals(true);
+    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
+    m_pVariantGroupBox->blockSignals(false);
+
+    m_pMediumSizePathGroupBox->blockSignals(true);
+    m_pMediumSizePathGroupBox->updateMediumPath(comMediumFormat, m_pFormatGroupBox->formatExtensions(), m_enmDeviceType);
+    m_pMediumSizePathGroupBox->blockSignals(false);
+    /* Update the wizard parameters explicitly since we blocked th signals: */
+    pWizard->setMediumPath(m_pMediumSizePathGroupBox->mediumPath());
+    pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
+}

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

@@ -76 +76 @@
     void setTargetLocation();
     UIWizardCloneVD *cloneWizard();
+    void updateDiskWidgetsAfterMediumFormatChange();
 
     UIDiskFormatsGroupBox *m_pFormatGroupBox;
     UIDiskVariantGroupBox *m_pVariantGroupBox;
     UIMediumSizeAndPathGroupBox *m_pMediumSizePathGroupBox;
+    KDeviceType m_enmDeviceType;
 };
 

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

@@ -116 +116 @@
     AssertReturnVoid(m_pVariantGroupBox);
 
-    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat, true /* hide disabled widgets*/);
+    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat);
 
     if (m_pDynamicLabel)

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

@@ -350 +350 @@
     {
         m_pSplitBox->setText(tr("&Split into files of less than 2GB"));
-        m_pSplitBox->setToolTip(tr("&When checked the virtual disk file will be splitted into 2GB parts in the host storage."));
+        m_pSplitBox->setToolTip(tr("<p>Possible only for some hard disk file types. When checked the virtual disk file will "
+                                   "be splitted into 2GB parts in the host storage.</p>"));
     }
 }
@@ -386 +387 @@
 }
 
-void UIDiskVariantGroupBox::setWidgetVisibility(const CMediumFormat &mediumFormat)
-{
+void UIDiskVariantGroupBox::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
+{
+    AssertReturnVoid(m_pFixedCheckBox && m_pSplitBox);
     ULONG uCapabilities = 0;
     QVector<KMediumFormatCapabilities> capabilities;
@@ -394 +396 @@
         uCapabilities |= capabilities[i];
 
-    bool m_fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
-    bool m_fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
-    bool m_fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
-    if (m_pFixedCheckBox)
-    {
-        if (!m_fIsCreateDynamicPossible)
-        {
-            m_pFixedCheckBox->setChecked(true);
-            m_pFixedCheckBox->setEnabled(false);
-        }
-        if (!m_fIsCreateFixedPossible)
-        {
-            m_pFixedCheckBox->setChecked(false);
-            m_pFixedCheckBox->setEnabled(false);
-        }
-    }
-    if (m_pFixedCheckBox)
-        m_pFixedCheckBox->setHidden(!m_fIsCreateFixedPossible);
-    if (m_pSplitBox)
-    {
-        m_pSplitBox->setHidden(!m_fIsCreateSplitPossible);
-        if (!m_fIsCreateSplitPossible)
-            m_pSplitBox->setChecked(false);
-    }
-}
-
-void UIDiskVariantGroupBox::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat,
-                                                                        bool fHideDisabled /* = false */)
-{
-    ULONG uCapabilities = 0;
-    QVector<KMediumFormatCapabilities> capabilities;
-    capabilities = mediumFormat.GetCapabilities();
-    for (int i = 0; i < capabilities.size(); i++)
-        uCapabilities |= capabilities[i];
-
     m_fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
     m_fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
     m_fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
 
-    if (m_pFixedCheckBox)
-    {
-        m_pFixedCheckBox->setEnabled(m_fIsCreateDynamicPossible || m_fIsCreateFixedPossible);
-        if (!m_fIsCreateDynamicPossible)
-            m_pFixedCheckBox->setChecked(true);
-        if (!m_fIsCreateFixedPossible)
-            m_pFixedCheckBox->setChecked(false);
-    }
+    m_pFixedCheckBox->setEnabled(true);
+    if (!m_fIsCreateDynamicPossible)
+    {
+        m_pFixedCheckBox->setChecked(true);
+        m_pFixedCheckBox->setEnabled(false);
+    }
+    if (!m_fIsCreateFixedPossible)
+    {
+        m_pFixedCheckBox->setChecked(false);
+        m_pFixedCheckBox->setEnabled(false);
+    }
+
     m_pSplitBox->setEnabled(m_fIsCreateSplitPossible);
-
-    if (fHideDisabled)
-    {
-        m_pFixedCheckBox->setHidden(!m_pFixedCheckBox->isEnabled());
-        m_pSplitBox->setHidden(!m_pSplitBox->isEnabled());
-    }
-    /* Deselect split box if it is disabled: */
-    if (!m_pSplitBox->isEnabled())
+    if (!m_fIsCreateSplitPossible)
         m_pSplitBox->setChecked(false);
     emit sigMediumVariantChanged(mediumVariant());

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

@@ -112 +112 @@
 
     UIDiskVariantGroupBox(bool fExpertMode, QWidget *pParent = 0);
-    void updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat, bool fHideDisabled = false);
+    void updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat);
     qulonglong mediumVariant() const;
     void setMediumVariant(qulonglong uMediumVariant);
-    void setWidgetVisibility(const CMediumFormat &mediumFormat);
     bool isComplete() const;
 

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

@@ -104 +104 @@
     AssertReturnVoid(m_pVariantGroupBox);
 
-    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat, true /* hide disabled widgets*/);
+    m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat);
 
     if (m_pDynamicLabel)