Kaydet (Commit) 718a7e58 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

qt5 a11y: Add event notifications

Change-Id: Idb2fb2f880b4e848adc213a4e2cea33c5eb56f05
Reviewed-on: https://gerrit.libreoffice.org/61424
Tested-by: Jenkins
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst f3b34508
......@@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_libs,vclplug_qt5,\
endif
$(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
vcl/qt5/Qt5AccessibleEventListener \
vcl/qt5/Qt5AccessibleText \
vcl/qt5/Qt5AccessibleValue \
vcl/qt5/Qt5AccessibleWidget \
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#pragma once
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include "Qt5AccessibleWidget.hxx"
#include <cppuhelper/implbase.hxx>
class Qt5AccessibleEventListener
: public cppu::WeakImplHelper<css::accessibility::XAccessibleEventListener>
{
public:
Qt5AccessibleEventListener(
const css::uno::Reference<css::accessibility::XAccessible> xAccessible,
Qt5AccessibleWidget* pAccessibleWidget);
virtual void SAL_CALL
notifyEvent(const css::accessibility::AccessibleEventObject& aEvent) override;
virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
private:
css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
Qt5AccessibleWidget* m_pAccessibleWidget;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <Qt5AccessibleEventListener.hxx>
#include <sal/log.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <QtGui/QAccessible>
using namespace css;
using namespace css::accessibility;
using namespace css::lang;
using namespace css::uno;
Qt5AccessibleEventListener::Qt5AccessibleEventListener(const Reference<XAccessible> xAccessible,
Qt5AccessibleWidget* pAccessibleWidget)
: m_xAccessible(xAccessible)
, m_pAccessibleWidget(pAccessibleWidget)
{
}
void Qt5AccessibleEventListener::notifyEvent(
const css::accessibility::AccessibleEventObject& aEvent)
{
QAccessibleInterface* pQAccessibleInterface
= static_cast<QAccessibleInterface*>(m_pAccessibleWidget);
Reference<XAccessible> xChild;
switch (aEvent.EventId)
{
case AccessibleEventId::NAME_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::NameChanged));
return;
case AccessibleEventId::DESCRIPTION_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::DescriptionChanged));
return;
case AccessibleEventId::ACTION_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::ActionChanged));
return;
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::ActiveDescendantChanged));
return;
case AccessibleEventId::CHILD:
QAccessible::Event event;
if (aEvent.OldValue >>= xChild)
event = QAccessible::ObjectDestroyed;
if (aEvent.NewValue >>= xChild)
event = QAccessible::ObjectCreated;
if (event)
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, event));
return;
case AccessibleEventId::SELECTION_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::Selection));
return;
case AccessibleEventId::VISIBLE_DATA_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::VisibleDataChanged));
return;
case AccessibleEventId::TEXT_SELECTION_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::Selection));
return;
case AccessibleEventId::TEXT_ATTRIBUTE_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::AttributeChanged));
return;
case AccessibleEventId::TABLE_CAPTION_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::TableCaptionChanged));
return;
case AccessibleEventId::TABLE_COLUMN_DESCRIPTION_CHANGED:
QAccessible::updateAccessibility(new QAccessibleEvent(
pQAccessibleInterface, QAccessible::TableColumnDescriptionChanged));
return;
case AccessibleEventId::TABLE_COLUMN_HEADER_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::TableColumnHeaderChanged));
return;
case AccessibleEventId::TABLE_ROW_DESCRIPTION_CHANGED:
QAccessible::updateAccessibility(new QAccessibleEvent(
pQAccessibleInterface, QAccessible::TableRowDescriptionChanged));
return;
case AccessibleEventId::TABLE_ROW_HEADER_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::TableRowHeaderChanged));
return;
case AccessibleEventId::TABLE_SUMMARY_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::TableSummaryChanged));
return;
case AccessibleEventId::SELECTION_CHANGED_ADD:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::SelectionAdd));
return;
case AccessibleEventId::SELECTION_CHANGED_REMOVE:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::SelectionRemove));
return;
case AccessibleEventId::SELECTION_CHANGED_WITHIN:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::SelectionWithin));
return;
case AccessibleEventId::PAGE_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::PageChanged));
return;
case AccessibleEventId::SECTION_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::SectionChanged));
return;
case AccessibleEventId::COLUMN_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::TextColumnChanged));
return;
case AccessibleEventId::BOUNDRECT_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::LocationChanged));
return;
case AccessibleEventId::STATE_CHANGED:
QAccessible::updateAccessibility(
new QAccessibleEvent(pQAccessibleInterface, QAccessible::ForegroundChanged));
return;
case AccessibleEventId::ROLE_CHANGED:
case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
case AccessibleEventId::VALUE_CHANGED:
case AccessibleEventId::CONTENT_FLOWS_FROM_RELATION_CHANGED:
case AccessibleEventId::CONTENT_FLOWS_TO_RELATION_CHANGED:
case AccessibleEventId::CONTROLLED_BY_RELATION_CHANGED:
case AccessibleEventId::CONTROLLER_FOR_RELATION_CHANGED:
case AccessibleEventId::LABEL_FOR_RELATION_CHANGED:
case AccessibleEventId::LABELED_BY_RELATION_CHANGED:
case AccessibleEventId::MEMBER_OF_RELATION_CHANGED:
case AccessibleEventId::SUB_WINDOW_OF_RELATION_CHANGED:
case AccessibleEventId::CARET_CHANGED:
case AccessibleEventId::TEXT_CHANGED:
case AccessibleEventId::HYPERTEXT_CHANGED:
case AccessibleEventId::TABLE_MODEL_CHANGED:
case AccessibleEventId::LISTBOX_ENTRY_EXPANDED:
case AccessibleEventId::LISTBOX_ENTRY_COLLAPSED:
case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS:
default:
SAL_WARN("vcl.qt5", "Unmapped AccessibleEventId: " << aEvent.EventId);
return;
}
}
void Qt5AccessibleEventListener::disposing(const EventObject& /* Source */) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -28,6 +28,7 @@
#include <Qt5XAccessible.hxx>
#include <Qt5AccessibleText.hxx>
#include <Qt5AccessibleValue.hxx>
#include <Qt5AccessibleEventListener.hxx>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
......@@ -38,6 +39,8 @@
#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <comphelper/AccessibleImplementationHelper.hxx>
......@@ -51,6 +54,14 @@ using namespace css::uno;
Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference<XAccessible> xAccessible)
: m_xAccessible(xAccessible)
{
Reference<XAccessibleContext> xContext(xAccessible, UNO_QUERY);
Reference<XAccessibleEventBroadcaster> xBroadcaster(xContext, UNO_QUERY);
if (xBroadcaster.is())
{
Reference<XAccessibleEventListener> xListener(
new Qt5AccessibleEventListener(xAccessible, this));
xBroadcaster->addAccessibleEventListener(xListener);
}
}
QWindow* Qt5AccessibleWidget::window() const { return nullptr; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment