Changeset 87907 in vbox for trunk

Timestamp:

Mar 2, 2021 8:58:03 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Merging hdd pages. part 1

Location:

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

Files:

• newvd/UIWizardNewVDPageBasic1.cpp (modified) (1 diff)
• newvm/UIWizardNewVM.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageBasic4.cpp (modified) (8 diffs)
• newvm/UIWizardNewVMPageBasic4.h (modified) (4 diffs)
• newvm/UIWizardNewVMPageBasic5.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -147 +147 @@
 void UIWizardNewVDPage1::retranslateWidgets()
 {
-    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_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));
+        }
     }
 }

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

@@ -86 +86 @@
             setPage(Page2, new UIWizardNewVMPageBasic2);
             setPage(Page4, new UIWizardNewVMPageBasic4);
-            setPage(Page5, new UIWizardNewVMPageBasic5);
             setPage(Page8, new UIWizardNewVMPageBasic8);
 

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

@@ -30 +30 @@
 #include "UIMedium.h"
 #include "UIMediumSelector.h"
+#include "UIMediumSizeEditor.h"
 #include "UIMessageCenter.h"
 #include "UIWizardNewVD.h"
 #include "UIWizardNewVMPageBasic4.h"
+
+/* COM includes: */
+#include "CGuestOSType.h"
+#include "CSystemProperties.h"
 
 UIWizardNewVMPage4::UIWizardNewVMPage4()
@@ -179 +184 @@
 UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
     : m_pLabel(0)
+    , m_fUserSetSize(false)
+
 {
     prepare();
@@ -185 +192 @@
     registerField("virtualDisk", this, "virtualDisk");
     registerField("selectedDiskSource", this, "selectedDiskSource");
+
+    registerField("mediumFormat", this, "mediumFormat");
+    registerField("mediumVariant" /* KMediumVariant */, this, "mediumVariant");
+    registerField("mediumPath", this, "mediumPath");
+    registerField("mediumSize", this, "mediumSize");
+
+    /* We do not have any UI elements for HDD format selection since we default to VDI in case of guided wizard mode: */
+    bool fFoundVDI = false;
+    CSystemProperties properties = uiCommon().virtualBox().GetSystemProperties();
+    const QVector<CMediumFormat> &formats = properties.GetMediumFormats();
+    foreach (const CMediumFormat &format, formats)
+    {
+        if (format.GetName() == "VDI")
+        {
+            m_mediumFormat = format;
+            fFoundVDI = true;
+        }
+    }
+    if (!fFoundVDI)
+        AssertMsgFailed(("No medium format corresponding to VDI could be found!"));
+
+    m_strDefaultExtension =  defaultExtension(m_mediumFormat);
+
+    /* Since the medium format is static we can decide widget visibility here: */
+    setWidgetVisibility(m_mediumFormat);
+}
+
+CMediumFormat UIWizardNewVMPageBasic4::mediumFormat() const
+{
+    return m_mediumFormat;
+}
+
+QString UIWizardNewVMPageBasic4::mediumPath() const
+{
+    return absoluteFilePath(toFileName(m_strDefaultName, m_strDefaultExtension), m_strDefaultPath);
 }
 
@@ -204 +246 @@
     pMainLayout->addStretch();
     setEnableDiskSelectionWidgets(m_enmSelectedDiskSource == SelectedDiskSource_Existing);
+
+
+    pMainLayout->addWidget(createMediumVariantWidgets(true));
+
+    m_pSizeLabel = new QIRichTextLabel;
+    m_pSizeEditor = new UIMediumSizeEditor;
+
+    pMainLayout->addWidget(m_pSizeLabel);
+    pMainLayout->addWidget(m_pSizeEditor);
+
     createConnections();
 }
@@ -215 +267 @@
     connect(m_pDiskSelectionButton, &QIToolButton::clicked,
             this, &UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog);
+    connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
+            this, &UIWizardNewVMPageBasic4::completeChanged);
+    connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
+            this, &UIWizardNewVMPageBasic4::sltHandleSizeEditorChange);
 }
 
@@ -259 +315 @@
                           .arg(strRecommendedHDD));
 
-    retranslateWidgets();
+    UIWizardNewVMPage4::retranslateWidgets();
+    UIWizardNewVDPage1::retranslateWidgets();
+    UIWizardNewVDPage2::retranslateWidgets();
+    UIWizardNewVDPage3::retranslateWidgets();
 }
 
@@ -291 +350 @@
     if (m_pDiskSelector)
         m_pDiskSelector->setCurrentIndex(0);
+
+    /* We set the medium name and path according to machine name/path and do let user change these in the guided mode: */
+    QString strDefaultName = fieldImp("machineBaseName").toString();
+    m_strDefaultName = strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName;
+    m_strDefaultPath = fieldImp("machineFolder").toString();
+    if (m_pSizeEditor && !m_fUserSetSize)
+    {
+        m_pSizeEditor->blockSignals(true);
+        setMediumSize(fieldImp("type").value<CGuestOSType>().GetRecommendedHDD());
+        m_pSizeEditor->blockSignals(false);
+    }
+
 }
 
@@ -320 +391 @@
     return fResult;
 }
+
+void UIWizardNewVMPageBasic4::sltHandleSizeEditorChange()
+{
+    m_fUserSetSize = true;
+}

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

@@ -27 +27 @@
 /* GUI includes: */
 #include "UIWizardPage.h"
+#include "UIWizardNewVDPageBasic1.h"
+#include "UIWizardNewVDPageBasic2.h"
+#include "UIWizardNewVDPageBasic3.h"
 #include "UIWizardNewVM.h"
 
@@ -85 +88 @@
 };
 
-class UIWizardNewVMPageBasic4 : public UIWizardPage, public UIWizardNewVMPage4
+class UIWizardNewVMPageBasic4 : public UIWizardPage,
+                                public UIWizardNewVMPage4,
+                                public UIWizardNewVDPage1,
+                                public UIWizardNewVDPage2,
+                                public UIWizardNewVDPage3
 {
     Q_OBJECT;
     Q_PROPERTY(CMedium virtualDisk READ virtualDisk WRITE setVirtualDisk);
     Q_PROPERTY(SelectedDiskSource selectedDiskSource READ selectedDiskSource WRITE setSelectedDiskSource);
+    Q_PROPERTY(CMediumFormat mediumFormat READ mediumFormat);
+    Q_PROPERTY(qulonglong mediumVariant READ mediumVariant WRITE setMediumVariant);
+    Q_PROPERTY(QString mediumPath READ mediumPath);
+    Q_PROPERTY(qulonglong mediumSize READ mediumSize WRITE setMediumSize);
 
 public:
 
-    /** Constructor. */
     UIWizardNewVMPageBasic4();
+    /** For the guide wizard mode medium path, name and extention is static and we have
+      * no UI element for this. thus override. */
+    virtual QString mediumPath() const /*override */;
     virtual int nextId() const /* override */;
+    CMediumFormat mediumFormat() const;
 
 protected:
@@ -111 +125 @@
     void sltVirtualSelectedDiskSourceChanged();
     void sltGetWithFileOpenDialog();
+    void sltHandleSizeEditorChange();
 
 private:
@@ -125 +140 @@
 
     QIRichTextLabel *m_pLabel;
+
+    /** This is set to true when user manually set the size. */
+    bool m_fUserSetSize;
+    /** For guided new vm wizard VDI is the only format. Thus we have no UI item for it. */
+    CMediumFormat m_mediumFormat;
 };
 

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

@@ -45 +45 @@
                                 public UIWizardNewVDPage2,
                                 public UIWizardNewVDPage3
-
 {