diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-10-06 14:54:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 19:25:42 +0200 |
commit | 4dc25c1f2995a5e02da47f0f6f3522af9eb6f78c (patch) | |
tree | 86391ff6c57ed46295df684a4c87ba9db0b73263 /src/plugins/accessible/widgets/complexwidgets.cpp | |
parent | 663cd1771883e1e7ac9c1a0dc8b797601b59ba17 (diff) |
Refactor QAccessibleActionInterface.
Some refinements done by Jan-Arve Sæther.
Change-Id: I99195b3c7273316cfa9c46e451924bbcfddd11a9
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/plugins/accessible/widgets/complexwidgets.cpp')
-rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.cpp | 94 |
1 files changed, 24 insertions, 70 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index b0014e3e75..a94163c117 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -486,7 +486,7 @@ QAccessibleInterface *QAccessibleItemRow::parent() const return new QAccessibleItemView(view->viewport()); } -QAccessibleInterface *QAccessibleItemRow::child(int index) const +QAccessibleInterface *QAccessibleItemRow::child(int) const { // FIXME? port to IA2 table2. return 0; @@ -1500,47 +1500,25 @@ public: return QAccessible::Unrelated; } -#ifndef QT_NO_ACTION - int userActionCount(int) const { return 0; } - QString actionText(int, Text, int) const { return QString(); } - bool doAction(int actionIndex, int, const QVariantList &) { - doAction(actionIndex); - return true; - } -#endif - // action interface int actionCount() { return 1; } - void doAction(int actionIndex) - { - if (actionIndex == Press || actionIndex == DefaultAction) - m_parent->setCurrentIndex(m_index); - } - QString localizedDescription(int actionIndex) + QStringList actionNames() const { - if (actionIndex == 0) - return QTabWidget::tr("Select this tab"); - return QString(); + return QStringList() << PressAction; } - QString name(int actionIndex) + void doAction(const QString &actionName) { - if (actionIndex == 0) - return QStringLiteral("Select tab"); - return QString(); + if (actionName == PressAction) + m_parent->setCurrentIndex(m_index); } - QString localizedName(int actionIndex) + QStringList keyBindingsForAction(const QString &) const { - if (actionIndex == 0) - return QTabWidget::tr("Select tab"); - return QString(); - } - QStringList keyBindings(int actionIndex) { return QStringList(); } @@ -1684,7 +1662,6 @@ QComboBox *QAccessibleComboBox::comboBox() const QAccessibleInterface* QAccessibleComboBox::child(int index) const { - QAccessibleInterface* target = 0; if (index == 0) { QAbstractItemView *view = comboBox()->view(); //QWidget *parent = view ? view->parentWidget() : 0; @@ -1717,7 +1694,8 @@ int QAccessibleComboBox::indexOfChild(const QAccessibleInterface *child) const return -1; } -QString QAccessibleComboBox::text(Text t, int child) const +/*! \reimp */ +QString QAccessibleComboBox::text(Text t, int) const { QString str; @@ -1746,54 +1724,30 @@ QString QAccessibleComboBox::text(Text t, int child) const return str; } -bool QAccessibleComboBox::doAction(int action, int, const QVariantList &) -{ - if (action == DefaultAction || action == Press) { - if (comboBox()->view()->isVisible()) { - comboBox()->hidePopup(); - } else { - comboBox()->showPopup(); - } - return true; - } - return false; -} - -QString QAccessibleComboBox::actionText(int action, Text t, int child) const -{ - QString text; - if (t == Name && (action == DefaultAction || action == Press)) - text = comboBox()->view()->isVisible() ? QComboBox::tr("Close") : QComboBox::tr("Open"); - return text; -} - -int QAccessibleComboBox::actionCount() -{ - return 1; -} - -void QAccessibleComboBox::doAction(int actionIndex) -{ - doAction(0, 0, QVariantList()); -} - -QString QAccessibleComboBox::localizedDescription -(int actionIndex) +QStringList QAccessibleComboBox::actionNames() const { - return QComboBox::tr("Opens the selection list of this combo box."); + return QStringList() << ShowMenuAction; } -QString QAccessibleComboBox::name(int actionIndex) +QString QAccessibleComboBox::localizedActionDescription(const QString &actionName) const { - return QStringLiteral("Popup Combobox Menu"); + if (actionName == ShowMenuAction) + return QComboBox::tr("Open the combo box selection popup"); + return QString(); } -QString QAccessibleComboBox::localizedName(int actionIndex) +void QAccessibleComboBox::doAction(const QString &actionName) { - return QComboBox::tr("Popup Combobox Menu"); + if (actionName == ShowMenuAction) { + if (comboBox()->view()->isVisible()) { + comboBox()->hidePopup(); + } else { + comboBox()->showPopup(); + } + } } -QStringList QAccessibleComboBox::keyBindings(int) +QStringList QAccessibleComboBox::keyBindingsForAction(const QString &/*actionName*/) const { return QStringList(); } |