From 5aa14793c422dc77f3b464c27091dcd1b2ed1c72 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 11 Oct 2011 16:20:47 +0200 Subject: Add default actions to QAccessibleWidget. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9f251aad663fd0b8db2ef068c6581241d91c090d Reviewed-by: Jan-Arve Sæther --- src/gui/accessible/qaccessible2.cpp | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) (limited to 'src/gui/accessible/qaccessible2.cpp') 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 -- cgit v1.2.3