Changeset 91277 in vbox

Timestamp:

Sep 16, 2021 11:50:40 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146937

Message:

FE/Qt: bugref:9996. Redesigning new vm and new vd expert pages.

Location:

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

Files:

• editors/UIWizardDiskEditors.cpp (modified) (1 diff)
• newvd/UIWizardNewVDExpertPage.cpp (modified) (3 diffs)
• newvd/UIWizardNewVDExpertPage.h (modified) (2 diffs)
• newvm/UIWizardNewVMExpertPage.cpp (modified) (3 diffs)
• newvm/UIWizardNewVMExpertPage.h (modified) (2 diffs)

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

@@ -252 +252 @@
     m_fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;
     m_fIsCreateSplitPossible = uCapabilities & KMediumFormatCapabilities_CreateSplit2G;
-
     m_pFixedCheckBox->setEnabled(true);
     if (!m_fIsCreateDynamicPossible)

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

@@ -35 +35 @@
     , m_pFormatComboxBox(0)
     , m_pVariantWidget(0)
+    , m_pFormatVariantGroupBox(0)
     , m_strDefaultName(strDefaultName)
     , m_strDefaultPath(strDefaultPath)
@@ -46 +47 @@
 void UIWizardNewVDExpertPage::prepare()
 {
-    QGridLayout *pMainLayout = new QGridLayout(this);
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     m_pSizeAndPathGroup = new UIMediumSizeAndPathGroupBox(true /* fExpertMode */, 0 /* parent */, _4M /* minimum size */);
-    m_pFormatComboxBox = new UIDiskFormatsGroupBox(true /* fExpertMode */, KDeviceType_HardDisk, 0);
+    m_pFormatComboxBox = new UIDiskFormatsComboBox(true /* fExpertMode */, KDeviceType_HardDisk, 0);
     m_pVariantWidget = new UIDiskVariantWidget(0);
 
-    pMainLayout->addWidget(m_pSizeAndPathGroup, 0, 0, 4, 2);
-    pMainLayout->addWidget(m_pFormatComboxBox, 4, 0, 7, 1);
-    pMainLayout->addWidget(m_pVariantWidget, 4, 1, 3, 1);
-
-    connect(m_pFormatComboxBox, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
+    m_pFormatVariantGroupBox = new QGroupBox;
+    QHBoxLayout *pFormatVariantLayout = new QHBoxLayout(m_pFormatVariantGroupBox);
+    pFormatVariantLayout->addWidget(m_pFormatComboxBox, 0, Qt::AlignTop);
+    pFormatVariantLayout->addWidget(m_pVariantWidget);
+
+    pMainLayout->addWidget(m_pSizeAndPathGroup);
+    pMainLayout->addWidget(m_pFormatVariantGroupBox);
+
+    connect(m_pFormatComboxBox, &UIDiskFormatsComboBox::sigMediumFormatChanged,
             this, &UIWizardNewVDExpertPage::sltMediumFormatChanged);
     connect(m_pVariantWidget, &UIDiskVariantWidget::sigMediumVariantChanged,
@@ -123 +128 @@
 void UIWizardNewVDExpertPage::retranslateUi()
 {
+    if (m_pFormatVariantGroupBox)
+        m_pFormatVariantGroupBox->setTitle(UIWizardNewVD::tr("Hard Disk File &Type and Variant"));
 }
 

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

@@ -26 +26 @@
 
 /* Forward declarations: */
-class UIDiskFormatsGroupBox;
+class QGroupBox;
+class UIDiskFormatsComboBox;
 class UIDiskVariantWidget;
 class UIMediumSizeAndPathGroupBox;
@@ -64 +65 @@
      * @{ */
        UIMediumSizeAndPathGroupBox *m_pSizeAndPathGroup;
-       UIDiskFormatsGroupBox *m_pFormatComboxBox;
+       UIDiskFormatsComboBox *m_pFormatComboxBox;
        UIDiskVariantWidget *m_pVariantWidget;
+       QGroupBox *m_pFormatVariantGroupBox;
    /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -43 +43 @@
 UIWizardNewVMExpertPage::UIWizardNewVMExpertPage()
     : m_pToolBox(0)
+    , m_pDiskFormatVariantGroupBox(0)
     , m_pDiskVariantWidget(0)
     , m_pFormatComboBox(0)
@@ -210 +211 @@
     if (m_pNameAndSystemLayout && m_pNameAndSystemEditor)
         m_pNameAndSystemLayout->setColumnMinimumWidth(0, m_pNameAndSystemEditor->firstColumnWidth());
+
+    if (m_pDiskFormatVariantGroupBox)
+        m_pDiskFormatVariantGroupBox->setTitle(UIWizardNewVM::tr("Hard Disk File &Type and Variant"));
 }
 
@@ -448 +452 @@
     m_pSizeAndLocationGroup = new UIMediumSizeAndPathGroupBox(true, 0 /* parent */, _4M /* minimum size */);
     pDiskContainerLayout->addWidget(m_pSizeAndLocationGroup, 0, 0, 2, 2);
+
+    m_pDiskFormatVariantGroupBox = new QGroupBox;
+    QHBoxLayout *pDiskFormatVariantLayout = new QHBoxLayout(m_pDiskFormatVariantGroupBox);
+
     m_pFormatComboBox = new UIDiskFormatsComboBox(true, KDeviceType_HardDisk, 0);
-    pDiskContainerLayout->addWidget(m_pFormatComboBox, 2, 0, 1, 1);
+    pDiskFormatVariantLayout->addWidget(m_pFormatComboBox, 0 /* stretch */, Qt::AlignTop);
+
     m_pDiskVariantWidget  = new UIDiskVariantWidget(0);
-    pDiskContainerLayout->addWidget(m_pDiskVariantWidget, 2, 1, 2, 1);
+    pDiskFormatVariantLayout->addWidget(m_pDiskVariantWidget);
+
+    pDiskContainerLayout->addWidget(m_pDiskFormatVariantGroupBox, 2, 0, 2, 2);
     return pNewDiskContainerWidget;
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h

@@ -32 +32 @@
 class QCheckBox;
 class QGridLayout;
+class QGroupBox;
 class QRadioButton;
 class QIToolButton;
@@ -126 +127 @@
       * @{ */
         UIToolBox  *m_pToolBox;
+        QGroupBox *m_pDiskFormatVariantGroupBox;
         UIDiskVariantWidget *m_pDiskVariantWidget;
         UIDiskFormatsComboBox *m_pFormatComboBox;