Changeset 87062 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 9, 2020 10:46:58 AM (4 years ago)

Author:

vboxsync

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

141827

Message:

FE/Qt: bugref:9515. Refactoring the first page.

Location:

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

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (7 diffs)
• UIWizardNewVMPageBasic1.h (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (2 diffs)

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

@@ -182 +182 @@
     : m_pISOSelectorLabel(0)
     , m_pISOFilePathSelector(0)
-    , m_pStartHeadlessLabel(0)
     , m_pEnableUnattendedInstallCheckBox(0)
     , m_pStartHeadlessCheckBox(0)
@@ -279 +278 @@
 }
 
-void UIWizardNewVMPage1::createNameOSTypeWidgets(QGridLayout *pGridLayout, bool fCreateLabels /* = true */)
-{
-    if (pGridLayout)
-    {
-        int iLayoutRow = 0;
-        if (fCreateLabels)
-        {
-            m_pNameOSTypeLabel = new QIRichTextLabel;
-            if (m_pNameOSTypeLabel)
-                pGridLayout->addWidget(m_pNameOSTypeLabel, iLayoutRow++, 0, 1, 3);
-        }
-
-        m_pNameAndFolderEditor = new UINameAndSystemEditor(0, true, true, false);
-        if (m_pNameAndFolderEditor)
-            pGridLayout->addWidget(m_pNameAndFolderEditor, iLayoutRow++, 1, 1, 2);
-
-        if (fCreateLabels)
-        {
-            m_pUnattendedLabel = new QIRichTextLabel;
-            if (m_pUnattendedLabel)
-                pGridLayout->addWidget(m_pUnattendedLabel, iLayoutRow++, 0, 1, 3);
-        }
-
-        m_pEnableUnattendedInstallCheckBox = new QCheckBox;
-        pGridLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iLayoutRow++, 0, 1, 3);
-
-        m_pISOSelectorLabel = new QLabel;
-        if (m_pISOSelectorLabel)
-        {
-            m_pISOSelectorLabel->setAlignment(Qt::AlignRight);
-            m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            m_pISOSelectorLabel->setEnabled(false);
-            pGridLayout->addWidget(m_pISOSelectorLabel, iLayoutRow++, 1);
-        }
-        m_pISOFilePathSelector = new UIFilePathSelector;
-        if (m_pISOFilePathSelector)
-        {
-            m_pISOFilePathSelector->setResetEnabled(false);
-            m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
-            m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
-            m_pISOFilePathSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            m_pISOFilePathSelector->setEnabled(false);
-            pGridLayout->addWidget(m_pISOFilePathSelector, iLayoutRow++, 2);
-        }
-
-        m_pStartHeadlessLabel = new QLabel;
-        if (m_pStartHeadlessLabel)
-        {
-            m_pStartHeadlessLabel->setAlignment(Qt::AlignRight);
-            m_pStartHeadlessLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            m_pStartHeadlessLabel->setEnabled(false);
-            pGridLayout->addWidget(m_pStartHeadlessLabel, iLayoutRow++, 1);
-        }
-        m_pStartHeadlessCheckBox = new QCheckBox;
-        if (m_pStartHeadlessCheckBox)
-        {
-            m_pStartHeadlessCheckBox->setEnabled(false);
-            pGridLayout->addWidget(m_pStartHeadlessCheckBox, iLayoutRow++, 2);
-        }
-
-        m_pSystemTypeEditor = new UINameAndSystemEditor(0, false, false, true);
-        if (m_pSystemTypeEditor)
-            pGridLayout->addWidget(m_pSystemTypeEditor, iLayoutRow++, 1, 1, 2);
-    }
+void UIWizardNewVMPage1::createNameOSTypeWidgets(QWidget *pContainerWidget, bool fCreateLabels /* = true */)
+{
+    AssertReturnVoid(pContainerWidget);
+    QGridLayout *pGridLayout = new QGridLayout(pContainerWidget);
+    AssertReturnVoid(pGridLayout);
+
+    int iLayoutRow = 0;
+    if (fCreateLabels)
+    {
+        m_pNameOSTypeLabel = new QIRichTextLabel;
+        if (m_pNameOSTypeLabel)
+            pGridLayout->addWidget(m_pNameOSTypeLabel, iLayoutRow++, 0, 1, 3);
+    }
+
+    m_pNameAndFolderEditor = new UINameAndSystemEditor(0, true, true, false);
+    if (m_pNameAndFolderEditor)
+        pGridLayout->addWidget(m_pNameAndFolderEditor, iLayoutRow++, 1, 1, 2);
+
+    if (fCreateLabels)
+    {
+        m_pUnattendedLabel = new QIRichTextLabel;
+        if (m_pUnattendedLabel)
+            pGridLayout->addWidget(m_pUnattendedLabel, iLayoutRow++, 0, 1, 3);
+    }
+
+    m_pEnableUnattendedInstallCheckBox = new QCheckBox;
+    pGridLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iLayoutRow++, 0, 1, 3);
+
+    m_pISOSelectorLabel = new QLabel;
+    if (m_pISOSelectorLabel)
+    {
+        m_pISOSelectorLabel->setAlignment(Qt::AlignRight);
+        m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        m_pISOSelectorLabel->setEnabled(false);
+        pGridLayout->addWidget(m_pISOSelectorLabel, iLayoutRow, 1);
+    }
+    m_pISOFilePathSelector = new UIFilePathSelector;
+    if (m_pISOFilePathSelector)
+    {
+        m_pISOFilePathSelector->setResetEnabled(false);
+        m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
+        m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
+        m_pISOFilePathSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+        m_pISOFilePathSelector->setEnabled(false);
+        pGridLayout->addWidget(m_pISOFilePathSelector, iLayoutRow++, 2);
+    }
+
+    m_pStartHeadlessCheckBox = new QCheckBox;
+    if (m_pStartHeadlessCheckBox)
+    {
+        m_pStartHeadlessCheckBox->setEnabled(false);
+        pGridLayout->addWidget(m_pStartHeadlessCheckBox, iLayoutRow++, 2);
+    }
+
+    m_pSystemTypeEditor = new UINameAndSystemEditor(0, false, false, true);
+    if (m_pSystemTypeEditor)
+        pGridLayout->addWidget(m_pSystemTypeEditor, iLayoutRow++, 1, 1, 2);
 }
 
@@ -497 +489 @@
 
     if (m_pISOSelectorLabel)
-        m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Image:"));
-
-    if (m_pStartHeadlessLabel)
-        m_pStartHeadlessLabel->setText(UIWizardNewVM::tr("Options:"));
+        m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installation Medium:"));
+
     if (m_pStartHeadlessCheckBox)
     {
@@ -507 +497 @@
                                                                "machine in headless mode after the guest OS install."));
     }
-
 }
 
@@ -518 +507 @@
 void UIWizardNewVMPageBasic1::prepare()
 {
-    QGridLayout *pMainLayout = new QGridLayout(this);;
-    createNameOSTypeWidgets(pMainLayout, false);
+    QWidget *pContainerWidget = new QWidget;
+    QVBoxLayout *pPageLayout = new QVBoxLayout(this);
+    pPageLayout->addWidget(pContainerWidget);
+    createNameOSTypeWidgets(pContainerWidget, false);
+    pPageLayout->addStretch();
     createConnections();
     /* Register fields: */
@@ -590 +582 @@
     if (m_pISOFilePathSelector)
         m_pISOFilePathSelector->setEnabled(fEnabled);
-    if (m_pStartHeadlessLabel)
-        m_pStartHeadlessLabel->setEnabled(fEnabled);
     if (m_pStartHeadlessCheckBox)
         m_pStartHeadlessCheckBox->setEnabled(fEnabled);
@@ -618 +608 @@
     if (   m_pNameAndFolderEditor
            && m_pSystemTypeEditor
-        && m_pISOSelectorLabel
-        && m_pStartHeadlessLabel)
+           && m_pISOSelectorLabel)
     {
         int iMinWidthHint = 0;
         iMinWidthHint = qMax(iMinWidthHint, m_pISOSelectorLabel->minimumSizeHint().width());
-        iMinWidthHint = qMax(iMinWidthHint, m_pStartHeadlessLabel->minimumSizeHint().width());
-        m_pNameAndFolderEditor->setMinimumLayoutIndent(iMinWidthHint);
-        m_pSystemTypeEditor->setMinimumLayoutIndent(iMinWidthHint);
+        // m_pNameAndFolderEditor->setMinimumLayoutIndent(iMinWidthHint);
+        // m_pSystemTypeEditor->setMinimumLayoutIndent(iMinWidthHint);
     }
 }

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

@@ -75 +75 @@
     void composeMachineFilePath();
     /** Creates the page widgets and adds them into the @p pGridLayout. */
-    void createNameOSTypeWidgets(QGridLayout *pGridLayout, bool fCreateLabels = true);
+    void createNameOSTypeWidgets(QWidget *pContainerWidget, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
     /** Colors the widgets red if they cause isComplete to fail. */
@@ -87 +87 @@
        /** Holds the ISO selector editor instance. */
        mutable UIFilePathSelector *m_pISOFilePathSelector;
-       QLabel *m_pStartHeadlessLabel;
        QCheckBox *m_pEnableUnattendedInstallCheckBox;
        QCheckBox *m_pStartHeadlessCheckBox;

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

@@ -52 +52 @@
         m_pToolBox = new QToolBox;
         m_pNameAndSystemContainer = new QWidget(this);
-        QGridLayout *pNameContainerLayout = new QGridLayout(m_pNameAndSystemContainer);
-        createNameOSTypeWidgets(pNameContainerLayout, false);
+        createNameOSTypeWidgets(m_pNameAndSystemContainer, false);
         m_pGAInstallContainer = createGAInstallWidgets();
         m_pUsernameHostnameContainer = createUserNameHostNameWidgets();
@@ -419 +418 @@
     if (m_pISOFilePathSelector)
         m_pISOFilePathSelector->setEnabled(fEnabled);
-    if (m_pStartHeadlessLabel)
-        m_pStartHeadlessLabel->setEnabled(fEnabled);
     if (m_pStartHeadlessCheckBox)
         m_pStartHeadlessCheckBox->setEnabled(fEnabled);