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

Timestamp:

Mar 24, 2022 7:03:55 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: Display page accessibility improvements for Screen tab, part 5; Moving monitor count stuff to separate editor.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/editors/UIMonitorCountEditor.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp ) (5 diffs)
• src/settings/editors/UIMonitorCountEditor.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h ) (7 diffs)
• src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (20 diffs)
• src/settings/machine/UIMachineSettingsDisplay.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -909 +909 @@
         src/settings/editors/UIMachineDisplayScreenFeaturesEditor.h \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.h \
+        src/settings/editors/UIMonitorCountEditor.h \
         src/settings/editors/UINameAndSystemEditor.h \
         src/settings/editors/UINetworkAttachmentEditor.h \
@@ -1466 +1467 @@
         src/settings/editors/UIMachineDisplayScreenFeaturesEditor.cpp \
         src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp \
+        src/settings/editors/UIMonitorCountEditor.cpp \
         src/settings/editors/UINameAndSystemEditor.cpp \
         src/settings/editors/UINetworkAttachmentEditor.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIVideoMemoryEditor class implementation.
+ * VBox Qt GUI - UIMonitorCountEditor class implementation.
  */
 
@@ -18 +18 @@
 /* Qt includes: */
 #include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QSpinBox>
-#include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QIAdvancedSlider.h"
 #include "UICommon.h"
-#include "UIVideoMemoryEditor.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIMonitorCountEditor.h"
 
 /* COM includes: */
+#include "COMEnums.h"
 #include "CSystemProperties.h"
 
 
-UIVideoMemoryEditor::UIVideoMemoryEditor(QWidget *pParent /* = 0 */)
+UIMonitorCountEditor::UIMonitorCountEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_comGuestOSType(CGuestOSType())
-    , m_cGuestScreenCount(1)
-    , m_enmGraphicsControllerType(KGraphicsControllerType_Null)
-#ifdef VBOX_WITH_3D_ACCELERATION
-    , m_f3DAccelerationSupported(false)
-    , m_f3DAccelerationEnabled(false)
-#endif
-    , m_iMinVRAM(0)
-    , m_iMaxVRAM(0)
-    , m_iMaxVRAMVisible(0)
-    , m_iInitialVRAM(0)
+    , m_iValue(1)
     , m_pLayout(0)
-    , m_pLabelMemory(0)
+    , m_pLabel(0)
     , m_pSlider(0)
-    , m_pLabelMemoryMin(0)
-    , m_pLabelMemoryMax(0)
     , m_pSpinBox(0)
+    , m_pLabelMin(0)
+    , m_pLabelMax(0)
 {
     prepare();
 }
 
-void UIVideoMemoryEditor::setValue(int iValue)
+void UIMonitorCountEditor::setValue(int iValue)
 {
-    if (m_pSlider)
+    if (m_iValue != iValue)
     {
-        m_iInitialVRAM = RT_MIN(iValue, m_iMaxVRAM);
-        m_pSlider->setValue(m_iInitialVRAM);
+        m_iValue = iValue;
+        if (m_pSlider)
+            m_pSlider->setValue(m_iValue);
+        if (m_pSpinBox)
+            m_pSpinBox->setValue(m_iValue);
     }
 }
 
-int UIVideoMemoryEditor::value() const
+int UIMonitorCountEditor::value() const
 {
-    return m_pSlider ? m_pSlider->value() : 0;
+    return m_pSpinBox ? m_pSpinBox->value() : m_iValue;
 }
 
-void UIVideoMemoryEditor::setGuestOSType(const CGuestOSType &comGuestOSType)
+int UIMonitorCountEditor::minimumLabelHorizontalHint() const
 {
-    /* Check if guest OS type really changed: */
-    if (m_comGuestOSType == comGuestOSType)
-        return;
-
-    /* Remember new guest OS type: */
-    m_comGuestOSType = comGuestOSType;
-
-    /* Update requirements: */
-    updateRequirements();
+    return m_pLabel->minimumSizeHint().width();
 }
 
-void UIVideoMemoryEditor::setGuestScreenCount(int cGuestScreenCount)
-{
-    /* Check if guest screen count really changed: */
-    if (m_cGuestScreenCount == cGuestScreenCount)
-        return;
-
-    /* Remember new guest screen count: */
-    m_cGuestScreenCount = cGuestScreenCount;
-
-    /* Update requirements: */
-    updateRequirements();
-}
-
-void UIVideoMemoryEditor::setGraphicsControllerType(const KGraphicsControllerType &enmGraphicsControllerType)
-{
-    /* Check if graphics controller type really changed: */
-    if (m_enmGraphicsControllerType == enmGraphicsControllerType)
-        return;
-
-    /* Remember new graphics controller type: */
-    m_enmGraphicsControllerType = enmGraphicsControllerType;
-
-    /* Update requirements: */
-    updateRequirements();
-}
-
-#ifdef VBOX_WITH_3D_ACCELERATION
-void UIVideoMemoryEditor::set3DAccelerationSupported(bool fSupported)
-{
-    /* Check if 3D acceleration really changed: */
-    if (m_f3DAccelerationSupported == fSupported)
-        return;
-
-    /* Remember new 3D acceleration: */
-    m_f3DAccelerationSupported = fSupported;
-
-    /* Update requirements: */
-    updateRequirements();
-}
-
-void UIVideoMemoryEditor::set3DAccelerationEnabled(bool fEnabled)
-{
-    /* Check if 3D acceleration really changed: */
-    if (m_f3DAccelerationEnabled == fEnabled)
-        return;
-
-    /* Remember new 3D acceleration: */
-    m_f3DAccelerationEnabled = fEnabled;
-
-    /* Update requirements: */
-    updateRequirements();
-}
-#endif /* VBOX_WITH_3D_ACCELERATION */
-
-int UIVideoMemoryEditor::minimumLabelHorizontalHint() const
-{
-    return m_pLabelMemory->minimumSizeHint().width();
-}
-
-void UIVideoMemoryEditor::setMinimumLayoutIndent(int iIndent)
+void UIMonitorCountEditor::setMinimumLayoutIndent(int iIndent)
 {
     if (m_pLayout)
@@ -147 +73 @@
 }
 
-void UIVideoMemoryEditor::retranslateUi()
+void UIMonitorCountEditor::retranslateUi()
 {
-    if (m_pLabelMemory)
-        m_pLabelMemory->setText(tr("Video &Memory:"));
+    if (m_pLabel)
+        m_pLabel->setText(tr("Mo&nitor Count:"));
 
     if (m_pSlider)
-        m_pSlider->setToolTip(tr("Holds the amount of video memory provided to the virtual machine."));
+        m_pSlider->setToolTip(tr("Holds the amount of virtual monitors provided to the virtual machine."));
     if (m_pSpinBox)
-        m_pSpinBox->setToolTip(tr("Holds the amount of video memory provided to the virtual machine."));
+        m_pSpinBox->setToolTip(tr("Holds the amount of virtual monitors provided to the virtual machine."));
 
-    if (m_pLabelMemoryMin)
-    {
-        m_pLabelMemoryMin->setText(tr("%1 MB").arg(m_iMinVRAM));
-        m_pLabelMemoryMin->setToolTip(tr("Minimum possible video memory size."));
-    }
-    if (m_pLabelMemoryMax)
-    {
-        m_pLabelMemoryMax->setText(tr("%1 MB").arg(m_iMaxVRAMVisible));
-        m_pLabelMemoryMax->setToolTip(tr("Maximum possible video memory size."));
-    }
-
-    if (m_pSpinBox)
-        m_pSpinBox->setSuffix(QString(" %1").arg(tr("MB")));
+    if (m_pLabelMin)
+        m_pLabelMin->setToolTip(tr("Minimum possible monitor count."));
+    if (m_pLabelMax)
+        m_pLabelMax->setToolTip(tr("Maximum possible monitor count."));
 }
 
-void UIVideoMemoryEditor::sltHandleSliderChange()
+void UIMonitorCountEditor::sltHandleSliderChange()
 {
-    /* Apply spin-box value keeping it's signals disabled: */
+    /* Apply spin-box value keeping signals disabled: */
     if (m_pSpinBox && m_pSlider)
     {
@@ -182 +99 @@
     }
 
-    /* Revalidate to send signal to listener: */
-    revalidate();
+    /* Notify listeners about value changed: */
+    emit sigValidChanged();
 }
 
-void UIVideoMemoryEditor::sltHandleSpinBoxChange()
+void UIMonitorCountEditor::sltHandleSpinBoxChange()
 {
-    /* Apply slider value keeping it's signals disabled: */
-    if (m_pSpinBox && m_pSlider)
+    /* Apply slider value keeping signals disabled: */
+    if (m_pSlider && m_pSpinBox)
     {
         m_pSlider->blockSignals(true);
@@ -196 +113 @@
     }
 
-    /* Revalidate to send signal to listener: */
-    revalidate();
+    /* Notify listeners about value changed: */
+    emit sigValidChanged();
 }
 
-void UIVideoMemoryEditor::prepare()
+void UIMonitorCountEditor::prepare()
 {
     /* Prepare common variables: */
     const CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
-    m_iMinVRAM = comProperties.GetMinGuestVRAM();
-    m_iMaxVRAM = comProperties.GetMaxGuestVRAM();
-    m_iMaxVRAMVisible = m_iMaxVRAM;
 
-    /* Create main layout: */
+    /* Prepare main layout: */
     m_pLayout = new QGridLayout(this);
     if (m_pLayout)
     {
         m_pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayout->setColumnStretch(2, 1); // spacer between min&max labels
 
-        /* Create memory label: */
-        m_pLabelMemory = new QLabel(this);
-        if (m_pLabelMemory)
+        /* Prepare main label: */
+        m_pLabel = new QLabel(this);
+        if (m_pLabel)
         {
-            m_pLabelMemory->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            m_pLayout->addWidget(m_pLabelMemory, 0, 0);
+            m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabel, 0, 0);
         }
 
-        /* Create slider layout: */
-        QVBoxLayout *pSliderLayout = new QVBoxLayout;
-        if (pSliderLayout)
+        /* Prepare slider: */
+        m_pSlider = new QIAdvancedSlider(this);
+        if (m_pSlider)
         {
-            pSliderLayout->setContentsMargins(0, 0, 0, 0);
+            const uint cHostScreens = gpDesktop->screenCount();
+            const uint cMinGuestScreens = 1;
+            const uint cMaxGuestScreens = comProperties.GetMaxGuestMonitors();
+            const uint cMaxGuestScreensForSlider = qMin(cMaxGuestScreens, (uint)8);
+            m_pSlider->setOrientation(Qt::Horizontal);
+            m_pSlider->setMinimum(cMinGuestScreens);
+            m_pSlider->setMaximum(cMaxGuestScreensForSlider);
+            m_pSlider->setPageStep(1);
+            m_pSlider->setSingleStep(1);
+            m_pSlider->setTickInterval(1);
+            m_pSlider->setOptimalHint(cMinGuestScreens, cHostScreens);
+            m_pSlider->setWarningHint(cHostScreens, cMaxGuestScreensForSlider);
 
-            /* Create memory slider: */
-            m_pSlider = new QIAdvancedSlider(this);
-            if (m_pSlider)
-            {
-                m_pSlider->setMinimum(m_iMinVRAM);
-                m_pSlider->setMaximum(m_iMaxVRAMVisible);
-                m_pSlider->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
-                m_pSlider->setSingleStep(m_pSlider->pageStep() / 4);
-                m_pSlider->setTickInterval(m_pSlider->pageStep());
-                m_pSlider->setSnappingEnabled(true);
-                m_pSlider->setErrorHint(0, 1);
-                m_pSlider->setMinimumWidth(150);
-                connect(m_pSlider, &QIAdvancedSlider::valueChanged,
-                        this, &UIVideoMemoryEditor::sltHandleSliderChange);
-                pSliderLayout->addWidget(m_pSlider);
-            }
-
-            /* Create legend layout: */
-            QHBoxLayout *pLegendLayout = new QHBoxLayout;
-            if (pLegendLayout)
-            {
-                pLegendLayout->setContentsMargins(0, 0, 0, 0);
-
-                /* Create min label: */
-                m_pLabelMemoryMin = new QLabel(this);
-                if (m_pLabelMemoryMin)
-                    pLegendLayout->addWidget(m_pLabelMemoryMin);
-
-                /* Push labels from each other: */
-                pLegendLayout->addStretch();
-
-                /* Create max label: */
-                m_pLabelMemoryMax = new QLabel(this);
-                if (m_pLabelMemoryMax)
-                    pLegendLayout->addWidget(m_pLabelMemoryMax);
-
-                /* Add legend layout to slider layout: */
-                pSliderLayout->addLayout(pLegendLayout);
-            }
-
-            /* Add slider layout to main layout: */
-            m_pLayout->addLayout(pSliderLayout, 0, 1, 2, 1);
+            m_pLayout->addWidget(m_pSlider, 0, 1, 1, 3);
         }
 
-        /* Create memory spin-box: */
+        /* Prepare spin-box: */
         m_pSpinBox = new QSpinBox(this);
         if (m_pSpinBox)
         {
-            setFocusProxy(m_pSpinBox);
-            if (m_pLabelMemory)
-                m_pLabelMemory->setBuddy(m_pSpinBox);
-            m_pSpinBox->setMinimum(m_iMinVRAM);
-            m_pSpinBox->setMaximum(m_iMaxVRAMVisible);
-            connect(m_pSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                    this, &UIVideoMemoryEditor::sltHandleSpinBoxChange);
-            m_pLayout->addWidget(m_pSpinBox, 0, 2);
+            if (m_pLabel)
+                m_pLabel->setBuddy(m_pSpinBox);
+            m_pSpinBox->setMinimum(1);
+            m_pSpinBox->setMaximum(comProperties.GetMaxGuestMonitors());
+
+            m_pLayout->addWidget(m_pSpinBox, 0, 4);
+        }
+
+        /* Prepare min label: */
+        m_pLabelMin = new QLabel(this);
+        if (m_pLabelMin)
+        {
+            m_pLabelMin->setText(QString::number(1));
+            m_pLayout->addWidget(m_pLabelMin, 1, 1);
+        }
+
+        /* Prepare max label: */
+        m_pLabelMax = new QLabel(this);
+        if (m_pLabelMax)
+        {
+            m_pLabelMax->setText(QString::number(qMin(comProperties.GetMaxGuestMonitors(), (ULONG)8)));
+            m_pLayout->addWidget(m_pLabelMax, 1, 3);
         }
     }
+
+    /* Prepare connections: */
+    if (m_pSlider)
+        connect(m_pSlider, &QIAdvancedSlider::valueChanged,
+                this, &UIMonitorCountEditor::sltHandleSliderChange);
+    if (m_pSpinBox)
+        connect(m_pSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+                this, &UIMonitorCountEditor::sltHandleSpinBoxChange);
 
     /* Apply language settings: */
     retranslateUi();
 }
-
-void UIVideoMemoryEditor::updateRequirements()
-{
-    /* Make sure guest OS type is set: */
-    if (m_comGuestOSType.isNull())
-        return;
-
-    /* Init visible maximum VRAM: */
-    m_iMaxVRAMVisible = m_cGuestScreenCount * 32;
-
-    /* Get monitors count and recommended VRAM: */
-    int iNeedMBytes = UICommon::requiredVideoMemory(m_comGuestOSType.GetId(), m_cGuestScreenCount) / _1M;
-    /* Adjust visible maximum VRAM to be no less than 128MB (if possible): */
-    if (m_iMaxVRAMVisible < 128 && m_iMaxVRAM >= 128)
-        m_iMaxVRAMVisible = 128;
-
-#ifdef VBOX_WITH_3D_ACCELERATION
-    if (m_f3DAccelerationEnabled && m_f3DAccelerationSupported)
-    {
-        /* Adjust recommended VRAM to be no less than 128MB: */
-        iNeedMBytes = qMax(iNeedMBytes, 128);
-        /* Adjust visible maximum VRAM to be no less than 256MB (if possible): */
-        if (m_iMaxVRAMVisible < 256 && m_iMaxVRAM >= 256)
-            m_iMaxVRAMVisible = 256;
-    }
-#endif
-
-    /* Adjust visible maximum VRAM to be no less than initial VRAM: */
-    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, m_iInitialVRAM);
-    /* Adjust visible maximum VRAM to be no less than recommended VRAM: */
-    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, iNeedMBytes);
-
-    /* Adjust recommended VRAM to be no more than actual maximum VRAM: */
-    iNeedMBytes = qMin(iNeedMBytes, m_iMaxVRAM);
-    /* Adjust visible maximum VRAM to be no more than actual maximum VRAM: */
-    m_iMaxVRAMVisible = qMin(m_iMaxVRAMVisible, m_iMaxVRAM);
-
-    if (m_pSpinBox)
-        m_pSpinBox->setMaximum(m_iMaxVRAMVisible);
-    if (m_pSlider)
-    {
-        m_pSlider->setMaximum(m_iMaxVRAMVisible);
-        m_pSlider->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
-        m_pSlider->setWarningHint(1, qMin(iNeedMBytes, m_iMaxVRAMVisible));
-        m_pSlider->setOptimalHint(qMin(iNeedMBytes, m_iMaxVRAMVisible), m_iMaxVRAMVisible);
-    }
-    if (m_pLabelMemoryMax)
-        m_pLabelMemoryMax->setText(tr("%1 MB").arg(m_iMaxVRAMVisible));
-}
-
-void UIVideoMemoryEditor::revalidate()
-{
-    if (m_pSlider)
-        emit sigValidChanged(   m_enmGraphicsControllerType == KGraphicsControllerType_Null
-                             || m_pSlider->value() > 0);
-}
-
-/* static */
-int UIVideoMemoryEditor::calculatePageStep(int iMax)
-{
-    /* Reasonable max. number of page steps is 32. */
-    const uint uPage = ((uint)iMax + 31) / 32;
-    /* Make it a power of 2: */
-    uint uP = uPage, p2 = 0x1;
-    while ((uP >>= 1))
-        p2 <<= 1;
-    if (uPage != p2)
-        p2 <<= 1;
-    if (p2 < 4)
-        p2 = 4;
-    return (int)p2;
-}

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIVideoMemoryEditor class declaration.
+ * VBox Qt GUI - UIMonitorCountEditor class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_settings_editors_UIVideoMemoryEditor_h
-#define FEQT_INCLUDED_SRC_settings_editors_UIVideoMemoryEditor_h
+#ifndef FEQT_INCLUDED_SRC_settings_editors_UIMonitorCountEditor_h
+#define FEQT_INCLUDED_SRC_settings_editors_UIMonitorCountEditor_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -29 +29 @@
 #include "UILibraryDefs.h"
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CGuestOSType.h"
-
 /* Forward declarations: */
 class QGridLayout;
@@ -39 +35 @@
 class QIAdvancedSlider;
 
-/** QWidget subclass used as a video memory editor. */
-class SHARED_LIBRARY_STUFF UIVideoMemoryEditor : public QIWithRetranslateUI<QWidget>
+/** QWidget subclass used as a monitor count editor. */
+class SHARED_LIBRARY_STUFF UIMonitorCountEditor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -46 +42 @@
 signals:
 
-    /** Notifies listeners about value has became @a fValid. */
-    void sigValidChanged(bool fValid);
+    /** Notifies listeners about value changed. */
+    void sigValidChanged();
 
 public:
 
-    /** Constructs video-memory editor passing @a pParent to the base-class. */
-    UIVideoMemoryEditor(QWidget *pParent = 0);
+    /** Constructs monitor count editor passing @a pParent to the base-class. */
+    UIMonitorCountEditor(QWidget *pParent = 0);
 
     /** Defines editor @a iValue. */
@@ -58 +54 @@
     /** Returns editor value. */
     int value() const;
-
-    /** Defines @a comGuestOSType. */
-    void setGuestOSType(const CGuestOSType &comGuestOSType);
-
-    /** Defines @a cGuestScreenCount. */
-    void setGuestScreenCount(int cGuestScreenCount);
-
-    /** Defines @a enmGraphicsControllerType. */
-    void setGraphicsControllerType(const KGraphicsControllerType &enmGraphicsControllerType);
-
-#ifdef VBOX_WITH_3D_ACCELERATION
-    /** Defines whether 3D acceleration is @a fSupported. */
-    void set3DAccelerationSupported(bool fSupported);
-    /** Defines whether 3D acceleration is @a fEnabled. */
-    void set3DAccelerationEnabled(bool fEnabled);
-#endif
 
     /** Returns minimum layout hint. */
@@ -97 +77 @@
     void prepare();
 
-    /** Update requirements. */
-    void updateRequirements();
-
     /** Revalidates and emits validity change signal. */
     void revalidate();
 
-    /** Calculates the reasonably sane slider page step. */
-    static int calculatePageStep(int iMax);
-
-    /** Holds the guest OS type ID. */
-    CGuestOSType             m_comGuestOSType;
-    /** Holds the guest screen count. */
-    int                      m_cGuestScreenCount;
-    /** Holds the graphics controller type. */
-    KGraphicsControllerType  m_enmGraphicsControllerType;
-#ifdef VBOX_WITH_3D_ACCELERATION
-    /** Holds whether 3D acceleration is supported. */
-    bool                     m_f3DAccelerationSupported;
-    /** Holds whether 3D acceleration is enabled. */
-    bool                     m_f3DAccelerationEnabled;
-#endif
-
-    /** Holds the minimum lower limit of VRAM (MiB). */
-    int  m_iMinVRAM;
-    /** Holds the maximum upper limit of VRAM (MiB). */
-    int  m_iMaxVRAM;
-    /** Holds the upper limit of VRAM (MiB) for this dialog.
-      * @note This value is lower than m_iMaxVRAM to save
-      *       careless users from setting useless big values. */
-    int  m_iMaxVRAMVisible;
-    /** Holds the initial VRAM value when the dialog is opened. */
-    int  m_iInitialVRAM;
+    /** Holds the value to be selected. */
+    int  m_iValue;
 
     /** Holds the main layout instance. */
     QGridLayout      *m_pLayout;
-    /** Holds the memory label instance. */
-    QLabel           *m_pLabelMemory;
-    /** Holds the memory slider instance. */
+    /** Holds the main label instance. */
+    QLabel           *m_pLabel;
+    /** Holds the slider instance. */
     QIAdvancedSlider *m_pSlider;
-    /** Holds minimum memory label instance. */
-    QLabel           *m_pLabelMemoryMin;
-    /** Holds maximum memory label instance. */
-    QLabel           *m_pLabelMemoryMax;
-    /** Holds the memory spin-box instance. */
+    /** Holds the spin-box instance. */
     QSpinBox         *m_pSpinBox;
+    /** Holds minimum label instance. */
+    QLabel           *m_pLabelMin;
+    /** Holds maximum label instance. */
+    QLabel           *m_pLabelMax;
 };
 
-#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIVideoMemoryEditor_h */
+#endif /* !FEQT_INCLUDED_SRC_settings_editors_UIMonitorCountEditor_h */

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

@@ -33 +33 @@
 #include "UICommon.h"
 #include "UIConverter.h"
-#include "UIDesktopWidgetWatchdog.h"
 #include "UIErrorString.h"
 #include "UIExtraDataManager.h"
@@ -43 +42 @@
 #endif
 #include "UIMachineSettingsDisplay.h"
+#include "UIMonitorCountEditor.h"
 #include "UIScaleFactorEditor.h"
 #include "UITranslator.h"
@@ -306 +306 @@
     , m_pTabWidget(0)
     , m_pTabScreen(0)
-    , m_pLayoutScreen(0)
     , m_pEditorVideoMemorySize(0)
-    , m_pLabelMonitorCount(0)
-    , m_pSliderMonitorCount(0)
-    , m_pSpinboxMonitorCount(0)
-    , m_pLabelMonitorCountMin(0)
-    , m_pLabelMonitorCountMax(0)
+    , m_pEditorMonitorCount(0)
     , m_pEditorScaleFactor(0)
     , m_pEditorGraphicsController(0)
@@ -500 +495 @@
 
     /* Load old 'Screen' data from cache: */
-    m_pSpinboxMonitorCount->setValue(oldDisplayData.m_cGuestScreenCount);
+    m_pEditorMonitorCount->setValue(oldDisplayData.m_cGuestScreenCount);
     m_pEditorScaleFactor->setScaleFactors(oldDisplayData.m_scaleFactors);
     m_pEditorScaleFactor->setMonitorCount(oldDisplayData.m_cGuestScreenCount);
@@ -508 +503 @@
 #endif
     /* Push required value to m_pEditorVideoMemorySize: */
-    sltHandleGuestScreenCountEditorChange();
+    sltHandleMonitorCountChange();
     sltHandleGraphicsControllerComboChange();
 #ifdef VBOX_WITH_3D_ACCELERATION
@@ -566 +561 @@
     /* Gather new 'Screen' data: */
     newDisplayData.m_iCurrentVRAM = m_pEditorVideoMemorySize->value();
-    newDisplayData.m_cGuestScreenCount = m_pSpinboxMonitorCount->value();
+    newDisplayData.m_cGuestScreenCount = m_pEditorMonitorCount->value();
     newDisplayData.m_scaleFactors = m_pEditorScaleFactor->scaleFactors();
     newDisplayData.m_graphicsControllerType = m_pEditorGraphicsController->value();
@@ -653 +648 @@
         if (shouldWeWarnAboutLowVRAM() && !m_comGuestOSType.isNull())
         {
-            quint64 uNeedBytes = UICommon::requiredVideoMemory(m_comGuestOSType.GetId(), m_pSpinboxMonitorCount->value());
+            quint64 uNeedBytes = UICommon::requiredVideoMemory(m_comGuestOSType.GetId(), m_pEditorMonitorCount->value());
 
             /* Basic video RAM amount test: */
@@ -752 +747 @@
     setTabOrder(pWidget, m_pTabWidget->focusProxy());
     setTabOrder(m_pTabWidget->focusProxy(), m_pEditorVideoMemorySize);
-    setTabOrder(m_pEditorVideoMemorySize, m_pSliderMonitorCount);
-    setTabOrder(m_pSliderMonitorCount, m_pSpinboxMonitorCount);
-    setTabOrder(m_pSpinboxMonitorCount, m_pEditorScaleFactor);
+    setTabOrder(m_pEditorVideoMemorySize, m_pEditorMonitorCount);
+    setTabOrder(m_pEditorMonitorCount, m_pEditorScaleFactor);
     setTabOrder(m_pEditorScaleFactor, m_pEditorGraphicsController);
 
@@ -777 +771 @@
 void UIMachineSettingsDisplay::retranslateUi()
 {
-    m_pLabelMonitorCount->setText(tr("Mo&nitor Count:"));
-    m_pSliderMonitorCount->setToolTip(tr("Controls the amount of virtual monitors provided to the virtual machine."));
-    m_pSpinboxMonitorCount->setToolTip(tr("Controls the amount of virtual monitors provided to the virtual machine."));
-    m_pEditorScaleFactor->setToolTip(tr("Controls the guest screen scale factor."));
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabScreen), tr("&Screen"));
     m_pCheckboxRemoteDisplay->setToolTip(tr("When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing "
@@ -826 +816 @@
     m_pTabWidget->setTabText(m_pTabWidget->indexOf(m_pTabRecording), tr("Re&cording"));
 
-    /* Screen stuff: */
-    CSystemProperties sys = uiCommon().virtualBox().GetSystemProperties();
-    m_pLabelMonitorCountMin->setText(QString::number(1));
-    m_pLabelMonitorCountMax->setText(QString::number(qMin(sys.GetMaxGuestMonitors(), (ULONG)8)));
-
     /* Translate Remote Display auth method combo: */
     AssertPtrReturnVoid(m_pComboRemoteDisplayAuthMethod);
@@ -859 +844 @@
     int iMinimumLayoutHint = 0;
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint());
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelMonitorCount->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMonitorCount->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGraphicsController->minimumLabelHorizontalHint());
@@ -866 +851 @@
 #endif
     m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorMonitorCount->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorGraphicsController->setMinimumLayoutIndent(iMinimumLayoutHint);
@@ -871 +857 @@
     m_pEditorDisplayScreenFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
 #endif
-    m_pLayoutScreen->setColumnMinimumWidth(0, iMinimumLayoutHint);
 
     updateRecordingFileSizeHint();
@@ -883 +868 @@
     /* Polish 'Screen' availability: */
     m_pEditorVideoMemorySize->setEnabled(isMachineOffline());
-    m_pLabelMonitorCount->setEnabled(isMachineOffline());
-    m_pSliderMonitorCount->setEnabled(isMachineOffline());
-    m_pLabelMonitorCountMin->setEnabled(isMachineOffline());
-    m_pLabelMonitorCountMax->setEnabled(isMachineOffline());
-    m_pSpinboxMonitorCount->setEnabled(isMachineOffline());
+    m_pEditorMonitorCount->setEnabled(isMachineOffline());
     m_pEditorScaleFactor->setEnabled(isMachineInValidMode());
     m_pEditorGraphicsController->setEnabled(isMachineOffline());
@@ -906 +887 @@
 }
 
-void UIMachineSettingsDisplay::sltHandleGuestScreenCountSliderChange()
-{
-    /* Apply proposed screen-count: */
-    m_pSpinboxMonitorCount->blockSignals(true);
-    m_pSpinboxMonitorCount->setValue(m_pSliderMonitorCount->value());
-    m_pSpinboxMonitorCount->blockSignals(false);
-
-    /* Update Video RAM requirements: */
-    m_pEditorVideoMemorySize->setGuestScreenCount(m_pSliderMonitorCount->value());
-
-    /* Update recording tab screen count: */
-    updateGuestScreenCount();
-
-    /* Revalidate: */
-    revalidate();
-}
-
-void UIMachineSettingsDisplay::sltHandleGuestScreenCountEditorChange()
-{
-    /* Apply proposed screen-count: */
-    m_pSliderMonitorCount->blockSignals(true);
-    m_pSliderMonitorCount->setValue(m_pSpinboxMonitorCount->value());
-    m_pSliderMonitorCount->blockSignals(false);
-
-    /* Update Video RAM requirements: */
-    m_pEditorVideoMemorySize->setGuestScreenCount(m_pSpinboxMonitorCount->value());
-
+void UIMachineSettingsDisplay::sltHandleMonitorCountChange()
+{
     /* Update recording tab screen count: */
     updateGuestScreenCount();
@@ -1093 +1049 @@
 void UIMachineSettingsDisplay::prepareTabScreen()
 {
-    /* Prepare common variables: */
-    const CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
-
     /* Prepare 'Screen' tab: */
     m_pTabScreen = new QWidget;
@@ -1101 +1054 @@
     {
         /* Prepare 'Screen' tab layout: */
-        m_pLayoutScreen = new QGridLayout(m_pTabScreen);
-        if (m_pLayoutScreen)
+        QVBoxLayout *pLayoutScreen = new QVBoxLayout(m_pTabScreen);
+        if (pLayoutScreen)
         {
-            m_pLayoutScreen->setRowStretch(8, 1);
-
             /* Prepare video memory editor: */
             m_pEditorVideoMemorySize = new UIVideoMemoryEditor(m_pTabScreen);
             if (m_pEditorVideoMemorySize)
-                m_pLayoutScreen->addWidget(m_pEditorVideoMemorySize, 0, 0, 1, 3);
-
-            /* Prepare monitor count label: */
-            m_pLabelMonitorCount = new QLabel(m_pTabScreen);
-            if (m_pLabelMonitorCount)
-            {
-                m_pLabelMonitorCount->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutScreen->addWidget(m_pLabelMonitorCount, 1, 0);
-            }
-            /* Prepare monitor count layout: */
-            QVBoxLayout *pLayoutMonitorCount = new QVBoxLayout;
-            if (pLayoutMonitorCount)
-            {
-                pLayoutMonitorCount->setContentsMargins(0, 0, 0, 0);
-
-                /* Prepare monitor count slider: */
-                m_pSliderMonitorCount = new QIAdvancedSlider(m_pTabScreen);
-                if (m_pSliderMonitorCount)
-                {
-                    const uint cHostScreens = gpDesktop->screenCount();
-                    const uint cMinGuestScreens = 1;
-                    const uint cMaxGuestScreens = comProperties.GetMaxGuestMonitors();
-                    const uint cMaxGuestScreensForSlider = qMin(cMaxGuestScreens, (uint)8);
-                    m_pSliderMonitorCount->setOrientation(Qt::Horizontal);
-                    m_pSliderMonitorCount->setMinimum(cMinGuestScreens);
-                    m_pSliderMonitorCount->setMaximum(cMaxGuestScreensForSlider);
-                    m_pSliderMonitorCount->setPageStep(1);
-                    m_pSliderMonitorCount->setSingleStep(1);
-                    m_pSliderMonitorCount->setTickInterval(1);
-                    m_pSliderMonitorCount->setOptimalHint(cMinGuestScreens, cHostScreens);
-                    m_pSliderMonitorCount->setWarningHint(cHostScreens, cMaxGuestScreensForSlider);
-
-                    pLayoutMonitorCount->addWidget(m_pSliderMonitorCount);
-                }
-                /* Prepare monitor count scale layout: */
-                QHBoxLayout *pLayoutMonitorCountScale = new QHBoxLayout;
-                if (pLayoutMonitorCountScale)
-                {
-                    pLayoutMonitorCountScale->setContentsMargins(0, 0, 0, 0);
-
-                    /* Prepare monitor count min label: */
-                    m_pLabelMonitorCountMin = new QLabel(m_pTabScreen);
-                    if (m_pLabelMonitorCountMin)
-                        pLayoutMonitorCountScale->addWidget(m_pLabelMonitorCountMin);
-                    pLayoutMonitorCountScale->addStretch();
-                    /* Prepare monitor count max label: */
-                    m_pLabelMonitorCountMax = new QLabel(m_pTabScreen);
-                    if (m_pLabelMonitorCountMax)
-                        pLayoutMonitorCountScale->addWidget(m_pLabelMonitorCountMax);
-
-                    pLayoutMonitorCount->addLayout(pLayoutMonitorCountScale);
-                }
-
-                m_pLayoutScreen->addLayout(pLayoutMonitorCount, 1, 1, 2, 1);
-            }
-            /* Prepare monitor count spinbox: */
-            m_pSpinboxMonitorCount = new QSpinBox(m_pTabScreen);
-            if (m_pSpinboxMonitorCount)
-            {
-                if (m_pLabelMonitorCount)
-                    m_pLabelMonitorCount->setBuddy(m_pSpinboxMonitorCount);
-                m_pSpinboxMonitorCount->setMinimum(1);
-                m_pSpinboxMonitorCount->setMaximum(comProperties.GetMaxGuestMonitors());
-
-                m_pLayoutScreen->addWidget(m_pSpinboxMonitorCount, 1, 2);
-            }
+                pLayoutScreen->addWidget(m_pEditorVideoMemorySize);
+
+            /* Prepare monitor count editor: */
+            m_pEditorMonitorCount = new UIMonitorCountEditor(m_pTabScreen);
+            if (m_pEditorMonitorCount)
+                pLayoutScreen->addWidget(m_pEditorMonitorCount);
 
             /* Prepare scale factor editor: */
             m_pEditorScaleFactor = new UIScaleFactorEditor(m_pTabScreen);
             if (m_pEditorScaleFactor)
-                m_pLayoutScreen->addWidget(m_pEditorScaleFactor, 3, 0, 1, 3);
+                pLayoutScreen->addWidget(m_pEditorScaleFactor);
 
             /* Prepare graphics controller editor: */
             m_pEditorGraphicsController = new UIGraphicsControllerEditor(m_pTabScreen);
             if (m_pEditorGraphicsController)
-                m_pLayoutScreen->addWidget(m_pEditorGraphicsController, 4, 0, 1, 3);
+                pLayoutScreen->addWidget(m_pEditorGraphicsController);
 
 #ifdef VBOX_WITH_3D_ACCELERATION
@@ -1190 +1081 @@
             m_pEditorDisplayScreenFeatures = new UIMachineDisplayScreenFeaturesEditor(m_pTabScreen);
             if (m_pEditorDisplayScreenFeatures)
-                m_pLayoutScreen->addWidget(m_pEditorDisplayScreenFeatures, 5, 0, 1, 2);
+                pLayoutScreen->addWidget(m_pEditorDisplayScreenFeatures);
 #endif /* VBOX_WITH_3D_ACCELERATION */
+
+            pLayoutScreen->addStretch();
         }
 
@@ -1677 +1570 @@
     connect(m_pEditorVideoMemorySize, &UIVideoMemoryEditor::sigValidChanged,
             this, &UIMachineSettingsDisplay::revalidate);
-    connect(m_pSliderMonitorCount, &QIAdvancedSlider::valueChanged,
-            this, &UIMachineSettingsDisplay::sltHandleGuestScreenCountSliderChange);
-    connect(m_pSpinboxMonitorCount, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-            this, &UIMachineSettingsDisplay::sltHandleGuestScreenCountEditorChange);
+    connect(m_pEditorMonitorCount, &UIMonitorCountEditor::sigValidChanged,
+            this, &UIMachineSettingsDisplay::sltHandleMonitorCountChange);
     connect(m_pEditorGraphicsController, &UIGraphicsControllerEditor::sigValueChanged,
             this, &UIMachineSettingsDisplay::sltHandleGraphicsControllerComboChange);
@@ -1769 +1660 @@
     /* Update copy of the cached item to get the desired result: */
     QVector<BOOL> screens = m_pCache->base().m_vecRecordingScreens;
-    screens.resize(m_pSpinboxMonitorCount->value());
+    screens.resize(m_pEditorMonitorCount->value());
     m_pScrollerRecordingScreens->setValue(screens);
-    m_pEditorScaleFactor->setMonitorCount(m_pSpinboxMonitorCount->value());
+    m_pEditorScaleFactor->setMonitorCount(m_pEditorMonitorCount->value());
 }
 

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

@@ -33 +33 @@
 class QLabel;
 class QLineEdit;
-class QGridLayout;
 class QSpinBox;
 class QStackedLayout;
@@ -46 +45 @@
 class UIMachineDisplayScreenFeaturesEditor;
 #endif
+class UIMonitorCountEditor;
 class UIScaleFactorEditor;
 class UIVideoMemoryEditor;
@@ -108 +108 @@
 private slots:
 
-    /** Handles Guest Screen count slider change. */
-    void sltHandleGuestScreenCountSliderChange();
-    /** Handles Guest Screen count editor change. */
-    void sltHandleGuestScreenCountEditorChange();
+    /** Handles monitor count change. */
+    void sltHandleMonitorCountChange();
     /** Handles Graphics Controller combo change. */
     void sltHandleGraphicsControllerComboChange();
@@ -202 +200 @@
         /** Holds the 'Screen' tab instance. */
         QWidget                              *m_pTabScreen;
-        /** Holds the 'Screen' layout instance. */
-        QGridLayout                          *m_pLayoutScreen;
         /** Holds the video memory size editor instance. */
         UIVideoMemoryEditor                  *m_pEditorVideoMemorySize;
-        /** Holds the monitor count label instance. */
-        QLabel                               *m_pLabelMonitorCount;
-        /** Holds the monitor count slider instance. */
-        QIAdvancedSlider                     *m_pSliderMonitorCount;
         /** Holds the monitor count spinbox instance. */
-        QSpinBox                             *m_pSpinboxMonitorCount;
-        /** Holds the monitor count min label instance. */
-        QLabel                               *m_pLabelMonitorCountMin;
-        /** Holds the monitor count max label instance. */
-        QLabel                               *m_pLabelMonitorCountMax;
+        UIMonitorCountEditor                 *m_pEditorMonitorCount;
         /** Holds the scale factor editor instance. */
         UIScaleFactorEditor                  *m_pEditorScaleFactor;