diff options
author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-10-11 16:20:47 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 11:12:38 +0200 |
commit | 5aa14793c422dc77f3b464c27091dcd1b2ed1c72 (patch) | |
tree | 8a167a67e5d1456a774e176db31a627d0a89cd33 /src/gui | |
parent | 8f912c5c0f3f89e6f3042c0a948ccd155e57e216 (diff) |
Add default actions to QAccessibleWidget.
Change-Id: I9f251aad663fd0b8db2ef068c6581241d91c090d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/accessible/qaccessible2.cpp | 31 | ||||
-rw-r--r-- | src/gui/accessible/qaccessible2.h | 2 |
2 files changed, 10 insertions, 23 deletions
diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp index b33d9755c5..b3ad00cbce 100644 --- a/src/gui/accessible/qaccessible2.cpp +++ b/src/gui/accessible/qaccessible2.cpp @@ -198,32 +198,17 @@ QT_BEGIN_NAMESPACE \sa actionNames() */ -const QString QAccessibleActionInterface::PressAction = QStringLiteral("Press"); -const QString QAccessibleActionInterface::IncreaseAction = QStringLiteral("Increase"); -const QString QAccessibleActionInterface::DecreaseAction = QStringLiteral("Decrease"); -const QString QAccessibleActionInterface::ShowMenuAction = QStringLiteral("ShowMenu"); -const QString QAccessibleActionInterface::SetFocusAction = QStringLiteral("SetFocus"); -const QString QAccessibleActionInterface::CheckAction = QStringLiteral("Check"); -const QString QAccessibleActionInterface::UncheckAction = QStringLiteral("Uncheck"); +const QString QAccessibleActionInterface::PressAction = QStringLiteral(QT_TR_NOOP("Press")); +const QString QAccessibleActionInterface::IncreaseAction = QStringLiteral(QT_TR_NOOP("Increase")); +const QString QAccessibleActionInterface::DecreaseAction = QStringLiteral(QT_TR_NOOP("Decrease")); +const QString QAccessibleActionInterface::ShowMenuAction = QStringLiteral(QT_TR_NOOP("ShowMenu")); +const QString QAccessibleActionInterface::SetFocusAction = QStringLiteral(QT_TR_NOOP("SetFocus")); +const QString QAccessibleActionInterface::CheckAction = QStringLiteral(QT_TR_NOOP("Check")); +const QString QAccessibleActionInterface::UncheckAction = QStringLiteral(QT_TR_NOOP("Uncheck")); QString QAccessibleActionInterface::localizedActionName(const QString &actionName) const { - if (actionName == PressAction) - return QCoreApplication::translate("QAccessibleActionInterface", "Press"); - else if (actionName == IncreaseAction) - return QCoreApplication::translate("QAccessibleActionInterface", "Increase"); - else if (actionName == DecreaseAction) - return QCoreApplication::translate("QAccessibleActionInterface", "Decrease"); - else if (actionName == ShowMenuAction) - return QCoreApplication::translate("QAccessibleActionInterface", "ShowMenu"); - else if (actionName == SetFocusAction) - return QCoreApplication::translate("QAccessibleActionInterface", "SetFocus"); - else if (actionName == CheckAction) - return QCoreApplication::translate("QAccessibleActionInterface", "Check"); - else if (actionName == UncheckAction) - return QCoreApplication::translate("QAccessibleActionInterface", "Uncheck"); - - return QString(); + return QAccessibleActionInterface::tr(qPrintable(actionName)); } QString QAccessibleActionInterface::localizedActionDescription(const QString &actionName) const diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h index 65e63b4fbf..d3777d6561 100644 --- a/src/gui/accessible/qaccessible2.h +++ b/src/gui/accessible/qaccessible2.h @@ -43,6 +43,7 @@ #define QACCESSIBLE2_H #include <QtGui/qaccessible.h> +#include <QtCore/qcoreapplication.h> QT_BEGIN_HEADER @@ -328,6 +329,7 @@ friend class QAbstractItemViewPrivate; class Q_GUI_EXPORT QAccessibleActionInterface: public QAccessible2Interface { + Q_DECLARE_TR_FUNCTIONS(QAccessibleActionInterface) public: inline QAccessible2Interface *qAccessibleActionCastHelper() { return this; } |