Changeset 104929 in vbox

Timestamp:

Jun 14, 2024 4:13:09 PM (3 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10666, bugref:10669: UIMediumSizeSlider: Implementing own accessibility interface; Adjusting tool-tip to have no HTML tags.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMediumSizeEditor.cpp (modified) (5 diffs)
• UIMediumSizeEditor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QAccessibleWidget>
 #include <QGridLayout>
 #include <QLabel>
@@ -43 +44 @@
 
 
+/** QAccessibleWidget extension used as an accessibility interface for UIMediumSizeSlider. */
+class UIAccessibilityInterfaceForUIMediumSizeSlider : public QAccessibleWidget
+{
+public:
+
+    /** Returns an accessibility interface for passed @a strClassname and @a pObject. */
+    static QAccessibleInterface *pFactory(const QString &strClassname, QObject *pObject)
+    {
+        /* Creating QIRichTextLabel accessibility interface: */
+        if (pObject && strClassname == QLatin1String("UIMediumSizeSlider"))
+            return new UIAccessibilityInterfaceForUIMediumSizeSlider(qobject_cast<QWidget*>(pObject));
+
+        /* Null by default: */
+        return 0;
+    }
+
+    /** Constructs an accessibility interface passing @a pWidget to the base-class. */
+    UIAccessibilityInterfaceForUIMediumSizeSlider(QWidget *pWidget)
+        : QAccessibleWidget(pWidget, QAccessible::Slider)
+    {}
+
+    /** Returns a text for the passed @a enmTextRole. */
+    virtual QString text(QAccessible::Text enmTextRole) const RT_OVERRIDE
+    {
+        /* Make sure label still alive: */
+        AssertPtrReturn(slider(), QString());
+
+        /* Non-macOS screen-readers using QAccessible::Value for slider: */
+        if (enmTextRole == QAccessible::Value)
+            return slider()->scaledValueToString();
+
+        /* Call to base-class: */
+        return QAccessibleWidget::text(enmTextRole);
+    }
+
+private:
+
+    /** Returns corresponding UIMediumSizeSlider. */
+    UIMediumSizeSlider *slider() const
+    {
+        return qobject_cast<UIMediumSizeSlider*>(widget());
+    }
+};
+
+
 /*********************************************************************************************************************************
 *   Class UIMediumSizeSlider implementation.                                                                                     *
@@ -54 +100 @@
     , m_uScaledValue(0)
 {
+    /* Install UIMediumSizeSlider accessibility interface factory: */
+    QAccessible::installFactory(UIAccessibilityInterfaceForUIMediumSizeSlider::pFactory);
+
     /* Configure basic properties: */
     setFocusPolicy(Qt::StrongFocus);
@@ -100 +149 @@
     /* Call to base-class: */
     QSlider::setValue(sizeMBToSlider(m_uScaledValue, m_iSliderScale));
+}
+
+QString UIMediumSizeSlider::scaledValueToString()
+{
+    return UITranslator::formatSize(m_uScaledValue);
 }
 
@@ -345 +399 @@
 void UIMediumSizeEditor::updateSizeToolTips(qulonglong uSize)
 {
-    const QString strToolTip = tr("<nobr>%1 (%2 B)</nobr>").arg(UITranslator::formatSize(uSize)).arg(uSize);
+    const QString strToolTip = tr("%1 (%2 B)").arg(UITranslator::formatSize(uSize)).arg(uSize);
     m_pSlider->setToolTip(strToolTip);
     m_pEditor->setToolTip(strToolTip);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.h

@@ -68 +68 @@
     /** Defines scaled @a uValue. */
     void setScaledValue(qulonglong uValue);
+
+    /** Returns scaled value in readable format. */
+    QString scaledValueToString();
 
 private slots: