Changeset 95661 in vbox

Timestamp:

Jul 15, 2022 11:06:18 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Accessibility interface for QIRichTextLabel; Fixing small NLS quirk in settings whats-this / tool-tip handling.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIRichTextLabel.cpp (modified) (4 diffs)
• extensions/QIRichTextLabel.h (modified) (1 diff)
• settings/UISettingsDialog.cpp (modified) (1 diff)

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QAccessibleWidget>
 #include <QtMath>
 #include <QUrl>
@@ -24 +25 @@
 #include "QIRichTextLabel.h"
 
+/* Other VBox includes: */
+#include "iprt/assert.h"
+
+/* Forward declarations: */
+class QIRichTextLabel;
+
+
+/** QAccessibleObject extension used as an accessibility interface for QIRichTextLabel. */
+class UIAccessibilityInterfaceForQIRichTextLabel : 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("QIRichTextLabel"))
+            return new UIAccessibilityInterfaceForQIRichTextLabel(qobject_cast<QWidget*>(pObject));
+
+        /* Null by default: */
+        return 0;
+    }
+
+    /** Constructs an accessibility interface passing @a pWidget to the base-class. */
+    UIAccessibilityInterfaceForQIRichTextLabel(QWidget *pWidget)
+        : QAccessibleWidget(pWidget, QAccessible::StaticText)
+    {}
+
+    /** Returns a text for the passed @a enmTextRole. */
+    virtual QString text(QAccessible::Text enmTextRole) const RT_OVERRIDE;
+
+private:
+
+    /** Returns corresponding QIRichTextLabel. */
+    QIRichTextLabel *label() const;
+};
+
+
+/*********************************************************************************************************************************
+*   Class UIAccessibilityInterfaceForQIRichTextLabel implementation.                                                             *
+*********************************************************************************************************************************/
+
+QString UIAccessibilityInterfaceForQIRichTextLabel::text(QAccessible::Text enmTextRole) const
+{
+    /* Make sure label still alive: */
+    AssertPtrReturn(label(), QString());
+
+    /* Return the description: */
+    if (enmTextRole == QAccessible::Description)
+        return label()->plainText();
+
+    /* Null-string by default: */
+    return QString();
+}
+
+QIRichTextLabel *UIAccessibilityInterfaceForQIRichTextLabel::label() const
+{
+    return qobject_cast<QIRichTextLabel*>(widget());
+}
+
+
+/*********************************************************************************************************************************
+*   Class QIRichTextLabel implementation.                                                                                        *
+*********************************************************************************************************************************/
 
 QIRichTextLabel::QIRichTextLabel(QWidget *pParent)
@@ -30 +95 @@
     , m_iMinimumTextWidth(0)
 {
+    /* Install QIRichTextLabel accessibility interface factory: */
+    QAccessible::installFactory(UIAccessibilityInterfaceForQIRichTextLabel::pFactory);
+
     /* Configure self: */
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
@@ -74 +142 @@
 }
 
+QString QIRichTextLabel::plainText() const
+{
+    return m_pTextBrowser->toPlainText();
+}
+
 void QIRichTextLabel::registerImage(const QImage &image, const QString &strName)
 {

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

@@ -47 +47 @@
     /** Returns text. */
     QString text() const;
+    /** Returns plain text. */
+    QString plainText() const;
 
     /** Registers @a image under a passed @a strName. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -590 +590 @@
 
     if (pWhatsThisWidget && !strWhatsThisText.isEmpty())
-        pWhatsThisWidget->setToolTip(QString("<qt>%1</qt>").arg(strWhatsThisText));
+        pWhatsThisWidget->setToolTip(strWhatsThisText);
 }