Changeset 87423 in vbox

Timestamp:

Jan 25, 2021 6:48:16 PM (4 years ago)

Author:

vboxsync

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

142417

Message:

FE/Qt: bugref:9515. Working on the guided mode. part 3

Location:

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

Files:

• UIWizardNewVMPageBasic4.cpp (modified) (7 diffs)
• UIWizardNewVMPageBasic4.h (modified) (3 diffs)

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

@@ -20 +20 @@
 #include <QMetaType>
 #include <QRadioButton>
-#include <QToolBox>
 #include <QVBoxLayout>
 
@@ -158 +157 @@
 void UIWizardNewVMPage4::retranslateWidgets()
 {
-    m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add a virtual hard disk"));
-    m_pDiskCreate->setText(UIWizardNewVM::tr("&Create a virtual hard disk now"));
-    m_pDiskPresent->setText(UIWizardNewVM::tr("&Use an existing virtual hard disk file"));
-    m_pVMMButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard disk file..."));
+    if (m_pDiskSkip)
+        m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add a virtual hard disk"));
+    if (m_pDiskCreate)
+        m_pDiskCreate->setText(UIWizardNewVM::tr("&Create a virtual hard disk now"));
+    if (m_pDiskPresent)
+        m_pDiskPresent->setText(UIWizardNewVM::tr("&Use an existing virtual hard disk file"));
+    if (m_pVMMButton)
+        m_pVMMButton->setToolTip(UIWizardNewVM::tr("Choose a virtual hard disk file..."));
 }
 
@@ -208 +211 @@
 UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
     : m_pLabel(0)
-    , m_pToolBox(0)
 {
     prepare();
@@ -223 +225 @@
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    m_pToolBox = new QToolBox;
 
     m_pLabel = new QIRichTextLabel(this);
     pMainLayout->addWidget(m_pLabel);
-    pMainLayout->addWidget(m_pToolBox);
-
-    m_pToolBox->insertItem(ToolBoxItems_Disk, createDiskWidgets(), QString());
-    m_pToolBox->insertItem(ToolBoxItems_Hardware, createHardwareWidgets(), QString());
-    m_pToolBox->setStyleSheet("QToolBox::tab:selected { font: bold; }");
+    pMainLayout->addWidget(createDiskWidgets());
 
     pMainLayout->addStretch();
@@ -275 +272 @@
     QString strRecommendedHDD = field("type").value<CGuestOSType>().isNull() ? QString() :
                                 UICommon::formatSize(field("type").value<CGuestOSType>().GetRecommendedHDD());
-    m_pLabel->setText(UIWizardNewVM::tr("<p>If you wish you can add a virtual hard disk to the new machine. "
-                                        "You can either create a new hard disk file or select one from the list "
-                                        "or from another location using the folder icon. "
-                                        "If you need a more complex storage set-up you can skip this step "
-                                        "and make the changes to the machine settings once the machine is created. "
-                                        "The recommended size of the hard disk is <b>%1</b>."
-                                        "<p>You can also modify the virtual machine's hardware by modifying the amount of memory "
-                                        "and virtual processors.</p>")
-                                        .arg(strRecommendedHDD));
+    if (m_pLabel)
+        m_pLabel->setText(UIWizardNewVM::tr("<p>If you wish you can add a virtual hard disk to the new machine. "
+                                            "You can either create a new hard disk file or select one from the list "
+                                            "or from another location using the folder icon. "
+                                            "If you need a more complex storage set-up you can skip this step "
+                                            "and make the changes to the machine settings once the machine is created. "
+                                            "The recommended size of the hard disk is <b>%1</b>.")
+                          .arg(strRecommendedHDD));
     retranslateWidgets();
-    if (m_pToolBox)
-    {
-        m_pToolBox->setItemText(ToolBoxItems_Disk, UIWizardNewVM::tr("Hard Disk"));
-        m_pToolBox->setItemText(ToolBoxItems_Hardware, UIWizardNewVM::tr("Hardware"));
-    }
 }
 
@@ -302 +293 @@
     CGuestOSType type = field("type").value<CGuestOSType>();
     ULONG recommendedRam = type.GetRecommendedRAM();
-    m_pBaseMemoryEditor->setValue(recommendedRam);
+    if (m_pBaseMemoryEditor)
+        m_pBaseMemoryEditor->setValue(recommendedRam);
 
 
@@ -338 +330 @@
 {
     /* Make sure 'virtualDisk' field feats the rules: */
+    if (!m_pDiskSkip)
+        return false;
     return m_pDiskSkip->isChecked() ||
-           !m_pDiskPresent->isChecked() ||
-           !uiCommon().medium(m_pDiskSelector->id()).isNull();
+        !m_pDiskPresent->isChecked() ||
+        !uiCommon().medium(m_pDiskSelector->id()).isNull();
 }
 

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

@@ -34 +34 @@
 /* Forward declarations: */
 class QRadioButton;
-class QToolBox;
 class QIRichTextLabel;
 class QIToolButton;
@@ -46 +45 @@
 
 protected:
-
-    enum
-    {
-        ToolBoxItems_Disk,
-        ToolBoxItems_Hardware
-    };
-
 
     /** Constructor. */
@@ -155 +147 @@
     /** Widgets. */
     QIRichTextLabel *m_pLabel;
-    QToolBox     *m_pToolBox;
 };