diff options
| author | Kyle K <190571+Docteh@users.noreply.github.com> | 2022-05-29 15:01:07 -0700 |
|---|---|---|
| committer | Kyle K <190571+Docteh@users.noreply.github.com> | 2022-05-29 18:37:38 -0700 |
| commit | 0c165895625f36b41883b5bb56a0598e69f30189 (patch) | |
| tree | edc895b3b21f450bf01de7b24834c8e00d731e11 /src | |
| parent | 50ea1827aa434da051e19b7d96e920bfe4be6541 (diff) | |
motion touch ui: move remaining connection out of .ui file
Two reasons for this:
1. Out of 7 connections, 6 are in ConfigureMotionTouch::ConnectEvents,
this is the outlier.
2. Qt6 doesn't moc the connection properly
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_motion_touch.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_motion_touch.ui | 19 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cpp index 27559c37bb..c313b09194 100644 --- a/src/yuzu/configuration/configure_motion_touch.cpp +++ b/src/yuzu/configuration/configure_motion_touch.cpp @@ -151,6 +151,8 @@ void ConfigureMotionTouch::ConnectEvents() { &ConfigureMotionTouch::OnConfigureTouchCalibration); connect(ui->touch_from_button_config_btn, &QPushButton::clicked, this, &ConfigureMotionTouch::OnConfigureTouchFromButton); + connect(ui->buttonBox, &QDialogButtonBox::accepted, this, + &ConfigureMotionTouch::ApplyConfiguration); connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] { if (CanCloseDialog()) { reject(); diff --git a/src/yuzu/configuration/configure_motion_touch.ui b/src/yuzu/configuration/configure_motion_touch.ui index c75a84ae41..0237fae54a 100644 --- a/src/yuzu/configuration/configure_motion_touch.ui +++ b/src/yuzu/configuration/configure_motion_touch.ui @@ -293,22 +293,5 @@ </layout> </widget> <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>ConfigureMotionTouch</receiver> - <slot>ApplyConfiguration()</slot> - <hints> - <hint type="sourcelabel"> - <x>20</x> - <y>20</y> - </hint> - <hint type="destinationlabel"> - <x>20</x> - <y>20</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui> |