diff --git a/src/mumble/Accessibility.cpp b/src/mumble/Accessibility.cpp index 4e0d9cea3bb..c192a9e8eac 100644 --- a/src/mumble/Accessibility.cpp +++ b/src/mumble/Accessibility.cpp @@ -19,6 +19,8 @@ #include +#include + namespace Mumble { namespace Accessibility { @@ -150,6 +152,9 @@ namespace Accessibility { // We set the value for the slider, any potential focus proxy, // and the QAccessibleInterface. Orca will still read the // raw slider value. + + qDebug() << value; + QVariant newValue = QVariant(value); slider->setFocus(); diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp index 9b8869d1b6a..000625bb00a 100644 --- a/src/mumble/AudioConfigDialog.cpp +++ b/src/mumble/AudioConfigDialog.cpp @@ -5,6 +5,7 @@ #include "AudioConfigDialog.h" +#include "Accessibility.h" #include "AudioInput.h" #include "AudioOutput.h" #include "AudioOutputSample.h" @@ -287,8 +288,11 @@ void AudioInputDialog::save() const { } void AudioInputDialog::on_qsFrames_valueChanged(int v) { - qlFrames->setText(tr("%1 ms").arg((v == 1) ? 10 : (v - 1) * 20)); + int val = (v == 1) ? 10 : (v - 1) * 20; + qlFrames->setText(tr("%1 ms").arg(val)); updateBitrate(); + + Mumble::Accessibility::setSliderSemanticValue(qsFrames, QString("%1 %2").arg(val).arg(tr("milliseconds"))); } void AudioInputDialog::on_qsDoublePush_valueChanged(int v) { @@ -299,21 +303,29 @@ void AudioInputDialog::on_qsDoublePush_valueChanged(int v) { } void AudioInputDialog::on_qsPTTHold_valueChanged(int v) { - if (v == 0) + if (v == 0) { qlPTTHold->setText(tr("Off")); - else + Mumble::Accessibility::setSliderSemanticValue(qsPTTHold, tr("Off")); + } else { qlPTTHold->setText(tr("%1 ms").arg(v)); + Mumble::Accessibility::setSliderSemanticValue(qsPTTHold, QString("%1 %2").arg(v).arg(tr("milliseconds"))); + } } void AudioInputDialog::on_qsTransmitHold_valueChanged(int v) { float val = static_cast< float >(v * 10); val = val / 1000.0f; qlTransmitHold->setText(tr("%1 s").arg(val, 0, 'f', 2)); + Mumble::Accessibility::setSliderSemanticValue(qsTransmitHold, + QString("%1 %2").arg(val, 0, 'f', 2).arg(tr("seconds"))); } void AudioInputDialog::on_qsQuality_valueChanged(int v) { qlQuality->setText(tr("%1 kb/s").arg(static_cast< float >(v) / 1000.0f, 0, 'f', 1)); updateBitrate(); + + Mumble::Accessibility::setSliderSemanticValue( + qsQuality, QString("%1 %2").arg(static_cast< float >(v) / 1000.0f, 0, 'f', 1).arg(tr("kilobit per second"))); } void AudioInputDialog::on_qsSpeexNoiseSupStrength_valueChanged(int v) { @@ -322,8 +334,11 @@ void AudioInputDialog::on_qsSpeexNoiseSupStrength_valueChanged(int v) { if (v < 15) { qlSpeexNoiseSupStrength->setText(tr("Off")); pal.setColor(qlSpeexNoiseSupStrength->foregroundRole(), Qt::red); + Mumble::Accessibility::setSliderSemanticValue(qsSpeexNoiseSupStrength, tr("Off")); } else { qlSpeexNoiseSupStrength->setText(tr("-%1 dB").arg(v)); + Mumble::Accessibility::setSliderSemanticValue(qsSpeexNoiseSupStrength, + QString("-%1 %2").arg(v).arg(tr("decibel"))); } qlSpeexNoiseSupStrength->setPalette(pal); } @@ -332,6 +347,8 @@ void AudioInputDialog::on_qsAmp_valueChanged(int v) { v = 18000 - v + 2000; float d = 20000.0f / static_cast< float >(v); qlAmp->setText(QString::fromLatin1("%1").arg(d, 0, 'f', 2)); + + Mumble::Accessibility::setSliderSemanticValue(qsAmp, QString("%1").arg(d, 0, 'f', 2)); } void AudioInputDialog::updateBitrate() { @@ -813,6 +830,7 @@ void AudioOutputDialog::on_qcbSystem_currentIndexChanged(int) { void AudioOutputDialog::on_qsJitter_valueChanged(int v) { qlJitter->setText(tr("%1 ms").arg(v * 10)); + Mumble::Accessibility::setSliderSemanticValue(qsJitter, QString("%1 %2").arg(v * 10).arg(tr("milliseconds"))); } void AudioOutputDialog::on_qsVolume_valueChanged(int v) { @@ -824,22 +842,30 @@ void AudioOutputDialog::on_qsVolume_valueChanged(int v) { qlVolume->setPalette(pal); qlVolume->setText(tr("%1 %").arg(v)); + Mumble::Accessibility::setSliderSemanticValue(qsVolume, Mumble::Accessibility::SliderAccesibilityMode::PERCENT, + "%"); } void AudioOutputDialog::on_qsOtherVolume_valueChanged(int v) { qlOtherVolume->setText(tr("%1 %").arg(v)); + Mumble::Accessibility::setSliderSemanticValue(qsOtherVolume, Mumble::Accessibility::SliderAccesibilityMode::PERCENT, + "%"); } void AudioOutputDialog::on_qsPacketDelay_valueChanged(int v) { qlPacketDelay->setText(tr("%1 ms").arg(v)); + Mumble::Accessibility::setSliderSemanticValue(qsPacketDelay, QString("%1 %2").arg(v).arg(tr("milliseconds"))); } void AudioOutputDialog::on_qsPacketLoss_valueChanged(int v) { qlPacketLoss->setText(tr("%1 %").arg(v)); + Mumble::Accessibility::setSliderSemanticValue(qsPacketLoss, Mumble::Accessibility::SliderAccesibilityMode::PERCENT, + "%"); } void AudioOutputDialog::on_qsDelay_valueChanged(int v) { qlDelay->setText(tr("%1 ms").arg(v * 10)); + Mumble::Accessibility::setSliderSemanticValue(qsDelay, QString("%1 %2").arg(v * 10).arg(tr("milliseconds"))); } void AudioOutputDialog::on_qcbLoopback_currentIndexChanged(int v) { @@ -864,6 +890,7 @@ void AudioOutputDialog::on_qsMinDistance_valueChanged(int value) { void AudioOutputDialog::on_qsbMinimumDistance_valueChanged(double value) { QSignalBlocker blocker(qsMinDistance); qsMinDistance->setValue(value * 10); + Mumble::Accessibility::setSliderSemanticValue(qsMinDistance, QString("%1 %2").arg(value * 10).arg(tr("meters"))); // Ensure that max distance is always a least 1m larger than min distance qsMaxDistance->setValue(std::max(qsMaxDistance->value(), static_cast< int >(value * 10) + 10)); @@ -879,6 +906,7 @@ void AudioOutputDialog::on_qsMaxDistance_valueChanged(int value) { void AudioOutputDialog::on_qsbMaximumDistance_valueChanged(double value) { QSignalBlocker blocker(qsMaxDistance); qsMaxDistance->setValue(value * 10); + Mumble::Accessibility::setSliderSemanticValue(qsMaxDistance, QString("%1 %2").arg(value * 10).arg(tr("meters"))); // Ensure that min distance is always a least 1m less than max distance qsMinDistance->setValue(std::min(qsMinDistance->value(), static_cast< int >(value * 10) - 10)); @@ -887,6 +915,8 @@ void AudioOutputDialog::on_qsbMaximumDistance_valueChanged(double value) { void AudioOutputDialog::on_qsMinimumVolume_valueChanged(int value) { QSignalBlocker blocker(qsbMinimumVolume); qsbMinimumVolume->setValue(value); + Mumble::Accessibility::setSliderSemanticValue(qsMinimumVolume, + Mumble::Accessibility::SliderAccesibilityMode::PERCENT, "%"); } void AudioOutputDialog::on_qsbMinimumVolume_valueChanged(int value) { @@ -897,6 +927,7 @@ void AudioOutputDialog::on_qsbMinimumVolume_valueChanged(int value) { void AudioOutputDialog::on_qsBloom_valueChanged(int value) { QSignalBlocker blocker(qsbBloom); qsbBloom->setValue(value); + Mumble::Accessibility::setSliderSemanticValue(qsBloom, Mumble::Accessibility::SliderAccesibilityMode::PERCENT, "%"); } void AudioOutputDialog::on_qsbBloom_valueChanged(int value) { diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt index d27031639b0..3a3ab0aa679 100644 --- a/src/mumble/CMakeLists.txt +++ b/src/mumble/CMakeLists.txt @@ -307,6 +307,8 @@ set(MUMBLE_SOURCES "widgets/SearchDialogItemDelegate.h" "widgets/SearchDialogTree.cpp" "widgets/SearchDialogTree.h" + "widgets/SemanticSlider.cpp" + "widgets/SemanticSlider.h" "${SHARED_SOURCE_DIR}/ACL.cpp" diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp index 226df1b58ec..5d7736ec83e 100644 --- a/src/mumble/Log.cpp +++ b/src/mumble/Log.cpp @@ -5,6 +5,7 @@ #include "Log.h" +#include "Accessibility.h" #include "AudioOutput.h" #include "AudioOutputSample.h" #include "AudioOutputToken.h" @@ -370,14 +371,18 @@ void LogConfig::browseForAudioFile() { void LogConfig::on_qsNotificationVolume_valueChanged(int value) { qsbNotificationVolume->setValue(value); + Mumble::Accessibility::setSliderSemanticValue(qsNotificationVolume, QString("%1 %2").arg(value).arg(tr("decibel"))); } void LogConfig::on_qsCueVolume_valueChanged(int value) { qsbCueVolume->setValue(value); + Mumble::Accessibility::setSliderSemanticValue(qsCueVolume, QString("%1 %2").arg(value).arg(tr("decibel"))); } void LogConfig::on_qsTTSVolume_valueChanged(int value) { qsbTTSVolume->setValue(value); + Mumble::Accessibility::setSliderSemanticValue(qsTTSVolume, Mumble::Accessibility::SliderAccesibilityMode::PERCENT, + "%"); } void LogConfig::on_qsbNotificationVolume_valueChanged(int value) { diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 2deaf3b0cd3..64a0e9e7c31 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -66,6 +66,7 @@ # include "AppNap.h" #endif +#include #include #include #include @@ -80,6 +81,8 @@ #include #include +#include "widgets/SemanticSlider.h" + #ifdef Q_OS_WIN # include #endif @@ -197,6 +200,8 @@ MainWindow::MainWindow(QWidget *p) QObject::connect(this, &MainWindow::serverSynchronized, Global::get().pluginManager, &PluginManager::on_serverSynchronized); + + QAccessible::installFactory(SemanticSlider::semanticSliderFactory); } void MainWindow::createActions() { diff --git a/src/mumble/widgets/SemanticSlider.cpp b/src/mumble/widgets/SemanticSlider.cpp new file mode 100644 index 00000000000..0a4f6b0de4e --- /dev/null +++ b/src/mumble/widgets/SemanticSlider.cpp @@ -0,0 +1,83 @@ +// Copyright 2023-2024 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +#include "SemanticSlider.h" + +SemanticAbstractSlider::SemanticAbstractSlider(QWidget *w, QAccessible::Role r) + : QAccessibleWidget(w, r) +{ + Q_ASSERT(qobject_cast(w)); +} + +void *SemanticAbstractSlider::interface_cast(QAccessible::InterfaceType t) +{ + if (t == QAccessible::ValueInterface) + return static_cast(this); + return QAccessibleWidget::interface_cast(t); +} + +QVariant SemanticAbstractSlider::currentValue() const +{ + return abstractSlider()->value(); +} + +void SemanticAbstractSlider::setCurrentValue(const QVariant &value) +{ + abstractSlider()->setValue(value.toInt()); +} + +QVariant SemanticAbstractSlider::maximumValue() const +{ + return abstractSlider()->maximum(); +} + +QVariant SemanticAbstractSlider::minimumValue() const +{ + return abstractSlider()->minimum(); +} + +QVariant SemanticAbstractSlider::minimumStepSize() const +{ + return abstractSlider()->singleStep(); +} + +QAbstractSlider *SemanticAbstractSlider::abstractSlider() const +{ + return static_cast(object()); +} + +SemanticSlider::SemanticSlider(QWidget *w) +: SemanticAbstractSlider(w) +{ + Q_ASSERT(slider()); + addControllingSignal("valueChanged(int)"_L1); +} + +QSlider *SemanticSlider::slider() const +{ + return qobject_cast(object()); +} + +QString SemanticSlider::text(QAccessible::Text t) const +{ + if (t == QAccessible::Value) { + if (!m_semanticValue.isEmpty()) { + return m_semanticValue; + } + return QString::number(slider()->value()); + } + + return SemanticAbstractSlider::text(t); +} + +QAccessibleInterface *SemanticSlider::semanticSliderFactory(const QString &classname, QObject *object) { + QAccessibleInterface *interface = nullptr; + + if (classname == QLatin1String("QSlider") && object && object->isWidgetType()) { + interface = new SemanticSlider(static_cast(object)); + } + + return interface; +} diff --git a/src/mumble/widgets/SemanticSlider.h b/src/mumble/widgets/SemanticSlider.h new file mode 100644 index 00000000000..0f20386225c --- /dev/null +++ b/src/mumble/widgets/SemanticSlider.h @@ -0,0 +1,50 @@ +// Copyright 2023-2024 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at . + +#ifndef MUMBLE_MUMBLE_WIDGETS_SEMANTICSLIDER_H_ +#define MUMBLE_MUMBLE_WIDGETS_SEMANTICSLIDER_H_ + +#include +#include +#include + +#include +#include +#include +#include + +#include + +class SemanticAbstractSlider: public QAccessibleWidget, public QAccessibleValueInterface +{ +public: + explicit SemanticAbstractSlider(QWidget *w, QAccessible::Role r = QAccessible::Slider); + void *interface_cast(QAccessible::InterfaceType t) override; + + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; + +protected: + QAbstractSlider *abstractSlider() const; +}; + +class SemanticSlider : public SemanticAbstractSlider +{ +public: + explicit SemanticSlider(QWidget *w); + QString text(QAccessible::Text t) const override; + + static QAccessibleInterface *semanticSliderFactory(const QString &classname, QObject *object); + + QString m_semanticValue; + +protected: + QSlider *slider() const; +}; + +#endif