mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4783 from FearlessTobi/port-2517

Browse source 
Port yuzu-emu/yuzu#2517: "configure_hotkeys: Minor cleanup"
This commit is contained in:
bunnei 2019-06-08 00:12:34 -04:00 committed by GitHub
commit 56fc61a41f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/citra_qt/configuration/configure_hotkeys.cpp
View file

@ -87,8 +87,8 @@ void ConfigureHotkeys::Configure(QModelIndex index) {
} }
if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) { if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) {
QMessageBox::critical(this, tr("Error in inputted key"), QMessageBox::warning(this, tr("Conflicting Key Sequence"),
tr("You're using a key that's already bound.")); tr("The entered key sequence is already assigned to another hotkey."));
} else { } else {
model->setData(index, key_sequence.toString(QKeySequence::NativeText)); model->setData(index, key_sequence.toString(QKeySequence::NativeText));
EmitHotkeysChanged(); EmitHotkeysChanged();
@ -118,7 +118,6 @@ void ConfigureHotkeys::applyConfiguration(HotkeyRegistry& registry) {
} }
registry.SaveHotkeys(); registry.SaveHotkeys();
Settings::Apply();
} }
void ConfigureHotkeys::retranslateUi() { void ConfigureHotkeys::retranslateUi() {

13
src/citra_qt/util/sequence_dialog/sequence_dialog.cpp
View file

@ -9,16 +9,19 @@
SequenceDialog::SequenceDialog(QWidget* parent) : QDialog(parent) { SequenceDialog::SequenceDialog(QWidget* parent) : QDialog(parent) {
setWindowTitle(tr("Enter a hotkey")); setWindowTitle(tr("Enter a hotkey"));
auto* layout = new QVBoxLayout(this); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
key_sequence = new QKeySequenceEdit; key_sequence = new QKeySequenceEdit;
layout->addWidget(key_sequence);
auto* buttons = auto* const buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal);
buttons->setCenterButtons(true); buttons->setCenterButtons(true);
auto* const layout = new QVBoxLayout(this);
layout->addWidget(key_sequence);
layout->addWidget(buttons); layout->addWidget(buttons);
connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
} }
SequenceDialog::~SequenceDialog() = default; SequenceDialog::~SequenceDialog() = default;