Changeset 87891 in vbox for trunk

Timestamp:

Feb 26, 2021 4:54:52 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9950. Adding the size editor to the page

Location:

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

Files:

• newvd/UIWizardNewVDPageBasic2.h (modified) (2 diffs)
• newvd/UIWizardNewVDPageBasic3.cpp (modified) (6 diffs)
• newvd/UIWizardNewVDPageBasic3.h (modified) (2 diffs)
• newvd/UIWizardNewVDPageExpert.cpp (modified) (2 diffs)
• newvm/UIWizardNewVMPageBasic5.cpp (modified) (6 diffs)
• newvm/UIWizardNewVMPageBasic5.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.h

@@ -64 +64 @@
 };
 
-
 /* 2nd page of the New Virtual Hard Drive wizard (basic extension): */
 class SHARED_LIBRARY_STUFF UIWizardNewVDPageBasic2 : public UIWizardPage, public UIWizardNewVDPage2
@@ -73 +72 @@
 public:
 
-    /* Constructor: */
     UIWizardNewVDPageBasic2();
 
 private:
 
-    /* Translation stuff: */
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
-
-    /* Validation stuff: */
     bool isComplete() const;
 };

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

@@ -54 +54 @@
     , m_pLocationEditor(0)
     , m_pLocationOpenButton(0)
-    , m_pEditorSize(0)
+    , m_pSizeEditor(0)
+    , m_pLocationLabel(0)
+    , m_pSizeLabel(0)
 {
 }
@@ -63 +65 @@
     , m_pLocationEditor(0)
     , m_pLocationOpenButton(0)
-    , m_pEditorSize(0)
+    , m_pSizeEditor(0)
 {
 }
@@ -216 +218 @@
 qulonglong UIWizardNewVDPage3::mediumSize() const
 {
-    return m_pEditorSize ? m_pEditorSize->mediumSize() : 0;
+    return m_pSizeEditor ? m_pSizeEditor->mediumSize() : 0;
 }
 
 void UIWizardNewVDPage3::setMediumSize(qulonglong uMediumSize)
 {
-    if (m_pEditorSize)
-        m_pEditorSize->setMediumSize(uMediumSize);
+    if (m_pSizeEditor)
+        m_pSizeEditor->setMediumSize(uMediumSize);
 }
 
@@ -250 +252 @@
         }
         m_pSizeLabel = new QIRichTextLabel(this);
-        m_pEditorSize = new UIMediumSizeEditor;
+        m_pSizeEditor = new UIMediumSizeEditor;
         setMediumSize(uDefaultSize);
         pMainLayout->addWidget(m_pLocationLabel);
         pMainLayout->addLayout(pLocationLayout);
         pMainLayout->addWidget(m_pSizeLabel);
-        pMainLayout->addWidget(m_pEditorSize);
+        pMainLayout->addWidget(m_pSizeEditor);
         pMainLayout->addStretch();
     }
@@ -262 +264 @@
     connect(m_pLocationEditor, &QLineEdit::textChanged,    this, &UIWizardNewVDPageBasic3::completeChanged);
     connect(m_pLocationOpenButton, &QIToolButton::clicked, this, &UIWizardNewVDPageBasic3::sltSelectLocationButtonClicked);
-    connect(m_pEditorSize, &UIMediumSizeEditor::sigSizeChanged, this, &UIWizardNewVDPageBasic3::completeChanged);
+    connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged, this, &UIWizardNewVDPageBasic3::completeChanged);
 
     /* Register fields: */
@@ -306 +308 @@
     if (!m_pLocationEditor)
         return false;
-    /* Make sure current name is not empty and current size feats the bounds: */
+    /* Make sure current name is not empty and current size fits the bounds: */
     return !m_pLocationEditor->text().trimmed().isEmpty() &&
            mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.h

@@ -45 +45 @@
 protected:
 
-    /* Constructor: */
     UIWizardNewVDPage3(const QString &strDefaultName, const QString &strDefaultPath);
     UIWizardNewVDPage3();
 
-    /* Handlers: */
     void onSelectLocationButtonClicked();
 
-    /* Location-editors stuff: */
     static QString toFileName(const QString &strName, const QString &strExtension);
-    /* Returns the full image file path except the extension. */
+    /** Returns the full image file path except the extension. */
     static QString absoluteFilePath(const QString &strFileName, const QString &strPath);
-    /* Returns the full image file path including the extension. */
+    /** Returns the full image file path including the extension. */
     static QString absoluteFilePath(const QString &strFileName, const QString &strPath, const QString &strExtension);
 
-    /* Stuff for 'mediumPath' field: */
     QString mediumPath() const;
 
-    /* Stuff for 'mediumSize' field: */
     qulonglong mediumSize() const;
     void setMediumSize(qulonglong uMediumSize);
     void retranslateWidgets();
 
-    /* Variables: */
-    QString m_strDefaultName;
-    QString m_strDefaultPath;
-    QString m_strDefaultExtension;
-    qulonglong m_uMediumSizeMin;
-    qulonglong m_uMediumSizeMax;
+    /** @name Widgets
+     * @{ */
+       QString m_strDefaultName;
+       QString m_strDefaultPath;
+       QString m_strDefaultExtension;
+       qulonglong m_uMediumSizeMin;
+       qulonglong m_uMediumSizeMax;
+    /** @} */
 
-    /* Widgets: */
-    QLineEdit *m_pLocationEditor;
-    QIToolButton *m_pLocationOpenButton;
-    UIMediumSizeEditor *m_pEditorSize;
+    /** @name Widgets
+     * @{ */
+       QLineEdit *m_pLocationEditor;
+       QIToolButton *m_pLocationOpenButton;
+       UIMediumSizeEditor *m_pSizeEditor;
+       QIRichTextLabel *m_pLocationLabel;
+       QIRichTextLabel *m_pSizeLabel;
+    /** @} */
 };
 
@@ -90 +91 @@
 public:
 
-    /* Constructor: */
     UIWizardNewVDPageBasic3(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize);
 
 protected:
 
-    /* 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:
 
-    /* Location editors stuff: */
+    /** Location editors stuff: */
     void sltSelectLocationButtonClicked();
 
 private:
 
-    /* Translation stuff: */
     void retranslateUi();
-
-    /* Prepare stuff: */
     void initializePage();
-
-    /* Validation stuff: */
     bool isComplete() const;
     bool validatePage();
-
-    /* Widgets: */
-    QIRichTextLabel *m_pLocationLabel;
-    QIRichTextLabel *m_pSizeLabel;
 };
 

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

@@ -76 +76 @@
             QVBoxLayout *pSizeGroupBoxLayout = new QVBoxLayout(m_pSizeGroupBox);
             {
-                m_pEditorSize = new UIMediumSizeEditor;
+                m_pSizeEditor = new UIMediumSizeEditor;
                 {
-                    pSizeGroupBoxLayout->addWidget(m_pEditorSize);
+                    pSizeGroupBoxLayout->addWidget(m_pSizeEditor);
                 }
             }
@@ -129 +129 @@
     connect(m_pLocationOpenButton, &QIToolButton::clicked,
             this, &UIWizardNewVDPageExpert::sltSelectLocationButtonClicked);
-    connect(m_pEditorSize, &UIMediumSizeEditor::sigSizeChanged,
+    connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
             this, &UIWizardNewVDPageExpert::completeChanged);
 

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

@@ -26 +26 @@
 #include "UIBaseMemoryEditor.h"
 #include "UICommon.h"
+#include "UIMediumSizeEditor.h"
 #include "UIVirtualCPUEditor.h"
 #include "UIWizardNewVM.h"
@@ -35 +36 @@
 
 UIWizardNewVMPageBasic5::UIWizardNewVMPageBasic5()
+    : m_fUserSetSize(false)
 {
     prepare();
@@ -62 +64 @@
     /* Since the medium format is static we can decide widget visibility here: */
     setWidgetVisibility(m_mediumFormat);
+
+    retranslateUi();
 }
 
@@ -75 +79 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     pMainLayout->addWidget(createMediumVariantWidgets(true));
+
+    m_pSizeLabel = new QIRichTextLabel;
+    m_pSizeEditor = new UIMediumSizeEditor;
+
+    pMainLayout->addWidget(m_pSizeLabel);
+
+    pMainLayout->addWidget(m_pSizeEditor);
+
     pMainLayout->addStretch();
 
-    // connect(m_pVariantButtonGroup,static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
-    //         this, &UIWizardNewVDPageBasic2::completeChanged);
-    // connect(m_pSplitBox, &QCheckBox::stateChanged,
-    //         this, &UIWizardNewVDPageBasic2::completeChanged);
-
-    // QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-
-
-    // m_pLabel = new QIRichTextLabel(this);
-    // pMainLayout->addWidget(m_pLabel);
-
-    // pMainLayout->addStretch();
-    // createConnections();
+    createConnections();
 }
 
 void UIWizardNewVMPageBasic5::createConnections()
 {
+    connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged, this, &UIWizardNewVDPageBasic3::completeChanged);
+    connect(m_pSizeEditor, &UIMediumSizeEditor::sigSizeChanged, this, &UIWizardNewVMPageBasic5::sltHandleSizeEditorChange);
 }
 
@@ -101 +103 @@
     UIWizardNewVDPage2::retranslateWidgets();
 
-
-    //retranslateWidgets();
+    if (m_pSizeLabel)
+        m_pSizeLabel->setText(UIWizardNewVM::tr("Select the size of the virtual hard disk in megabytes. "
+                                                "This size is the limit on the amount of file data "
+                                                "that a virtual machine will be able to store on the hard disk."));
 }
 
@@ -111 +115 @@
     m_strDefaultName = strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName;
     m_strDefaultPath = fieldImp("machineFolder").toString();
-    // fieldImp("type").value<CGuestOSType>().GetRecommendedHDD()
-
-    retranslateUi();
+    if (m_pSizeEditor && !m_fUserSetSize)
+    {
+        m_pSizeEditor->blockSignals(true);
+        setMediumSize(fieldImp("type").value<CGuestOSType>().GetRecommendedHDD());
+        m_pSizeEditor->blockSignals(false);
+    }
 }
 
 void UIWizardNewVMPageBasic5::cleanupPage()
 {
-    UIWizardPage::cleanupPage();
+    /* do not reset fields: */
 }
 
 bool UIWizardNewVMPageBasic5::isComplete() const
 {
-    return true;
+    return mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
 }
+
+
+void UIWizardNewVMPageBasic5::sltHandleSizeEditorChange()
+{
+    m_fUserSetSize = true;
+}

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

@@ -71 +71 @@
 private slots:
 
+    void sltHandleSizeEditorChange();
 
 private:
@@ -83 +84 @@
 
     bool isComplete() const;
-
+    /** 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. */