Add interface_cast for the action interface.
Implement actions for the following roles:
Button : Press
CheckBox, RadioButton : Press, Check, Uncheck
Slider, Spinbox, Dial, ScrollBar : Increment, Decrement
Change-Id: Ic8e0d17c709ba51655f3f4b699092baf603b6f18
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
--- /dev/null
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+import QtQuick 2.0
+
+
+Rectangle {
+ id: checkbox
+
+ Accessible.role: Accessible.CheckBox
+
+ property bool checked // required variable
+
+ width: 30
+ height: 30
+
+
+ Text {
+ id: checkboxText
+ text: parent.checked ? "on" : "off"
+ anchors.centerIn: parent
+ }
+}
--- /dev/null
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia 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.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+import QtQuick 2.0
+
+// Minimal slider implementation
+Rectangle {
+ id: slider
+
+ property alias text : buttonText.text
+ Accessible.role: Accessible.Slider
+
+ property int value // required
+ property int minimumValue : 0 // optional (default INT_MIN)
+ property int maximumValue : 20 // optional (default INT_MAX)
+ property int stepSize : 1 // optional (default 1)
+
+ width: 30
+ height: 30
+
+
+ Text {
+ id: buttonText
+ text: parent.value
+ anchors.centerIn: parent
+ font.pixelSize: parent.height * .5
+ }
+}
id: column
spacing: 6
anchors.fill: parent
+ anchors.margins: 10
width: parent.width
Row {
spacing: 6
width: column.width
- Button { width: 100; height: column.h + 20; text: "Send" }
- Button { width: 100; height: column.h + 20; text: "Discard" }
+ Button { width: 100; height: column.h + 20; text: "Send"; onClicked : { status.text = "Send" } }
+ Button { width: 100; height: column.h + 20; text: "Discard"; onClicked : { status.text = "Discard" } }
}
Row {
wrapMode: TextEdit.WordWrap
}
}
+ Text {
+ id : status
+ width: column.width
+ }
+
+ Row {
+ spacing: 6
+ width: column.width
+ Checkbox { checked: false }
+ Slider { value: 10 }
+ }
}
}
Accessible.name: text
Accessible.description: "This button does " + text
Accessible.role: Accessible.Button
+ function accessiblePressAction() {
+ button.clicked()
+ }
signal clicked
id: mouseArea
anchors.fill: parent
onClicked: {
- checked = !checked;
+ parent.clicked()
}
}
}
case QAccessible::Slider:
case QAccessible::SpinBox:
case QAccessible::Dial:
+ case QAccessible::ScrollBar:
return new QAccessibleQuickItemValueInterface(item);
default:
return new QAccessibleQuickItem(item);
{
}
+void *QQmlAccessible::interface_cast(QAccessible::InterfaceType t)
+{
+ if (t == QAccessible::ActionInterface)
+ return static_cast<QAccessibleActionInterface*>(this);
+ return QAccessibleObject::interface_cast(t);
+}
+
QQmlAccessible::~QQmlAccessible()
{
}
break;
case QAccessible::RadioButton:
case QAccessible::CheckBox:
- actions << QAccessibleActionInterface::checkAction();
+ actions << QAccessibleActionInterface::checkAction()
+ << QAccessibleActionInterface::uncheckAction()
+ << QAccessibleActionInterface::pressAction();
+ break;
+ case QAccessible::Slider:
+ case QAccessible::SpinBox:
+ case QAccessible::ScrollBar:
+ actions << QAccessibleActionInterface::increaseAction()
+ << QAccessibleActionInterface::decreaseAction();
break;
default:
break;
void QQmlAccessible::doAction(const QString &actionName)
{
- if (role() == QAccessible::PushButton && actionName == QAccessibleActionInterface::pressAction()) {
- QMetaObject::invokeMethod(object(), "accessibleAction");
+ // Look for and call the accessible[actionName]Action() function on the item.
+ // This allows for overriding the default action handling.
+ const QByteArray functionName = "accessible" + actionName.toLatin1() + "Action()";
+ if (object()->metaObject()->indexOfMethod(functionName) != -1) {
+ QMetaObject::invokeMethod(object(), functionName, Q_ARG(QString, actionName));
+ return;
}
- if ((role() == QAccessible::CheckBox || role() == QAccessible::RadioButton) && actionName == QAccessibleActionInterface::checkAction()) {
- bool checked = object()->property("checked").toBool();
- object()->setProperty("checked", QVariant(!checked));
+
+ // Role-specific default action handling follows. Items are excepted to provide
+ // properties according to role conventions. These will then be read and/or updated
+ // by the accessibility system.
+ // Checkable roles : checked
+ // Value-based roles : (via the value interface: value, minimumValue, maximumValue), stepSize
+ switch (role()) {
+ case QAccessible::RadioButton:
+ case QAccessible::CheckBox: {
+ QVariant checked = object()->property("checked");
+ if (checked.isValid()) {
+ if (actionName == QAccessibleActionInterface::pressAction()) {
+ object()->setProperty("checked", QVariant(!checked.toBool()));
+ } else if (actionName == QAccessibleActionInterface::checkAction()) {
+ object()->setProperty("checked", QVariant(true));
+ } else if (actionName == QAccessibleActionInterface::uncheckAction()) {
+ object()->setProperty("checked", QVariant(false));
+ }
+ }
+ break;
+ }
+ case QAccessible::Slider:
+ case QAccessible::SpinBox:
+ case QAccessible::Dial:
+ case QAccessible::ScrollBar: {
+ if (actionName != QAccessibleActionInterface::increaseAction() &&
+ actionName != QAccessibleActionInterface::decreaseAction())
+ break;
+
+ // Update the value using QAccessibleValueInterface, respecting
+ // the minimum and maximum value (if set). Also check for and
+ // use the "stepSize" property on the item
+ if (QAccessibleValueInterface *valueIface = valueInterface()) {
+ QVariant valueV = valueIface->currentValue();
+ qreal newValue = valueV.toInt();
+
+ QVariant stepSizeV = object()->property("stepSize");
+ qreal stepSize = stepSizeV.isValid() ? stepSizeV.toReal() : qreal(1.0);
+ if (actionName == QAccessibleActionInterface::increaseAction()) {
+ newValue += stepSize;
+ } else {
+ newValue -= stepSize;
+ }
+
+ QVariant minimumValueV = valueIface->minimumValue();
+ if (minimumValueV.isValid()) {
+ newValue = qMax(newValue, minimumValueV.toReal());
+ }
+ QVariant maximumValueV = valueIface->maximumValue();
+ if (maximumValueV.isValid()) {
+ newValue = qMin(newValue, maximumValueV.toReal());
+ }
+
+ valueIface->setCurrentValue(QVariant(newValue));
+ }
+ break;
+ }
+ default:
+ break;
}
}
{
public:
~QQmlAccessible();
+ void *interface_cast(QAccessible::InterfaceType t);
virtual QRect viewRect() const = 0;
QAccessibleInterface *childAt(int, int) const;
}
Accessible.name: label.text
Accessible.role: Accessible.Button
+ funtion accessiblePressAction { ... }
}
\endqml
\o
\row
- \o CheckBox
- \o checked
- \o The check state of the check box.
+ \o Button
+ \o function accessiblePressAction
+ \o Called when the button receives a press action. The implementation should visually simulate a button click and perform the button action.
\row
- \o RadioButton
+ \o CheckBox, Radiobutton
\o checked
- \o The selected state of the radio button.
- \row
- \o Button
- \o checkable
- \o Whether the button is checkable.
+ \o The check state of the check box. Updated on Press, Check and Uncheck actions.
\row
- \o Button
- \o checked
- \o Whether the button is checked (only if checkable is true).
+ \o Slider, SpinBox, Dial, ScrollBar
+ \o value, minimumValue, maximumValue, stepSize
+ \o value will be updated on increase and decrase actions, in accordance with the other properties
\endtable
-
*/
QQuickAccessibleAttached::QQuickAccessibleAttached(QObject *parent)
projects / profile / ivi / qtdeclarative.git / commitdiff