summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2017-06-07 21:20:06 -0700
committerGitHub <noreply@github.com>2017-06-07 21:20:06 -0700
commitffd8309aca806a6cf5ca4da85f5854ef14c8e0d9 (patch)
treeba029b5a68e1613f3dca3185a854ef70d05de61e /Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
parenta2358786dc66eab8fa63987751d4e3fc1a3ee525 (diff)
parent9ee63608b3c7160cadb0291e577b158d1b8aa5c6 (diff)
Merge branch 'master' into fix-unittests
Diffstat (limited to 'Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp')
-rw-r--r--Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
index 04e20485b2..33e30a9b93 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -20,6 +20,12 @@
#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
#include "DolphinQt2/Config/Mapping/GCPadEmu.h"
#include "DolphinQt2/Config/Mapping/GCPadWiiU.h"
+#include "DolphinQt2/Config/Mapping/Hotkey3D.h"
+#include "DolphinQt2/Config/Mapping/HotkeyGeneral.h"
+#include "DolphinQt2/Config/Mapping/HotkeyGraphics.h"
+#include "DolphinQt2/Config/Mapping/HotkeyStates.h"
+#include "DolphinQt2/Config/Mapping/HotkeyTAS.h"
+#include "DolphinQt2/Config/Mapping/HotkeyWii.h"
#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h"
#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h"
#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h"
@@ -285,6 +291,18 @@ void MappingWindow::ChangeMappingType(MappingWindow::Type type)
AddWidget(tr("Extension"), extension);
break;
}
+ case Type::MAPPING_HOTKEYS:
+ {
+ widget = new HotkeyGeneral(this);
+ AddWidget(tr("General"), widget);
+ AddWidget(tr("TAS Tools"), new HotkeyTAS(this));
+ AddWidget(tr("Wii (Remote)"), new HotkeyWii(this));
+ AddWidget(tr("Graphics"), new HotkeyGraphics(this));
+ AddWidget(tr("3D"), new Hotkey3D(this));
+ AddWidget(tr("Save States"), new HotkeyStates(this));
+ setWindowTitle(tr("Hotkey Settings"));
+ break;
+ }
default:
return;
}