From fd4e41bc7d1fdd099903a4e4faac7c67aff77e21 Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Sun, 14 Jun 2020 16:06:29 -0700 Subject: [PATCH 1/2] Qt: Simplify Rebind All behavior --- .../controllersettingswidget.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/duckstation-qt/controllersettingswidget.cpp b/src/duckstation-qt/controllersettingswidget.cpp index c6c11f384..ba8e78218 100644 --- a/src/duckstation-qt/controllersettingswidget.cpp +++ b/src/duckstation-qt/controllersettingswidget.cpp @@ -124,7 +124,7 @@ void ControllerSettingsWidget::createPortSettingsUi(int index, PortSettingsUI* u QPushButton* clear_all_button = new QPushButton(tr("Clear All"), ui->widget); clear_all_button->connect(clear_all_button, &QPushButton::clicked, [this, index]() { if (QMessageBox::question(this, tr("Clear Bindings"), - tr("Are you sure you want to clear all bound controls? This cannot be reversed.")) != + tr("Are you sure you want to clear all bound controls? This can not be reversed.")) != QMessageBox::Yes) { return; @@ -140,15 +140,19 @@ void ControllerSettingsWidget::createPortSettingsUi(int index, PortSettingsUI* u QPushButton* rebind_all_button = new QPushButton(tr("Rebind All"), ui->widget); rebind_all_button->connect(rebind_all_button, &QPushButton::clicked, [this, index]() { - if (QMessageBox::question(this, tr("Clear Bindings"), tr("Do you want to clear all currently-bound controls?")) == + if (QMessageBox::question(this, tr("Rebind All"), + tr("Are you sure you want to rebind all controls? All currently-bound controls will be " + "irreversibly cleared. Rebinding will begin after confirmation.")) != QMessageBox::Yes) { - InputBindingWidget* widget = m_port_ui[index].first_button; - while (widget) - { - widget->clearBinding(); - widget = widget->getNextWidget(); - } + return; + } + + InputBindingWidget* widget = m_port_ui[index].first_button; + while (widget) + { + widget->clearBinding(); + widget = widget->getNextWidget(); } if (m_port_ui[index].first_button) From 1b9dbc1a0b557bd7de3db754fb8803eb9448f611 Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Sun, 14 Jun 2020 16:29:25 -0700 Subject: [PATCH 2/2] Qt: Add help text note about binding rumble --- src/duckstation-qt/settingsdialog.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/duckstation-qt/settingsdialog.cpp b/src/duckstation-qt/settingsdialog.cpp index 9e1dfb9b7..5fbdac13a 100644 --- a/src/duckstation-qt/settingsdialog.cpp +++ b/src/duckstation-qt/settingsdialog.cpp @@ -27,8 +27,9 @@ static constexpr std::array(SettingsDialog::Catego "self-explanatory.", "Controller Settings
This page lets you choose the type of controller you wish to simulate for " "the console, and rebind the keys or host game controller buttons to your choosing. Clicking a binding will start a " - "count-down, in which case you should press the key or controller button/axis you wish to bind. If no button is " - "pressed and the timer lapses, the binding will be unchanged. To clear a binding, right-click the button.", + "countdown, in which case you should press the key or controller button/axis you wish to bind. (For rumble, press " + "any button/axis on the controller you wish to send rumble to.) If no button is pressed and the timer lapses, " + "the binding will be unchanged. To clear a binding, right-click the button.", "Memory Card Settings
This page lets you control what mode the memory card emulation will " "function in, and where the images for these cards will be stored on disk.", "GPU Settings
These options control the simulation of the GPU in the console. Various "