Changeset 87057 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2020 7:53:33 AM (4 years ago)

Author:

vboxsync

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

141822

Message:

FE/Qt: bugref:9515. Repositioning widgets.

Location:

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

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (23 diffs)
• UIWizardNewVMPageBasic1.h (modified) (1 diff)
• UIWizardNewVMPageExpert.cpp (modified) (4 diffs)

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

@@ -186 +186 @@
     , m_pStartHeadlessLabel(0)
     , m_pStartHeadlessCheckBox(0)
-    , m_pNameAndSystemEditor(0)
+    , m_pNameAndFolderEditor(0)
+    , m_pSystemTypeEditor(0)
     , m_pUnattendedLabel(0)
     , m_pNameOSTypeLabel(0)
@@ -206 +207 @@
         if (strNewName.contains(gs_OSTypePattern[i].pattern))
         {
-            if (m_pNameAndSystemEditor)
-                m_pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
+            if (m_pSystemTypeEditor)
+                m_pSystemTypeEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
             break;
         }
@@ -216 +217 @@
     /* If the user manually edited the OS type, we didn't want our automatic OS type guessing anymore.
      * So simply disconnect the text-edit signal. */
-    if (m_pNameAndSystemEditor)
-        m_pNameAndSystemEditor->disconnect(SIGNAL(sigNameChanged(const QString &)), thisImp(), SLOT(sltNameChanged(const QString &)));
+    if (m_pNameAndFolderEditor)
+        m_pNameAndFolderEditor->disconnect(SIGNAL(sigNameChanged(const QString &)), thisImp(), SLOT(sltNameChanged(const QString &)));
 }
 
@@ -250 +251 @@
 void UIWizardNewVMPage1::composeMachineFilePath()
 {
-    if (!m_pNameAndSystemEditor)
+    if (!m_pNameAndFolderEditor)
         return;
-    if (m_pNameAndSystemEditor->name().isEmpty() || m_pNameAndSystemEditor->path().isEmpty())
+    if (m_pNameAndFolderEditor->name().isEmpty() || m_pNameAndFolderEditor->path().isEmpty())
         return;
     /* Get VBox: */
@@ -258 +259 @@
 
     /* Compose machine filename: */
-    m_strMachineFilePath = vbox.ComposeMachineFilename(m_pNameAndSystemEditor->name(),
+    m_strMachineFilePath = vbox.ComposeMachineFilename(m_pNameAndFolderEditor->name(),
                                                        m_strGroup,
                                                        QString(),
-                                                       m_pNameAndSystemEditor->path());
+                                                       m_pNameAndFolderEditor->path());
     /* Compose machine folder/basename: */
     const QFileInfo fileInfo(m_strMachineFilePath);
@@ -283 +284 @@
     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, 0, 0, 1, 3);
+                pGridLayout->addWidget(m_pUnattendedLabel, iLayoutRow++, 0, 1, 3);
         }
 
@@ -297 +310 @@
             {
                 m_pButtonSimple->setChecked(true);
-                pGridLayout->addWidget(m_pButtonSimple, 1, 0, 1, 3);
+                pGridLayout->addWidget(m_pButtonSimple, iLayoutRow++, 0, 1, 3);
             }
             m_pButtonUnattended = new QRadioButton;
             if (m_pButtonUnattended)
             {
-                QStyleOptionButton options;
-                options.initFrom(m_pButtonUnattended);
-                const int iWidth = m_pButtonUnattended->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth,
-                                                                             &options, m_pButtonUnattended);
-                pGridLayout->setColumnMinimumWidth(0, iWidth);
-                pGridLayout->addWidget(m_pButtonUnattended, 2, 0, 1, 3);
+                // QStyleOptionButton options;
+                // options.initFrom(m_pButtonUnattended);
+                // const int iWidth = m_pButtonUnattended->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth,
+                //                                                              &options, m_pButtonUnattended);
+                // pGridLayout->setColumnMinimumWidth(0, iWidth);
+                pGridLayout->addWidget(m_pButtonUnattended, iLayoutRow++, 0, 1, 3);
             }
 
@@ -320 +333 @@
             m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
             m_pISOSelectorLabel->setEnabled(false);
-            pGridLayout->addWidget(m_pISOSelectorLabel, 3, 1);
+            pGridLayout->addWidget(m_pISOSelectorLabel, iLayoutRow++, 1);
         }
         m_pISOFilePathSelector = new UIFilePathSelector;
@@ -330 +343 @@
             m_pISOFilePathSelector->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
             m_pISOFilePathSelector->setEnabled(false);
-            pGridLayout->addWidget(m_pISOFilePathSelector, 3, 2);
+            pGridLayout->addWidget(m_pISOFilePathSelector, iLayoutRow++, 2);
         }
 
@@ -339 +352 @@
             m_pStartHeadlessLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
             m_pStartHeadlessLabel->setEnabled(false);
-            pGridLayout->addWidget(m_pStartHeadlessLabel, 4, 1);
+            pGridLayout->addWidget(m_pStartHeadlessLabel, iLayoutRow++, 1);
         }
         m_pStartHeadlessCheckBox = new QCheckBox;
@@ -345 +358 @@
         {
             m_pStartHeadlessCheckBox->setEnabled(false);
-            pGridLayout->addWidget(m_pStartHeadlessCheckBox, 4, 2);
-        }
-
-        if (fCreateLabels)
-        {
-            m_pNameOSTypeLabel = new QIRichTextLabel;
-            if (m_pNameOSTypeLabel)
-                pGridLayout->addWidget(m_pNameOSTypeLabel, 5, 0, 1, 3);
-        }
-
-        m_pNameAndSystemEditor = new UINameAndSystemEditor(0, true, true, true);
-        if (m_pNameAndSystemEditor)
-        {
-            pGridLayout->addWidget(m_pNameAndSystemEditor, 6, 1, 1, 2);
-        }
+            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);
     }
 }
@@ -365 +369 @@
 bool UIWizardNewVMPage1::createMachineFolder()
 {
-    if (!m_pNameAndSystemEditor)
+    if (!m_pNameAndFolderEditor)
         return false;
     /* Cleanup previosly created folder if any: */
@@ -452 +456 @@
 QString UIWizardNewVMPage1::guestOSFamiyId() const
 {
-    if (!m_pNameAndSystemEditor)
+    if (!m_pSystemTypeEditor)
         return QString();
-    return m_pNameAndSystemEditor->familyId();
+    return m_pSystemTypeEditor->familyId();
 }
 
@@ -493 +497 @@
     if (m_pISOFilePathSelector)
         m_pISOFilePathSelector->mark(!isISOFileSelectorComplete());
-    if (m_pNameAndSystemEditor)
-        m_pNameAndSystemEditor->markNameLineEdit(m_pNameAndSystemEditor->name().isEmpty());
+    if (m_pNameAndFolderEditor)
+        m_pNameAndFolderEditor->markNameLineEdit(m_pNameAndFolderEditor->name().isEmpty());
 }
 
@@ -509 +513 @@
     {
         m_pButtonSimple->setText(UIWizardNewVM::tr("Leave Disk Empty"));
-        m_pButtonSimple->setToolTip(UIWizardNewVM::tr("When checked, no guest OS will be installed after this wizard is closed thereby leaving the virtual machine's disk empty."));
+        m_pButtonSimple->setToolTip(UIWizardNewVM::tr("When checked, no guest OS will be installed after this wizard is closed"
+                                                      " thereby leaving the virtual machine's disk empty."));
     }
     if (m_pButtonUnattended)
     {
         m_pButtonUnattended->setText(UIWizardNewVM::tr("Unattended Install"));
-        m_pButtonUnattended->setToolTip(UIWizardNewVM::tr("When checked, an unattended guest OS installation will be started after this wizard is closed."));
+        m_pButtonUnattended->setToolTip(UIWizardNewVM::tr("When checked, an unattended guest OS installation will be started "
+                                                          "after this wizard is closed."));
     }
 
@@ -525 +531 @@
     {
         m_pStartHeadlessCheckBox->setText(UIWizardNewVM::tr("Start VM Headless"));
-        m_pStartHeadlessCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the unattended install will start the virtual machine in headless mode."));
+        m_pStartHeadlessCheckBox->setToolTip(UIWizardNewVM::tr("When checked, the unattended install will start the virtual "
+                                                               "machine in headless mode after the guest OS install."));
     }
 
@@ -539 +546 @@
 {
     QGridLayout *pMainLayout = new QGridLayout(this);;
-    createNameOSTypeWidgets(pMainLayout);
+    createNameOSTypeWidgets(pMainLayout, false);
     createConnections();
     /* Register fields: */
-    registerField("name*", m_pNameAndSystemEditor, "name", SIGNAL(sigNameChanged(const QString &)));
-    registerField("type", m_pNameAndSystemEditor, "type", SIGNAL(sigOsTypeChanged()));
+    registerField("name*", m_pNameAndFolderEditor, "name", SIGNAL(sigNameChanged(const QString &)));
+    registerField("type", m_pSystemTypeEditor, "type", SIGNAL(sigOsTypeChanged()));
     registerField("machineFilePath", this, "machineFilePath");
     registerField("machineFolder", this, "machineFolder");
@@ -559 +566 @@
             this, &UIWizardNewVMPageBasic1::sltUnattendedCheckBoxToggle);
     connect(m_pISOFilePathSelector, &UIFilePathSelector::pathChanged, this, &UIWizardNewVMPageBasic1::sltISOPathChanged);
-    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic1::sltNameChanged);
-    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasic1::sltPathChanged);
-    connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasic1::sltOsTypeChanged);
+    connect(m_pNameAndFolderEditor, &UINameAndSystemEditor::sigNameChanged, this, &UIWizardNewVMPageBasic1::sltNameChanged);
+    connect(m_pNameAndFolderEditor, &UINameAndSystemEditor::sigPathChanged, this, &UIWizardNewVMPageBasic1::sltPathChanged);
+    connect(m_pSystemTypeEditor, &UINameAndSystemEditor::sigOsTypeChanged, this, &UIWizardNewVMPageBasic1::sltOsTypeChanged);
 }
 
@@ -575 +582 @@
 {
     markWidgets();
-    if (m_pNameAndSystemEditor->name().isEmpty())
+    if (m_pNameAndFolderEditor->name().isEmpty())
         return false;
     return isISOFileSelectorComplete();
@@ -627 +634 @@
 
     if (m_pUnattendedLabel)
-        m_pUnattendedLabel->setText(UIWizardNewVM::tr("Please choose whether you want to start an unattended guest os install "
-                                             "in which case you will have to select a valid installation medium. If not "
-                                             "your virtual disk will have an empty virtual hard disk. "
-                                             "Additionally you can choose to start the unattended install as a headless vm process."));
+        m_pUnattendedLabel->setText(UIWizardNewVM::tr("Please decide whether you want to start an unattended guest os install "
+                                             "in which case you will have to select a valid installation medium. If not, "
+                                             "your virtual disk will have an empty virtual hard disk."));
 
 
@@ -639 +645 @@
                                              "to identify this machine."));
 
-    if (   m_pNameAndSystemEditor
+    if (   m_pNameAndFolderEditor
+           && m_pSystemTypeEditor
         && m_pISOSelectorLabel
         && m_pStartHeadlessLabel)
@@ -646 +653 @@
         iMinWidthHint = qMax(iMinWidthHint, m_pISOSelectorLabel->minimumSizeHint().width());
         iMinWidthHint = qMax(iMinWidthHint, m_pStartHeadlessLabel->minimumSizeHint().width());
-        m_pNameAndSystemEditor->setMinimumLayoutIndent(iMinWidthHint);
+        m_pNameAndFolderEditor->setMinimumLayoutIndent(iMinWidthHint);
+        m_pSystemTypeEditor->setMinimumLayoutIndent(iMinWidthHint);
     }
 }
@@ -654 +662 @@
     /* Translate page: */
     retranslateUi();
-    if (m_pNameAndSystemEditor)
-        m_pNameAndSystemEditor->setFocus();
+    if (m_pNameAndFolderEditor)
+        m_pNameAndFolderEditor->setFocus();
 }
 

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

@@ -97 +97 @@
        QCheckBox *m_pStartHeadlessCheckBox;
        /** Provides a path selector and a line edit field for path and name entry. */
-       UINameAndSystemEditor *m_pNameAndSystemEditor;
+       UINameAndSystemEditor *m_pNameAndFolderEditor;
+       UINameAndSystemEditor *m_pSystemTypeEditor;
        QIRichTextLabel *m_pUnattendedLabel;
        QIRichTextLabel *m_pNameOSTypeLabel;

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

@@ -73 +73 @@
     qRegisterMetaType<CMedium>();
     /* Register fields: */
-    registerField("name*", m_pNameAndSystemEditor, "name", SIGNAL(sigNameChanged(const QString &)));
-    registerField("type", m_pNameAndSystemEditor, "type", SIGNAL(sigOsTypeChanged()));
+    registerField("name*", m_pNameAndFolderEditor, "name", SIGNAL(sigNameChanged(const QString &)));
+    registerField("type", m_pSystemTypeEditor, "type", SIGNAL(sigOsTypeChanged()));
     registerField("machineFilePath", this, "machineFilePath");
     registerField("machineFolder", this, "machineFolder");
@@ -107 +107 @@
     onNameChanged(strNewText);
 
-    /* Fetch recommended RAM value: */
-    CGuestOSType type = m_pNameAndSystemEditor->type();
-
     composeMachineFilePath();
     /* Broadcast complete-change: */
@@ -127 +124 @@
 
     /* Fetch recommended RAM value: */
-    CGuestOSType type = m_pNameAndSystemEditor->type();
+    CGuestOSType type = m_pSystemTypeEditor->type();
     m_pBaseMemoryEditor->setValue(type.GetRecommendedRAM());
 
@@ -204 +201 @@
 {
     /* Connections for Name, OS Type, and unattended install stuff: */
-    if (m_pNameAndSystemEditor)
-    {
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigNameChanged,
+    if (m_pNameAndFolderEditor)
+    {
+        connect(m_pNameAndFolderEditor, &UINameAndSystemEditor::sigNameChanged,
                 this, &UIWizardNewVMPageExpert::sltNameChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigPathChanged,
+        connect(m_pNameAndFolderEditor, &UINameAndSystemEditor::sigPathChanged,
                 this, &UIWizardNewVMPageExpert::sltPathChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged,
+    }
+    if (m_pSystemTypeEditor)
+    {
+        connect(m_pSystemTypeEditor, &UINameAndSystemEditor::sigOsTypeChanged,
                 this, &UIWizardNewVMPageExpert::sltOsTypeChanged);
-        connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOSFamilyChanged,
+        connect(m_pSystemTypeEditor, &UINameAndSystemEditor::sigOSFamilyChanged,
                 this, &UIWizardNewVMPageExpert::sltOSFamilyTypeChanged);
     }