Changeset 87845 in vbox

Timestamp:

Feb 23, 2021 11:17:12 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Refactoring

Location:

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

Files:

• UIWizardNewVDPageExpert.cpp (modified) (5 diffs)
• UIWizardNewVDPageExpert.h (modified) (1 diff)

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

@@ -67 +67 @@
             }
         }
-        m_pSizeCnt = new QGroupBox(this);
-        {
-            m_pSizeCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QVBoxLayout *pSizeCntLayout = new QVBoxLayout(m_pSizeCnt);
+        m_pSizeGroupBox = new QGroupBox(this);
+        {
+            m_pSizeGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            QVBoxLayout *pSizeGroupBoxLayout = new QVBoxLayout(m_pSizeGroupBox);
             {
                 m_pEditorSize = new UIMediumSizeEditor;
                 {
-                    pSizeCntLayout->addWidget(m_pEditorSize);
+                    pSizeGroupBoxLayout->addWidget(m_pEditorSize);
                 }
             }
         }
-        m_pFormatCnt = new QGroupBox(this);
-        {
-            m_pFormatCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QVBoxLayout *pFormatCntLayout = new QVBoxLayout(m_pFormatCnt);
+        m_pFormatGroupBox = new QGroupBox(this);
+        {
+            m_pFormatGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            QVBoxLayout *pFormatGroupBoxLayout = new QVBoxLayout(m_pFormatGroupBox);
             {
-                m_pFormatButtonGroup = new QButtonGroup(m_pFormatCnt);
+                m_pFormatButtonGroup = new QButtonGroup(m_pFormatGroupBox);
                 {
                     /* Enumerate medium formats in special order: */
@@ -108 +108 @@
                     /* Create buttons for VDI, preferred and others: */
                     foreach (const QString &strId, vdi.keys())
-                        addFormatButton(this, pFormatCntLayout, vdi.value(strId), true);
+                        addFormatButton(this, pFormatGroupBoxLayout, vdi.value(strId), true);
                     foreach (const QString &strId, preferred.keys())
-                        addFormatButton(this, pFormatCntLayout, preferred.value(strId), true);
+                        addFormatButton(this, pFormatGroupBoxLayout, preferred.value(strId), true);
                     foreach (const QString &strId, others.keys())
-                        addFormatButton(this, pFormatCntLayout, others.value(strId));
+                        addFormatButton(this, pFormatGroupBoxLayout, others.value(strId));
 
                     if (!m_pFormatButtonGroup->buttons().isEmpty())
@@ -122 +122 @@
             }
         }
-        m_pVariantCnt = new QGroupBox(this);
-        {
-            m_pVariantCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QVBoxLayout *pVariantCntLayout = new QVBoxLayout(m_pVariantCnt);
+        m_pVariantGroupBox = new QGroupBox(this);
+        {
+            m_pVariantGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+            QVBoxLayout *pVariantGroupBoxLayout = new QVBoxLayout(m_pVariantGroupBox);
             {
-                m_pVariantButtonGroup = new QButtonGroup(m_pVariantCnt);
+                m_pVariantButtonGroup = new QButtonGroup(m_pVariantGroupBox);
                 {
-                    m_pDynamicalButton = new QRadioButton(m_pVariantCnt);
+                    m_pDynamicalButton = new QRadioButton(m_pVariantGroupBox);
                     {
                         m_pDynamicalButton->click();
                         m_pDynamicalButton->setFocus();
                     }
-                    m_pFixedButton = new QRadioButton(m_pVariantCnt);
+                    m_pFixedButton = new QRadioButton(m_pVariantGroupBox);
                     m_pVariantButtonGroup->addButton(m_pDynamicalButton, 0);
                     m_pVariantButtonGroup->addButton(m_pFixedButton, 1);
                 }
-                m_pSplitBox = new QCheckBox(m_pVariantCnt);
-                pVariantCntLayout->addWidget(m_pDynamicalButton);
-                pVariantCntLayout->addWidget(m_pFixedButton);
-                pVariantCntLayout->addWidget(m_pSplitBox);
+                m_pSplitBox = new QCheckBox(m_pVariantGroupBox);
+                pVariantGroupBoxLayout->addWidget(m_pDynamicalButton);
+                pVariantGroupBoxLayout->addWidget(m_pFixedButton);
+                pVariantGroupBoxLayout->addWidget(m_pSplitBox);
             }
         }
         pMainLayout->addWidget(m_pLocationCnt, 0, 0, 1, 2);
-        pMainLayout->addWidget(m_pSizeCnt, 1, 0, 1, 2);
-        pMainLayout->addWidget(m_pFormatCnt, 2, 0, Qt::AlignTop);
-        pMainLayout->addWidget(m_pVariantCnt, 2, 1, Qt::AlignTop);
+        pMainLayout->addWidget(m_pSizeGroupBox, 1, 0, 1, 2);
+        pMainLayout->addWidget(m_pFormatGroupBox, 2, 0, Qt::AlignTop);
+        pMainLayout->addWidget(m_pVariantGroupBox, 2, 1, Qt::AlignTop);
         setMediumSize(uDefaultSize);
         sltMediumFormatChanged();
@@ -234 +234 @@
     m_pLocationCnt->setTitle(UIWizardNewVD::tr("File &location"));
     m_pLocationOpenButton->setToolTip(UIWizardNewVD::tr("Choose a location for new virtual hard disk file..."));
-    m_pSizeCnt->setTitle(UIWizardNewVD::tr("File &size"));
-    m_pFormatCnt->setTitle(UIWizardNewVD::tr("Hard disk file &type"));
+    m_pSizeGroupBox->setTitle(UIWizardNewVD::tr("File &size"));
+    m_pFormatGroupBox->setTitle(UIWizardNewVD::tr("Hard disk file &type"));
     QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
     for (int i = 0; i < buttons.size(); ++i)
@@ -243 +243 @@
         pButton->setText(gpConverter->toString(enmFormat));
     }
-    m_pVariantCnt->setTitle(UIWizardNewVD::tr("Storage on physical hard disk"));
+    m_pVariantGroupBox->setTitle(UIWizardNewVD::tr("Storage on physical hard disk"));
     m_pDynamicalButton->setText(UIWizardNewVD::tr("&Dynamically allocated"));
     m_pFixedButton->setText(UIWizardNewVD::tr("&Fixed size"));

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

@@ -78 +78 @@
 
     /* Widgets: */
-    QGroupBox *m_pFormatCnt;
-    QGroupBox *m_pVariantCnt;
+    QGroupBox *m_pFormatGroupBox;
+    QGroupBox *m_pVariantGroupBox;
     QGroupBox *m_pLocationCnt;
-    QGroupBox *m_pSizeCnt;
+    QGroupBox *m_pSizeGroupBox;
 };