Changeset 87912 in vbox for trunk

Timestamp:

Mar 2, 2021 12:46:18 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Merging hdd pages. part 2

Location:

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

Files:

• newvd/UIWizardNewVDPageBasic2.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageBasic4.cpp (modified) (9 diffs)
• newvm/UIWizardNewVMPageBasic4.h (modified) (4 diffs)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -83 +83 @@
         pMainLayout->addLayout(pVariantLayout);
         pMainLayout->addStretch();
+        pMainLayout->setContentsMargins(0, 0, 0, 0);
     }
     return pContainerWidget;

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

@@ -19 +19 @@
 #include <QButtonGroup>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QMetaType>
 #include <QRadioButton>
@@ -46 +47 @@
     , m_pDiskSelector(0)
     , m_pDiskSelectionButton(0)
+    , m_pMediumVariantContainer(0)
+    , m_pSizeContainer(0)
     , m_enmSelectedDiskSource(SelectedDiskSource_New)
 {
@@ -138 +141 @@
     if (m_pDiskSelectionButton)
         m_pDiskSelectionButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard disk file..."));
+    if (m_pMediumVariantContainer)
+        m_pMediumVariantContainer->setTitle(UIWizardNewVM::tr("Storage on physical hard disk"));
+    if (m_pSizeContainer)
+        m_pSizeContainer->setTitle(UIWizardNewVM::tr("File size"));
 }
 
@@ -147 +154 @@
     m_pDiskSelector->setEnabled(fEnabled);
     m_pDiskSelectionButton->setEnabled(fEnabled);
+}
+
+QWidget *UIWizardNewVMPage4::createDiskVariantAndSizeWidgets()
+{
+    return new QWidget();
 }
 
@@ -174 +186 @@
         m_pDiskSelectionButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
     }
-    pDiskLayout->addWidget(m_pDiskEmpty, 0, 0, 1, 3);
-    pDiskLayout->addWidget(m_pDiskNew, 1, 0, 1, 3);
-    pDiskLayout->addWidget(m_pDiskExisting, 2, 0, 1, 3);
-    pDiskLayout->addWidget(m_pDiskSelector, 3, 1);
-    pDiskLayout->addWidget(m_pDiskSelectionButton, 3, 2);
+    pDiskLayout->addWidget(m_pDiskEmpty, 0, 0, 1, 4);
+    pDiskLayout->addWidget(m_pDiskNew, 1, 0, 1, 4);
+    pDiskLayout->addWidget(createDiskVariantAndSizeWidgets(), 2, 1, 3, 3);
+    pDiskLayout->addWidget(m_pDiskExisting, 5, 0, 1, 4);
+    pDiskLayout->addWidget(m_pDiskSelector, 6, 1, 1, 2);
+    pDiskLayout->addWidget(m_pDiskSelectionButton, 6, 3, 1, 1);
     return pDiskContainer;
 }
@@ -246 +259 @@
     pMainLayout->addStretch();
     setEnableDiskSelectionWidgets(m_enmSelectedDiskSource == SelectedDiskSource_Existing);
-
-
-    pMainLayout->addWidget(createMediumVariantWidgets(true));
-
+    setEnableNewDiskWidgets(m_enmSelectedDiskSource == SelectedDiskSource_New);
+
+    createConnections();
+}
+
+QWidget *UIWizardNewVMPageBasic4::createDiskVariantAndSizeWidgets()
+{
+
+    QWidget *pWidget = new QWidget;
+    QHBoxLayout *pLayout = new QHBoxLayout(pWidget);
+    pLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_pMediumVariantContainer = new QGroupBox;
+    QVBoxLayout *pMediumVariantLayout = new QVBoxLayout(m_pMediumVariantContainer);
+    pMediumVariantLayout->addWidget(createMediumVariantWidgets(false /* no labels */));
+    pLayout->addWidget(m_pMediumVariantContainer);
+
+    m_pSizeContainer = new QGroupBox;
+    QVBoxLayout *pSizeLayout = new QVBoxLayout(m_pSizeContainer);
     m_pSizeLabel = new QIRichTextLabel;
     m_pSizeEditor = new UIMediumSizeEditor;
-
-    pMainLayout->addWidget(m_pSizeLabel);
-    pMainLayout->addWidget(m_pSizeEditor);
-
-    createConnections();
+    pSizeLayout->addWidget(m_pSizeLabel);
+    pSizeLayout->addWidget(m_pSizeEditor);
+    pSizeLayout->addStretch();
+    pLayout->addWidget(m_pSizeContainer);
+
+    return pWidget;
 }
 
@@ -286 +315 @@
 
     setEnableDiskSelectionWidgets(m_enmSelectedDiskSource == SelectedDiskSource_Existing);
+    setEnableNewDiskWidgets(m_enmSelectedDiskSource == SelectedDiskSource_New);
+
     completeChanged();
 }
@@ -373 +404 @@
 bool UIWizardNewVMPageBasic4::isComplete() const
 {
-    if (!m_pDiskEmpty)
-        return false;
-    return m_pDiskEmpty->isChecked() ||
-        !m_pDiskExisting->isChecked() ||
-        !uiCommon().medium(m_pDiskSelector->id()).isNull();
+    if (selectedDiskSource() == SelectedDiskSource_New)
+        return mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
+    if (selectedDiskSource() == SelectedDiskSource_Existing)
+        return m_virtualDisk.isNull();
+    return true;
 }
 
@@ -396 +427 @@
     m_fUserSetSize = true;
 }
+
+void UIWizardNewVMPageBasic4::setEnableNewDiskWidgets(bool fEnable)
+{
+    if (m_pMediumVariantContainer)
+        m_pMediumVariantContainer->setEnabled(fEnable);
+
+    if (m_pSizeContainer)
+        m_pSizeContainer->setEnabled(fEnable);
+}

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

@@ -38 +38 @@
 /* Forward declarations: */
 class QButtonGroup;
+class QGroupBox;
 class QRadioButton;
 class QIRichTextLabel;
@@ -64 +65 @@
 
     QWidget *createDiskWidgets();
+    virtual QWidget *createDiskVariantAndSizeWidgets();
 
     void ensureNewVirtualDiskDeleted();
@@ -84 +86 @@
        UIMediaComboBox *m_pDiskSelector;
        QIToolButton *m_pDiskSelectionButton;
+       QGroupBox *m_pMediumVariantContainer;
+       QGroupBox *m_pSizeContainer;
     /** @} */
     SelectedDiskSource m_enmSelectedDiskSource;
@@ -129 +133 @@
 private:
 
-
     void prepare();
     void createConnections();
+    QWidget *createDiskVariantAndSizeWidgets();
     void retranslateUi();
     void initializePage();
     void cleanupPage();
+    void setEnableNewDiskWidgets(bool fEnable);
 
     bool isComplete() const;

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

@@ -53 +53 @@
         m_pToolBox->insertPage(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(/* fCreateLabels */ false), "");
         m_pToolBox->insertPage(ExpertToolboxItems_Unattended, createUnattendedWidgets(), "", false);
-        m_pToolBox->insertPage(ExpertToolboxItems_Disk, createDiskWidgets(), "");
+        //m_pToolBox->insertPage(ExpertToolboxItems_Disk, createDiskWidgets(), "");
         m_pToolBox->insertPage(ExpertToolboxItems_Hardware, createHardwareWidgets(), "");