summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorfearlessTobi <thm.frey@gmail.com>2018-11-13 15:06:41 +0100
committerfearlessTobi <thm.frey@gmail.com>2018-11-13 15:10:39 +0100
commit9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12 (patch)
tree34873e21b1030b7fb5ecbb4bb239f537856601d1 /src
parentMerge pull request #1674 from FearlessTobi/fullscreen-fix (diff)
downloadyuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.tar
yuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.tar.gz
yuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.tar.bz2
yuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.tar.lz
yuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.tar.xz
yuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.tar.zst
yuzu-9ea8eb6b2e380a3e3ed8518bc735e6c70cf52e12.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index ec592c755..221702dc3 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -12,7 +12,7 @@
#include "core/file_sys/vfs_real.h"
#include "core/hle/service/acc/profile_manager.h"
-// These are wrappers to avoid the calls to CreateDirectory and CreateFile becuase of the Windows
+// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows
// defines.
static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper(
const FileSys::VirtualFilesystem& vfs, const std::string& path, FileSys::Mode mode) {
@@ -308,6 +308,8 @@ void GMainWindow::InitializeHotkeys() {
Qt::ApplicationShortcut);
hotkey_registry.RegisterHotkey("Main Window", "Decrease Speed Limit", QKeySequence("-"),
Qt::ApplicationShortcut);
+ hotkey_registry.RegisterHotkey("Main Window", "Load Amiibo", QKeySequence(Qt::Key_F2),
+ Qt::ApplicationShortcut);
hotkey_registry.LoadHotkeys();
connect(hotkey_registry.GetHotkey("Main Window", "Load File", this), &QShortcut::activated,
@@ -361,6 +363,12 @@ void GMainWindow::InitializeHotkeys() {
UpdateStatusBar();
}
});
+ connect(hotkey_registry.GetHotkey("Main Window", "Load Amiibo", this), &QShortcut::activated,
+ this, [&] {
+ if (ui.action_Load_Amiibo->isEnabled()) {
+ OnLoadAmiibo();
+ }
+ });
}
void GMainWindow::SetDefaultUIGeometry() {