Changeset 104630 in vbox

Timestamp:

May 14, 2024 2:00:10 PM (7 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10672: Accessibility fixes for Runtime UI; Providing UIMachineView with own accessibility interface wrapping underlying graphical canvas.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (9 diffs)
• UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QAbstractNativeEventFilter>
+#include <QAccessibleWidget>
 #include <QApplication>
 #include <QBitmap>
@@ -42 +43 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UIFrameBuffer.h"
+#include "UIKeyboardHandler.h"
 #include "UILoggingDefs.h"
 #include "UIMachine.h"
@@ -51 +54 @@
 #include "UIMachineViewSeamless.h"
 #include "UIMachineViewScale.h"
+#include "UIMouseHandler.h"
 #include "UINotificationCenter.h"
-#include "UIKeyboardHandler.h"
-#include "UIMouseHandler.h"
-#include "UIFrameBuffer.h"
+#include "UITranslationEventListener.h"
 #ifdef VBOX_WS_MAC
 # include "UICocoaApplication.h"
@@ -102 +104 @@
 # define DNDDEBUG(x)
 #endif
+
+
+/** QAccessibleWidget extension used as an accessibility interface for Machine-view. */
+class UIAccessibilityInterfaceForUIMachineView : public QAccessibleWidget
+{
+public:
+
+    /** Returns an accessibility interface for passed @a strClassname and @a pObject. */
+    static QAccessibleInterface *pFactory(const QString &strClassname, QObject *pObject)
+    {
+        /* Creating Machine-view accessibility interface: */
+        if (pObject && strClassname == QLatin1String("UIMachineView"))
+            return new UIAccessibilityInterfaceForUIMachineView(qobject_cast<QWidget*>(pObject));
+
+        /* Null by default: */
+        return 0;
+    }
+
+    /** Constructs an accessibility interface passing @a pWidget to the base-class. */
+    UIAccessibilityInterfaceForUIMachineView(QWidget *pWidget)
+        : QAccessibleWidget(pWidget, QAccessible::Canvas)
+    {}
+
+    /** Returns the number of children. */
+    virtual int childCount() const RT_OVERRIDE
+    {
+        /* Make sure view still alive: */
+        AssertPtrReturn(view(), 0);
+
+        /* Zero by default: */
+        return 0;
+    }
+
+    /** Returns the child with the passed @a iIndex. */
+    virtual QAccessibleInterface *child(int iIndex) const RT_OVERRIDE
+    {
+        /* Make sure view still alive: */
+        AssertPtrReturn(view(), 0);
+        /* Make sure index is valid: */
+        AssertReturn(iIndex >= 0 && iIndex < childCount(), 0);
+
+        /* Null by default: */
+        return 0;
+    }
+
+    /** Returns the index of passed @a pChild. */
+    virtual int indexOfChild(const QAccessibleInterface *pChild) const RT_OVERRIDE
+    {
+        /* Make sure view still alive: */
+        AssertPtrReturn(view(), -1);
+        /* Make sure child is valid: */
+        AssertReturn(pChild, -1);
+
+        /* -1 by default: */
+        return -1;;
+    }
+
+    /** Returns a text for the passed @a enmTextRole. */
+    virtual QString text(QAccessible::Text enmTextRole) const RT_OVERRIDE
+    {
+        /* Make sure view still alive: */
+        AssertPtrReturn(view(), QString());
+
+        /* Gather suitable text: */
+        Q_UNUSED(enmTextRole);
+        QString strText = view()->toolTip();
+        if (strText.isEmpty())
+            strText = view()->whatsThis();
+        return strText;
+    }
+
+private:
+
+    /** Returns corresponding Machine-view. */
+    UIMachineView *view() const { return qobject_cast<UIMachineView*>(widget()); }
+};
 
 
@@ -1145 +1223 @@
 }
 
+void UIMachineView::sltRetranslateUI()
+{
+    setWhatsThis(tr("Holds the graphical canvas containing guest screen contents."));
+}
+
 UIMachineView::UIMachineView(UIMachineWindow *pMachineWindow, ulong uScreenId)
     : QAbstractScrollArea(pMachineWindow->centralWidget())
@@ -1158 +1241 @@
     , m_pNativeEventFilter(0)
 {
+    /* Install Machine-view accessibility interface factory: */
+    QAccessible::installFactory(UIAccessibilityInterfaceForUIMachineView::pFactory);
 }
 
@@ -1321 +1406 @@
     /* UICommon connections: */
     connect(&uiCommon(), &UICommon::sigAskToDetachCOM, this, &UIMachineView::sltDetachCOM);
+
     /* Desktop resolution change (e.g. monitor hotplug): */
     connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
             this, &UIMachineView::sltDesktopResized);
+
     /* Scale-factor change: */
     connect(gEDataManager, &UIExtraDataManager::sigScaleFactorChange,
@@ -1330 +1417 @@
     connect(gEDataManager, &UIExtraDataManager::sigScalingOptimizationTypeChange,
             this, &UIMachineView::sltHandleScalingOptimizationChange);
+
     /* Action-pool connections: */
     UIActionPoolRuntime *pActionPoolRuntime = qobject_cast<UIActionPoolRuntime*>(actionPool());
@@ -1339 +1427 @@
                 this, &UIMachineView::sltHandleActionTriggerViewScreenResize);
     }
+
+    /* Translate initially: */
+    connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
+            this, &UIMachineView::sltRetranslateUI);
+    sltRetranslateUI();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -234 +234 @@
     void sltDetachCOM();
 
+    /** Handles translation event. */
+    void sltRetranslateUI();
+
 protected: