mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-27 07:37:19 +02:00
Merge pull request #2376 from lioncash/const
yuzu/configure_hotkey: Minor changes
This commit is contained in:
commit
2654eb659e
@ -12,7 +12,7 @@
|
|||||||
#include "yuzu/hotkeys.h"
|
#include "yuzu/hotkeys.h"
|
||||||
|
|
||||||
ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
|
ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
|
||||||
: QDialog(parent), registry(registry), ui(new Ui::ConfigureDialog) {
|
: QDialog(parent), ui(new Ui::ConfigureDialog), registry(registry) {
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->hotkeysTab->Populate(registry);
|
ui->hotkeysTab->Populate(registry);
|
||||||
this->setConfiguration();
|
this->setConfiguration();
|
||||||
|
@ -66,20 +66,21 @@ void ConfigureHotkeys::Populate(const HotkeyRegistry& registry) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureHotkeys::Configure(QModelIndex index) {
|
void ConfigureHotkeys::Configure(QModelIndex index) {
|
||||||
if (index.parent() == QModelIndex())
|
if (!index.parent().isValid()) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
index = index.sibling(index.row(), 1);
|
index = index.sibling(index.row(), 1);
|
||||||
auto* model = ui->hotkey_list->model();
|
auto* const model = ui->hotkey_list->model();
|
||||||
auto previous_key = model->data(index);
|
const auto previous_key = model->data(index);
|
||||||
|
|
||||||
auto* hotkey_dialog = new SequenceDialog;
|
SequenceDialog hotkey_dialog{this};
|
||||||
int return_code = hotkey_dialog->exec();
|
|
||||||
|
|
||||||
auto key_sequence = hotkey_dialog->GetSequence();
|
const int return_code = hotkey_dialog.exec();
|
||||||
|
const auto key_sequence = hotkey_dialog.GetSequence();
|
||||||
if (return_code == QDialog::Rejected || key_sequence.isEmpty())
|
if (return_code == QDialog::Rejected || key_sequence.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
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::critical(this, tr("Error in inputted key"),
|
||||||
@ -90,7 +91,7 @@ void ConfigureHotkeys::Configure(QModelIndex index) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ConfigureHotkeys::IsUsedKey(QKeySequence key_sequence) {
|
bool ConfigureHotkeys::IsUsedKey(QKeySequence key_sequence) const {
|
||||||
return GetUsedKeyList().contains(key_sequence);
|
return GetUsedKeyList().contains(key_sequence);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include "core/settings.h"
|
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class ConfigureHotkeys;
|
class ConfigureHotkeys;
|
||||||
@ -39,7 +38,7 @@ signals:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void Configure(QModelIndex index);
|
void Configure(QModelIndex index);
|
||||||
bool IsUsedKey(QKeySequence key_sequence);
|
bool IsUsedKey(QKeySequence key_sequence) const;
|
||||||
QList<QKeySequence> GetUsedKeyList() const;
|
QList<QKeySequence> GetUsedKeyList() const;
|
||||||
|
|
||||||
std::unique_ptr<Ui::ConfigureHotkeys> ui;
|
std::unique_ptr<Ui::ConfigureHotkeys> ui;
|
||||||
|
Loading…
Reference in New Issue
Block a user