Changeset 47814 in vbox

Timestamp:

Aug 16, 2013 1:46:11 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Wizards: New VM wizard: Rework RAM editor to be spin-box, add corresponding validation.

Location:

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

Files:

• UIWizardNewVMPageBasic2.cpp (modified) (8 diffs)
• UIWizardNewVMPageBasic2.h (modified) (3 diffs)
• UIWizardNewVMPageExpert.cpp (modified) (6 diffs)
• UIWizardNewVMPageExpert.h (modified) (1 diff)

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

@@ -24 +24 @@
 #include <QSpacerItem>
 #include <QLabel>
+#include <QSpinBox>
 
 /* GUI includes: */
@@ -30 +31 @@
 #include "VBoxGlobal.h"
 #include "VBoxGuestRAMSlider.h"
-#include "QILineEdit.h"
 #include "QIRichTextLabel.h"
 
@@ -37 +37 @@
 }
 
-void UIWizardNewVMPage2::onRamSliderValueChanged(int iValue)
+void UIWizardNewVMPage2::onRamSliderValueChanged()
 {
     /* Update 'ram' field editor connected to slider: */
     m_pRamEditor->blockSignals(true);
-    m_pRamEditor->setText(QString::number(iValue));
+    m_pRamEditor->setValue(m_pRamSlider->value());
     m_pRamEditor->blockSignals(false);
 }
 
-void UIWizardNewVMPage2::onRamEditorTextChanged(const QString &strText)
+void UIWizardNewVMPage2::onRamEditorValueChanged()
 {
     /* Update 'ram' field slider connected to editor: */
     m_pRamSlider->blockSignals(true);
-    m_pRamSlider->setValue(strText.toInt());
+    m_pRamSlider->setValue(m_pRamEditor->value());
     m_pRamSlider->blockSignals(false);
 }
@@ -66 +66 @@
                 m_pRamSlider->setOrientation(Qt::Horizontal);
             }
-            m_pRamEditor = new QILineEdit(this);
+            m_pRamEditor = new QSpinBox(this);
             {
-                m_pRamEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-                m_pRamEditor->setFixedWidthByText("88888");
-                m_pRamEditor->setAlignment(Qt::AlignRight);
-                m_pRamEditor->setValidator(new QIntValidator(m_pRamSlider->minRAM(), m_pRamSlider->maxRAM(), this));
+                m_pRamEditor->setMinimum(m_pRamSlider->minRAM());
+                m_pRamEditor->setMaximum(m_pRamSlider->maxRAM());
+                vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pRamEditor, 5);
             }
             m_pRamUnits = new QLabel(this);
@@ -98 +97 @@
 
     /* Setup connections: */
-    connect(m_pRamSlider, SIGNAL(valueChanged(int)), this, SLOT(sltRamSliderValueChanged(int)));
-    connect(m_pRamEditor, SIGNAL(textChanged(const QString&)), this, SLOT(sltRamEditorTextChanged(const QString&)));
+    connect(m_pRamSlider, SIGNAL(valueChanged(int)), this, SLOT(sltRamSliderValueChanged()));
+    connect(m_pRamEditor, SIGNAL(valueChanged(int)), this, SLOT(sltRamEditorValueChanged()));
 
     /* Register fields: */
@@ -105 +104 @@
 }
 
-void UIWizardNewVMPageBasic2::sltRamSliderValueChanged(int iValue)
+void UIWizardNewVMPageBasic2::sltRamSliderValueChanged()
 {
     /* Call to base-class: */
-    onRamSliderValueChanged(iValue);
+    onRamSliderValueChanged();
 
     /* Broadcast complete-change: */
@@ -114 +113 @@
 }
 
-void UIWizardNewVMPageBasic2::sltRamEditorTextChanged(const QString &strText)
+void UIWizardNewVMPageBasic2::sltRamEditorValueChanged()
 {
     /* Call to base-class: */
-    onRamEditorTextChanged(strText);
+    onRamEditorValueChanged();
 
     /* Broadcast complete-change: */
@@ -148 +147 @@
     CGuestOSType type = field("type").value<CGuestOSType>();
     m_pRamSlider->setValue(type.GetRecommendedRAM());
-    m_pRamEditor->setText(QString::number(type.GetRecommendedRAM()));
+    m_pRamEditor->setValue(type.GetRecommendedRAM());
 
     /* 'Ram' field should have focus initially: */

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

@@ -25 +25 @@
 /* Forward declarations: */
 class VBoxGuestRAMSlider;
-class QILineEdit;
+class QSpinBox;
 class QLabel;
 class QIRichTextLabel;
@@ -38 +38 @@
 
     /* Handlers: */
-    void onRamSliderValueChanged(int iValue);
-    void onRamEditorTextChanged(const QString &strText);
+    void onRamSliderValueChanged();
+    void onRamEditorValueChanged();
 
     /* Widgets: */
     VBoxGuestRAMSlider *m_pRamSlider;
-    QILineEdit *m_pRamEditor;
+    QSpinBox *m_pRamEditor;
     QLabel *m_pRamMin;
     QLabel *m_pRamMax;
@@ -62 +62 @@
 
     /* Handlers: */
-    void sltRamSliderValueChanged(int iValue);
-    void sltRamEditorTextChanged(const QString &strText);
+    void sltRamSliderValueChanged();
+    void sltRamEditorValueChanged();
 
 private:

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

@@ -26 +26 @@
 #include <QLineEdit>
 #include <QLabel>
+#include <QSpinBox>
 #include <QRadioButton>
 
@@ -35 +36 @@
 #include "VBoxGuestRAMSlider.h"
 #include "VBoxMediaComboBox.h"
-#include "QILineEdit.h"
 #include "QIToolButton.h"
 
@@ -66 +66 @@
                     m_pRamSlider->setValue(m_pNameAndSystemEditor->type().GetRecommendedRAM());
                 }
-                m_pRamEditor = new QILineEdit(m_pMemoryCnt);
-                {
-                    m_pRamEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-                    m_pRamEditor->setFixedWidthByText("88888");
-                    m_pRamEditor->setAlignment(Qt::AlignRight);
-                    m_pRamEditor->setValidator(new QIntValidator(m_pRamSlider->minRAM(), m_pRamSlider->maxRAM(), this));
-                    m_pRamEditor->setText(QString::number(m_pNameAndSystemEditor->type().GetRecommendedRAM()));
+                m_pRamEditor = new QSpinBox(m_pMemoryCnt);
+                {
+                    m_pRamEditor->setMinimum(m_pRamSlider->minRAM());
+                    m_pRamEditor->setMaximum(m_pRamSlider->maxRAM());
+                    vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pRamEditor, 5);
                 }
                 m_pRamUnits = new QLabel(m_pMemoryCnt);
@@ -136 +134 @@
     connect(m_pNameAndSystemEditor, SIGNAL(sigNameChanged(const QString &)), this, SLOT(sltNameChanged(const QString &)));
     connect(m_pNameAndSystemEditor, SIGNAL(sigOsTypeChanged()), this, SLOT(sltOsTypeChanged()));
-    connect(m_pRamSlider, SIGNAL(valueChanged(int)), this, SLOT(sltRamSliderValueChanged(int)));
-    connect(m_pRamEditor, SIGNAL(textChanged(const QString &)), this, SLOT(sltRamEditorTextChanged(const QString &)));
+    connect(m_pRamSlider, SIGNAL(valueChanged(int)), this, SLOT(sltRamSliderValueChanged()));
+    connect(m_pRamEditor, SIGNAL(valueChanged(int)), this, SLOT(sltRamEditorValueChanged()));
     connect(m_pDiskSkip, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged()));
     connect(m_pDiskCreate, SIGNAL(toggled(bool)), this, SLOT(sltVirtualDiskSourceChanged()));
@@ -165 +163 @@
     CGuestOSType type = m_pNameAndSystemEditor->type();
     m_pRamSlider->setValue(type.GetRecommendedRAM());
-    m_pRamEditor->setText(QString::number(type.GetRecommendedRAM()));
+    m_pRamEditor->setValue(type.GetRecommendedRAM());
 
     /* Broadcast complete-change: */
@@ -179 +177 @@
     CGuestOSType type = m_pNameAndSystemEditor->type();
     m_pRamSlider->setValue(type.GetRecommendedRAM());
-    m_pRamEditor->setText(QString::number(type.GetRecommendedRAM()));
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltRamSliderValueChanged(int iValue)
-{
-    /* Call to base-class: */
-    onRamSliderValueChanged(iValue);
-
-    /* Broadcast complete-change: */
-    emit completeChanged();
-}
-
-void UIWizardNewVMPageExpert::sltRamEditorTextChanged(const QString &strText)
-{
-    /* Call to base-class: */
-    onRamEditorTextChanged(strText);
+    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();
 
     /* Broadcast complete-change: */

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

@@ -60 +60 @@
     void sltNameChanged(const QString &strNewText);
     void sltOsTypeChanged();
-    void sltRamSliderValueChanged(int iValue);
-    void sltRamEditorTextChanged(const QString &strText);
+    void sltRamSliderValueChanged();
+    void sltRamEditorValueChanged();
     void sltVirtualDiskSourceChanged();
     void sltGetWithFileOpenDialog();