RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 22:19:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Qt: merge pad settings

Browse source
This commit is contained in:
Megamouse 2018-07-22 10:57:28 +02:00
parent 52bfe6d4fb
commit d13e71eeb8
9 changed files with 2487 additions and 2443 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/rpcs3qt/main_window.cpp
View file

@ -29,7 +29,7 @@
#include "main_window.h"
#include "emu_settings.h"
#include "about_dialog.h"
#include "gamepads_settings_dialog.h"
#include "pad_settings_dialog.h"
#include "progress_dialog.h"
#include <thread>
@ -1228,11 +1228,13 @@ void main_window::CreateConnects()
connect(ui->confIOAct, &QAction::triggered, [=]() { openSettings(3); });
connect(ui->confSystemAct, &QAction::triggered, [=]() { openSettings(4); });
connect(ui->confPadsAct, &QAction::triggered, this, [=]
auto openPadSettings = [this]
{
gamepads_settings_dialog dlg(this);
pad_settings_dialog dlg(this);
dlg.exec();
});
};
connect(ui->confPadsAct, &QAction::triggered, openPadSettings);
connect(ui->confAutopauseManagerAct, &QAction::triggered, [=]
{
@ -1416,7 +1418,7 @@ void main_window::CreateConnects()
}
});
connect(ui->toolbar_controls, &QAction::triggered, [=]() { gamepads_settings_dialog dlg(this); dlg.exec(); });
connect(ui->toolbar_controls, &QAction::triggered, openPadSettings);
connect(ui->toolbar_config, &QAction::triggered, [=]() { openSettings(0); });
connect(ui->toolbar_list, &QAction::triggered, [=]() { ui->setlistModeListAct->trigger(); });
connect(ui->toolbar_grid, &QAction::triggered, [=]() { ui->setlistModeGridAct->trigger(); });