jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Make sure "Defaults" buttons aren't default buttons

Browse Source
This commit is contained in:
jp9000 2017-06-28 08:59:35 -07:00
parent aedb85f5d3
commit 14e41dc0c1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/window-basic-filters.cpp
View File

@ -87,8 +87,9 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_)
SLOT(EffectFilterNameEdited(QWidget*,
QAbstractItemDelegate::EndEditHint)));
connect(ui->buttonBox->button(QDialogButtonBox::Close),
SIGNAL(clicked()), this, SLOT(close()));
QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close);
connect(close, SIGNAL(clicked()), this, SLOT(close()));
close->setDefault(true);
ui->buttonBox->button(QDialogButtonBox::Reset)->setText(
QTStr("Defaults"));

5
UI/window-basic-properties.cpp
View File

@ -49,11 +49,14 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
int cy = (int)config_get_int(App()->GlobalConfig(), "PropertiesWindow",
"cy");
buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole);
QPushButton *b;
b = buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(QTStr("Cancel"), QDialogButtonBox::RejectRole);
buttonBox->addButton(QTStr("Defaults"), QDialogButtonBox::ResetRole);
buttonBox->setObjectName(QStringLiteral("buttonBox"));
b->setDefault(true);
if (cx > 400 && cy > 400)
resize(cx, cy);
else