Changeset 47274 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 19, 2013 5:42:33 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: System page: Cleanup/rework (part 9): Replace line-editors with spin-boxes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsSystem.cpp (modified) (11 diffs)
• UIMachineSettingsSystem.h (modified) (5 diffs)
• UIMachineSettingsSystem.ui (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -90 +90 @@
     }
 
-    /* Setup validators: */
-    m_pEditorMemorySize->setValidator(new QIntValidator(m_pSliderMemorySize->minRAM(), m_pSliderMemorySize->maxRAM(), this));
-    m_pEditorCPUCount->setValidator(new QIntValidator(m_uMinGuestCPU, m_uMaxGuestCPU, this));
-    m_pEditorCPUExecCap->setValidator(new QIntValidator(m_uMinGuestCPUExecCap, m_uMaxGuestCPUExecCap, this));
-
-    /* Setup RAM connections: */
-    connect(m_pSliderMemorySize, SIGNAL(valueChanged(int)), this, SLOT(valueChangedRAM(int)));
-    connect(m_pEditorMemorySize, SIGNAL(textChanged(const QString&)), this, SLOT(textChangedRAM(const QString&)));
+    /* Pre-configure memory-size editor: */
+    m_pEditorMemorySize->setMinimum(m_pSliderMemorySize->minRAM());
+    m_pEditorMemorySize->setMaximum(m_pSliderMemorySize->maxRAM());
+    vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pEditorMemorySize, 5);
+
+    /* Pre-configure CPU-count editor: */
+    m_pEditorCPUCount->setMinimum(m_uMinGuestCPU);
+    m_pEditorCPUCount->setMaximum(m_uMaxGuestCPU);
+    vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pEditorCPUCount, 4);
+
+    /* Pre-configure CPU-execution-cap editor: */
+    m_pEditorCPUExecCap->setMinimum(m_uMinGuestCPUExecCap);
+    m_pEditorCPUExecCap->setMaximum(m_uMaxGuestCPUExecCap);
+    vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pEditorCPUExecCap, 4);
+
+    /* Setup memory-size connections: */
+    connect(m_pSliderMemorySize, SIGNAL(valueChanged(int)), this, SLOT(sltHandleMemorySizeSliderChange()));
+    connect(m_pEditorMemorySize, SIGNAL(valueChanged(int)), this, SLOT(sltHandleMemorySizeEditorChange()));
 
     /* Setup boot-table connections: */
@@ -105 +115 @@
 
     /* Setup CPU connections: */
-    connect(m_pSliderCPUCount, SIGNAL(valueChanged(int)), this, SLOT(valueChangedCPU(int)));
-    connect(m_pEditorCPUCount, SIGNAL(textChanged(const QString&)), this, SLOT(textChangedCPU(const QString&)));
-    connect(m_pSliderCPUExecCap, SIGNAL(valueChanged(int)), this, SLOT(sltValueChangedCPUExecCap(int)));
-    connect(m_pEditorCPUExecCap, SIGNAL(textChanged(const QString&)), this, SLOT(sltTextChangedCPUExecCap(const QString&)));
+    connect(m_pSliderCPUCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUCountSliderChange()));
+    connect(m_pEditorCPUCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUCountEditorChange()));
+    connect(m_pSliderCPUExecCap, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUExecCapSliderChange()));
+    connect(m_pEditorCPUExecCap, SIGNAL(valueChanged(int)), this, SLOT(sltHandleCPUExecCapEditorChange()));
 
     /* Setup boot-table iconsets: */
@@ -119 +129 @@
     m_pLayoutBootOrder->setSpacing (3);
 #endif /* Q_WS_MAC */
-
-    /* Limit min/max size of QLineEdit: */
-    m_pEditorMemorySize->setFixedWidthByText(QString().fill('8', 5));
-    /* Ensure m_pEditorMemorySize value and validation is updated: */
-    valueChangedRAM(m_pSliderMemorySize->value());
 
     /* Setup cpu slider: */
@@ -134 +139 @@
     m_pSliderCPUCount->setOptimalHint(1, hostCPUs);
     m_pSliderCPUCount->setWarningHint(hostCPUs, m_uMaxGuestCPU);
-    /* Limit min/max. size of QLineEdit: */
-    m_pEditorCPUCount->setFixedWidthByText(QString().fill('8', 4));
-    /* Ensure m_pEditorMemorySize value and validation is updated: */
-    valueChangedCPU(m_pSliderCPUCount->value());
 
     /* Setup cpu cap slider: */
@@ -148 +149 @@
     m_pSliderCPUExecCap->setWarningHint(m_uMinGuestCPUExecCap, m_uMedGuestCPUExecCap);
     m_pSliderCPUExecCap->setOptimalHint(m_uMedGuestCPUExecCap, m_uMaxGuestCPUExecCap);
-    /* Limit min/max. size of QLineEdit: */
-    m_pEditorCPUExecCap->setFixedWidthByText(QString().fill('8', 4));
-    /* Ensure m_pEditorMemorySize value and validation is updated: */
-    sltValueChangedCPUExecCap(m_pSliderCPUExecCap->value());
 
     /* Configure 'pointing HID type' combo: */
@@ -205 +202 @@
 
     /* Load motherboard data: */
-    systemData.m_iRAMSize = m_machine.GetMemorySize();
+    systemData.m_iMemorySize = m_machine.GetMemorySize();
     /* Load boot-items of current VM: */
     QList<KDeviceType> usedBootItems;
@@ -268 +265 @@
 
     /* Load motherboard data to page: */
-    m_pSliderMemorySize->setValue(systemData.m_iRAMSize);
+    m_pSliderMemorySize->setValue(systemData.m_iMemorySize);
     /* Remove any old data in the boot view: */
     QAbstractItemView *iv = qobject_cast <QAbstractItemView*> (mTwBootOrder);
@@ -314 +311 @@
 
     /* Gather motherboard data: */
-    systemData.m_iRAMSize = m_pSliderMemorySize->value();
+    systemData.m_iMemorySize = m_pSliderMemorySize->value();
     /* Gather boot-table data: */
     systemData.m_bootItems.clear();
@@ -363 +360 @@
         {
             /* Motherboard tab: */
-            m_machine.SetMemorySize(systemData.m_iRAMSize);
+            m_machine.SetMemorySize(systemData.m_iMemorySize);
             /* Save boot-items of current VM: */
             int iBootIndex = 0;
@@ -567 +564 @@
 }
 
-void UIMachineSettingsSystem::valueChangedRAM(int iValue)
-{
-    m_pEditorMemorySize->setText(QString::number(iValue));
-}
-
-void UIMachineSettingsSystem::textChangedRAM(const QString &strText)
-{
-    m_pSliderMemorySize->setValue(strText.toInt());
+void UIMachineSettingsSystem::sltHandleMemorySizeSliderChange()
+{
+    /* Apply new memory-size value: */
+    m_pEditorMemorySize->blockSignals(true);
+    m_pEditorMemorySize->setValue(m_pSliderMemorySize->value());
+    m_pEditorMemorySize->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleMemorySizeEditorChange()
+{
+    /* Apply new memory-size value: */
+    m_pSliderMemorySize->blockSignals(true);
+    m_pSliderMemorySize->setValue(m_pEditorMemorySize->value());
+    m_pSliderMemorySize->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
 }
 
@@ -644 +655 @@
 }
 
-void UIMachineSettingsSystem::valueChangedCPU(int iValue)
-{
-    m_pEditorCPUCount->setText(QString::number(iValue));
-}
-
-void UIMachineSettingsSystem::textChangedCPU(const QString &strText)
-{
-    m_pSliderCPUCount->setValue(strText.toInt());
-}
-
-void UIMachineSettingsSystem::sltValueChangedCPUExecCap(int iValue)
-{
-    m_pEditorCPUExecCap->setText(QString::number(iValue));
-}
-
-void UIMachineSettingsSystem::sltTextChangedCPUExecCap(const QString &strText)
-{
-    m_pSliderCPUExecCap->setValue(strText.toInt());
+void UIMachineSettingsSystem::sltHandleCPUCountSliderChange()
+{
+    /* Apply new memory-size value: */
+    m_pEditorCPUCount->blockSignals(true);
+    m_pEditorCPUCount->setValue(m_pSliderCPUCount->value());
+    m_pEditorCPUCount->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleCPUCountEditorChange()
+{
+    /* Apply new memory-size value: */
+    m_pSliderCPUCount->blockSignals(true);
+    m_pSliderCPUCount->setValue(m_pEditorCPUCount->value());
+    m_pSliderCPUCount->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleCPUExecCapSliderChange()
+{
+    /* Apply new memory-size value: */
+    m_pEditorCPUExecCap->blockSignals(true);
+    m_pEditorCPUExecCap->setValue(m_pSliderCPUExecCap->value());
+    m_pEditorCPUExecCap->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
+}
+
+void UIMachineSettingsSystem::sltHandleCPUExecCapEditorChange()
+{
+    /* Apply new memory-size value: */
+    m_pSliderCPUExecCap->blockSignals(true);
+    m_pSliderCPUExecCap->setValue(m_pEditorCPUExecCap->value());
+    m_pSliderCPUExecCap->blockSignals(false);
+
+    /* Revalidate if possible: */
+    if (m_pValidator)
+        m_pValidator->revalidate();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -51 +51 @@
         , m_fSupportedHwVirtEx(false)
         /* Motherboard data: */
-        , m_iRAMSize(-1)
+        , m_iMemorySize(-1)
         , m_bootItems(QList<UIBootItemData>())
         , m_chipsetType(KChipsetType_Null)
@@ -74 +74 @@
                (m_fSupportedHwVirtEx == other.m_fSupportedHwVirtEx) &&
                /* Motherboard data: */
-               (m_iRAMSize == other.m_iRAMSize) &&
+               (m_iMemorySize == other.m_iMemorySize) &&
                (m_bootItems == other.m_bootItems) &&
                (m_chipsetType == other.m_chipsetType) &&
@@ -99 +99 @@
 
     /* Variables: Motherboard data: */
-    int m_iRAMSize;
+    int m_iMemorySize;
     QList<UIBootItemData> m_bootItems;
     KChipsetType m_chipsetType;
@@ -164 +164 @@
 private slots:
 
-    /* Handlers: RAM stuff: */
-    void valueChangedRAM(int iValue);
-    void textChangedRAM(const QString &strText);
+    /* Handlers: Memory-size stuff: */
+    void sltHandleMemorySizeSliderChange();
+    void sltHandleMemorySizeEditorChange();
 
     /* Handler: Boot-table stuff: */
@@ -172 +172 @@
 
     /* Handlers: CPU stuff: */
-    void valueChangedCPU(int iValue);
-    void textChangedCPU(const QString &strText);
-    void sltValueChangedCPUExecCap(int iValue);
-    void sltTextChangedCPUExecCap(const QString &strText);
+    void sltHandleCPUCountSliderChange();
+    void sltHandleCPUCountEditorChange();
+    void sltHandleCPUExecCapSliderChange();
+    void sltHandleCPUExecCapEditorChange();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui

@@ -3 +3 @@
  VBox frontends: Qt4 GUI ("VirtualBox"):
 
- Copyright (C) 2008-2012 Oracle Corporation
+ Copyright (C) 2008-2013 Oracle Corporation
 
  This file is part of VirtualBox Open Source Edition (OSE), as
@@ -90 +90 @@
         <layout class="QHBoxLayout">
          <item>
-          <widget class="QILineEdit" name="m_pEditorMemorySize">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
+          <widget class="QSpinBox" name="m_pEditorMemorySize">
            <property name="whatsThis">
             <string>Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start.</string>
@@ -448 +442 @@
        </item>
        <item row="0" column="2">
-        <widget class="QILineEdit" name="m_pEditorCPUCount">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QSpinBox" name="m_pEditorCPUCount">
          <property name="whatsThis">
           <string>Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.</string>
@@ -517 +505 @@
        </item>
        <item row="2" column="2">
-        <widget class="QILineEdit" name="m_pEditorCPUExecCap">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
+        <widget class="QSpinBox" name="m_pEditorCPUExecCap">
          <property name="whatsThis">
           <string>Limits the amount of time that each virtual CPU is allowed to run for. Each virtual CPU will be allowed to use up to this percentage of the processing time available on one physical CPU. The execution cap can be disabled by setting it to 100%. Setting the cap too low can make the machine feel slow to respond.</string>
@@ -632 +614 @@
    <extends>QListWidget</extends>
    <header>UIBootTable.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QILineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>QILineEdit.h</header>
   </customwidget>
   <customwidget>