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

Timestamp:

Jun 18, 2020 8:07:25 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Using UIBaseMemortEditor instead of separate widget.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (2 diffs)
• UIWizardNewVMPageBasic2.cpp (modified) (4 diffs)
• UIWizardNewVMPageBasic2.h (modified) (5 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (9 diffs)
• UIWizardNewVMPageExpert.h (modified) (2 diffs)

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

@@ -132 +132 @@
     m_machine.ApplyDefaults(QString());
     /* correct the RAM size. IMachine::applyDefaults may have overwritten the user setting: */
-    m_machine.SetMemorySize(field("ram").toUInt());
+    m_machine.SetMemorySize(field("baseMemory").toUInt());
     /* Correct the VRAM size since API does not take fullscreen memory requirements into account: */
     CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
@@ -154 +154 @@
 
     /* RAM size: */
-    m_machine.SetMemorySize(field("ram").toInt());
+    m_machine.SetMemorySize(field("baseMemory").toInt());
 
     /* Graphics Controller type: */

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

@@ -25 +25 @@
 
 /* GUI includes: */
+#include "QIRichTextLabel.h"
+#include "UIBaseMemoryEditor.h"
+#include "UIBaseMemorySlider.h"
+#include "UICommon.h"
 #include "UIWizardNewVMPageBasic2.h"
 #include "UIWizardNewVM.h"
-#include "UICommon.h"
-#include "UIBaseMemorySlider.h"
-#include "QIRichTextLabel.h"
 
 
 UIWizardNewVMPage2::UIWizardNewVMPage2()
+    : m_pBaseMemoryEditor(0)
+    , m_pRamLabel(0)
 {
 }
 
-void UIWizardNewVMPage2::onRamSliderValueChanged()
+int UIWizardNewVMPage2::baseMemory() const
 {
-    /* Update 'ram' field editor connected to slider: */
-    m_pRamEditor->blockSignals(true);
-    m_pRamEditor->setValue(m_pRamSlider->value());
-    m_pRamEditor->blockSignals(false);
-}
-
-void UIWizardNewVMPage2::onRamEditorValueChanged()
-{
-    /* Update 'ram' field slider connected to editor: */
-    m_pRamSlider->blockSignals(true);
-    m_pRamSlider->setValue(m_pRamEditor->value());
-    m_pRamSlider->blockSignals(false);
+    if (!m_pBaseMemoryEditor)
+        return 0;
+    return m_pBaseMemoryEditor->value();
 }
 
 UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
+    : m_pLabel(0)
 {
     /* Create widget: */
@@ -60 +55 @@
         QGridLayout *pMemoryLayout = new QGridLayout;
         {
-            m_pRamSlider = new UIBaseMemorySlider(this);
-            {
-                m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-                m_pRamSlider->setOrientation(Qt::Horizontal);
-            }
-            m_pRamEditor = new QSpinBox(this);
-            {
-                m_pRamEditor->setMinimum(m_pRamSlider->minimum());
-                m_pRamEditor->setMaximum(m_pRamSlider->maximum());
-                uiCommon().setMinimumWidthAccordingSymbolCount(m_pRamEditor, 5);
-            }
-            m_pRamUnits = new QLabel(this);
-            {
-                m_pRamUnits->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            }
-            m_pRamMin = new QLabel(this);
-            {
-                m_pRamMin->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            }
-            m_pRamMax = new QLabel(this);
-            {
-                m_pRamMax->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-            }
-            pMemoryLayout->addWidget(m_pRamSlider, 0, 0, 1, 3);
-            pMemoryLayout->addWidget(m_pRamEditor, 0, 3);
-            pMemoryLayout->addWidget(m_pRamUnits, 0, 4);
-            pMemoryLayout->addWidget(m_pRamMin, 1, 0);
-            pMemoryLayout->setColumnStretch(1, 1);
-            pMemoryLayout->addWidget(m_pRamMax, 1, 2);
+            m_pRamLabel = new QLabel;
+            m_pBaseMemoryEditor = new UIBaseMemoryEditor;
+            pMemoryLayout->addWidget(m_pRamLabel, 0, 0, 1, 1, Qt::AlignRight|Qt::AlignTop);
+            pMemoryLayout->addWidget(m_pBaseMemoryEditor, 0, 1, 1, 4);
         }
-        pMainLayout->addWidget(m_pLabel);
+        if (m_pLabel)
+            pMainLayout->addWidget(m_pLabel);
         pMainLayout->addLayout(pMemoryLayout);
         pMainLayout->addStretch();
     }
 
-    /* Setup connections: */
-    connect(m_pRamSlider, &UIBaseMemorySlider::valueChanged,
-            this, &UIWizardNewVMPageBasic2::sltRamSliderValueChanged);
-    connect(m_pRamEditor, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-            this, &UIWizardNewVMPageBasic2::sltRamEditorValueChanged);
 
     /* Register fields: */
-    registerField("ram", m_pRamSlider, "value", SIGNAL(valueChanged(int)));
-}
-
-void UIWizardNewVMPageBasic2::sltRamSliderValueChanged()
-{
-    /* Call to base-class: */
-    onRamSliderValueChanged();
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageBasic2::sltRamEditorValueChanged()
-{
-    /* Call to base-class: */
-    onRamEditorValueChanged();
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
+    registerField("baseMemory", this, "baseMemory");
 }
 
@@ -126 +74 @@
 {
     /* Translate page: */
-    setTitle(UIWizardNewVM::tr("Memory size"));
+    setTitle(UIWizardNewVM::tr("Virtual Machine Settings"));
 
     /* Translate widgets: */
-    QString strRecommendedRAM = field("type").value<CGuestOSType>().isNull() ?
-                                QString() : QString::number(field("type").value<CGuestOSType>().GetRecommendedRAM());
-    m_pLabel->setText(UIWizardNewVM::tr("<p>Select the amount of memory (RAM) in megabytes "
-                                        "to be allocated to the virtual machine.</p>"
-                                        "<p>The recommended memory size is <b>%1</b> MB.</p>")
-                                        .arg(strRecommendedRAM));
-    m_pRamUnits->setText(UICommon::tr("MB", "size suffix MBytes=1024 KBytes"));
-    m_pRamMin->setText(QString("%1 %2").arg(m_pRamSlider->minRAM()).arg(UICommon::tr("MB", "size suffix MBytes=1024 KBytes")));
-    m_pRamMax->setText(QString("%1 %2").arg(m_pRamSlider->maxRAM()).arg(UICommon::tr("MB", "size suffix MBytes=1024 KBytes")));
+    if (m_pLabel)
+        m_pLabel->setText(UIWizardNewVM::tr("<p>You can modify the virtual machine's hardware.</p>"));
+
+    if (m_pRamLabel)
+        m_pRamLabel->setText(UIWizardNewVM::tr("Base Memory:"));
 }
 
@@ -147 +91 @@
     /* Get recommended 'ram' field value: */
     CGuestOSType type = field("type").value<CGuestOSType>();
-    m_pRamSlider->setValue(type.GetRecommendedRAM());
-    m_pRamEditor->setValue(type.GetRecommendedRAM());
+    m_pBaseMemoryEditor->setValue(type.GetRecommendedRAM());
 
     /* 'Ram' field should have focus initially: */
-    m_pRamSlider->setFocus();
+    m_pBaseMemoryEditor->setFocus();
 }
 
 bool UIWizardNewVMPageBasic2::isComplete() const
 {
-    /* Make sure 'ram' field feats the bounds: */
-    return m_pRamSlider->value() >= qMax(1, (int)m_pRamSlider->minRAM()) &&
-           m_pRamSlider->value() <= (int)m_pRamSlider->maxRAM();
+    return UIWizardPage::isComplete();
 }

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

@@ -27 +27 @@
 /* Forward declarations: */
 class UIBaseMemorySlider;
+class UIBaseMemoryEditor;
 class QSpinBox;
 class QLabel;
@@ -39 +40 @@
     UIWizardNewVMPage2();
 
-    /* Handlers: */
-    void onRamSliderValueChanged();
-    void onRamEditorValueChanged();
+    int baseMemory() const;
 
     /* Widgets: */
-    UIBaseMemorySlider *m_pRamSlider;
-    QSpinBox *m_pRamEditor;
-    QLabel *m_pRamMin;
-    QLabel *m_pRamMax;
-    QLabel *m_pRamUnits;
+    UIBaseMemoryEditor *m_pBaseMemoryEditor;
+    QLabel *m_pRamLabel;
 };
 
@@ -55 +51 @@
 {
     Q_OBJECT;
+    Q_PROPERTY(int baseMemory READ baseMemory);
 
 public:
@@ -62 +59 @@
 
 private slots:
-
-    /* Handlers: */
-    void sltRamSliderValueChanged();
-    void sltRamEditorValueChanged();
 
 private:
@@ -83 +76 @@
 
 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic2_h */
-

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

@@ -30 +30 @@
 #include "QIToolButton.h"
 #include "UIBaseMemorySlider.h"
+#include "UIBaseMemoryEditor.h"
 #include "UIIconPool.h"
 #include "UIMediaComboBox.h"
@@ -58 +59 @@
             QGridLayout *pMemoryCntLayout = new QGridLayout(m_pMemoryCnt);
             {
-                m_pRamSlider = new UIBaseMemorySlider(m_pMemoryCnt);
-                {
-                    m_pRamSlider->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-                    m_pRamSlider->setOrientation(Qt::Horizontal);
-                }
-                m_pRamEditor = new QSpinBox(m_pMemoryCnt);
-                {
-                    m_pRamEditor->setMinimum(m_pRamSlider->minimum());
-                    m_pRamEditor->setMaximum(m_pRamSlider->maximum());
-                    uiCommon().setMinimumWidthAccordingSymbolCount(m_pRamEditor, 5);
-                }
-                m_pRamUnits = new QLabel(m_pMemoryCnt);
-                {
-                    m_pRamUnits->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                }
-                m_pRamMin = new QLabel(m_pMemoryCnt);
-                {
-                    m_pRamMin->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                }
-                m_pRamMax = new QLabel(m_pMemoryCnt);
-                {
-                    m_pRamMax->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                }
-                pMemoryCntLayout->addWidget(m_pRamSlider, 0, 0, 1, 3);
-                pMemoryCntLayout->addWidget(m_pRamEditor, 0, 3);
-                pMemoryCntLayout->addWidget(m_pRamUnits, 0, 4);
-                pMemoryCntLayout->addWidget(m_pRamMin, 1, 0);
-                pMemoryCntLayout->setColumnStretch(1, 1);
-                pMemoryCntLayout->addWidget(m_pRamMax, 1, 2);
+                m_pBaseMemoryEditor = new UIBaseMemoryEditor;
+                pMemoryCntLayout->addWidget(m_pBaseMemoryEditor, 0, 0, 1, 4);
             }
         }
@@ -135 +109 @@
     connect(m_pNameAndSystemEditor, &UINameAndSystemEditor::sigOsTypeChanged,
             this, &UIWizardNewVMPageExpert::sltOsTypeChanged);
-    connect(m_pRamSlider, &UIBaseMemorySlider::valueChanged,
-            this, &UIWizardNewVMPageExpert::sltRamSliderValueChanged);
-    connect(m_pRamEditor, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-            this, &UIWizardNewVMPageExpert::sltRamEditorValueChanged);
     connect(m_pDiskSkip, &QRadioButton::toggled,
             this, &UIWizardNewVMPageExpert::sltVirtualDiskSourceChanged);
@@ -158 +128 @@
     registerField("machineFolder", this, "machineFolder");
     registerField("machineBaseName", this, "machineBaseName");
-    registerField("ram", m_pRamSlider, "value", SIGNAL(valueChanged(int)));
+    registerField("baseMemory", this, "baseMemory");
     registerField("virtualDisk", this, "virtualDisk");
     registerField("virtualDiskId", this, "virtualDiskId");
@@ -171 +141 @@
     /* Fetch recommended RAM value: */
     CGuestOSType type = m_pNameAndSystemEditor->type();
-    m_pRamSlider->setValue(type.GetRecommendedRAM());
-    m_pRamEditor->setValue(type.GetRecommendedRAM());
 
     composeMachineFilePath();
@@ -192 +160 @@
     /* Fetch recommended RAM value: */
     CGuestOSType type = m_pNameAndSystemEditor->type();
-    m_pRamSlider->setValue(type.GetRecommendedRAM());
-    m_pRamEditor->setValue(type.GetRecommendedRAM());
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltRamSliderValueChanged()
-{
-    /* Call to base-class: */
-    onRamSliderValueChanged();
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltRamEditorValueChanged()
-{
-    /* Call to base-class: */
-    onRamEditorValueChanged();
+    m_pBaseMemoryEditor->setValue(type.GetRecommendedRAM());
 
     /* Broadcast complete-change: */
@@ -237 +186 @@
     m_pNameAndSystemCnt->setTitle(UIWizardNewVM::tr("Name and operating system"));
     m_pMemoryCnt->setTitle(UIWizardNewVM::tr("&Memory size"));
-    m_pRamUnits->setText(UICommon::tr("MB", "size suffix MBytes=1024 KBytes"));
-    m_pRamMin->setText(QString("%1 %2").arg(m_pRamSlider->minRAM()).arg(UICommon::tr("MB", "size suffix MBytes=1024 KBytes")));
-    m_pRamMax->setText(QString("%1 %2").arg(m_pRamSlider->maxRAM()).arg(UICommon::tr("MB", "size suffix MBytes=1024 KBytes")));
     m_pDiskCnt->setTitle(UIWizardNewVM::tr("Hard disk"));
     m_pDiskSkip->setText(UIWizardNewVM::tr("&Do not add a virtual hard disk"));
@@ -255 +201 @@
     CGuestOSType type = field("type").value<CGuestOSType>();
     ULONG recommendedRam = type.GetRecommendedRAM();
-    m_pRamSlider->setValue(recommendedRam);
-    m_pRamEditor->setValue(recommendedRam);
-
+    m_pBaseMemoryEditor->setValue(recommendedRam);
 }
 
@@ -273 +217 @@
      * 'virtualDisk' field feats the rules: */
     return UIWizardPage::isComplete() &&
-           (m_pRamSlider->value() >= qMax(1, (int)m_pRamSlider->minRAM()) && m_pRamSlider->value() <= (int)m_pRamSlider->maxRAM()) &&
            (m_pDiskSkip->isChecked() || !m_pDiskPresent->isChecked() || !uiCommon().medium(m_pDiskSelector->id()).isNull());
 }

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

@@ -43 +43 @@
     Q_PROPERTY(QUuid virtualDiskId READ virtualDiskId WRITE setVirtualDiskId);
     Q_PROPERTY(QString virtualDiskLocation READ virtualDiskLocation WRITE setVirtualDiskLocation);
+    Q_PROPERTY(int baseMemory READ baseMemory);
 
 public:
@@ -64 +65 @@
     void sltPathChanged(const QString &strNewPath);
     void sltOsTypeChanged();
-    void sltRamSliderValueChanged();
-    void sltRamEditorValueChanged();
     void sltVirtualDiskSourceChanged();
     void sltGetWithFileOpenDialog();