Changeset 87073 in vbox

Timestamp:

Dec 9, 2020 5:30:53 PM (4 years ago)

Author:

vboxsync

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

141845

Message:

FE/Qt: bugref:9515. Banging on the wizard page to make it look a bit better

Location:

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

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (8 diffs)
• UIWizardNewVMPageBasic1.h (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (1 diff)

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

@@ -278 +278 @@
 }
 
-void UIWizardNewVMPage1::createNameOSTypeWidgets(QWidget *pContainerWidget, bool fCreateLabels /* = true */)
-{
-    AssertReturnVoid(pContainerWidget);
-    QGridLayout *pGridLayout = new QGridLayout(pContainerWidget);
-    AssertReturnVoid(pGridLayout);
-
-    int iLayoutRow = 0;
+void UIWizardNewVMPage1::createNameOSTypeWidgets(QVBoxLayout *pLayout, bool fCreateLabels /* = true */)
+{
+    AssertReturnVoid(pLayout);
+
     if (fCreateLabels)
     {
         m_pNameOSTypeLabel = new QIRichTextLabel;
         if (m_pNameOSTypeLabel)
-            pGridLayout->addWidget(m_pNameOSTypeLabel, iLayoutRow++, 0, 1, 3);
+            pLayout->addWidget(m_pNameOSTypeLabel);
     }
 
     m_pNameAndFolderEditor = new UINameAndSystemEditor(0, true, true, false);
     if (m_pNameAndFolderEditor)
-        pGridLayout->addWidget(m_pNameAndFolderEditor, iLayoutRow++, 1, 1, 2);
+        pLayout->addWidget(m_pNameAndFolderEditor);
 
     if (fCreateLabels)
@@ -300 +297 @@
         m_pUnattendedLabel = new QIRichTextLabel;
         if (m_pUnattendedLabel)
-            pGridLayout->addWidget(m_pUnattendedLabel, iLayoutRow++, 0, 1, 3);
-    }
-
+            pLayout->addWidget(m_pUnattendedLabel);
+    }
+
+    QGridLayout *pUnattendedInstall = new QGridLayout;
     m_pEnableUnattendedInstallCheckBox = new QCheckBox;
-    pGridLayout->addWidget(m_pEnableUnattendedInstallCheckBox, iLayoutRow++, 0, 1, 3);
+    pUnattendedInstall->addWidget(m_pEnableUnattendedInstallCheckBox, 0, 0, 1, 4, Qt::AlignLeft);
 
     m_pISOSelectorLabel = new QLabel;
@@ -310 +308 @@
     {
         m_pISOSelectorLabel->setAlignment(Qt::AlignRight);
-        m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+        m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
         m_pISOSelectorLabel->setEnabled(false);
-        pGridLayout->addWidget(m_pISOSelectorLabel, iLayoutRow, 1);
+        pUnattendedInstall->addWidget(m_pISOSelectorLabel, 1, 0, 1, 1, Qt::AlignRight);
     }
     m_pISOFilePathSelector = new UIFilePathSelector;
@@ -320 +318 @@
         m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
         m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
-        m_pISOFilePathSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+        m_pISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
         m_pISOFilePathSelector->setEnabled(false);
-        pGridLayout->addWidget(m_pISOFilePathSelector, iLayoutRow++, 2);
+        pUnattendedInstall->addWidget(m_pISOFilePathSelector, 1, 1, 1, 4);
     }
 
@@ -329 +327 @@
     {
         m_pStartHeadlessCheckBox->setEnabled(false);
-        pGridLayout->addWidget(m_pStartHeadlessCheckBox, iLayoutRow++, 2);
-    }
-
+        pUnattendedInstall->addWidget(m_pStartHeadlessCheckBox, 2, 1, 1, 1);
+    }
+    pLayout->addLayout(pUnattendedInstall);
     m_pSystemTypeEditor = new UINameAndSystemEditor(0, false, false, true);
     if (m_pSystemTypeEditor)
-        pGridLayout->addWidget(m_pSystemTypeEditor, iLayoutRow++, 1, 1, 2);
+        pLayout->addWidget(m_pSystemTypeEditor);
+
 }
 
@@ -489 +488 @@
 
     if (m_pISOSelectorLabel)
-        m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installation Medium:"));
+        m_pISOSelectorLabel->setText(UIWizardNewVM::tr("Installer:"));
 
     if (m_pStartHeadlessCheckBox)
@@ -507 +506 @@
 void UIWizardNewVMPageBasic1::prepare()
 {
-    QWidget *pContainerWidget = new QWidget;
     QVBoxLayout *pPageLayout = new QVBoxLayout(this);
-    pPageLayout->addWidget(pContainerWidget);
-    createNameOSTypeWidgets(pContainerWidget, false);
+    createNameOSTypeWidgets(pPageLayout, false);
     pPageLayout->addStretch();
     createConnections();
@@ -606 +603 @@
                                              "to identify this machine."));
 
-    if (   m_pNameAndFolderEditor
-           && m_pSystemTypeEditor
-           && m_pISOSelectorLabel)
-    {
-        int iMinWidthHint = 0;
-        iMinWidthHint = qMax(iMinWidthHint, m_pISOSelectorLabel->minimumSizeHint().width());
-        // m_pNameAndFolderEditor->setMinimumLayoutIndent(iMinWidthHint);
-        // m_pSystemTypeEditor->setMinimumLayoutIndent(iMinWidthHint);
-    }
+    // if (   m_pNameAndFolderEditor
+    //        && m_pSystemTypeEditor
+    //        && m_pISOSelectorLabel)
+    // {
+    //     int iMinWidthHint = 0;
+    //     iMinWidthHint = qMax(iMinWidthHint, m_pISOSelectorLabel->minimumSizeHint().width());
+    //     m_pNameAndFolderEditor->setMinimumLayoutIndent(iMinWidthHint);
+    //     m_pSystemTypeEditor->setMinimumLayoutIndent(iMinWidthHint);
+    // }
 }
 

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

@@ -27 +27 @@
 /* Forward declarations: */
 class QCheckBox;
-class QGridLayout;
 class QLabel;
 class QRadioButton;
+class QVBoxLayout;
 class QIRichTextLabel;
 class UIFilePathSelector;
@@ -75 +75 @@
     void composeMachineFilePath();
     /** Creates the page widgets and adds them into the @p pGridLayout. */
-    void createNameOSTypeWidgets(QWidget *pContainerWidget, bool fCreateLabels = true);
+    void createNameOSTypeWidgets(QVBoxLayout *pLayout, bool fCreateLabels = true);
     void setTypeByISODetectedOSType(const QString &strDetectedOSType);
     /** Colors the widgets red if they cause isComplete to fail. */

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

@@ -52 +52 @@
         m_pToolBox = new QToolBox;
         m_pNameAndSystemContainer = new QWidget(this);
-        createNameOSTypeWidgets(m_pNameAndSystemContainer, false);
+        QVBoxLayout *pNameContainerLayout = new QVBoxLayout(m_pNameAndSystemContainer);
+        createNameOSTypeWidgets(pNameContainerLayout, false);
         m_pGAInstallContainer = createGAInstallWidgets();
         m_pUsernameHostnameContainer = createUserNameHostNameWidgets();