diff options
| author | 2022-05-29 15:01:07 -0700 | |
|---|---|---|
| committer | 2022-05-29 18:37:38 -0700 | |
| commit | 499c89790b0e07dbb014b8b7415bf0e28cecfaaf (patch) | |
| tree | edc895b3b21f450bf01de7b24834c8e00d731e11 /src | |
| parent | Update some files with Qt 5.15.2 best practices in mind (diff) | |
| download | yuzu-499c89790b0e07dbb014b8b7415bf0e28cecfaaf.tar.gz yuzu-499c89790b0e07dbb014b8b7415bf0e28cecfaaf.tar.xz yuzu-499c89790b0e07dbb014b8b7415bf0e28cecfaaf.zip | |
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 27559c37b..c313b0919 100644 --- a/src/yuzu/configuration/configure_motion_touch.cpp +++ b/src/yuzu/configuration/configure_motion_touch.cpp | |||
| @@ -151,6 +151,8 @@ void ConfigureMotionTouch::ConnectEvents() { | |||
| 151 | &ConfigureMotionTouch::OnConfigureTouchCalibration); | 151 | &ConfigureMotionTouch::OnConfigureTouchCalibration); |
| 152 | connect(ui->touch_from_button_config_btn, &QPushButton::clicked, this, | 152 | connect(ui->touch_from_button_config_btn, &QPushButton::clicked, this, |
| 153 | &ConfigureMotionTouch::OnConfigureTouchFromButton); | 153 | &ConfigureMotionTouch::OnConfigureTouchFromButton); |
| 154 | connect(ui->buttonBox, &QDialogButtonBox::accepted, this, | ||
| 155 | &ConfigureMotionTouch::ApplyConfiguration); | ||
| 154 | connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] { | 156 | connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] { |
| 155 | if (CanCloseDialog()) { | 157 | if (CanCloseDialog()) { |
| 156 | reject(); | 158 | reject(); |
diff --git a/src/yuzu/configuration/configure_motion_touch.ui b/src/yuzu/configuration/configure_motion_touch.ui index c75a84ae4..0237fae54 100644 --- a/src/yuzu/configuration/configure_motion_touch.ui +++ b/src/yuzu/configuration/configure_motion_touch.ui | |||
| @@ -293,22 +293,5 @@ | |||
| 293 | </layout> | 293 | </layout> |
| 294 | </widget> | 294 | </widget> |
| 295 | <resources/> | 295 | <resources/> |
| 296 | <connections> | 296 | <connections/> |
| 297 | <connection> | ||
| 298 | <sender>buttonBox</sender> | ||
| 299 | <signal>accepted()</signal> | ||
| 300 | <receiver>ConfigureMotionTouch</receiver> | ||
| 301 | <slot>ApplyConfiguration()</slot> | ||
| 302 | <hints> | ||
| 303 | <hint type="sourcelabel"> | ||
| 304 | <x>20</x> | ||
| 305 | <y>20</y> | ||
| 306 | </hint> | ||
| 307 | <hint type="destinationlabel"> | ||
| 308 | <x>20</x> | ||
| 309 | <y>20</y> | ||
| 310 | </hint> | ||
| 311 | </hints> | ||
| 312 | </connection> | ||
| 313 | </connections> | ||
| 314 | </ui> | 297 | </ui> |