Changeset 87956 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 4, 2021 5:56:15 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. More fix on the expert mode page

Location:

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

Files:

• UIWizardNewVMPageBasic4.cpp (modified) (3 diffs)
• UIWizardNewVMPageBasic4.h (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (6 diffs)
• UIWizardNewVMPageExpert.h (modified) (1 diff)

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

@@ -119 +119 @@
 }
 
-QWidget *UIWizardNewVMPage4::createDiskVariantAndSizeWidgets()
+QWidget *UIWizardNewVMPage4::createNewDiskWidgets()
 {
     return new QWidget();
@@ -150 +150 @@
     }
     pDiskLayout->addWidget(m_pDiskNew, 0, 0, 1, 6);
-    pDiskLayout->addWidget(createDiskVariantAndSizeWidgets(), 1, 2, 3, 4);
+    pDiskLayout->addWidget(createNewDiskWidgets(), 1, 2, 3, 4);
     pDiskLayout->addWidget(m_pDiskExisting, 4, 0, 1, 6);
     pDiskLayout->addWidget(m_pDiskSelector, 5, 2, 1, 3);
@@ -220 +220 @@
 }
 
-QWidget *UIWizardNewVMPageBasic4::createDiskVariantAndSizeWidgets()
+QWidget *UIWizardNewVMPageBasic4::createNewDiskWidgets()
 {
     QWidget *pWidget = new QWidget;

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

@@ -61 +61 @@
 
     virtual QWidget *createDiskWidgets();
-    virtual QWidget *createDiskVariantAndSizeWidgets();
+    virtual QWidget *createNewDiskWidgets();
     void getWithFileOpenDialog();
     void retranslateWidgets();
@@ -128 +128 @@
     void prepare();
     void createConnections();
-    QWidget *createDiskVariantAndSizeWidgets();
+    QWidget *createNewDiskWidgets();
     void retranslateUi();
     void initializePage();

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QButtonGroup>
 #include <QCheckBox>
 #include <QGridLayout>
@@ -31 +32 @@
 #include "QIToolButton.h"
 #include "UIBaseMemoryEditor.h"
+#include "UIConverter.h"
 #include "UIFilePathSelector.h"
 #include "UIIconPool.h"
@@ -47 +49 @@
     , m_pToolBox(0)
     , m_pInstallationISOContainer(0)
+    , m_pDiskFormatGroupBox(0)
+    , m_pDiskVariantGroupBox(0)
+    , m_pDiskLocationGroupBox(0)
+    , m_pDiskSizeGroupBox(0)
+
 {
     /* Create widgets: */
@@ -173 +180 @@
         m_pToolBox->setPageTitle(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("Hardware"));
     }
+
+
+    if (m_pDiskLocationGroupBox)
+        m_pDiskLocationGroupBox->setTitle(UIWizardNewVM::tr("Hard disk file &location"));
+    if (m_pDiskSizeGroupBox)
+        m_pDiskSizeGroupBox->setTitle(UIWizardNewVM::tr("Hard disk file &size"));
+    if (m_pDiskFormatGroupBox)
+        m_pDiskFormatGroupBox->setTitle(UIWizardNewVM::tr("Hard disk file &type"));
+    if (m_pFormatButtonGroup)
+    {
+        QList<QAbstractButton*> buttons = m_pFormatButtonGroup->buttons();
+        for (int i = 0; i < buttons.size(); ++i)
+        {
+            QAbstractButton *pButton = buttons[i];
+            UIMediumFormat enmFormat = gpConverter->fromInternalString<UIMediumFormat>(m_formatNames[m_pFormatButtonGroup->id(pButton)]);
+            pButton->setText(gpConverter->toString(enmFormat));
+        }
+    }
+    if (m_pDiskVariantGroupBox)
+        m_pDiskVariantGroupBox->setTitle(UIWizardNewVM::tr("Storage on physical hard disk"));
+
 }
 
@@ -359 +387 @@
 }
 
-QWidget *UIWizardNewVMPageExpert::createDiskWidgets()
-{
-    QWidget *pDiskContainerWidget = new QWidget;
-    QGridLayout *pDiskContainerLayout = new QGridLayout(pDiskContainerWidget);
+QWidget *UIWizardNewVMPageExpert::createNewDiskWidgets()
+{
+    QWidget *pNewDiskContainerWidget = new QWidget;
+    QGridLayout *pDiskContainerLayout = new QGridLayout(pNewDiskContainerWidget);
 
     /* Disk location widgets: */
-    QGroupBox *pLocationGroupBox = new QGroupBox;
-    QHBoxLayout *pLocationLayout = new QHBoxLayout(pLocationGroupBox);
+    m_pDiskLocationGroupBox = new QGroupBox;
+    QHBoxLayout *pLocationLayout = new QHBoxLayout(m_pDiskLocationGroupBox);
     m_pLocationEditor = new QLineEdit;
     m_pLocationOpenButton = new QIToolButton;
@@ -378 +406 @@
 
     /* Disk file size widgets: */
-    QGroupBox *pDiskSizeGroupBox = new QGroupBox;
-    QHBoxLayout *pDiskSizeLayout = new QHBoxLayout(pDiskSizeGroupBox);
+    m_pDiskSizeGroupBox = new QGroupBox;
+    QHBoxLayout *pDiskSizeLayout = new QHBoxLayout(m_pDiskSizeGroupBox);
     m_pSizeEditor = new UIMediumSizeEditor;
     pDiskSizeLayout->addWidget(m_pSizeEditor);
 
     /* Disk file format widgets: */
-    QGroupBox *pDiskFormatGroupBox = new QGroupBox;
-    QHBoxLayout *pDiskFormatLayout = new QHBoxLayout(pDiskFormatGroupBox);
+    m_pDiskFormatGroupBox = new QGroupBox;
+    QHBoxLayout *pDiskFormatLayout = new QHBoxLayout(m_pDiskFormatGroupBox);
     m_pSizeEditor = new UIMediumSizeEditor;
     pDiskFormatLayout->addWidget(createFormatButtonGroup(true));
 
     /* Disk variant and dik split widgets: */
-    QGroupBox *pDiskVariantGroupBox = new QGroupBox;
-    QVBoxLayout *pDiskVariantLayout = new QVBoxLayout(pDiskVariantGroupBox);
+    m_pDiskVariantGroupBox  = new QGroupBox;
+    QVBoxLayout *pDiskVariantLayout = new QVBoxLayout(m_pDiskVariantGroupBox);
     pDiskVariantLayout->addWidget(createMediumVariantWidgets(false /* fWithLabels */));
 
-    pDiskContainerLayout->addWidget(pLocationGroupBox, 0, 0, 1, 2);
-    pDiskContainerLayout->addWidget(pDiskSizeGroupBox, 1, 0, 1, 2);
-    pDiskContainerLayout->addWidget(pDiskFormatGroupBox, 2, 0, 1, 1);
-    pDiskContainerLayout->addWidget(pDiskVariantGroupBox, 2, 1, 1, 1);
-
-    return pDiskContainerWidget;
+    pDiskContainerLayout->addWidget(m_pDiskLocationGroupBox, 0, 0, 1, 2);
+    pDiskContainerLayout->addWidget(m_pDiskSizeGroupBox, 1, 0, 1, 2);
+    pDiskContainerLayout->addWidget(m_pDiskFormatGroupBox, 2, 0, 1, 1);
+    pDiskContainerLayout->addWidget(m_pDiskVariantGroupBox, 2, 1, 1, 1);
+
+    return pNewDiskContainerWidget;
 }
 

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

@@ -127 +127 @@
     void markWidgets() const;
     QWidget *createUnattendedWidgets();
-    virtual QWidget *createDiskWidgets() /* override */;
+    virtual QWidget *createNewDiskWidgets() /* override */;
 
     UIToolBox  *m_pToolBox;
     QGroupBox *m_pInstallationISOContainer;
+
+    QGroupBox *m_pDiskFormatGroupBox;
+    QGroupBox *m_pDiskVariantGroupBox;
+    QGroupBox *m_pDiskLocationGroupBox;
+    QGroupBox *m_pDiskSizeGroupBox;
+
 
     /** Set of widgets which user explicitly modified their values. They are exempt from