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

Timestamp:

Mar 23, 2022 7:06:51 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/details/UIDetailsElement.cpp (modified) (1 diff)
• settings/editors/UIVideoMemoryEditor.cpp (modified) (6 diffs)
• settings/editors/UIVideoMemoryEditor.h (modified) (5 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (13 diffs)
• settings/machine/UIMachineSettingsDisplay.h (modified) (1 diff)

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

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

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

@@ -32 +32 @@
 
 
-UIVideoMemoryEditor::UIVideoMemoryEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
+UIVideoMemoryEditor::UIVideoMemoryEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabel(fWithLabel)
     , m_comGuestOSType(CGuestOSType())
     , m_cGuestScreenCount(1)
@@ -46 +45 @@
     , m_iMaxVRAMVisible(0)
     , m_iInitialVRAM(0)
+    , m_pLayout(0)
     , m_pLabelMemory(0)
     , m_pSlider(0)
@@ -136 +136 @@
 #endif /* VBOX_WITH_3D_ACCELERATION */
 
+int UIVideoMemoryEditor::minimumLabelHorizontalHint() const
+{
+    return m_pLabelMemory->minimumSizeHint().width();
+}
+
+void UIVideoMemoryEditor::setMinimumLayoutIndent(int iIndent)
+{
+    if (m_pLayout)
+        m_pLayout->setColumnMinimumWidth(0, iIndent);
+}
+
 void UIVideoMemoryEditor::retranslateUi()
 {
     if (m_pLabelMemory)
         m_pLabelMemory->setText(tr("Video &Memory:"));
+
+    if (m_pSlider)
+        m_pSlider->setToolTip(tr("Holds the amount of video memory provided to the virtual machine."));
+    if (m_pSpinBox)
+        m_pSpinBox->setToolTip(tr("Holds the amount of video memory 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")));
@@ -185 +209 @@
 
     /* Create main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setContentsMargins(0, 0, 0, 0);
-        int iRow = 0;
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
+    {
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create memory label: */
-        if (m_fWithLabel)
-            m_pLabelMemory = new QLabel(this);
+        m_pLabelMemory = new QLabel(this);
         if (m_pLabelMemory)
-            pMainLayout->addWidget(m_pLabelMemory, 0, iRow++, 1, 1);
+        {
+            m_pLabelMemory->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+            m_pLayout->addWidget(m_pLabelMemory, 0, 0);
+        }
 
         /* Create slider layout: */
@@ -244 +269 @@
 
             /* Add slider layout to main layout: */
-            pMainLayout->addLayout(pSliderLayout, 0, iRow++, 2, 1);
+            m_pLayout->addLayout(pSliderLayout, 0, 1, 2, 1);
         }
 
@@ -258 +283 @@
             connect(m_pSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
                     this, &UIVideoMemoryEditor::sltHandleSpinBoxChange);
-            pMainLayout->addWidget(m_pSpinBox, 0, iRow++, 1, 1);
+            m_pLayout->addWidget(m_pSpinBox, 0, 2);
         }
     }

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

@@ -34 +34 @@
 
 /* Forward declarations: */
+class QGridLayout;
 class QLabel;
 class QSpinBox;
@@ -50 +51 @@
 public:
 
-    /** Constructs video-memory editor passing @a pParent to the base-class.
-      * @param  fWithLabel  Brings whether we should add label ourselves. */
-    UIVideoMemoryEditor(QWidget *pParent = 0, bool fWithLabel = false);
+    /** Constructs video-memory editor passing @a pParent to the base-class. */
+    UIVideoMemoryEditor(QWidget *pParent = 0);
 
     /** Defines editor @a iValue. */
@@ -74 +74 @@
     void set3DAccelerationEnabled(bool fEnabled);
 #endif
+
+    /** Returns minimum layout hint. */
+    int minimumLabelHorizontalHint() const;
+    /** Defines minimum layout @a iIndent. */
+    void setMinimumLayoutIndent(int iIndent);
 
 protected:
@@ -101 +106 @@
     static int calculatePageStep(int iMax);
 
-    /** Holds whether descriptive label should be created. */
-    bool  m_fWithLabel;
-
     /** Holds the guest OS type ID. */
     CGuestOSType             m_comGuestOSType;
@@ -128 +130 @@
     int  m_iInitialVRAM;
 
+    /** Holds the main layout instance. */
+    QGridLayout      *m_pLayout;
     /** Holds the memory label instance. */
     QLabel           *m_pLabelMemory;

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

@@ -303 +303 @@
     , m_pTabWidget(0)
     , m_pTabScreen(0)
-    , m_pLabelVideoMemorySize(0)
+    , m_pLayoutScreen(0)
     , m_pEditorVideoMemorySize(0)
     , m_pLabelMonitorCount(0)
@@ -778 +778 @@
 void UIMachineSettingsDisplay::retranslateUi()
 {
-    m_pLabelVideoMemorySize->setText(tr("Video &Memory:"));
-    m_pEditorVideoMemorySize->setToolTip(tr("Controls the amount of video memory provided to the virtual machine."));
     m_pLabelMonitorCount->setText(tr("Mo&nitor Count:"));
     m_pSliderMonitorCount->setToolTip(tr("Controls the amount of virtual monitors provided to the virtual machine."));
@@ -865 +863 @@
     m_pComboRecordingMode->setItemText(2, gpConverter->toString(UISettingsDefs::RecordingMode_AudioOnly));
 
+    /* These editors have own labels, but we want them to be properly layouted according to each other: */
+    int iMinimumLayoutHint = 0;
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorVideoMemorySize->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelMonitorCount->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelScaleFactor->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelGraphicsController->minimumSizeHint().width());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pLabelAcceleration->minimumSizeHint().width());
+    m_pEditorVideoMemorySize->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pLayoutScreen->setColumnMinimumWidth(0, iMinimumLayoutHint);
+
     updateRecordingFileSizeHint();
 }
@@ -874 +882 @@
 
     /* Polish 'Screen' availability: */
-    m_pLabelVideoMemorySize->setEnabled(isMachineOffline());
     m_pEditorVideoMemorySize->setEnabled(isMachineOffline());
     m_pLabelMonitorCount->setEnabled(isMachineOffline());
@@ -1098 +1105 @@
     {
         /* Prepare 'Screen' tab layout: */
-        QGridLayout *pLayoutScreen = new QGridLayout(m_pTabScreen);
-        if (pLayoutScreen)
+        m_pLayoutScreen = new QGridLayout(m_pTabScreen);
+        if (m_pLayoutScreen)
         {
-            pLayoutScreen->setRowStretch(8, 1);
-
-            /* Prepare video memory label: */
-            m_pLabelVideoMemorySize = new QLabel(m_pTabScreen);
-            if (m_pLabelVideoMemorySize)
-            {
-                m_pLabelVideoMemorySize->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutScreen->addWidget(m_pLabelVideoMemorySize, 0, 0);
-            }
+            m_pLayoutScreen->setRowStretch(8, 1);
+
             /* Prepare video memory editor: */
             m_pEditorVideoMemorySize = new UIVideoMemoryEditor(m_pTabScreen);
             if (m_pEditorVideoMemorySize)
-            {
-                if (m_pLabelVideoMemorySize)
-                    m_pLabelVideoMemorySize->setBuddy(m_pEditorVideoMemorySize->focusProxy());
-                pLayoutScreen->addWidget(m_pEditorVideoMemorySize, 0, 1, 2, 2);
-            }
+                m_pLayoutScreen->addWidget(m_pEditorVideoMemorySize, 0, 0, 1, 3);
 
             /* Prepare monitor count label: */
@@ -1124 +1120 @@
             {
                 m_pLabelMonitorCount->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutScreen->addWidget(m_pLabelMonitorCount, 2, 0);
+                m_pLayoutScreen->addWidget(m_pLabelMonitorCount, 1, 0);
             }
             /* Prepare monitor count layout: */
@@ -1170 +1166 @@
                 }
 
-                pLayoutScreen->addLayout(pLayoutMonitorCount, 2, 1, 2, 1);
+                m_pLayoutScreen->addLayout(pLayoutMonitorCount, 1, 1, 2, 1);
             }
             /* Prepare monitor count spinbox: */
@@ -1181 +1177 @@
                 m_pSpinboxMonitorCount->setMaximum(comProperties.GetMaxGuestMonitors());
 
-                pLayoutScreen->addWidget(m_pSpinboxMonitorCount, 2, 2);
+                m_pLayoutScreen->addWidget(m_pSpinboxMonitorCount, 1, 2);
             }
 
@@ -1189 +1185 @@
             {
                 m_pLabelScaleFactor->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutScreen->addWidget(m_pLabelScaleFactor, 4, 0);
+                m_pLayoutScreen->addWidget(m_pLabelScaleFactor, 3, 0);
             }
             /* Prepare scale factor editor: */
@@ -1197 +1193 @@
                 if (m_pLabelScaleFactor)
                     m_pLabelScaleFactor->setBuddy(m_pEditorScaleFactor->focusProxy());
-                pLayoutScreen->addWidget(m_pEditorScaleFactor, 4, 1, 2, 2);
+                m_pLayoutScreen->addWidget(m_pEditorScaleFactor, 3, 1, 2, 2);
             }
 
@@ -1205 +1201 @@
             {
                 m_pLabelGraphicsController->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutScreen->addWidget(m_pLabelGraphicsController, 6, 0);
+                m_pLayoutScreen->addWidget(m_pLabelGraphicsController, 5, 0);
             }
             /* Prepare graphics controller editor: */
@@ -1213 +1209 @@
                 if (m_pLabelGraphicsController)
                     m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController);
-                pLayoutScreen->addWidget(m_pEditorGraphicsController, 6, 1, 1, 2);
+                m_pLayoutScreen->addWidget(m_pEditorGraphicsController, 5, 1, 1, 2);
             }
 
@@ -1221 +1217 @@
             {
                 m_pLabelAcceleration->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                pLayoutScreen->addWidget(m_pLabelAcceleration, 7, 0);
+                m_pLayoutScreen->addWidget(m_pLabelAcceleration, 6, 0);
             }
             /* Prepare 3D checkbox: */
             m_pCheckbox3D = new QCheckBox(m_pTabScreen);
             if (m_pCheckbox3D)
-                pLayoutScreen->addWidget(m_pCheckbox3D, 7, 1);
+                m_pLayoutScreen->addWidget(m_pCheckbox3D, 6, 1);
         }
 

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

@@ -199 +199 @@
         /** Holds the 'Screen' tab instance. */
         QWidget                    *m_pTabScreen;
-        /** Holds the video memory size label instance. */
-        QLabel                     *m_pLabelVideoMemorySize;
+        /** Holds the 'Screen' layout instance. */
+        QGridLayout                *m_pLayoutScreen;
         /** Holds the video memory size editor instance. */
         UIVideoMemoryEditor        *m_pEditorVideoMemorySize;