summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2017-06-06 16:12:52 -0700
committerGitHub <noreply@github.com>2017-06-06 16:12:52 -0700
commit03c1a1e3924d963b100b04e49209d68a73b13814 (patch)
tree60cb7c59f3c3ca5aeefbecddc8969bdfb254c296 /Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
parentc9ba2b3cf58a9b99a47b8768927567b6ac8e5f71 (diff)
parent151ae38a568a518458e57ac0c72d6b15172f0462 (diff)
Merge pull request #5510 from spycrab/qt_hotkeys
Qt: Implement hotkeys
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;
}