Changeset 93992 in vbox

Timestamp:

Feb 28, 2022 5:56:58 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Global preferences: Reworking Display page to increase page accessibility; Adding missed API bit into QIAdvancedSlider extension.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIAdvancedSlider.cpp (modified) (1 diff)
• extensions/QIAdvancedSlider.h (modified) (1 diff)
• settings/editors/UIMaximumGuestScreenSizeEditor.cpp (modified) (8 diffs)
• settings/editors/UIMaximumGuestScreenSizeEditor.h (modified) (4 diffs)
• settings/editors/UIScaleFactorEditor.cpp (modified) (5 diffs)
• settings/editors/UIScaleFactorEditor.h (modified) (3 diffs)
• settings/global/UIGlobalSettingsDisplay.cpp (modified) (5 diffs)
• settings/global/UIGlobalSettingsDisplay.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp

@@ -284 +284 @@
 }
 
+void QIAdvancedSlider::setToolTip(const QString &strToolTip)
+{
+    m_pSlider->setToolTip(strToolTip);
+}
+
 void QIAdvancedSlider::setOrientation(Qt::Orientation enmOrientation)
 {

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.h

@@ -104 +104 @@
     void setErrorHint(int iMin, int iMax);
 
+    /** Defines slider @a strToolTip. */
+    void setToolTip(const QString &strToolTip);
+
 public slots:
 

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

@@ -53 +53 @@
 *********************************************************************************************************************************/
 
-UIMaximumGuestScreenSizeEditor::UIMaximumGuestScreenSizeEditor(QWidget *pParent /* = 0 */, bool fWithLabels /* = false */)
+UIMaximumGuestScreenSizeEditor::UIMaximumGuestScreenSizeEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabels(fWithLabels)
+    , m_pLayout(0)
     , m_pLabelPolicy(0)
     , m_pComboPolicy(0)
@@ -116 +116 @@
 }
 
+int UIMaximumGuestScreenSizeEditor::minimumLabelHorizontalHint() const
+{
+    int iMinimumHint = 0;
+    iMinimumHint = qMax(iMinimumHint, m_pLabelPolicy->minimumSizeHint().width());
+    iMinimumHint = qMax(iMinimumHint, m_pLabelMaxWidth->minimumSizeHint().width());
+    iMinimumHint = qMax(iMinimumHint, m_pLabelMaxHeight->minimumSizeHint().width());
+    return iMinimumHint;
+}
+
+void UIMaximumGuestScreenSizeEditor::setMinimumLayoutIndent(int iIndent)
+{
+    if (m_pLayout)
+        m_pLayout->setColumnMinimumWidth(0, iIndent);
+}
+
 void UIMaximumGuestScreenSizeEditor::retranslateUi()
 {
@@ -123 +138 @@
         m_pLabelMaxWidth->setText(tr("&Width:"));
     if (m_pSpinboxMaxWidth)
-        m_pSpinboxMaxWidth->setWhatsThis(tr("Holds the maximum width which we would like the guest to use."));
+        m_pSpinboxMaxWidth->setToolTip(tr("Holds the maximum width which we would like the guest to use."));
     if (m_pLabelMaxHeight)
         m_pLabelMaxHeight->setText(tr("&Height:"));
     if (m_pSpinboxMaxHeight)
-        m_pSpinboxMaxHeight->setWhatsThis(tr("Holds the maximum height which we would like the guest to use."));
-
-    if (m_pComboPolicy)
-    {
+        m_pSpinboxMaxHeight->setToolTip(tr("Holds the maximum height which we would like the guest to use."));
+
+    if (m_pComboPolicy)
+    {
+        m_pComboPolicy->setToolTip(tr("Selects maximum guest screen size policy."));
         for (int i = 0; i < m_pComboPolicy->count(); ++i)
         {
             const MaximumGuestScreenSizePolicy enmType = m_pComboPolicy->itemData(i).value<MaximumGuestScreenSizePolicy>();
             m_pComboPolicy->setItemText(i, gpConverter->toString(enmType));
-            switch (enmType)
-            {
-                case MaximumGuestScreenSizePolicy_Automatic:
-                    m_pComboPolicy->setItemData(i,
-                                                tr("Suggest a reasonable maximum screen size to the guest. The guest "
-                                                   "will only see this suggestion when guest additions are installed."),
-                                                Qt::ToolTipRole);
-                    break;
-                case MaximumGuestScreenSizePolicy_Any:
-                    m_pComboPolicy->setItemData(i,
-                                                tr("Do not attempt to limit the size of the guest screen."),
-                                                Qt::ToolTipRole);
-                    break;
-                case MaximumGuestScreenSizePolicy_Fixed:
-                    m_pComboPolicy->setItemData(i,
-                                                tr("Suggest a maximum screen size to the guest. The guest will only see "
-                                                   "this suggestion when guest additions are installed."),
-                                                Qt::ToolTipRole);
-                    break;
-            }
         }
     }
@@ -198 +194 @@
 {
     /* Create main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
-    if (pLayoutMain)
-    {
-        pLayoutMain->setContentsMargins(0, 0, 0, 0);
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
+    {
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayout->setColumnStretch(1, 1);
 
         const int iMinWidth = 640;
@@ -207 +204 @@
         const int iMaxSize = 16 * _1K;
 
-        int iColumn = 0;
-        if (m_fWithLabels)
-        {
-            /* Prepare policy label: */
-            m_pLabelPolicy = new QLabel(this);
-            if (m_pLabelPolicy)
-            {
-               m_pLabelPolicy->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-               pLayoutMain->addWidget(m_pLabelPolicy, 0, iColumn++);
-            }
+        /* Prepare policy label: */
+        m_pLabelPolicy = new QLabel(this);
+        if (m_pLabelPolicy)
+        {
+           m_pLabelPolicy->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+           m_pLayout->addWidget(m_pLabelPolicy, 0, 0);
         }
         /* Prepare policy combo: */
@@ -227 +220 @@
                     this, &UIMaximumGuestScreenSizeEditor::sltHandleCurrentPolicyIndexChanged);
 
-            pLayoutMain->addWidget(m_pComboPolicy, 0, iColumn++);
-        }
-
-        iColumn = 0;
-        if (m_fWithLabels)
-        {
-            /* Prepare max width label: */
-            m_pLabelMaxWidth = new QLabel(this);
-            if (m_pLabelMaxWidth)
-            {
-                m_pLabelMaxWidth->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutMain->addWidget(m_pLabelMaxWidth, 1, iColumn++);
-            }
+            m_pLayout->addWidget(m_pComboPolicy, 0, 1);
+        }
+
+        /* Prepare max width label: */
+        m_pLabelMaxWidth = new QLabel(this);
+        if (m_pLabelMaxWidth)
+        {
+            m_pLabelMaxWidth->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabelMaxWidth, 1, 0);
         }
         /* Prepare max width spinbox: */
@@ -252 +241 @@
                     this, &UIMaximumGuestScreenSizeEditor::sltHandleSizeChanged);
 
-            pLayoutMain->addWidget(m_pSpinboxMaxWidth, 1, iColumn++);
-        }
-
-        iColumn = 0;
-        if (m_fWithLabels)
-        {
-            /* Prepare max height label: */
-            m_pLabelMaxHeight = new QLabel(this);
-            if (m_pLabelMaxHeight)
-            {
-                m_pLabelMaxHeight->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutMain->addWidget(m_pLabelMaxHeight, 2, iColumn++);
-            }
+            m_pLayout->addWidget(m_pSpinboxMaxWidth, 1, 1);
+        }
+
+        /* Prepare max height label: */
+        m_pLabelMaxHeight = new QLabel(this);
+        if (m_pLabelMaxHeight)
+        {
+            m_pLabelMaxHeight->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabelMaxHeight, 2, 0);
         }
         /* Prepare max width spinbox: */
@@ -277 +262 @@
                     this, &UIMaximumGuestScreenSizeEditor::sltHandleSizeChanged);
 
-            pLayoutMain->addWidget(m_pSpinboxMaxHeight, 2, iColumn++);
+            m_pLayout->addWidget(m_pSpinboxMaxHeight, 2, 1);
         }
     }

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

@@ -31 +31 @@
 
 /* Forward declarations: */
+class QGridLayout;
 class QLabel;
 class QSpinBox;
@@ -70 +71 @@
 public:
 
-    /** Constructs maximum guest screen size editor passing @a pParent to the base-class.
-      * @param  fWithLabels  Brings whether we should add labels ourselves. */
-    UIMaximumGuestScreenSizeEditor(QWidget *pParent = 0, bool fWithLabels = false);
+    /** Constructs maximum guest screen size editor passing @a pParent to the base-class. */
+    UIMaximumGuestScreenSizeEditor(QWidget *pParent = 0);
 
     /** Returns focus proxy 1. */
@@ -85 +85 @@
     /** Returns editor value. */
     UIMaximumGuestScreenSizeValue value() const;
+
+    /** Returns minimum layout hint. */
+    int minimumLabelHorizontalHint() const;
+    /** Defines minimum layout @a iIndent. */
+    void setMinimumLayoutIndent(int iIndent);
 
 protected:
@@ -105 +110 @@
     void populateCombo();
 
-    /** Holds whether descriptive labels should be created. */
-    bool  m_fWithLabels;
-
     /** Holds the value to be selected. */
     UIMaximumGuestScreenSizeValue  m_guiValue;
 
+    /** Holds the main layout: */
+    QGridLayout *m_pLayout;
     /** Holds the policy label instance. */
-    QLabel     *m_pLabelPolicy;
+    QLabel      *m_pLabelPolicy;
     /** Holds the policy combo instance. */
-    QIComboBox *m_pComboPolicy;
+    QIComboBox  *m_pComboPolicy;
     /** Holds the max width label instance. */
-    QLabel     *m_pLabelMaxWidth;
+    QLabel      *m_pLabelMaxWidth;
     /** Holds the max width spinbox instance. */
-    QSpinBox   *m_pSpinboxMaxWidth;
+    QSpinBox    *m_pSpinboxMaxWidth;
     /** Holds the max height label instance. */
-    QLabel     *m_pLabelMaxHeight;
+    QLabel      *m_pLabelMaxHeight;
     /** Holds the max height spinbox instance. */
-    QSpinBox   *m_pSpinboxMaxHeight;
+    QSpinBox    *m_pSpinboxMaxHeight;
 };
 

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

@@ -33 +33 @@
 
 
-UIScaleFactorEditor::UIScaleFactorEditor(QWidget *pParent)
+UIScaleFactorEditor::UIScaleFactorEditor(QWidget *pParent, bool fWithLabels /* = false */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pMainLayout(0)
+    , m_fWithLabels(fWithLabels)
+    , m_pLayout(0)
+    , m_pLabel(0)
     , m_pMonitorComboBox(0)
     , m_pScaleSlider(0)
@@ -161 +163 @@
 }
 
+int UIScaleFactorEditor::minimumLabelHorizontalHint() const
+{
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
+}
+
+void UIScaleFactorEditor::setMinimumLayoutIndent(int iIndent)
+{
+    if (m_pLayout)
+        m_pLayout->setColumnMinimumWidth(0, iIndent);
+}
+
 void UIScaleFactorEditor::retranslateUi()
 {
-    if (m_pMonitorComboBox && m_pMonitorComboBox->count() > 0)
-    {
-        m_pMonitorComboBox->setItemText(0, tr("All Monitors"));
-        for (int i = 1; i < m_pMonitorComboBox->count(); ++i)
-            m_pMonitorComboBox->setItemText(i, tr("Monitor %1").arg(i));
-    }
-    setToolTip(tr("Controls the guest screen scale factor."));
-
-    m_pMinScaleLabel->setText(tr("%1%").arg(m_pScaleSlider->minimum()));
-    m_pMaxScaleLabel->setText(tr("%1%").arg(m_pScaleSlider->maximum()));
+    if (m_pLabel)
+        m_pLabel->setText(tr("Scale &Factor:"));
+
+    if (m_pMonitorComboBox)
+    {
+        if (m_pMonitorComboBox->count() > 0)
+        {
+            m_pMonitorComboBox->setItemText(0, tr("All Monitors"));
+            for (int i = 1; i < m_pMonitorComboBox->count(); ++i)
+                m_pMonitorComboBox->setItemText(i, tr("Monitor %1").arg(i));
+        }
+        m_pMonitorComboBox->setToolTip(tr("Selects the index of monitor guest screen scale factor being defined for."));
+    }
+
+    if (m_pScaleSlider)
+        m_pScaleSlider->setToolTip(tr("Holds the guest screen scale factor."));
+    if (m_pScaleSpinBox)
+        m_pScaleSpinBox->setToolTip(tr("Holds the guest screen scale factor."));
+
+    if (m_pMinScaleLabel)
+    {
+        m_pMinScaleLabel->setText(tr("%1%").arg(m_pScaleSlider->minimum()));
+        m_pMinScaleLabel->setToolTip(tr("Minimum possible scale factor."));
+    }
+    if (m_pMaxScaleLabel)
+    {
+        m_pMaxScaleLabel->setText(tr("%1%").arg(m_pScaleSlider->maximum()));
+        m_pMaxScaleLabel->setToolTip(tr("Maximum possible scale factor."));
+    }
 }
 
@@ -196 +228 @@
 void UIScaleFactorEditor::prepare()
 {
-    m_pMainLayout = new QGridLayout(this);
-    if (m_pMainLayout)
-    {
-        m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-
-        m_pMonitorComboBox = new QComboBox;
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
+    {
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
+        m_pLayout->setColumnStretch(1, 1);
+        m_pLayout->setColumnStretch(2, 1);
+
+        /* Prepare label: */
+        if (m_fWithLabels)
+        {
+            m_pLabel = new QLabel(this);
+            if (m_pLabel)
+            {
+                m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                m_pLayout->addWidget(m_pLabel, 0, 0);
+            }
+        }
+
+        m_pMonitorComboBox = new QComboBox(this);
         if (m_pMonitorComboBox)
         {
@@ -207 +252 @@
             connect(m_pMonitorComboBox ,static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                     this, &UIScaleFactorEditor::sltMonitorComboIndexChanged);
-            m_pMainLayout->addWidget(m_pMonitorComboBox, 0, 0);
-        }
-
-        QGridLayout *pSliderLayout = new QGridLayout;
-        if (pSliderLayout)
-        {
-            m_pScaleSlider = new QIAdvancedSlider;
-            {
-                m_pScaleSlider->setPageStep(10);
-                m_pScaleSlider->setSingleStep(1);
-                m_pScaleSlider->setTickInterval(10);
-                m_pScaleSlider->setSnappingEnabled(true);
-                connect(m_pScaleSlider, static_cast<void(QIAdvancedSlider::*)(int)>(&QIAdvancedSlider::valueChanged),
-                        this, &UIScaleFactorEditor::sltScaleSliderValueChanged);
-                pSliderLayout->addWidget(m_pScaleSlider, 0, 0, 1, 3);
-            }
-
-            m_pMinScaleLabel = new QLabel;
-            if (m_pMinScaleLabel)
-                pSliderLayout->addWidget(m_pMinScaleLabel, 1, 0);
-
-            QSpacerItem *pSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-            if (pSpacer)
-                pSliderLayout->addItem(pSpacer, 1, 1);
-
-            m_pMaxScaleLabel = new QLabel;
-            if (m_pMaxScaleLabel)
-                pSliderLayout->addWidget(m_pMaxScaleLabel, 1, 2);
-
-            m_pMainLayout->addLayout(pSliderLayout, 0, 1, 2, 1);
-        }
-
-        m_pScaleSpinBox = new QSpinBox;
+
+            m_pLayout->addWidget(m_pMonitorComboBox, 0, 1);
+        }
+
+        m_pScaleSlider = new QIAdvancedSlider(this);
+        {
+            if (m_pLabel)
+                m_pLabel->setBuddy(m_pScaleSlider);
+            m_pScaleSlider->setPageStep(10);
+            m_pScaleSlider->setSingleStep(1);
+            m_pScaleSlider->setTickInterval(10);
+            m_pScaleSlider->setSnappingEnabled(true);
+            connect(m_pScaleSlider, static_cast<void(QIAdvancedSlider::*)(int)>(&QIAdvancedSlider::valueChanged),
+                    this, &UIScaleFactorEditor::sltScaleSliderValueChanged);
+
+            m_pLayout->addWidget(m_pScaleSlider, 0, 2, 1, 2);
+        }
+
+        m_pScaleSpinBox = new QSpinBox(this);
         if (m_pScaleSpinBox)
         {
@@ -246 +277 @@
             connect(m_pScaleSpinBox ,static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
                     this, &UIScaleFactorEditor::sltScaleSpinBoxValueChanged);
-            m_pMainLayout->addWidget(m_pScaleSpinBox, 0, 3);
-        }
+            m_pLayout->addWidget(m_pScaleSpinBox, 0, 4);
+        }
+
+        m_pMinScaleLabel = new QLabel(this);
+        if (m_pMinScaleLabel)
+            m_pLayout->addWidget(m_pMinScaleLabel, 1, 2);
+
+        m_pMaxScaleLabel = new QLabel(this);
+        if (m_pMaxScaleLabel)
+            m_pLayout->addWidget(m_pMaxScaleLabel, 1, 3);
     }
 

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

@@ -43 +43 @@
 public:
 
-    /** Creates scale factor editor passing @a pParent to the base-class. */
-    UIScaleFactorEditor(QWidget *pParent);
+    /** Creates scale factor editor passing @a pParent to the base-class.
+      * @param  fWithLabels  Brings whether we should add labels ourselves. */
+    UIScaleFactorEditor(QWidget *pParent, bool fWithLabels = false);
 
     /** Defines @a iMonitorCount. */
@@ -59 +60 @@
     /** Defines minimum width @a iHint for internal spin-box. */
     void setSpinBoxWidthHint(int iHint);
+
+    /** Returns minimum layout hint. */
+    int minimumLabelHorizontalHint() const;
+    /** Defines minimum layout @a iIndent. */
+    void setMinimumLayoutIndent(int iIndent);
 
 protected:
@@ -95 +101 @@
     /** @name Member widgets.
       * @{ */
-        QGridLayout      *m_pMainLayout;
+        bool              m_fWithLabels;
+        QGridLayout      *m_pLayout;
+        QLabel           *m_pLabel;
         QComboBox        *m_pMonitorComboBox;
         QIAdvancedSlider *m_pScaleSlider;

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

@@ -76 +76 @@
 UIGlobalSettingsDisplay::UIGlobalSettingsDisplay()
     : m_pCache(0)
-    , m_pLabelMaximumGuestScreenSizePolicy(0)
-    , m_pLabelMaximumGuestScreenWidth(0)
-    , m_pLabelMaximumGuestScreenHeight(0)
     , m_pEditorMaximumGuestScreenSize(0)
-    , m_pLabelScaleFactor(0)
     , m_pEditorScaleFactor(0)
-    , m_pLabelMachineWindows(0)
+    , m_pLabelExtendedFeatures(0)
     , m_pCheckBoxActivateOnMouseHover(0)
     , m_pCheckBoxDisableHostScreenSaver(0)
@@ -157 +153 @@
 void UIGlobalSettingsDisplay::retranslateUi()
 {
-    m_pLabelMaximumGuestScreenSizePolicy->setText(tr("Maximum Guest Screen &Size:"));
-    m_pLabelMaximumGuestScreenWidth->setText(tr("&Width:"));
-    m_pLabelMaximumGuestScreenHeight->setText(tr("&Height:"));
-    m_pLabelScaleFactor->setText(tr("Scale &Factor:"));
-    m_pLabelMachineWindows->setText(tr("Extended Features:"));
+    m_pLabelExtendedFeatures->setText(tr("Extended Features:"));
     m_pCheckBoxActivateOnMouseHover->setToolTip(tr("When checked, machine windows will be raised "
                                                    "when the mouse pointer moves over them."));
@@ -170 +162 @@
         m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
     }
+
+    /* These editors have own labels, but we want them to be properly layouted according to each other: */
+    int iMinimumLayoutHint = 0;
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelExtendedFeatures->minimumSizeHint().width());
+    m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pLayout->setColumnMinimumWidth(0, iMinimumLayoutHint);
 }
 
@@ -188 +189 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
-    if (pLayoutMain)
-    {
-        pLayoutMain->setColumnStretch(1, 1);
-        pLayoutMain->setRowStretch(7, 1);
-
-        /* Prepare maximum guest screen size label: */
-        m_pLabelMaximumGuestScreenSizePolicy = new QLabel(this);
-        if (m_pLabelMaximumGuestScreenSizePolicy)
-        {
-           m_pLabelMaximumGuestScreenSizePolicy->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-           pLayoutMain->addWidget(m_pLabelMaximumGuestScreenSizePolicy, 0, 0);
-        }
-        /* Prepare maximum guest screen width label: */
-        m_pLabelMaximumGuestScreenWidth = new QLabel(this);
-        if (m_pLabelMaximumGuestScreenWidth)
-        {
-            m_pLabelMaximumGuestScreenWidth->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            pLayoutMain->addWidget(m_pLabelMaximumGuestScreenWidth, 1, 0);
-        }
-        /* Prepare maximum guest screen height label: */
-        m_pLabelMaximumGuestScreenHeight = new QLabel(this);
-        if (m_pLabelMaximumGuestScreenHeight)
-        {
-            m_pLabelMaximumGuestScreenHeight->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            pLayoutMain->addWidget(m_pLabelMaximumGuestScreenHeight, 2, 0);
-        }
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
+    {
+        m_pLayout->setColumnStretch(1, 1);
+        m_pLayout->setRowStretch(4, 1);
+
         /* Prepare maximum guest screen size editor: */
         m_pEditorMaximumGuestScreenSize = new UIMaximumGuestScreenSizeEditor(this);
         if (m_pEditorMaximumGuestScreenSize)
+            m_pLayout->addWidget(m_pEditorMaximumGuestScreenSize, 0, 0, 1, 3);
+
+        /* Prepare scale-factor editor: */
+        m_pEditorScaleFactor = new UIScaleFactorEditor(this, true /* with label */);
+        if (m_pEditorScaleFactor)
+            m_pLayout->addWidget(m_pEditorScaleFactor, 1, 0, 1, 3);
+
+        /* Prepare 'machine-windows' label: */
+        m_pLabelExtendedFeatures = new QLabel(this);
+        if (m_pLabelExtendedFeatures)
         {
-            if (m_pLabelMaximumGuestScreenSizePolicy)
-                m_pLabelMaximumGuestScreenSizePolicy->setBuddy(m_pEditorMaximumGuestScreenSize->focusProxy1());
-            if (m_pLabelMaximumGuestScreenWidth)
-                m_pLabelMaximumGuestScreenWidth->setBuddy(m_pEditorMaximumGuestScreenSize->focusProxy2());
-            if (m_pLabelMaximumGuestScreenHeight)
-                m_pLabelMaximumGuestScreenHeight->setBuddy(m_pEditorMaximumGuestScreenSize->focusProxy3());
-            pLayoutMain->addWidget(m_pEditorMaximumGuestScreenSize, 0, 1, 3, 2);
-        }
-
-        /* Prepare scale-factor label: */
-        m_pLabelScaleFactor = new QLabel(this);
-        if (m_pLabelScaleFactor)
-        {
-            m_pLabelScaleFactor->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            pLayoutMain->addWidget(m_pLabelScaleFactor, 3, 0);
-        }
-        /* Prepare scale-factor editor: */
-        m_pEditorScaleFactor = new UIScaleFactorEditor(this);
-        if (m_pEditorScaleFactor)
-        {
-            if (m_pLabelScaleFactor)
-                m_pLabelScaleFactor->setBuddy(m_pEditorScaleFactor->focusProxy());
-            pLayoutMain->addWidget(m_pEditorScaleFactor, 3, 1, 2, 2);
-        }
-
-        /* Prepare 'machine-windows' label: */
-        m_pLabelMachineWindows = new QLabel(this);
-        if (m_pLabelMachineWindows)
-        {
-            m_pLabelMachineWindows->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            pLayoutMain->addWidget(m_pLabelMachineWindows, 5, 0);
+            m_pLabelExtendedFeatures->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabelExtendedFeatures, 2, 0);
         }
         /* Prepare 'activate on mouse hover' check-box: */
         m_pCheckBoxActivateOnMouseHover = new QCheckBox(this);
         if (m_pCheckBoxActivateOnMouseHover)
-            pLayoutMain->addWidget(m_pCheckBoxActivateOnMouseHover, 5, 1);
+            m_pLayout->addWidget(m_pCheckBoxActivateOnMouseHover, 2, 1);
 
         /* Prepare 'disable host screen saver' check-box: */
@@ -262 +223 @@
         if (NativeWindowSubsystem::X11CheckDBusScreenSaverServices())
             m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
-#endif
+#endif /* VBOX_WS_X11 */
         if (m_pCheckBoxDisableHostScreenSaver)
-            pLayoutMain->addWidget(m_pCheckBoxDisableHostScreenSaver, 6, 1);
-
+            m_pLayout->addWidget(m_pCheckBoxDisableHostScreenSaver, 3, 1);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

@@ -27 +27 @@
 /* Forward declarations: */
 class QCheckBox;
+class QGridLayout;
 class QLabel;
 class UIMaximumGuestScreenSizeEditor;
@@ -81 +82 @@
     /** @name Widgets
      * @{ */
-        /** Holds the maximum guest screen size label instance. */
-        QLabel                         *m_pLabelMaximumGuestScreenSizePolicy;
-        /** Holds the maximum guest screen width label instance. */
-        QLabel                         *m_pLabelMaximumGuestScreenWidth;
-        /** Holds the maximum guest screen height label instance. */
-        QLabel                         *m_pLabelMaximumGuestScreenHeight;
+        /** Holds the main layout instance. */
+        QGridLayout *m_pLayout;
+
         /** Holds the maximum guest screen size editor instance. */
         UIMaximumGuestScreenSizeEditor *m_pEditorMaximumGuestScreenSize;
-        /** Holds the scale-factor label instance. */
-        QLabel                         *m_pLabelScaleFactor;
+
         /** Holds the scale-factor editor instance. */
-        UIScaleFactorEditor            *m_pEditorScaleFactor;
-        /** Holds the 'machine-windows' label instance. */
-        QLabel                         *m_pLabelMachineWindows;
+        UIScaleFactorEditor *m_pEditorScaleFactor;
+
+        /** Holds the 'extended features' label instance. */
+        QLabel    *m_pLabelExtendedFeatures;
         /** Holds the 'activate on mouse hover' check-box instance. */
-        QCheckBox                      *m_pCheckBoxActivateOnMouseHover;
+        QCheckBox *m_pCheckBoxActivateOnMouseHover;
         /** Holds the 'disable host screen saver' check-box instance. */
-        QCheckBox                      *m_pCheckBoxDisableHostScreenSaver;
+        QCheckBox *m_pCheckBoxDisableHostScreenSaver;
     /** @} */
 };