diff options
Diffstat (limited to 'src/widgets/accessible/simplewidgets.cpp')
-rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 73 |
1 files changed, 49 insertions, 24 deletions
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index d5933a6804..ade5cfe3dc 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the plugins of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -84,12 +76,14 @@ QString qt_accHotKey(const QString &text); /*! Creates a QAccessibleButton object for \a w. - \a role is propagated to the QAccessibleWidget constructor. */ -QAccessibleButton::QAccessibleButton(QWidget *w, QAccessible::Role role) -: QAccessibleWidget(w, role) +QAccessibleButton::QAccessibleButton(QWidget *w) +: QAccessibleWidget(w) { Q_ASSERT(button()); + + // FIXME: The checkable state of the button is dynamic, + // while we only update the controlling signal once :( if (button()->isCheckable()) addControllingSignal(QLatin1String("toggled(bool)")); else @@ -178,6 +172,23 @@ QRect QAccessibleButton::rect() const return QAccessibleWidget::rect(); } +QAccessible::Role QAccessibleButton::role() const +{ + QAbstractButton *ab = button(); + +#ifndef QT_NO_MENU + if (QPushButton *pb = qobject_cast<QPushButton*>(ab)) { + if (pb->menu()) + return QAccessible::ButtonMenu; + } +#endif + + if (ab->isCheckable()) + return ab->autoExclusive() ? QAccessible::RadioButton : QAccessible::CheckBox; + + return QAccessible::Button; +} + QStringList QAccessibleButton::actionNames() const { QStringList names; @@ -244,10 +255,9 @@ QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) c /*! Creates a QAccessibleToolButton object for \a w. - \a role is propagated to the QAccessibleWidget constructor. */ -QAccessibleToolButton::QAccessibleToolButton(QWidget *w, QAccessible::Role role) -: QAccessibleButton(w, role) +QAccessibleToolButton::QAccessibleToolButton(QWidget *w) +: QAccessibleButton(w) { Q_ASSERT(toolButton()); } @@ -287,6 +297,21 @@ int QAccessibleToolButton::childCount() const return isSplitButton() ? 1 : 0; } +QAccessible::Role QAccessibleToolButton::role() const +{ + QAbstractButton *ab = button(); + +#ifndef QT_NO_MENU + QToolButton *tb = qobject_cast<QToolButton*>(ab); + if (!tb->menu()) + return tb->isCheckable() ? QAccessible::CheckBox : QAccessible::PushButton; + else if (tb->popupMode() == QToolButton::DelayedPopup) + return QAccessible::ButtonDropDown; +#endif + + return QAccessible::ButtonMenu; +} + QAccessibleInterface *QAccessibleToolButton::child(int index) const { #ifndef QT_NO_MENU |