Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-13 05:05:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update gui with new touchpad inputs (#3125)
Some checks are pending
Build and Release / reuse (push) Waiting to run
Details
Build and Release / clang-format (push) Waiting to run
Details
Build and Release / get-info (push) Waiting to run
Details
Build and Release / windows-sdl (push) Blocked by required conditions
Details
Build and Release / windows-qt (push) Blocked by required conditions
Details
Build and Release / macos-sdl (push) Blocked by required conditions
Details
Build and Release / macos-qt (push) Blocked by required conditions
Details
Build and Release / linux-sdl (push) Blocked by required conditions
Details
Build and Release / linux-qt (push) Blocked by required conditions
Details
Build and Release / linux-sdl-gcc (push) Blocked by required conditions
Details
Build and Release / linux-qt-gcc (push) Blocked by required conditions
Details
Build and Release / pre-release (push) Blocked by required conditions
Details

Browse source 
* Update gui with new touchpad inputs

* Update kbm_gui.ui

---------

Co-authored-by: rainmakerv2 <josefkarloprado@gmail.com>
This commit is contained in:
rainmakerv2 2025-06-20 21:19:33 +08:00 • committed by GitHub
parent 551751df3c
commit 7b0249d9ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 157 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/qt_gui/kbm_gui.cpp
View file

@ -32,14 +32,34 @@ KBMSettings::KBMSettings(std::shared_ptr<GameInfoClass> game_info_get, QWidget*
ui->ProfileComboBox->addItem(QString::fromStdString(m_game_info->m_games[i].serial));
}
ButtonsList = {
ui->CrossButton, ui->CircleButton, ui->TriangleButton, ui->SquareButton,
ui->L1Button, ui->R1Button, ui->L2Button, ui->R2Button,
ui->L3Button, ui->R3Button, ui->OptionsButton, ui->TouchpadButton,
ui->DpadUpButton, ui->DpadDownButton, ui->DpadLeftButton, ui->DpadRightButton,
ui->LStickUpButton, ui->LStickDownButton, ui->LStickLeftButton, ui->LStickRightButton,
ui->RStickUpButton, ui->RStickDownButton, ui->RStickLeftButton, ui->RStickRightButton,
ui->LHalfButton, ui->RHalfButton};
ButtonsList = {ui->CrossButton,
ui->CircleButton,
ui->TriangleButton,
ui->SquareButton,
ui->L1Button,
ui->R1Button,
ui->L2Button,
ui->R2Button,
ui->L3Button,
ui->R3Button,
ui->OptionsButton,
ui->TouchpadLeftButton,
ui->TouchpadCenterButton,
ui->TouchpadRightButton,
ui->DpadUpButton,
ui->DpadDownButton,
ui->DpadLeftButton,
ui->DpadRightButton,
ui->LStickUpButton,
ui->LStickDownButton,
ui->LStickLeftButton,
ui->LStickRightButton,
ui->RStickUpButton,
ui->RStickDownButton,
ui->RStickLeftButton,
ui->RStickRightButton,
ui->LHalfButton,
ui->RHalfButton};
ButtonConnects();
SetUIValuestoMappings("default");
@ -249,12 +269,23 @@ void KBMSettings::SaveKBMConfig(bool CloseOnSave) {
if (input_string != "unmapped")
inputs.push_back(input_string);
input_string = ui->TouchpadButton->text().toStdString();
output_string = "touchpad";
input_string = ui->TouchpadLeftButton->text().toStdString();
output_string = "touchpad_left";
lines.push_back(output_string + " = " + input_string);
if (input_string != "unmapped")
inputs.push_back(input_string);
input_string = ui->TouchpadCenterButton->text().toStdString();
output_string = "touchpad_center";
lines.push_back(output_string + " = " + input_string);
if (input_string != "unmapped")
inputs.push_back(input_string);
input_string = ui->TouchpadRightButton->text().toStdString();
output_string = "touchpad_right";
lines.push_back(output_string + " = " + input_string);
if (input_string != "unmapped")
inputs.push_back(input_string);
lines.push_back("");
input_string = ui->LStickUpButton->text().toStdString();
@ -432,7 +463,9 @@ void KBMSettings::SetDefault() {
ui->R2Button->setText("o");
ui->R3Button->setText("m");
ui->TouchpadButton->setText("space");
ui->TouchpadLeftButton->setText("space");
ui->TouchpadCenterButton->setText("unmapped");
ui->TouchpadRightButton->setText("unmapped");
ui->OptionsButton->setText("enter");
ui->DpadUpButton->setText("up");
@ -512,8 +545,12 @@ void KBMSettings::SetUIValuestoMappings(std::string config_id) {
ui->DpadRightButton->setText(QString::fromStdString(input_string));
} else if (output_string == "options") {
ui->OptionsButton->setText(QString::fromStdString(input_string));
} else if (output_string == "touchpad") {
ui->TouchpadButton->setText(QString::fromStdString(input_string));
} else if (output_string == "touchpad_left") {
ui->TouchpadLeftButton->setText(QString::fromStdString(input_string));
} else if (output_string == "touchpad_center") {
ui->TouchpadCenterButton->setText(QString::fromStdString(input_string));
} else if (output_string == "touchpad_right") {
ui->TouchpadRightButton->setText(QString::fromStdString(input_string));
} else if (output_string == "axis_left_x_minus") {
ui->LStickLeftButton->setText(QString::fromStdString(input_string));
} else if (output_string == "axis_left_x_plus") {