From 25a1d8698608f66eabd1feab0e4a4bbf8600b271 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 29 Nov 2017 20:28:33 +0100 Subject: [PATCH] Qt/Input: Remove unsupported groupboxes from pad dialog and shorten text --- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 13 +++++++++++++ rpcs3/rpcs3qt/pad_settings_dialog.ui | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 1cf632fa1f..8f41817426 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -154,6 +154,11 @@ pad_settings_dialog::pad_settings_dialog(const std::string& device, std::shared_ }); }); } + else + { + ui->verticalLayout_left->removeWidget(ui->gb_vibration); + delete ui->gb_vibration; + } // Enable Deadzone Settings if (m_handler->has_deadzones()) @@ -187,6 +192,14 @@ pad_settings_dialog::pad_settings_dialog(const std::string& device, std::shared_ RepaintPreviewLabel(ui->preview_stick_right, value, ui->slider_stick_right->sizeHint().width(), rx, ry); }); } + else + { + ui->verticalLayout_right->removeWidget(ui->gb_sticks); + ui->verticalLayout_left->removeWidget(ui->gb_triggers); + + delete ui->gb_sticks; + delete ui->gb_triggers; + } auto insertButton = [this](int id, QPushButton* button, cfg::string* cfg_name) { diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.ui b/rpcs3/rpcs3qt/pad_settings_dialog.ui index 5cdc217dde..dde6afcba6 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.ui +++ b/rpcs3/rpcs3qt/pad_settings_dialog.ui @@ -17,9 +17,9 @@ :/rpcs3.ico:/rpcs3.ico - + - + 5 @@ -672,7 +672,7 @@ - + 0 @@ -1155,7 +1155,7 @@ - We currently support keyboard and mouse input devices as well as native DualShock 4, XInput and MMjoy controllers through software thanks to our core developers and contributors. Unfortunately, we currently do not natively support DualShock 3 controllers. You can however use third party tools like SCP Driver Package to allow your DualShock 3 controller to function like an XInput controller. We plan to add additional input methods in the future. + Unfortunately, we currently do not natively support DualShock 3 controllers. You can however use third party tools like SCP Driver Package to allow your DualShock 3 controller to function like an XInput controller. We plan to add additional input methods in the future. Qt::PlainText @@ -1174,7 +1174,7 @@ - + 5