diff options
author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-16 06:56:48 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 13:32:59 +0200 |
commit | 87ae97c11ab9b298c0ce6701873b45fc3992b385 (patch) | |
tree | 8f30a95f054b8bf2346a98e072ba864a7a974da5 /src/widgets/accessible/qaccessible2.cpp | |
parent | 8ebd7d84fcdaeba152bd9812b45d5c49b1e03a23 (diff) |
Refactor accessibility for Qt5
* Moved most stuff to gui\accessible
* Moved widget-specific stuff to widgets\accessible
* Moved platform-specific code to either the bridge plugin (this was already the case)
or to the platform plugin.
* Added several classes and functions. These have not yet gone through an API
review. The plan is to do that in a later commit.
Classes:
- QPlatformAccessibility
- QWindowsAccessibility
Functions:
- QWindow *QAccessibleInterface::window();
- QPlatformAccessibility *QPlatformIntegration::accessibility()
* The bridge code can now either be a plugin or integrated into the platform plugin
* Mac accessibility is left out for now. Unix "should still work" (tm). These platforms
should be fixed soon.
Change-Id: Ib49ffa73b647ee0af90864544c2769440157f562
Reviewed-on: http://codereview.qt-project.org/5330
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/widgets/accessible/qaccessible2.cpp')
-rw-r--r-- | src/widgets/accessible/qaccessible2.cpp | 317 |
1 files changed, 0 insertions, 317 deletions
diff --git a/src/widgets/accessible/qaccessible2.cpp b/src/widgets/accessible/qaccessible2.cpp deleted file mode 100644 index 896c2c8915..0000000000 --- a/src/widgets/accessible/qaccessible2.cpp +++ /dev/null @@ -1,317 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui 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$ -** -****************************************************************************/ - -#include "qaccessible2.h" -#include "qapplication.h" -#include "qclipboard.h" -#include "qtextboundaryfinder.h" - -#ifndef QT_NO_ACCESSIBILITY - -QT_BEGIN_NAMESPACE - -/*! - \namespace QAccessible2 - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessible2 namespace defines constants relating to - IAccessible2-based interfaces - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - -/*! - \class QAccessibleTextInterface - - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessibleTextInterface class implements support for - the IAccessibleText interface. - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - -/*! - \class QAccessibleEditableTextInterface - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessibleEditableTextInterface class implements support for - the IAccessibleEditableText interface. - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - -/*! - \class QAccessibleSimpleEditableTextInterface - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessibleSimpleEditableTextInterface class is a convenience class for - text-based widgets. - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - -/*! - \class QAccessibleValueInterface - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessibleValueInterface class implements support for - the IAccessibleValue interface. - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - -/*! - \class QAccessibleActionInterface - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessibleActionInterface class implements support for - the IAccessibleAction interface. - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - -/*! - \class QAccessibleImageInterface - \ingroup accessibility - \internal - \preliminary - - \brief The QAccessibleImageInterface class implements support for - the IAccessibleImage interface. - - \link http://www.linux-foundation.org/en/Accessibility/IAccessible2 IAccessible2 Specification \endlink -*/ - - -/*! - \internal -*/ -QString Q_WIDGETS_EXPORT qTextBeforeOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, - int *startOffset, int *endOffset, const QString& text) -{ - QTextBoundaryFinder::BoundaryType type; - switch (boundaryType) { - case QAccessible2::CharBoundary: - type = QTextBoundaryFinder::Grapheme; - break; - case QAccessible2::WordBoundary: - type = QTextBoundaryFinder::Word; - break; - case QAccessible2::SentenceBoundary: - type = QTextBoundaryFinder::Sentence; - break; - default: - // in any other case return the whole line - *startOffset = 0; - *endOffset = text.length(); - return text; - } - - QTextBoundaryFinder boundary(type, text); - boundary.setPosition(offset); - - if (!boundary.isAtBoundary()) { - boundary.toPreviousBoundary(); - } - boundary.toPreviousBoundary(); - *startOffset = boundary.position(); - boundary.toNextBoundary(); - *endOffset = boundary.position(); - - return text.mid(*startOffset, *endOffset - *startOffset); -} - -/*! - \internal -*/ -QString Q_WIDGETS_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, - int *startOffset, int *endOffset, const QString& text) -{ - QTextBoundaryFinder::BoundaryType type; - switch (boundaryType) { - case QAccessible2::CharBoundary: - type = QTextBoundaryFinder::Grapheme; - break; - case QAccessible2::WordBoundary: - type = QTextBoundaryFinder::Word; - break; - case QAccessible2::SentenceBoundary: - type = QTextBoundaryFinder::Sentence; - break; - default: - // in any other case return the whole line - *startOffset = 0; - *endOffset = text.length(); - return text; - } - - QTextBoundaryFinder boundary(type, text); - boundary.setPosition(offset); - - boundary.toNextBoundary(); - *startOffset = boundary.position(); - boundary.toNextBoundary(); - *endOffset = boundary.position(); - - return text.mid(*startOffset, *endOffset - *startOffset); -} - -/*! - \internal -*/ -QString Q_WIDGETS_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType, - int *startOffset, int *endOffset, const QString& text) -{ - QTextBoundaryFinder::BoundaryType type; - switch (boundaryType) { - case QAccessible2::CharBoundary: - type = QTextBoundaryFinder::Grapheme; - break; - case QAccessible2::WordBoundary: - type = QTextBoundaryFinder::Word; - break; - case QAccessible2::SentenceBoundary: - type = QTextBoundaryFinder::Sentence; - break; - default: - // in any other case return the whole line - *startOffset = 0; - *endOffset = text.length(); - return text; - } - - QTextBoundaryFinder boundary(type, text); - boundary.setPosition(offset); - - if (!boundary.isAtBoundary()) { - boundary.toPreviousBoundary(); - } - *startOffset = boundary.position(); - boundary.toNextBoundary(); - *endOffset = boundary.position(); - - return text.mid(*startOffset, *endOffset - *startOffset); -} - -QAccessibleSimpleEditableTextInterface::QAccessibleSimpleEditableTextInterface( - QAccessibleInterface *accessibleInterface) - : iface(accessibleInterface) -{ - Q_ASSERT(iface); -} - -#ifndef QT_NO_CLIPBOARD -static QString textForRange(QAccessibleInterface *iface, int startOffset, int endOffset) -{ - return iface->text(QAccessible::Value, 0).mid(startOffset, endOffset - startOffset); -} -#endif - -void QAccessibleSimpleEditableTextInterface::copyText(int startOffset, int endOffset) -{ -#ifdef QT_NO_CLIPBOARD - Q_UNUSED(startOffset); - Q_UNUSED(endOffset); -#else - QApplication::clipboard()->setText(textForRange(iface, startOffset, endOffset)); -#endif -} - -void QAccessibleSimpleEditableTextInterface::deleteText(int startOffset, int endOffset) -{ - QString txt = iface->text(QAccessible::Value, 0); - txt.remove(startOffset, endOffset - startOffset); - iface->setText(QAccessible::Value, 0, txt); -} - -void QAccessibleSimpleEditableTextInterface::insertText(int offset, const QString &text) -{ - QString txt = iface->text(QAccessible::Value, 0); - txt.insert(offset, text); - iface->setText(QAccessible::Value, 0, txt); -} - -void QAccessibleSimpleEditableTextInterface::cutText(int startOffset, int endOffset) -{ -#ifdef QT_NO_CLIPBOARD - Q_UNUSED(startOffset); - Q_UNUSED(endOffset); -#else - QString sub = textForRange(iface, startOffset, endOffset); - deleteText(startOffset, endOffset); - QApplication::clipboard()->setText(sub); -#endif -} - -void QAccessibleSimpleEditableTextInterface::pasteText(int offset) -{ -#ifdef QT_NO_CLIPBOARD - Q_UNUSED(offset); -#else - QString txt = iface->text(QAccessible::Value, 0); - txt.insert(offset, QApplication::clipboard()->text()); - iface->setText(QAccessible::Value, 0, txt); -#endif -} - -void QAccessibleSimpleEditableTextInterface::replaceText(int startOffset, int endOffset, const QString &text) -{ - QString txt = iface->text(QAccessible::Value, 0); - txt.replace(startOffset, endOffset - startOffset, text); - iface->setText(QAccessible::Value, 0, txt); -} - -QT_END_NAMESPACE - -#endif // QT_NO_ACCESSIBILITY |