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

Timestamp:

Mar 24, 2022 3:24:02 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/details/UIDetailsElement.cpp (modified) (1 diff)
• settings/editors/UIGraphicsControllerEditor.cpp (modified) (4 diffs)
• settings/editors/UIGraphicsControllerEditor.h (modified) (5 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsDisplay.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -1030 +1030 @@
     {
         /* Prepare editor: */
-        UIGraphicsControllerEditor *pEditor = new UIGraphicsControllerEditor(pPopup, true /* with label */);
+        UIGraphicsControllerEditor *pEditor = new UIGraphicsControllerEditor(pPopup);
         if (pEditor)
         {

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

@@ -31 +31 @@
 
 
-UIGraphicsControllerEditor::UIGraphicsControllerEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
+UIGraphicsControllerEditor::UIGraphicsControllerEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabel(fWithLabel)
     , m_enmValue(KGraphicsControllerType_Max)
+    , m_pLayout(0)
     , m_pLabel(0)
     , m_pCombo(0)
@@ -65 +65 @@
 }
 
+int UIGraphicsControllerEditor::minimumLabelHorizontalHint() const
+{
+    return m_pLabel->minimumSizeHint().width();
+}
+
+void UIGraphicsControllerEditor::setMinimumLayoutIndent(int iIndent)
+{
+    if (m_pLayout)
+        m_pLayout->setColumnMinimumWidth(0, iIndent);
+}
+
 void UIGraphicsControllerEditor::retranslateUi()
 {
@@ -89 +100 @@
 {
     /* Create main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
     {
-        pMainLayout->setContentsMargins(0, 0, 0, 0);
-        int iRow = 0;
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create label: */
-        if (m_fWithLabel)
-            m_pLabel = new QLabel(this);
+        m_pLabel = new QLabel(this);
         if (m_pLabel)
-            pMainLayout->addWidget(m_pLabel, 0, iRow++, 1, 1);
+        {
+            m_pLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabel, 0, 0);
+        }
 
         /* Create combo layout: */
-        QHBoxLayout *pComboLayout = new QHBoxLayout;
-        if (pComboLayout)
+        QHBoxLayout *pLayoutCombo = new QHBoxLayout;
+        if (pLayoutCombo)
         {
             /* Create combo: */
@@ -110 +122 @@
             {
                 /* This is necessary since contents is dynamical now: */
-                m_pCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo);
+                m_pCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                         this, &UIGraphicsControllerEditor::sltHandleCurrentIndexChanged);
-                pComboLayout->addWidget(m_pCombo);
+
+                pLayoutCombo->addWidget(m_pCombo);
             }
 
             /* Add stretch: */
-            pComboLayout->addStretch();
+            pLayoutCombo->addStretch();
 
             /* Add combo-layout into main-layout: */
-            pMainLayout->addLayout(pComboLayout, 0, iRow++, 1, 1);
+            m_pLayout->addLayout(pLayoutCombo, 0, 1);
         }
     }

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

@@ -34 +34 @@
 /* Forward declarations: */
 class QComboBox;
+class QGridLayout;
 class QLabel;
 
@@ -48 +49 @@
 public:
 
-    /** Constructs graphics controller editor passing @a pParent to the base-class.
-      * @param  fWithLabel  Brings whether we should add label ourselves. */
-    UIGraphicsControllerEditor(QWidget *pParent = 0, bool fWithLabel = false);
+    /** Constructs graphics controller editor passing @a pParent to the base-class. */
+    UIGraphicsControllerEditor(QWidget *pParent = 0);
 
     /** Defines editor @a enmValue. */
@@ -59 +59 @@
     /** Returns the vector of supported values. */
     QVector<KGraphicsControllerType> supportedValues() const { return m_supportedValues; }
+
+    /** Returns minimum layout hint. */
+    int minimumLabelHorizontalHint() const;
+    /** Defines minimum layout @a iIndent. */
+    void setMinimumLayoutIndent(int iIndent);
 
 protected:
@@ -77 +82 @@
     void populateCombo();
 
-    /** Holds whether descriptive label should be created. */
-    bool  m_fWithLabel;
-
     /** Holds the value to be selected. */
     KGraphicsControllerType  m_enmValue;
@@ -86 +88 @@
     QVector<KGraphicsControllerType>  m_supportedValues;
 
+    /** Holds the main layout instance. */
+    QGridLayout *m_pLayout;
     /** Holds the label instance. */
-    QLabel    *m_pLabel;
+    QLabel      *m_pLabel;
     /** Holds the combo instance. */
-    QComboBox *m_pCombo;
+    QComboBox   *m_pCombo;
 };
 

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

@@ -311 +311 @@
     , m_pLabelMonitorCountMax(0)
     , m_pEditorScaleFactor(0)
-    , m_pLabelGraphicsController(0)
     , m_pEditorGraphicsController(0)
     , m_pLabelAcceleration(0)
@@ -778 +777 @@
     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_pLabelGraphicsController->setText(tr("&Graphics Controller:"));
     m_pLabelAcceleration->setText(tr("Acceleration:"));
     m_pCheckbox3D->setToolTip(tr("When checked, the virtual machine will be given access "
@@ -863 +861 @@
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelMonitorCount->minimumSizeHint().width());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelGraphicsController->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGraphicsController->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelAcceleration->minimumSizeHint().width());
     m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorGraphicsController->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pLayoutScreen->setColumnMinimumWidth(0, iMinimumLayoutHint);
 
@@ -885 +884 @@
     m_pSpinboxMonitorCount->setEnabled(isMachineOffline());
     m_pEditorScaleFactor->setEnabled(isMachineInValidMode());
-    m_pLabelGraphicsController->setEnabled(isMachineOffline());
     m_pEditorGraphicsController->setEnabled(isMachineOffline());
     m_pLabelAcceleration->setEnabled(isMachineOffline());
@@ -1181 +1179 @@
                 m_pLayoutScreen->addWidget(m_pEditorScaleFactor, 3, 0, 1, 3);
 
-            /* Prepare graphics controller label: */
-            m_pLabelGraphicsController = new QLabel(m_pTabScreen);
-            if (m_pLabelGraphicsController)
-            {
-                m_pLabelGraphicsController->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutScreen->addWidget(m_pLabelGraphicsController, 4, 0);
-            }
             /* Prepare graphics controller editor: */
             m_pEditorGraphicsController = new UIGraphicsControllerEditor(m_pTabScreen);
             if (m_pEditorGraphicsController)
-            {
-                if (m_pLabelGraphicsController)
-                    m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController);
-                m_pLayoutScreen->addWidget(m_pEditorGraphicsController, 4, 1, 1, 2);
-            }
+                m_pLayoutScreen->addWidget(m_pEditorGraphicsController, 4, 0, 1, 3);
 
             /* Prepare acceleration label: */

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

@@ -215 +215 @@
         /** Holds the scale factor editor instance. */
         UIScaleFactorEditor        *m_pEditorScaleFactor;
-        /** Holds the graphics controller label instance. */
-        QLabel                     *m_pLabelGraphicsController;
         /** Holds the graphics controller editor instance. */
         UIGraphicsControllerEditor *m_pEditorGraphicsController;