Changeset 64106 in vbox

Timestamp:

Sep 30, 2016 12:10:19 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111062

Message:

FE/Qt: bugref:6899: Accessibility support (step 64): Continuing with the r111055.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp (modified) (5 diffs)

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

@@ -39 +39 @@
 
 
-/** QAccessibleWidget extension used as an accessibility interface for UIToolBar. */
+/** QAccessibleWidget extension used as an accessibility interface for UIToolBar buttons. */
 class UIAccessibilityInterfaceForUIToolBarButton : public QAccessibleWidget
 {
@@ -47 +47 @@
     static QAccessibleInterface *pFactory(const QString &strClassname, QObject *pObject)
     {
-        /* Creating segmented-button accessibility interface: */
+        /* Creating toolbar button accessibility interface: */
         if (   pObject
             && strClassname == QLatin1String("QToolButton")
@@ -59 +59 @@
     /** Constructs an accessibility interface passing @a pWidget to the base-class. */
     UIAccessibilityInterfaceForUIToolBarButton(QWidget *pWidget)
-        : QAccessibleWidget(pWidget, QAccessible::RadioButton)
+        : QAccessibleWidget(pWidget, QAccessible::Button)
     {}
 
-    virtual QAccessible::State state() const
+    /** Returns the role. */
+    virtual QAccessible::Role role() const /* override */
+    {
+        /* Make sure button still alive: */
+        AssertPtrReturn(button(), QAccessible::NoRole);
+
+        /* Return role for checkable button: */
+        if (button()->isCheckable())
+            return QAccessible::RadioButton;
+
+        /* Return default role: */
+        return QAccessible::Button;
+    }
+
+    /** Returns the state. */
+    virtual QAccessible::State state() const /* override */
     {
         /* Prepare the button state: */
@@ -74 +89 @@
         state.checked = button()->isChecked();
 
-        /* Return the segment state: */
+        /* Return the button state: */
         return state;
     }
@@ -80 +95 @@
 private:
 
-    /** Returns corresponding segmented-button. */
+    /** Returns corresponding toolbar button. */
     QToolButton *button() const { return qobject_cast<QToolButton*>(widget()); }
 };