Changeset 87621 in vbox

Timestamp:

Feb 5, 2021 8:31:08 AM (4 years ago)

Author:

vboxsync

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

142656

Message:

FE/Qt: bugref:9515. Changing the order of pages in expert mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIToolBox.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

@@ -279 +279 @@
     if (m_pages.contains(iIndex))
         return false;
+
+    /* Remove the stretch from the end of the layout: */
+    QLayoutItem *pItem = m_pMainLayout->takeAt(m_pMainLayout->count() - 1);
+    delete pItem;
+
     ++m_iPageCount;
     UIToolBoxPage *pNewPage = new UIToolBoxPage(fAddEnableCheckBox, 0);;
@@ -308 +313 @@
                      iTotalTitleHeight +
                      iMaxPageHeight);
-
+    /* Add stretch at the end: */
+    m_pMainLayout->addStretch();
     return iIndex;
 }
@@ -354 +360 @@
     m_pMainLayout = new QVBoxLayout(this);
     m_pMainLayout->addStretch();
-    //m_pMainLayout->setContentsMargins(0, 0, 0, 0);
 
     retranslateUi();

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

@@ -64 +64 @@
     if (m_pEFICheckBox)
     {
-        m_pEFICheckBox->setText(UIWizardNewVM::tr("Enable &EFI (special OSes only)"));
-        m_pEFICheckBox->setWhatsThis(UIWizardNewVM::tr("When checked, the guest will support the "
-                                                       "Extended Firmware Interface (EFI), which is required to boot certain "
+        m_pEFICheckBox->setText(UIWizardNewVM::tr("Enable EFI (special OSes only)"));
+        m_pEFICheckBox->setToolTip(UIWizardNewVM::tr("When checked, the guest will support the\n"
+                                                       "Extended Firmware Interface (EFI), which is required to boot certain\n"
                                                        "guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated."));
     }

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

@@ -100 +100 @@
         ExpertToolboxItems_NameAndOSType,
         ExpertToolboxItems_Unattended,
-        ExpertToolboxItems_Disk,
         ExpertToolboxItems_Hardware,
+        ExpertToolboxItems_Disk
     };