Revert "UI: Various screen reader fixes"

This reverts commit b5843caa48.

This breaks some hotkeys because the signals are tied to a signal which
is now triggered because "toggled" is used instead of "clicked", so just
revert it for now for the release and look at it later post-patch.
This commit is contained in:
jp9000
2019-09-12 13:55:31 -07:00
parent 5287518044
commit 3064887ae2
10 changed files with 122 additions and 315 deletions

View File

@@ -260,9 +260,10 @@ void OBSBasicSettings::HookWidget(QWidget *widget, const char *signal,
#define COMBO_CHANGED SIGNAL(currentIndexChanged(int))
#define EDIT_CHANGED SIGNAL(textChanged(const QString &))
#define CBEDIT_CHANGED SIGNAL(editTextChanged(const QString &))
#define CHECK_CHANGED SIGNAL(toggled(bool))
#define CHECK_CHANGED SIGNAL(clicked(bool))
#define SCROLL_CHANGED SIGNAL(valueChanged(int))
#define DSCROLL_CHANGED SIGNAL(valueChanged(double))
#define TOGGLE_CHANGED SIGNAL(toggled(bool))
#define GENERAL_CHANGED SLOT(GeneralChanged())
#define STREAM1_CHANGED SLOT(Stream1Changed())
@@ -725,68 +726,18 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
InitStreamPage();
LoadSettings(false);
ui->advOutTrack1->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track1"));
ui->advOutTrack2->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track2"));
ui->advOutTrack3->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track3"));
ui->advOutTrack4->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track4"));
ui->advOutTrack5->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track5"));
ui->advOutTrack6->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track6"));
ui->advOutRecTrack1->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track1"));
ui->advOutRecTrack2->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track2"));
ui->advOutRecTrack3->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track3"));
ui->advOutRecTrack4->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track4"));
ui->advOutRecTrack5->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track5"));
ui->advOutRecTrack6->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track6"));
ui->advOutFFTrack1->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track1"));
ui->advOutFFTrack2->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track2"));
ui->advOutFFTrack3->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track3"));
ui->advOutFFTrack4->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track4"));
ui->advOutFFTrack5->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track5"));
ui->advOutFFTrack6->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Audio.Track6"));
ui->snappingEnabled->setAccessibleName(
QTStr("Basic.Settings.General.Snapping"));
ui->systemTrayEnabled->setAccessibleName(
QTStr("Basic.Settings.General.SysTray"));
ui->label_31->setAccessibleName(
QTStr("Basic.Settings.Output.Adv.Recording.RecType"));
ui->streamDelayEnable->setAccessibleName(
QTStr("Basic.Settings.Advanced.StreamDelay"));
ui->reconnectEnable->setAccessibleName(
QTStr("Basic.Settings.Output.Reconnect"));
// Add warning checks to advanced output recording section controls
connect(ui->advOutRecTrack1, SIGNAL(toggled()), this,
connect(ui->advOutRecTrack1, SIGNAL(clicked()), this,
SLOT(AdvOutRecCheckWarnings()));
connect(ui->advOutRecTrack2, SIGNAL(toggled()), this,
connect(ui->advOutRecTrack2, SIGNAL(clicked()), this,
SLOT(AdvOutRecCheckWarnings()));
connect(ui->advOutRecTrack3, SIGNAL(toggled()), this,
connect(ui->advOutRecTrack3, SIGNAL(clicked()), this,
SLOT(AdvOutRecCheckWarnings()));
connect(ui->advOutRecTrack4, SIGNAL(toggled()), this,
connect(ui->advOutRecTrack4, SIGNAL(clicked()), this,
SLOT(AdvOutRecCheckWarnings()));
connect(ui->advOutRecTrack5, SIGNAL(toggled()), this,
connect(ui->advOutRecTrack5, SIGNAL(clicked()), this,
SLOT(AdvOutRecCheckWarnings()));
connect(ui->advOutRecTrack6, SIGNAL(toggled()), this,
connect(ui->advOutRecTrack6, SIGNAL(clicked()), this,
SLOT(AdvOutRecCheckWarnings()));
connect(ui->advOutRecFormat, SIGNAL(currentIndexChanged(int)), this,
SLOT(AdvOutRecCheckWarnings()));