summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/yuzu/applets/controller.cpp16
-rw-r--r--src/yuzu/applets/controller.h3
2 files changed, 19 insertions, 0 deletions
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp
index b92cd6886..836d90fda 100644
--- a/src/yuzu/applets/controller.cpp
+++ b/src/yuzu/applets/controller.cpp
@@ -16,6 +16,7 @@
16#include "yuzu/applets/controller.h" 16#include "yuzu/applets/controller.h"
17#include "yuzu/configuration/configure_input.h" 17#include "yuzu/configuration/configure_input.h"
18#include "yuzu/configuration/configure_input_profile_dialog.h" 18#include "yuzu/configuration/configure_input_profile_dialog.h"
19#include "yuzu/configuration/configure_motion_touch.h"
19#include "yuzu/configuration/configure_vibration.h" 20#include "yuzu/configuration/configure_vibration.h"
20#include "yuzu/configuration/input_profiles.h" 21#include "yuzu/configuration/input_profiles.h"
21#include "yuzu/main.h" 22#include "yuzu/main.h"
@@ -206,6 +207,9 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
206 connect(ui->vibrationButton, &QPushButton::clicked, this, 207 connect(ui->vibrationButton, &QPushButton::clicked, this,
207 &QtControllerSelectorDialog::CallConfigureVibrationDialog); 208 &QtControllerSelectorDialog::CallConfigureVibrationDialog);
208 209
210 connect(ui->motionButton, &QPushButton::clicked, this,
211 &QtControllerSelectorDialog::CallConfigureMotionTouchDialog);
212
209 connect(ui->inputConfigButton, &QPushButton::clicked, this, 213 connect(ui->inputConfigButton, &QPushButton::clicked, this,
210 &QtControllerSelectorDialog::CallConfigureInputProfileDialog); 214 &QtControllerSelectorDialog::CallConfigureInputProfileDialog);
211 215
@@ -276,6 +280,18 @@ void QtControllerSelectorDialog::CallConfigureVibrationDialog() {
276 } 280 }
277} 281}
278 282
283void QtControllerSelectorDialog::CallConfigureMotionTouchDialog() {
284 ConfigureMotionTouch dialog(this, input_subsystem);
285
286 dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
287 Qt::WindowSystemMenuHint);
288 dialog.setWindowModality(Qt::WindowModal);
289
290 if (dialog.exec() == QDialog::Accepted) {
291 dialog.ApplyConfiguration();
292 }
293}
294
279void QtControllerSelectorDialog::CallConfigureInputProfileDialog() { 295void QtControllerSelectorDialog::CallConfigureInputProfileDialog() {
280 ConfigureInputProfileDialog dialog(this, input_subsystem, input_profiles.get()); 296 ConfigureInputProfileDialog dialog(this, input_subsystem, input_profiles.get());
281 297
diff --git a/src/yuzu/applets/controller.h b/src/yuzu/applets/controller.h
index 3518eed56..9b57aea1a 100644
--- a/src/yuzu/applets/controller.h
+++ b/src/yuzu/applets/controller.h
@@ -51,6 +51,9 @@ private:
51 // Initializes the "Configure Vibration" Dialog. 51 // Initializes the "Configure Vibration" Dialog.
52 void CallConfigureVibrationDialog(); 52 void CallConfigureVibrationDialog();
53 53
54 // Initializes the "Configure Motion / Touch" Dialog.
55 void CallConfigureMotionTouchDialog();
56
54 // Initializes the "Create Input Profile" Dialog. 57 // Initializes the "Create Input Profile" Dialog.
55 void CallConfigureInputProfileDialog(); 58 void CallConfigureInputProfileDialog();
56 59