Changeset 94357 in vbox

Timestamp:

Mar 24, 2022 2:42:20 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150663

Message:

FE/Qt/Ds: bugref:6899: Machine settings: Display page accessibility improvements for Screen tab, part 2.

Location:

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

Files:

• editors/UIScaleFactorEditor.cpp (modified) (2 diffs)
• editors/UIScaleFactorEditor.h (modified) (2 diffs)
• global/UIGlobalSettingsDisplay.cpp (modified) (1 diff)
• machine/UIMachineSettingsDisplay.cpp (modified) (10 diffs)
• machine/UIMachineSettingsDisplay.h (modified) (1 diff)

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

@@ -33 +33 @@
 
 
-UIScaleFactorEditor::UIScaleFactorEditor(QWidget *pParent, bool fWithLabels /* = false */)
+UIScaleFactorEditor::UIScaleFactorEditor(QWidget *pParent)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabels(fWithLabels)
     , m_pLayout(0)
     , m_pLabel(0)
@@ -236 +235 @@
 
         /* 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_pLabel = new QLabel(this);
+        if (m_pLabel)
+        {
+            m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabel, 0, 0);
         }
 

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

@@ -43 +43 @@
 public:
 
-    /** 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);
+    /** Creates scale factor editor passing @a pParent to the base-class. */
+    UIScaleFactorEditor(QWidget *pParent);
 
     /** Defines @a iMonitorCount. */
@@ -101 +100 @@
     /** @name Member widgets.
       * @{ */
-        bool              m_fWithLabels;
         QGridLayout      *m_pLayout;
         QLabel           *m_pLabel;

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

@@ -178 +178 @@
 
         /* Prepare 'scale-factor' editor: */
-        m_pEditorScaleFactor = new UIScaleFactorEditor(this, true /* with label */);
+        m_pEditorScaleFactor = new UIScaleFactorEditor(this);
         if (m_pEditorScaleFactor)
             pLayout->addWidget(m_pEditorScaleFactor);

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

@@ -310 +310 @@
     , m_pLabelMonitorCountMin(0)
     , m_pLabelMonitorCountMax(0)
-    , m_pLabelScaleFactor(0)
     , m_pEditorScaleFactor(0)
     , m_pLabelGraphicsController(0)
@@ -327 +326 @@
     , m_pLabelRemoteDisplayOptions(0)
     , m_pCheckboxMultipleConn(0)
-
     , m_pTabRecording(0)
     , m_pCheckboxRecording(0)
@@ -362 +360 @@
     , m_pScrollerRecordingScreens(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -368 +365 @@
 UIMachineSettingsDisplay::~UIMachineSettingsDisplay()
 {
-    /* Cleanup: */
     cleanup();
 }
@@ -781 +777 @@
     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_pLabelScaleFactor->setText(tr("Scale &Factor:"));
     m_pEditorScaleFactor->setToolTip(tr("Controls the guest screen scale factor."));
     m_pLabelGraphicsController->setText(tr("&Graphics Controller:"));
@@ -867 +862 @@
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelMonitorCount->minimumSizeHint().width());
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelScaleFactor->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelGraphicsController->minimumSizeHint().width());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelAcceleration->minimumSizeHint().width());
     m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pLayoutScreen->setColumnMinimumWidth(0, iMinimumLayoutHint);
 
@@ -1180 +1176 @@
             }
 
-            /* Prepare scale factor label: */
-            m_pLabelScaleFactor = new QLabel(m_pTabScreen);
-            if (m_pLabelScaleFactor)
-            {
-                m_pLabelScaleFactor->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutScreen->addWidget(m_pLabelScaleFactor, 3, 0);
-            }
             /* Prepare scale factor editor: */
             m_pEditorScaleFactor = new UIScaleFactorEditor(m_pTabScreen);
             if (m_pEditorScaleFactor)
-            {
-                if (m_pLabelScaleFactor)
-                    m_pLabelScaleFactor->setBuddy(m_pEditorScaleFactor->focusProxy());
-                m_pLayoutScreen->addWidget(m_pEditorScaleFactor, 3, 1, 2, 2);
-            }
+                m_pLayoutScreen->addWidget(m_pEditorScaleFactor, 3, 0, 1, 3);
 
             /* Prepare graphics controller label: */
@@ -1201 +1186 @@
             {
                 m_pLabelGraphicsController->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutScreen->addWidget(m_pLabelGraphicsController, 5, 0);
+                m_pLayoutScreen->addWidget(m_pLabelGraphicsController, 4, 0);
             }
             /* Prepare graphics controller editor: */
@@ -1209 +1194 @@
                 if (m_pLabelGraphicsController)
                     m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController);
-                m_pLayoutScreen->addWidget(m_pEditorGraphicsController, 5, 1, 1, 2);
+                m_pLayoutScreen->addWidget(m_pEditorGraphicsController, 4, 1, 1, 2);
             }
 
@@ -1217 +1202 @@
             {
                 m_pLabelAcceleration->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutScreen->addWidget(m_pLabelAcceleration, 6, 0);
+                m_pLayoutScreen->addWidget(m_pLabelAcceleration, 5, 0);
             }
             /* Prepare 3D checkbox: */
             m_pCheckbox3D = new QCheckBox(m_pTabScreen);
             if (m_pCheckbox3D)
-                m_pLayoutScreen->addWidget(m_pCheckbox3D, 6, 1);
+                m_pLayoutScreen->addWidget(m_pCheckbox3D, 5, 1);
         }
 

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

@@ -213 +213 @@
         /** Holds the monitor count max label instance. */
         QLabel                     *m_pLabelMonitorCountMax;
-        /** Holds the scale factor label instance. */
-        QLabel                     *m_pLabelScaleFactor;
         /** Holds the scale factor editor instance. */
         UIScaleFactorEditor        *m_pEditorScaleFactor;