Browse Source
Merge pull request #2326 from lioncash/translation
yuzu/applets/{profile_select, software_keyboard}: Use QDialogButtonBox standard buttons instead of custom ones where applicable
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
11 deletions
-
src/yuzu/applets/profile_select.cpp
-
src/yuzu/applets/software_keyboard.cpp
|
|
|
@ -58,10 +58,7 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(QWidget* parent) |
|
|
|
|
|
|
|
scroll_area = new QScrollArea; |
|
|
|
|
|
|
|
buttons = new QDialogButtonBox; |
|
|
|
buttons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole); |
|
|
|
buttons->addButton(tr("OK"), QDialogButtonBox::AcceptRole); |
|
|
|
|
|
|
|
buttons = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok); |
|
|
|
connect(buttons, &QDialogButtonBox::accepted, this, &QtProfileSelectionDialog::accept); |
|
|
|
connect(buttons, &QDialogButtonBox::rejected, this, &QtProfileSelectionDialog::reject); |
|
|
|
|
|
|
|
|
|
|
|
@ -75,13 +75,13 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog( |
|
|
|
length_label->setText(QStringLiteral("%1/%2").arg(text.size()).arg(parameters.max_length)); |
|
|
|
}); |
|
|
|
|
|
|
|
buttons = new QDialogButtonBox; |
|
|
|
buttons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole); |
|
|
|
buttons->addButton(parameters.submit_text.empty() |
|
|
|
? tr("OK") |
|
|
|
: QString::fromStdU16String(parameters.submit_text), |
|
|
|
QDialogButtonBox::AcceptRole); |
|
|
|
|
|
|
|
buttons = new QDialogButtonBox(QDialogButtonBox::Cancel); |
|
|
|
if (parameters.submit_text.empty()) { |
|
|
|
buttons->addButton(QDialogButtonBox::Ok); |
|
|
|
} else { |
|
|
|
buttons->addButton(QString::fromStdU16String(parameters.submit_text), |
|
|
|
QDialogButtonBox::AcceptRole); |
|
|
|
} |
|
|
|
connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::accept); |
|
|
|
connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::reject); |
|
|
|
layout->addWidget(header_label); |
|
|
|
|