Changeset 87929 in vbox

Timestamp:

Mar 3, 2021 8:45:46 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Converting radio button pair into a check box in new hdd wizard.

Location:

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

Files:

• UIWizardNewVDPageBasic2.cpp (modified) (7 diffs)
• UIWizardNewVDPageBasic2.h (modified) (2 diffs)
• UIWizardNewVDPageExpert.cpp (modified) (4 diffs)

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

@@ -31 +31 @@
 
 UIWizardNewVDPage2::UIWizardNewVDPage2()
-    : m_pVariantButtonGroup(0)
-    , m_pDynamicalButton(0)
-    , m_pFixedButton(0)
+    : m_pFixedCheckBox(0)
     , m_pSplitBox(0)
     , m_pDescriptionLabel(0)
@@ -58 +56 @@
         if (pVariantLayout)
         {
-            m_pVariantButtonGroup = new QButtonGroup;
-            {
-                m_pDynamicalButton = new QRadioButton;
-                {
-                    m_pDynamicalButton->click();
-                    m_pDynamicalButton->setFocus();
-                }
-                m_pFixedButton = new QRadioButton;
-                m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
-                m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
-            }
+            m_pFixedCheckBox = new QCheckBox;
             m_pSplitBox = new QCheckBox;
-            pVariantLayout->addWidget(m_pDynamicalButton);
-            pVariantLayout->addWidget(m_pFixedButton);
+            pVariantLayout->addWidget(m_pFixedCheckBox);
             pVariantLayout->addWidget(m_pSplitBox);
         }
@@ -94 +81 @@
 
     /* Exclusive options: */
-    if (m_pDynamicalButton && m_pDynamicalButton->isChecked())
+    if (m_pFixedCheckBox && m_pFixedCheckBox->isChecked())
+        uMediumVariant = (qulonglong)KMediumVariant_Fixed;
+    else
         uMediumVariant = (qulonglong)KMediumVariant_Standard;
-    else if (m_pFixedButton && m_pFixedButton->isChecked())
-        uMediumVariant = (qulonglong)KMediumVariant_Fixed;
 
     /* Additional options: */
@@ -112 +99 @@
     if (uMediumVariant & (qulonglong)KMediumVariant_Fixed)
     {
-        m_pFixedButton->click();
-        m_pFixedButton->setFocus();
-    }
-    else
-    {
-        m_pDynamicalButton->click();
-        m_pDynamicalButton->setFocus();
+        m_pFixedCheckBox->click();
+        m_pFixedCheckBox->setFocus();
     }
 
@@ -127 +109 @@
 void UIWizardNewVDPage2::retranslateWidgets()
 {
-    if (m_pDynamicalButton)
-        m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
-    if (m_pFixedButton)
-        m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));
+    if (m_pFixedCheckBox)
+        m_pFixedCheckBox->setText(UIWizardNewVD::tr("&Fixed size"));
     if (m_pSplitBox)
         m_pSplitBox->setText(UIWizardNewVD::tr("&Split into files of less than 2GB"));
@@ -164 +144 @@
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
     bool fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
+    if (m_pFixedCheckBox)
+    {
+        if (!fIsCreateDynamicPossible)
+        {
+            m_pFixedCheckBox->setChecked(true);
+            m_pFixedCheckBox->setEnabled(false);
+        }
+        if (!fIsCreateFixedPossible)
+        {
+            m_pFixedCheckBox->setChecked(false);
+            m_pFixedCheckBox->setEnabled(false);
+        }
+    }
     if (m_pDynamicLabel)
         m_pDynamicLabel->setHidden(!fIsCreateDynamicPossible);
-    if (m_pDynamicalButton)
-        m_pDynamicalButton->setHidden(!fIsCreateDynamicPossible);
     if (m_pFixedLabel)
         m_pFixedLabel->setHidden(!fIsCreateFixedPossible);
-    if (m_pFixedButton)
-        m_pFixedButton->setHidden(!fIsCreateFixedPossible);
+    if (m_pFixedCheckBox)
+        m_pFixedCheckBox->setHidden(!fIsCreateFixedPossible);
     if (m_pSplitLabel)
         m_pSplitLabel->setHidden(!fIsCreateSplitPossible);
@@ -186 +177 @@
 
     /* Setup connections: */
-    connect(m_pVariantButtonGroup,static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
+    connect(m_pFixedCheckBox, &QAbstractButton::toggled,
             this, &UIWizardNewVDPageBasic2::completeChanged);
     connect(m_pSplitBox, &QCheckBox::stateChanged,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.h

@@ -28 +28 @@
 class CMediumFormat;
 class QButtonGroup;
-class QRadioButton;
 class QCheckBox;
 class QIRichTextLabel;
@@ -49 +48 @@
     /** @name Widgets
      * @{ */
-        QButtonGroup *m_pVariantButtonGroup;
-        QRadioButton *m_pDynamicalButton;
-        QRadioButton *m_pFixedButton;
+        QCheckBox    *m_pFixedCheckBox;
         QCheckBox *m_pSplitBox;
     /** @} */

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

@@ -93 +93 @@
             QVBoxLayout *pVariantGroupBoxLayout = new QVBoxLayout(m_pVariantGroupBox);
             {
-                m_pVariantButtonGroup = new QButtonGroup(m_pVariantGroupBox);
-                {
-                    m_pDynamicalButton = new QRadioButton(m_pVariantGroupBox);
-                    {
-                        m_pDynamicalButton->click();
-                        m_pDynamicalButton->setFocus();
-                    }
-                    m_pFixedButton = new QRadioButton(m_pVariantGroupBox);
-                    m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
-                    m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
-                }
+                m_pFixedCheckBox = new QCheckBox;
                 m_pSplitBox = new QCheckBox(m_pVariantGroupBox);
-                pVariantGroupBoxLayout->addWidget(m_pDynamicalButton);
-                pVariantGroupBoxLayout->addWidget(m_pFixedButton);
+                pVariantGroupBoxLayout->addWidget(m_pFixedCheckBox);
                 pVariantGroupBoxLayout->addWidget(m_pSplitBox);
             }
@@ -121 +110 @@
     connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
             this, &UIWizardNewVDPageExpert::sltMediumFormatChanged);
-    connect(m_pVariantButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
+    connect(m_pFixedCheckBox, &QAbstractButton::toggled,
             this, &UIWizardNewVDPageExpert::completeChanged);
     connect(m_pSplitBox, &QCheckBox::stateChanged,
@@ -167 +156 @@
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
     bool fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
-    m_pDynamicalButton->setEnabled(fIsCreateDynamicPossible);
-    m_pFixedButton->setEnabled(fIsCreateFixedPossible);
+
+    if (m_pFixedCheckBox)
+    {
+        if (!fIsCreateDynamicPossible)
+        {
+            m_pFixedCheckBox->setEnabled(false);
+            m_pFixedCheckBox->setChecked(true);
+        }
+        if (!fIsCreateFixedPossible)
+        {
+            m_pFixedCheckBox->setEnabled(false);
+            m_pFixedCheckBox->setChecked(false);
+        }
+    }
     m_pSplitBox->setEnabled(fIsCreateSplitPossible);
 
@@ -219 +220 @@
     if (m_pVariantGroupBox)
         m_pVariantGroupBox->setTitle(UIWizardNewVD::tr("Storage on physical hard disk"));
-    if (m_pDynamicalButton)
-        m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
-    if (m_pFixedButton)
-        m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));
+    if (m_pFixedCheckBox)
+        m_pFixedCheckBox->setText(UIWizardNewVD::tr("&Fixed size"));
     if (m_pSplitBox)
         m_pSplitBox->setText(UIWizardNewVD::tr("&Split into files of less than 2GB"));