Changeset 90210 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2021 11:28:32 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Completing inserting disk related widgets to expert page.

Location:

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

Files:

• UIWizardNewVMDiskPageBasic.cpp (modified) (2 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (5 diffs)
• UIWizardNewVMPageExpert.h (modified) (5 diffs)

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

@@ -541 +541 @@
     if (pMainLayout)
     {
+        QVBoxLayout *pVariantLayout = new QVBoxLayout;
+        if (pVariantLayout)
+        {
+            m_pFixedCheckBox = new QCheckBox;
+            pVariantLayout->addWidget(m_pFixedCheckBox);
+        }
         if (fWithLabels)
         {
@@ -546 +552 @@
             m_pDynamicLabel = new QIRichTextLabel;
             m_pFixedLabel = new QIRichTextLabel;
-        }
-        QVBoxLayout *pVariantLayout = new QVBoxLayout;
-        if (pVariantLayout)
-        {
-            m_pFixedCheckBox = new QCheckBox;
-            pVariantLayout->addWidget(m_pFixedCheckBox);
-        }
-        if (fWithLabels)
-        {
+
             pMainLayout->addWidget(m_pDescriptionLabel);
             pMainLayout->addWidget(m_pDynamicLabel);

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

@@ -61 +61 @@
     , m_pAdditionalOptionsContainer(0)
     , m_pGAInstallationISOContainer(0)
+    , m_pDiskSourceButtonGroup(0)
+    , m_pDiskEmpty(0)
+    , m_pDiskNew(0)
+    , m_pDiskExisting(0)
+    , m_pDiskSelector(0)
+    , m_pDiskSelectionButton(0)
 {
     /* Create widgets: */
@@ -70 +76 @@
         m_pHardwareWidgetContainer = new UINewVMHardwareContainer;
         m_pToolBox->insertPage(ExpertToolboxItems_Hardware, m_pHardwareWidgetContainer, "");
-        m_pToolBox->insertPage(ExpertToolboxItems_Disk, createNewDiskWidgets(), "");
+        m_pToolBox->insertPage(ExpertToolboxItems_Disk, createDiskWidgets(), "");
         m_pToolBox->setCurrentPage(ExpertToolboxItems_NameAndOSType);
         pMainLayout->addWidget(m_pToolBox);
@@ -182 +188 @@
     }
 
+    if (m_pDiskEmpty)
+        m_pDiskEmpty->setText(UIWizardNewVM::tr("&Do Not Add a Virtual Hard Disk"));
+    if (m_pDiskNew)
+        m_pDiskNew->setText(UIWizardNewVM::tr("&Create a Virtual Hard Disk Now"));
+    if (m_pDiskExisting)
+        m_pDiskExisting->setText(UIWizardNewVM::tr("U&se an Existing Virtual Hard Disk File"));
+    if (m_pDiskSelectionButton)
+        m_pDiskSelectionButton->setToolTip(UIWizardNewVM::tr("Choose a Virtual Hard Fisk File..."));
+
+
+
     // if (m_pFormatButtonGroup)
     // {
@@ -385 +402 @@
     QGridLayout *pDiskContainerLayout = new QGridLayout(pNewDiskContainerWidget);
 
-    /* Disk location widgets: */
-
-    // m_pLocationLabel = new QLabel;
-    // m_pLocationLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-    // m_pLocationEditor = new QLineEdit;
-    // m_pLocationOpenButton = new QIToolButton;
-    // if (m_pLocationOpenButton)
-    // {
-    //     m_pLocationOpenButton->setAutoRaise(true);
-    //     m_pLocationOpenButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", "select_file_disabled_16px.png"));
-    // }
-    // m_pLocationLabel->setBuddy(m_pLocationEditor);
-
-    // /* Disk file size widgets: */
-    // m_pMediumSizeEditorLabel = new QLabel;
-    // m_pMediumSizeEditorLabel->setAlignment(Qt::AlignRight);
-    // m_pMediumSizeEditorLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-    // m_pMediumSizeEditor = new UIMediumSizeEditor;
-    // m_pMediumSizeEditorLabel->setBuddy(m_pMediumSizeEditor);
-    // m_pMediumSizeEditor = new UIMediumSizeEditor;
-
-    // pDiskContainerLayout->addWidget(m_pLocationLabel, 0, 0, 1, 1);
-    // pDiskContainerLayout->addWidget(m_pLocationEditor, 0, 1, 1, 2);
-    // pDiskContainerLayout->addWidget(m_pLocationOpenButton, 0, 3, 1, 1);
-
-    // pDiskContainerLayout->addWidget(m_pMediumSizeEditorLabel, 1, 0, 1, 1, Qt::AlignBottom);
-    // pDiskContainerLayout->addWidget(m_pMediumSizeEditor, 1, 1, 2, 3);
-
     m_pSizeAndLocationGroup = new UIDiskSizeAndLocationGroupBox;
     pDiskContainerLayout->addWidget(m_pSizeAndLocationGroup, 0, 0, 2, 2);
@@ -421 +410 @@
 
     return pNewDiskContainerWidget;
+}
+
+QWidget *UIWizardNewVMPageExpert::createDiskWidgets()
+{
+    QWidget *pDiskContainer = new QWidget;
+    QGridLayout *pDiskLayout = new QGridLayout(pDiskContainer);
+    pDiskLayout->setContentsMargins(0, 0, 0, 0);
+    m_pDiskSourceButtonGroup = new QButtonGroup;
+    m_pDiskEmpty = new QRadioButton;
+    m_pDiskNew = new QRadioButton;
+    m_pDiskExisting = new QRadioButton;
+    m_pDiskSourceButtonGroup->addButton(m_pDiskEmpty);
+    m_pDiskSourceButtonGroup->addButton(m_pDiskNew);
+    m_pDiskSourceButtonGroup->addButton(m_pDiskExisting);
+    QStyleOptionButton options;
+    options.initFrom(m_pDiskExisting);
+    int iWidth = m_pDiskExisting->style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth, &options, m_pDiskExisting);
+    pDiskLayout->setColumnMinimumWidth(0, iWidth);
+    m_pDiskSelector = new UIMediaComboBox;
+    {
+        m_pDiskSelector->setType(UIMediumDeviceType_HardDisk);
+        m_pDiskSelector->repopulate();
+    }
+    m_pDiskSelectionButton = new QIToolButton;
+    {
+        m_pDiskSelectionButton->setAutoRaise(true);
+        m_pDiskSelectionButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
+    }
+    pDiskLayout->addWidget(m_pDiskNew, 0, 0, 1, 6);
+    pDiskLayout->addWidget(createNewDiskWidgets(), 1, 2, 3, 4);
+    pDiskLayout->addWidget(m_pDiskExisting, 4, 0, 1, 6);
+    pDiskLayout->addWidget(m_pDiskSelector, 5, 2, 1, 3);
+    pDiskLayout->addWidget(m_pDiskSelectionButton, 5, 5, 1, 1);
+    pDiskLayout->addWidget(m_pDiskEmpty, 6, 0, 1, 6);
+    return pDiskContainer;
 }
 

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

@@ -37 +37 @@
 class QLabel;
 class QLineEdit;
+class QRadioButton;
 class QVBoxLayout;
+class QIToolButton;
 class UIAdditionalUnattendedOptions;
 class UIDiskFormatsGroupBox;
@@ -45 +47 @@
 class UIGAInstallationGroupBox;
 class UIHostnameDomainNameEditor;
+class UIMediaComboBox;
 class UIMediumSizeEditor;
 class UINameAndSystemEditor;
@@ -50 +53 @@
 class UIToolBox;
 class UIUserNamePasswordGroupBox;
-class QIToolButton;
+
 
 /** Expert page of the New Virtual Machine wizard. */
@@ -114 +117 @@
     void markWidgets() const;
     QWidget *createUnattendedWidgets();
-    virtual QWidget *createNewDiskWidgets() /* override */;
-    QWidget *createFormatButtonGroup(bool fExpertMode);
-    QWidget *createMediumVariantWidgets();
-    void addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout,
-                                                  CMediumFormat medFormat, bool fPreferred /* = false */);
+    QWidget *createNewDiskWidgets();
+    QWidget *createDiskWidgets();
+
     QWidget *createNameOSTypeWidgets();
-    QWidget *createAdditionalOptionsWidgets();
 
     void updateVirtualDiskPathFromMachinePathName();
@@ -140 +140 @@
         UIGAInstallationGroupBox *m_pGAInstallationISOContainer;
         UIUserNamePasswordGroupBox *m_pUserNamePasswordGroupBox;
+
+
+    QButtonGroup *m_pDiskSourceButtonGroup;
+    QRadioButton *m_pDiskEmpty;
+    QRadioButton *m_pDiskNew;
+    QRadioButton *m_pDiskExisting;
+    UIMediaComboBox *m_pDiskSelector;
+    QIToolButton *m_pDiskSelectionButton;
+
+
     /** @} */
 };