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

Timestamp:

Jul 7, 2020 12:03:00 PM (5 years ago)

Author:

vboxsync

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

138986

Message:

FE/Qt: bugref:9515. First go at the expert mode page.

Location:

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

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• UIWizardNewVMPageBasic3.cpp (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (4 diffs)
• UIWizardNewVMPageExpert.h (modified) (3 diffs)

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

@@ -489 +489 @@
     QGridLayout *pMainLayout = new QGridLayout(this);;
     createWidgets(pMainLayout);
-    void createConnections();
+    createConnections();
     /* Register fields: */
     registerField("name*", m_pNameAndSystemEditor, "name", SIGNAL(sigNameChanged(const QString &)));

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

@@ -52 +52 @@
 void UIWizardNewVMPage3::updateVirtualDiskSource()
 {
+    if (!m_pDiskSelector || !m_pVMMButton)
+        return;
+
     /* Enable/disable controls: */
     m_pDiskSelector->setEnabled(m_pDiskPresent->isChecked());
@@ -260 +263 @@
 {
     /* Translate page: */
-    setTitle(UIWizardNewVM::tr("Hard disk"));
+    setTitle(UIWizardNewVM::tr("Hard disk and Hardware"));
 
     /* Translate widgets: */

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

@@ -25 +25 @@
 #include <QSpacerItem>
 #include <QSpinBox>
+#include <QToolBox>
 #include <QVBoxLayout>
 
@@ -41 +42 @@
 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
     : UIWizardNewVMPage1(strGroup)
+    , m_pNameAndSystemCnt(0)
+    , m_pMemoryCnt(0)
+    , m_pDiskCnt(0)
+    , m_pToolBox(0)
 {
     /* Create widgets: */
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
-        m_pNameAndSystemCnt = new QGroupBox(this);
+        m_pToolBox = new QToolBox;
+        m_pNameAndSystemCnt = new QWidget(this);
         {
             m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
@@ -54 +60 @@
             }
         }
-        m_pMemoryCnt = new QGroupBox(this);
-        {
-            m_pMemoryCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QGridLayout *pMemoryCntLayout = new QGridLayout(m_pMemoryCnt);
-            {
-                m_pBaseMemoryEditor = new UIBaseMemoryEditor;
-                pMemoryCntLayout->addWidget(m_pBaseMemoryEditor, 0, 0, 1, 4);
-            }
-        }
-        m_pDiskCnt = new QGroupBox(this);
-        {
-            m_pDiskCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QGridLayout *pDiskCntLayout = new QGridLayout(m_pDiskCnt);
-            {
-                m_pDiskSkip = new QRadioButton(m_pDiskCnt);
-                m_pDiskCreate = new QRadioButton(m_pDiskCnt);
-                {
-                    m_pDiskCreate->setChecked(true);
-                }
-                m_pDiskPresent = new QRadioButton(m_pDiskCnt);
-                QStyleOptionButton options;
-                options.initFrom(m_pDiskPresent);
-                int iWidth = m_pDiskPresent->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pDiskPresent);
-                pDiskCntLayout->setColumnMinimumWidth(0, iWidth);
-                m_pDiskSelector = new UIMediaComboBox(m_pDiskCnt);
-                {
-                    m_pDiskSelector->setType(UIMediumDeviceType_HardDisk);
-                    m_pDiskSelector->repopulate();
-                }
-                m_pVMMButton = new QIToolButton(m_pDiskCnt);
-                {
-                    m_pVMMButton->setAutoRaise(true);
-                    m_pVMMButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
-                }
-                pDiskCntLayout->addWidget(m_pDiskSkip, 0, 0, 1, 3);
-                pDiskCntLayout->addWidget(m_pDiskCreate, 1, 0, 1, 3);
-                pDiskCntLayout->addWidget(m_pDiskPresent, 2, 0, 1, 3);
-                pDiskCntLayout->addWidget(m_pDiskSelector, 3, 1);
-                pDiskCntLayout->addWidget(m_pVMMButton, 3, 2);
-            }
-        }
-        pMainLayout->addWidget(m_pNameAndSystemCnt);
-        pMainLayout->addWidget(m_pMemoryCnt);
-        pMainLayout->addWidget(m_pDiskCnt);
+
+        pMainLayout->addWidget(m_pToolBox);
+        m_pToolBox->insertItem(ExpertToolboxItems_NameAnsOSType, m_pNameAndSystemCnt, "");
+        m_pToolBox->insertItem(ExpertToolboxItems_Disk, createDiskWidgets(), "");
+        m_pToolBox->insertItem(ExpertToolboxItems_Hardware, createHardwareWidgets(), "");
+
         pMainLayout->addStretch();
         updateVirtualDiskSource();
@@ -184 +152 @@
 {
     /* Translate widgets: */
-    m_pNameAndSystemCnt->setTitle(UIWizardNewVM::tr("Name and operating system"));
-    m_pMemoryCnt->setTitle(UIWizardNewVM::tr("&Memory size"));
-    m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard disk"));
+
+    //m_pMemoryCnt->setTitle(UIWizardNewVM::tr("&Memory size"));
+    //m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard disk"));
     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_pToolBox)
+    {
+        m_pToolBox->setItemText(ExpertToolboxItems_NameAnsOSType, UIWizardNewVM::tr("Name and operating system"));
+        m_pToolBox->setItemText(ExpertToolboxItems_Disk, UIWizardNewVM::tr("Hard disk"));
+        m_pToolBox->setItemText(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("Hardware"));
+    }
 }
 

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

@@ -28 +28 @@
 /* Forward declarations: */
 class QGroupBox;
+class QToolBox;
 
-/* Expert page of the New Virtual Machine wizard: */
+/** Expert page of the New Virtual Machine wizard. */
 class UIWizardNewVMPageExpert : public UIWizardPage,
                                 public UIWizardNewVMPage1,
@@ -45 +46 @@
 public:
 
-    /* Constructor: */
+    /** Constructor. */
     UIWizardNewVMPageExpert(const QString &strGroup);
 
 protected:
 
-    /* Wrapper to access 'wizard' from base part: */
+    /** Wrapper to access 'wizard' from base part. */
     UIWizard *wizardImp() const { return wizard(); }
-    /* Wrapper to access 'this' from base part: */
+    /** Wrapper to access 'this' from base part. */
     UIWizardPage* thisImp() { return this; }
-    /* Wrapper to access 'wizard-field' from base part: */
+    /** Wrapper to access 'wizard-field' from base part. */
     QVariant fieldImp(const QString &strFieldName) const { return UIWizardPage::field(strFieldName); }
 
 private slots:
 
-    /* Handlers: */
+    /** Handlers. */
     void sltNameChanged(const QString &strNewText);
     void sltPathChanged(const QString &strNewPath);
@@ -67 +68 @@
 
 private:
+    enum ExpertToolboxItems
+    {
+        ExpertToolboxItems_NameAnsOSType,
+        ExpertToolboxItems_Disk,
+        ExpertToolboxItems_Hardware
 
-    /* Translation stuff: */
+    };
+    /** Translation stuff. */
     void retranslateUi();
 
-    /* Prepare stuff: */
+    /** Prepare stuff. */
     void initializePage();
     void cleanupPage();
 
-    /* Validation stuff: */
+    /** Validation stuff. */
     bool isComplete() const;
     bool validatePage();
 
-    /* Widgets: */
-    QGroupBox *m_pNameAndSystemCnt;
+    /** Widgets. */
+    QWidget *m_pNameAndSystemCnt;
     QGroupBox *m_pMemoryCnt;
     QGroupBox *m_pDiskCnt;
+    QToolBox  *m_pToolBox;
 };