mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 01:40:02 +00:00
Port accessibility to Qt 5
REVIEW: 119428
This commit is contained in:
Frederik Gladhorn
parent
df871967c9
commit
316539b9f3
|
|
@ -27,7 +27,7 @@ set(dolphinprivate_LIB_SRCS
|
|||
kitemviews/kitemlistselectionmanager.cpp
|
||||
kitemviews/kitemliststyleoption.cpp
|
||||
kitemviews/kitemlistview.cpp
|
||||
# kitemviews/kitemlistviewaccessible.cpp
|
||||
kitemviews/kitemlistviewaccessible.cpp
|
||||
kitemviews/kitemlistwidget.cpp
|
||||
kitemviews/kitemmodelbase.cpp
|
||||
kitemviews/kitemset.cpp
|
||||
|
|
|
|||
|
|
@ -46,12 +46,7 @@
|
|||
|
||||
#include <algorithm>
|
||||
|
||||
#if 0
|
||||
#include "kitemlistviewaccessible.h"
|
||||
#else
|
||||
#define QT_NO_ACCESSIBILITY 1
|
||||
#pragma message("TODO: port accessibility to Qt5")
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
// Time in ms until reaching the autoscroll margin triggers
|
||||
|
|
@ -63,7 +58,7 @@ namespace {
|
|||
}
|
||||
|
||||
#ifndef QT_NO_ACCESSIBILITY
|
||||
QAccessibleInterface* accessibleInterfaceFactory(const QString &key, QObject *object)
|
||||
QAccessibleInterface* accessibleInterfaceFactory(const QString& key, QObject* object)
|
||||
{
|
||||
Q_UNUSED(key)
|
||||
|
||||
|
|
@ -941,7 +936,7 @@ void KItemListView::dragEnterEvent(QGraphicsSceneDragDropEvent* event)
|
|||
setAutoScroll(true);
|
||||
}
|
||||
|
||||
void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
|
||||
void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent* event)
|
||||
{
|
||||
QGraphicsWidget::dragMoveEvent(event);
|
||||
|
||||
|
|
@ -951,7 +946,7 @@ void KItemListView::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
|
|||
}
|
||||
}
|
||||
|
||||
void KItemListView::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
|
||||
void KItemListView::dragLeaveEvent(QGraphicsSceneDragDropEvent* event)
|
||||
{
|
||||
QGraphicsWidget::dragLeaveEvent(event);
|
||||
setAutoScroll(false);
|
||||
|
|
@ -1273,9 +1268,12 @@ void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges,
|
|||
updateVisibleGroupHeaders();
|
||||
doLayout(NoAnimation);
|
||||
}
|
||||
|
||||
QAccessibleTableModelChangeEvent ev(this, QAccessibleTableModelChangeEvent::DataChanged);
|
||||
ev.setFirstRow(itemRange.index);
|
||||
ev.setLastRow(itemRange.index + itemRange.count);
|
||||
QAccessible::updateAccessibility(&ev);
|
||||
}
|
||||
#pragma message("TODO: port accessibility otherwise the following line asserts")
|
||||
//QAccessible::updateAccessibility(this, 0, QAccessible::TableModelChanged);
|
||||
}
|
||||
|
||||
void KItemListView::slotGroupsChanged()
|
||||
|
|
@ -1351,8 +1349,10 @@ void KItemListView::slotCurrentChanged(int current, int previous)
|
|||
currentWidget->setCurrent(true);
|
||||
}
|
||||
}
|
||||
#pragma message("TODO: port accessibility otherwise the following line asserts")
|
||||
//QAccessible::updateAccessibility(this, current+1, QAccessible::Focus);
|
||||
|
||||
QAccessibleEvent ev(this, QAccessible::Focus);
|
||||
ev.setChild(current);
|
||||
QAccessible::updateAccessibility(&ev);
|
||||
}
|
||||
|
||||
void KItemListView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include "kitemlistview.h"
|
||||
#include "private/kitemlistviewlayouter.h"
|
||||
|
||||
#include <QtGui/qaccessible2.h>
|
||||
#include <QtGui/qaccessible.h>
|
||||
#include <qgraphicsscene.h>
|
||||
#include <qgraphicsview.h>
|
||||
|
||||
|
|
@ -40,35 +40,52 @@ KItemListView* KItemListViewAccessible::view() const
|
|||
}
|
||||
|
||||
KItemListViewAccessible::KItemListViewAccessible(KItemListView* view_) :
|
||||
QAccessibleObjectEx(view_)
|
||||
QAccessibleObject(view_)
|
||||
{
|
||||
Q_ASSERT(view());
|
||||
m_cells.resize(childCount());
|
||||
}
|
||||
|
||||
KItemListViewAccessible::~KItemListViewAccessible()
|
||||
{
|
||||
foreach (QAccessibleInterface* child, m_cells) {
|
||||
if (child) {
|
||||
QAccessible::Id childId = QAccessible::uniqueId(child);
|
||||
QAccessible::deleteAccessibleInterface(childId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void* KItemListViewAccessible::interface_cast(QAccessible::InterfaceType type)
|
||||
{
|
||||
if (type == QAccessible::TableInterface) {
|
||||
return static_cast<QAccessibleTableInterface*>(this);
|
||||
}
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
void KItemListViewAccessible::modelReset()
|
||||
{
|
||||
}
|
||||
|
||||
QAccessible::Role KItemListViewAccessible::cellRole() const
|
||||
{
|
||||
return QAccessible::Cell;
|
||||
}
|
||||
|
||||
QAccessibleTable2CellInterface* KItemListViewAccessible::cell(int index) const
|
||||
QAccessibleInterface* KItemListViewAccessible::cell(int index) const
|
||||
{
|
||||
if (index < 0 || index >= view()->model()->count()) {
|
||||
return 0;
|
||||
} else {
|
||||
return new KItemListAccessibleCell(view(), index);
|
||||
}
|
||||
|
||||
if (m_cells.size() < index - 1)
|
||||
m_cells.resize(childCount());
|
||||
|
||||
QAccessibleInterface* child = m_cells.at(index);
|
||||
if (!child) {
|
||||
child = new KItemListAccessibleCell(view(), index);
|
||||
QAccessible::registerAccessibleInterface(child);
|
||||
}
|
||||
return child;
|
||||
}
|
||||
|
||||
QVariant KItemListViewAccessible::invokeMethodEx(Method, int, const QVariantList&)
|
||||
{
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
QAccessibleTable2CellInterface* KItemListViewAccessible::cellAt(int row, int column) const
|
||||
QAccessibleInterface* KItemListViewAccessible::cellAt(int row, int column) const
|
||||
{
|
||||
return cell(columnCount() * row + column);
|
||||
}
|
||||
|
|
@ -127,9 +144,9 @@ QString KItemListViewAccessible::rowDescription(int) const
|
|||
return QString();
|
||||
}
|
||||
|
||||
QList<QAccessibleTable2CellInterface*> KItemListViewAccessible::selectedCells() const
|
||||
QList<QAccessibleInterface*> KItemListViewAccessible::selectedCells() const
|
||||
{
|
||||
QList<QAccessibleTable2CellInterface*> cells;
|
||||
QList<QAccessibleInterface*> cells;
|
||||
Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) {
|
||||
cells.append(cell(index));
|
||||
}
|
||||
|
|
@ -181,42 +198,31 @@ bool KItemListViewAccessible::unselectColumn(int)
|
|||
return true;
|
||||
}
|
||||
|
||||
QAccessible2::TableModelChange KItemListViewAccessible::modelChange() const
|
||||
void KItemListViewAccessible::modelChange(QAccessibleTableModelChangeEvent* /*event*/)
|
||||
{}
|
||||
|
||||
QAccessible::Role KItemListViewAccessible::role() const
|
||||
{
|
||||
QAccessible2::TableModelChange change;
|
||||
change.lastRow = rowCount();
|
||||
change.lastColumn = columnCount();
|
||||
return change;
|
||||
return QAccessible::Table;
|
||||
}
|
||||
|
||||
QAccessible::Role KItemListViewAccessible::role(int child) const
|
||||
QAccessible::State KItemListViewAccessible::state() const
|
||||
{
|
||||
Q_ASSERT(child >= 0);
|
||||
|
||||
if (child > 0) {
|
||||
return QAccessible::Cell;
|
||||
} else {
|
||||
return QAccessible::Table;
|
||||
}
|
||||
QAccessible::State s;
|
||||
return s;
|
||||
}
|
||||
|
||||
QAccessible::State KItemListViewAccessible::state(int child) const
|
||||
QAccessibleInterface* KItemListViewAccessible::childAt(int x, int y) const
|
||||
{
|
||||
if (child) {
|
||||
QAccessibleInterface* interface = 0;
|
||||
navigate(Child, child, &interface);
|
||||
if (interface) {
|
||||
return interface->state(0);
|
||||
}
|
||||
}
|
||||
|
||||
return QAccessible::Normal | QAccessible::HasInvokeExtension;
|
||||
const QPointF point = QPointF(x, y);
|
||||
int itemIndex = view()->itemAt(view()->mapFromScene(point));
|
||||
return child(itemIndex);
|
||||
}
|
||||
|
||||
int KItemListViewAccessible::childAt(int x, int y) const
|
||||
QAccessibleInterface* KItemListViewAccessible::parent() const
|
||||
{
|
||||
const QPointF point = QPointF(x,y);
|
||||
return view()->itemAt(view()->mapFromScene(point));
|
||||
// FIXME: return KItemListContainerAccessible here
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
int KItemListViewAccessible::childCount() const
|
||||
|
|
@ -227,18 +233,16 @@ int KItemListViewAccessible::childCount() const
|
|||
int KItemListViewAccessible::indexOfChild(const QAccessibleInterface* interface) const
|
||||
{
|
||||
const KItemListAccessibleCell* widget = static_cast<const KItemListAccessibleCell*>(interface);
|
||||
return widget->index() + 1;
|
||||
return widget->index();
|
||||
}
|
||||
|
||||
QString KItemListViewAccessible::text(Text, int child) const
|
||||
QString KItemListViewAccessible::text(QAccessible::Text) const
|
||||
{
|
||||
Q_ASSERT(child == 0);
|
||||
return QString();
|
||||
}
|
||||
|
||||
QRect KItemListViewAccessible::rect(int child) const
|
||||
QRect KItemListViewAccessible::rect() const
|
||||
{
|
||||
Q_UNUSED(child)
|
||||
if (!view()->isVisible()) {
|
||||
return QRect();
|
||||
}
|
||||
|
|
@ -253,50 +257,14 @@ QRect KItemListViewAccessible::rect(int child) const
|
|||
}
|
||||
}
|
||||
|
||||
int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const
|
||||
QAccessibleInterface* KItemListViewAccessible::child(int index) const
|
||||
{
|
||||
*interface = 0;
|
||||
|
||||
switch (relation) {
|
||||
case QAccessible::Child:
|
||||
Q_ASSERT(index > 0);
|
||||
*interface = cell(index - 1);
|
||||
if (*interface) {
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
if (index >= 0 && index < childCount()) {
|
||||
return cell(index);
|
||||
}
|
||||
|
||||
return -1;
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
QAccessible::Relation KItemListViewAccessible::relationTo(int, const QAccessibleInterface*, int) const
|
||||
{
|
||||
return QAccessible::Unrelated;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_ACTION
|
||||
|
||||
int KItemListViewAccessible::userActionCount(int) const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
QString KItemListViewAccessible::actionText(int, Text, int) const
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
|
||||
bool KItemListViewAccessible::doAction(int, int, const QVariantList&)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// Table Cell
|
||||
|
||||
KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index) :
|
||||
|
|
@ -306,6 +274,14 @@ KItemListAccessibleCell::KItemListAccessibleCell(KItemListView* view, int index)
|
|||
Q_ASSERT(index >= 0 && index < view->model()->count());
|
||||
}
|
||||
|
||||
void* KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type)
|
||||
{
|
||||
if (type == QAccessible::TableCellInterface) {
|
||||
return static_cast<QAccessibleTableCellInterface*>(this);
|
||||
}
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
int KItemListAccessibleCell::columnExtent() const
|
||||
{
|
||||
return 1;
|
||||
|
|
@ -341,52 +317,39 @@ bool KItemListAccessibleCell::isSelected() const
|
|||
return m_view->controller()->selectionManager()->isSelected(m_index);
|
||||
}
|
||||
|
||||
void KItemListAccessibleCell::rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const
|
||||
QAccessibleInterface* KItemListAccessibleCell::table() const
|
||||
{
|
||||
const KItemListViewLayouter* layouter = m_view->m_layouter;
|
||||
*row = layouter->itemRow(m_index);
|
||||
*column = layouter->itemColumn(m_index);
|
||||
*rowExtents = 1;
|
||||
*columnExtents = 1;
|
||||
*selected = isSelected();
|
||||
return QAccessible::queryAccessibleInterface(m_view);
|
||||
}
|
||||
|
||||
QAccessibleTable2Interface* KItemListAccessibleCell::table() const
|
||||
QAccessible::Role KItemListAccessibleCell::role() const
|
||||
{
|
||||
return QAccessible::queryAccessibleInterface(m_view)->table2Interface();
|
||||
}
|
||||
|
||||
QAccessible::Role KItemListAccessibleCell::role(int child) const
|
||||
{
|
||||
Q_ASSERT(child == 0);
|
||||
return QAccessible::Cell;
|
||||
}
|
||||
|
||||
QAccessible::State KItemListAccessibleCell::state(int child) const
|
||||
QAccessible::State KItemListAccessibleCell::state() const
|
||||
{
|
||||
Q_ASSERT(child == 0);
|
||||
QAccessible::State state = Normal;
|
||||
QAccessible::State state;
|
||||
|
||||
state.selectable = true;
|
||||
if (isSelected()) {
|
||||
state |= Selected;
|
||||
state.selected = true;
|
||||
}
|
||||
|
||||
state.focusable = true;
|
||||
if (m_view->controller()->selectionManager()->currentItem() == m_index) {
|
||||
state |= Focused;
|
||||
state.focused = true;
|
||||
}
|
||||
|
||||
state |= Selectable;
|
||||
state |= Focusable;
|
||||
|
||||
if (m_view->controller()->selectionBehavior() == KItemListController::MultiSelection) {
|
||||
state |= MultiSelectable;
|
||||
state.multiSelectable = true;
|
||||
}
|
||||
|
||||
if (m_view->model()->isExpandable(m_index)) {
|
||||
if (m_view->model()->isExpanded(m_index)) {
|
||||
state |= Expanded;
|
||||
state.expanded = true;
|
||||
} else {
|
||||
state |= Collapsed;
|
||||
state.collapsed = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -398,7 +361,7 @@ bool KItemListAccessibleCell::isExpandable() const
|
|||
return m_view->model()->isExpandable(m_index);
|
||||
}
|
||||
|
||||
QRect KItemListAccessibleCell::rect(int) const
|
||||
QRect KItemListAccessibleCell::rect() const
|
||||
{
|
||||
QRect rect = m_view->itemRect(m_index).toRect();
|
||||
|
||||
|
|
@ -411,13 +374,9 @@ QRect KItemListAccessibleCell::rect(int) const
|
|||
return rect;
|
||||
}
|
||||
|
||||
QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const
|
||||
QString KItemListAccessibleCell::text(QAccessible::Text t) const
|
||||
{
|
||||
Q_ASSERT(child == 0);
|
||||
Q_UNUSED(child)
|
||||
|
||||
switch (t) {
|
||||
case QAccessible::Value:
|
||||
case QAccessible::Name: {
|
||||
const QHash<QByteArray, QVariant> data = m_view->model()->data(m_index);
|
||||
return data["text"].toString();
|
||||
|
|
@ -430,9 +389,13 @@ QString KItemListAccessibleCell::text(QAccessible::Text t, int child) const
|
|||
return QString();
|
||||
}
|
||||
|
||||
void KItemListAccessibleCell::setText(QAccessible::Text, int child, const QString&)
|
||||
void KItemListAccessibleCell::setText(QAccessible::Text, const QString&)
|
||||
{
|
||||
Q_ASSERT(child == 0);
|
||||
}
|
||||
|
||||
QAccessibleInterface* KItemListAccessibleCell::child(int) const
|
||||
{
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
bool KItemListAccessibleCell::isValid() const
|
||||
|
|
@ -440,9 +403,9 @@ bool KItemListAccessibleCell::isValid() const
|
|||
return m_view && (m_index >= 0) && (m_index < m_view->model()->count());
|
||||
}
|
||||
|
||||
int KItemListAccessibleCell::childAt(int, int) const
|
||||
QAccessibleInterface* KItemListAccessibleCell::childAt(int, int) const
|
||||
{
|
||||
return 0;
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
int KItemListAccessibleCell::childCount() const
|
||||
|
|
@ -456,43 +419,11 @@ int KItemListAccessibleCell::indexOfChild(const QAccessibleInterface* child) con
|
|||
return -1;
|
||||
}
|
||||
|
||||
int KItemListAccessibleCell::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const
|
||||
QAccessibleInterface* KItemListAccessibleCell::parent() const
|
||||
{
|
||||
if (relation == Ancestor && index == 1) {
|
||||
*interface = new KItemListViewAccessible(m_view);
|
||||
return 0;
|
||||
}
|
||||
|
||||
*interface = 0;
|
||||
return -1;
|
||||
return QAccessible::queryAccessibleInterface(m_view);
|
||||
}
|
||||
|
||||
QAccessible::Relation KItemListAccessibleCell::relationTo(int child, const QAccessibleInterface* , int otherChild) const
|
||||
{
|
||||
Q_ASSERT(child == 0);
|
||||
Q_ASSERT(otherChild == 0);
|
||||
return QAccessible::Unrelated;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_ACTION
|
||||
|
||||
int KItemListAccessibleCell::userActionCount(int) const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
QString KItemListAccessibleCell::actionText(int, Text, int) const
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
|
||||
bool KItemListAccessibleCell::doAction(int, int, const QVariantList&)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int KItemListAccessibleCell::index() const
|
||||
{
|
||||
return m_index;
|
||||
|
|
@ -505,7 +436,7 @@ QObject* KItemListAccessibleCell::object() const
|
|||
|
||||
// Container Interface
|
||||
KItemListContainerAccessible::KItemListContainerAccessible(KItemListContainer* container) :
|
||||
QAccessibleWidgetEx(container)
|
||||
QAccessibleWidget(container)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -521,20 +452,17 @@ int KItemListContainerAccessible::childCount() const
|
|||
int KItemListContainerAccessible::indexOfChild(const QAccessibleInterface* child) const
|
||||
{
|
||||
if (child->object() == container()->controller()->view()) {
|
||||
return 1;
|
||||
} else {
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int KItemListContainerAccessible::navigate(QAccessible::RelationFlag relation, int index, QAccessibleInterface** target) const
|
||||
QAccessibleInterface* KItemListContainerAccessible::child(int index) const
|
||||
{
|
||||
if (relation == QAccessible::Child) {
|
||||
*target = new KItemListViewAccessible(container()->controller()->view());
|
||||
return 0;
|
||||
} else {
|
||||
return QAccessibleWidgetEx::navigate(relation, index, target);
|
||||
if (index == 0) {
|
||||
return QAccessible::queryAccessibleInterface(container()->controller()->view());
|
||||
}
|
||||
return Q_NULLPTR;
|
||||
}
|
||||
|
||||
const KItemListContainer* KItemListContainerAccessible::container() const
|
||||
|
|
|
|||
|
|
@ -22,118 +22,104 @@
|
|||
|
||||
#ifndef QT_NO_ACCESSIBILITY
|
||||
|
||||
#include <libdolphin_export.h>
|
||||
|
||||
#include <QtCore/qpointer.h>
|
||||
#include <QtGui/qaccessible.h>
|
||||
#include <QtGui/qaccessible2.h>
|
||||
#include <QtGui/qaccessiblewidget.h>
|
||||
#include <QtGui/qaccessibleobject.h>
|
||||
#include <QtWidgets/qaccessiblewidget.h>
|
||||
|
||||
class KItemListView;
|
||||
class KItemListContainer;
|
||||
|
||||
class KItemListViewAccessible: public QAccessibleTable2Interface, public QAccessibleObjectEx
|
||||
class LIBDOLPHINPRIVATE_EXPORT KItemListViewAccessible: public QAccessibleObject, public QAccessibleTableInterface
|
||||
{
|
||||
Q_ACCESSIBLE_OBJECT
|
||||
|
||||
public:
|
||||
explicit KItemListViewAccessible(KItemListView* view);
|
||||
~KItemListViewAccessible();
|
||||
|
||||
Role role(int child) const;
|
||||
State state(int child) const;
|
||||
QString text(Text t, int child) const;
|
||||
QRect rect(int child) const;
|
||||
void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE;
|
||||
|
||||
int childAt(int x, int y) const;
|
||||
int childCount() const;
|
||||
int indexOfChild(const QAccessibleInterface*) const;
|
||||
QAccessible::Role role() const Q_DECL_OVERRIDE;
|
||||
QAccessible::State state() const Q_DECL_OVERRIDE;
|
||||
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
|
||||
QRect rect() const Q_DECL_OVERRIDE;
|
||||
|
||||
int navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const;
|
||||
Relation relationTo(int child, const QAccessibleInterface* other, int otherChild) const;
|
||||
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
|
||||
int childCount() const Q_DECL_OVERRIDE;
|
||||
int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE;
|
||||
QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE;
|
||||
QAccessibleInterface* parent() const Q_DECL_OVERRIDE;
|
||||
|
||||
#ifndef QT_NO_ACTION
|
||||
int userActionCount(int child) const;
|
||||
QString actionText(int action, Text t, int child) const;
|
||||
bool doAction(int action, int child, const QVariantList& params);
|
||||
#endif
|
||||
QVariant invokeMethodEx(Method, int, const QVariantList&);
|
||||
|
||||
// Table2 interface
|
||||
virtual QAccessibleTable2CellInterface* cellAt(int row, int column) const;
|
||||
virtual QAccessibleInterface* caption() const;
|
||||
virtual QAccessibleInterface* summary() const;
|
||||
virtual QString columnDescription(int column) const;
|
||||
virtual QString rowDescription(int row) const;
|
||||
virtual int columnCount() const;
|
||||
virtual int rowCount() const;
|
||||
virtual QAccessible2::TableModelChange modelChange() const;
|
||||
virtual void rowsInserted(const QModelIndex&, int, int) {}
|
||||
virtual void rowsRemoved(const QModelIndex&, int, int) {}
|
||||
virtual void columnsInserted(const QModelIndex&, int, int) {}
|
||||
virtual void columnsRemoved(const QModelIndex&, int, int) {}
|
||||
virtual void rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int) {}
|
||||
virtual void columnsMoved(const QModelIndex&, int, int, const QModelIndex&, int) {}
|
||||
// Table interface
|
||||
virtual QAccessibleInterface* cellAt(int row, int column) const Q_DECL_OVERRIDE;
|
||||
virtual QAccessibleInterface* caption() const Q_DECL_OVERRIDE;
|
||||
virtual QAccessibleInterface* summary() const Q_DECL_OVERRIDE;
|
||||
virtual QString columnDescription(int column) const Q_DECL_OVERRIDE;
|
||||
virtual QString rowDescription(int row) const Q_DECL_OVERRIDE;
|
||||
virtual int columnCount() const Q_DECL_OVERRIDE;
|
||||
virtual int rowCount() const Q_DECL_OVERRIDE;
|
||||
|
||||
// Selection
|
||||
virtual int selectedCellCount() const;
|
||||
virtual int selectedColumnCount() const;
|
||||
virtual int selectedRowCount() const;
|
||||
virtual QList<QAccessibleTable2CellInterface*> selectedCells() const;
|
||||
virtual QList<int> selectedColumns() const;
|
||||
virtual QList<int> selectedRows() const;
|
||||
virtual bool isColumnSelected(int column) const;
|
||||
virtual bool isRowSelected(int row) const;
|
||||
virtual bool selectRow(int row);
|
||||
virtual bool selectColumn(int column);
|
||||
virtual bool unselectRow(int row);
|
||||
virtual bool unselectColumn(int column);
|
||||
virtual int selectedCellCount() const Q_DECL_OVERRIDE;
|
||||
virtual int selectedColumnCount() const Q_DECL_OVERRIDE;
|
||||
virtual int selectedRowCount() const Q_DECL_OVERRIDE;
|
||||
virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE;
|
||||
virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE;
|
||||
virtual QList<int> selectedRows() const Q_DECL_OVERRIDE;
|
||||
virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE;
|
||||
virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE;
|
||||
virtual bool selectRow(int row) Q_DECL_OVERRIDE;
|
||||
virtual bool selectColumn(int column) Q_DECL_OVERRIDE;
|
||||
virtual bool unselectRow(int row) Q_DECL_OVERRIDE;
|
||||
virtual bool unselectColumn(int column) Q_DECL_OVERRIDE;
|
||||
virtual void modelChange(QAccessibleTableModelChangeEvent*) Q_DECL_OVERRIDE;
|
||||
|
||||
KItemListView* view() const;
|
||||
|
||||
protected:
|
||||
virtual void modelReset();
|
||||
/**
|
||||
* Create an QAccessibleTable2CellInterface representing the table
|
||||
* Create an QAccessibleTableCellInterface representing the table
|
||||
* cell at the @index. Index is 0-based.
|
||||
*/
|
||||
inline QAccessibleTable2CellInterface* cell(int index) const;
|
||||
inline QAccessible::Role cellRole() const;
|
||||
inline QAccessibleInterface* cell(int index) const;
|
||||
|
||||
private:
|
||||
mutable QVector<QAccessibleInterface*> m_cells;
|
||||
};
|
||||
|
||||
class KItemListAccessibleCell: public QAccessibleTable2CellInterface
|
||||
class LIBDOLPHINPRIVATE_EXPORT KItemListAccessibleCell: public QAccessibleInterface, public QAccessibleTableCellInterface
|
||||
{
|
||||
public:
|
||||
KItemListAccessibleCell(KItemListView* view, int m_index);
|
||||
|
||||
QObject* object() const;
|
||||
Role role(int) const;
|
||||
State state(int) const;
|
||||
QRect rect(int) const;
|
||||
bool isValid() const;
|
||||
int childAt(int, int) const;
|
||||
int childCount() const;
|
||||
int indexOfChild(const QAccessibleInterface*) const;
|
||||
QString text(Text t, int child) const;
|
||||
void setText(Text t, int child, const QString& text);
|
||||
int navigate(RelationFlag relation, int m_index, QAccessibleInterface** interface) const;
|
||||
Relation relationTo(int child, const QAccessibleInterface* other, int otherChild) const;
|
||||
void* interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE;
|
||||
QObject* object() const Q_DECL_OVERRIDE;
|
||||
bool isValid() const Q_DECL_OVERRIDE;
|
||||
QAccessible::Role role() const Q_DECL_OVERRIDE;
|
||||
QAccessible::State state() const Q_DECL_OVERRIDE;
|
||||
QRect rect() const Q_DECL_OVERRIDE;
|
||||
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
|
||||
void setText(QAccessible::Text t, const QString& text) Q_DECL_OVERRIDE;
|
||||
|
||||
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
|
||||
int childCount() const Q_DECL_OVERRIDE;
|
||||
QAccessibleInterface* childAt(int x, int y) const Q_DECL_OVERRIDE;
|
||||
int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE;
|
||||
|
||||
QAccessibleInterface* parent() const Q_DECL_OVERRIDE;
|
||||
bool isExpandable() const;
|
||||
|
||||
#ifndef QT_NO_ACTION
|
||||
int userActionCount(int child) const;
|
||||
QString actionText(int action, Text t, int child) const;
|
||||
bool doAction(int action, int child, const QVariantList& params);
|
||||
#endif
|
||||
|
||||
// Cell Interface
|
||||
virtual int columnExtent() const;
|
||||
virtual QList<QAccessibleInterface*> columnHeaderCells() const;
|
||||
virtual int columnIndex() const;
|
||||
virtual int rowExtent() const;
|
||||
virtual QList<QAccessibleInterface*> rowHeaderCells() const;
|
||||
virtual int rowIndex() const;
|
||||
virtual bool isSelected() const;
|
||||
virtual void rowColumnExtents(int* row, int* column, int* rowExtents, int* columnExtents, bool* selected) const;
|
||||
virtual QAccessibleTable2Interface* table() const;
|
||||
virtual int columnExtent() const Q_DECL_OVERRIDE;
|
||||
virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE;
|
||||
virtual int columnIndex() const Q_DECL_OVERRIDE;
|
||||
virtual int rowExtent() const Q_DECL_OVERRIDE;
|
||||
virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE;
|
||||
virtual int rowIndex() const Q_DECL_OVERRIDE;
|
||||
virtual bool isSelected() const Q_DECL_OVERRIDE;
|
||||
virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE;
|
||||
|
||||
inline int index() const;
|
||||
|
||||
|
|
@ -142,17 +128,15 @@ private:
|
|||
int m_index;
|
||||
};
|
||||
|
||||
class KItemListContainerAccessible : public QAccessibleWidgetEx
|
||||
class LIBDOLPHINPRIVATE_EXPORT KItemListContainerAccessible : public QAccessibleWidget
|
||||
{
|
||||
Q_ACCESSIBLE_OBJECT
|
||||
|
||||
public:
|
||||
explicit KItemListContainerAccessible(KItemListContainer* container);
|
||||
virtual ~KItemListContainerAccessible();
|
||||
|
||||
int childCount() const;
|
||||
int indexOfChild(const QAccessibleInterface* child) const;
|
||||
int navigate(RelationFlag relation, int entry, QAccessibleInterface** target) const;
|
||||
QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
|
||||
int childCount() const Q_DECL_OVERRIDE;
|
||||
int indexOfChild(const QAccessibleInterface* child) const Q_DECL_OVERRIDE;
|
||||
|
||||
private:
|
||||
const KItemListContainer* container() const;
|
||||
|
|
|
|||
Loading…
Reference in a new issue