Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

citra-qt: Add /default parsing for hotkeys. Also minor code cleanups.

Browse source
This commit is contained in:
Adityarup Laha 2018-12-30 15:39:16 +05:30
parent 71f36efd27
commit 80ebd75285
No known key found for this signature in database
GPG key ID: 1B24048A1F78845F
12 changed files with 67 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <QMessageBox>
#include <QStandardItemModel>
#include "citra_qt/configuration/configure_hotkeys.h"
#include "citra_qt/hotkeys.h"
#include "citra_qt/util/sequence_dialog/sequence_dialog.h"
@ -18,7 +19,6 @@ ConfigureHotkeys::ConfigureHotkeys(QWidget* parent)
model->setColumnCount(3);
model->setHorizontalHeaderLabels({tr("Action"), tr("Hotkey"), tr("Context")});
ui->hotkey_list->setSelectionMode(QTreeView::SingleSelection);
connect(ui->hotkey_list, &QTreeView::doubleClicked, this, &ConfigureHotkeys::Configure);
ui->hotkey_list->setModel(model);
@ -27,10 +27,9 @@ ConfigureHotkeys::ConfigureHotkeys(QWidget* parent)
ui->hotkey_list->setColumnWidth(0, 200);
ui->hotkey_list->resizeColumnToContents(1);
ui->hotkey_list->setEditTriggers(QTreeView::NoEditTriggers);
}
ConfigureHotkeys::~ConfigureHotkeys() {}
ConfigureHotkeys::~ConfigureHotkeys() = default;
void ConfigureHotkeys::EmitHotkeysChanged() {
emit HotkeysChanged(GetUsedKeyList());
@ -86,9 +85,7 @@ void ConfigureHotkeys::Configure(QModelIndex index) {
if (return_code == QDialog::Rejected || key_sequence.isEmpty())
return;
if (IsUsedKey(key_sequence) &&
key_sequence != QKeySequence(previous_key.toString(), QKeySequence::NativeText)) {
model->setData(index, previous_key);
if (IsUsedKey(key_sequence) && key_sequence != QKeySequence(previous_key.toString())) {
QMessageBox::critical(this, tr("Error in inputted key"),
tr("You're using a key that's already bound."));
} else {