diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-07 14:45:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 14:45:45 -0400 |
| commit | 3242e7c16402b39ac0e4b7f044600f60a900bbbf (patch) | |
| tree | 59fe3c49811b91299e3be12b3e27d1faa970cea4 /src/yuzu/configuration/configure_dialog.cpp | |
| parent | c7072406855441284827e936eac4b871cb35544d (diff) | |
| parent | c8f6754417628d696f81513e34951193f8e5d023 (diff) | |
Merge pull request #950 from lioncash/hotkey
qt/hotkey: Get rid of global hotkey map instance
Diffstat (limited to 'src/yuzu/configuration/configure_dialog.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 1ca7e876c..cc4b326ae 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -6,9 +6,12 @@ #include "ui_configure.h" #include "yuzu/configuration/config.h" #include "yuzu/configuration/configure_dialog.h" +#include "yuzu/hotkeys.h" -ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ConfigureDialog) { +ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry) + : QDialog(parent), ui(new Ui::ConfigureDialog) { ui->setupUi(this); + ui->generalTab->PopulateHotkeyList(registry); this->setConfiguration(); } |