franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2326 from lioncash/translation 

yuzu/applets/{profile_select, software_keyboard}: Use QDialogButtonBox standard buttons instead of custom ones where applicable
This commit is contained in:
bunnei 2019-04-03 11:44:18 -04:00 committed by GitHub
parent e796351a0d 65ae1ac4e5
commit 774fa0b828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/yuzu/applets/profile_select.cpp
View File

@ -58,10 +58,7 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(QWidget* parent)
scroll_area = new QScrollArea; scroll_area = new QScrollArea;
buttons = new QDialogButtonBox; buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
buttons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
buttons->addButton(tr("OK"), QDialogButtonBox::AcceptRole);
connect(buttons, &QDialogButtonBox::accepted, this, &QtProfileSelectionDialog::accept); connect(buttons, &QDialogButtonBox::accepted, this, &QtProfileSelectionDialog::accept);
connect(buttons, &QDialogButtonBox::rejected, this, &QtProfileSelectionDialog::reject); connect(buttons, &QDialogButtonBox::rejected, this, &QtProfileSelectionDialog::reject);

12
src/yuzu/applets/software_keyboard.cpp
View File

@ -75,13 +75,13 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
length_label->setText(QStringLiteral("%1/%2").arg(text.size()).arg(parameters.max_length)); length_label->setText(QStringLiteral("%1/%2").arg(text.size()).arg(parameters.max_length));
}); });
buttons = new QDialogButtonBox; buttons = new QDialogButtonBox(QDialogButtonBox::Cancel);
buttons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole); if (parameters.submit_text.empty()) {
buttons->addButton(parameters.submit_text.empty() buttons->addButton(QDialogButtonBox::Ok);
? tr("OK") } else {
: QString::fromStdU16String(parameters.submit_text), buttons->addButton(QString::fromStdU16String(parameters.submit_text),
QDialogButtonBox::AcceptRole); QDialogButtonBox::AcceptRole);
}
connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::accept); connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::accept);
connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::reject); connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::reject);
layout->addWidget(header_label); layout->addWidget(header_label);