mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-05 22:41:25 +12:00
Qt: merge pad settings
This commit is contained in:
Megamouse
parent
52bfe6d4fb
commit
d13e71eeb8
9 changed files with 2487 additions and 2443 deletions
|
|
@ -1,5 +1,4 @@
|
|||
#include "pad_thread.h"
|
||||
#include "rpcs3qt/gamepads_settings_dialog.h"
|
||||
#include "../ds4_pad_handler.h"
|
||||
#ifdef _WIN32
|
||||
#include "../xinput_pad_handler.h"
|
||||
|
|
|
|||
|
|
@ -987,7 +987,6 @@
|
|||
<ClCompile Include="rpcs3qt\debugger_list.cpp" />
|
||||
<ClCompile Include="rpcs3qt\_discord_utils.cpp" />
|
||||
<ClCompile Include="rpcs3qt\find_dialog.cpp" />
|
||||
<ClCompile Include="rpcs3qt\gamepads_settings_dialog.cpp" />
|
||||
<ClCompile Include="rpcs3qt\game_compatibility.cpp" />
|
||||
<ClCompile Include="rpcs3qt\game_list_grid.cpp" />
|
||||
<ClCompile Include="rpcs3qt\game_list_grid_delegate.cpp" />
|
||||
|
|
@ -1428,7 +1427,6 @@
|
|||
<ClInclude Include="rpcs3qt\_discord_utils.h" />
|
||||
<ClInclude Include="rpcs3qt\find_dialog.h" />
|
||||
<ClInclude Include="rpcs3qt\custom_table_widget_item.h" />
|
||||
<ClInclude Include="rpcs3qt\gamepads_settings_dialog.h" />
|
||||
<CustomBuild Include="rpcs3qt\game_compatibility.h">
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">Moc%27ing game_compatibility.h...</Message>
|
||||
|
|
|
|||
|
|
@ -491,9 +491,6 @@
|
|||
<ClCompile Include="rpcs3qt\gs_frame.cpp">
|
||||
<Filter>Gui\game window</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="rpcs3qt\gamepads_settings_dialog.cpp">
|
||||
<Filter>Gui\settings</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="rpcs3qt\pad_settings_dialog.cpp">
|
||||
<Filter>Gui\settings</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -688,9 +685,6 @@
|
|||
<ClInclude Include="rpcs3qt\gl_gs_frame.h">
|
||||
<Filter>Gui\game window</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="rpcs3qt\gamepads_settings_dialog.h">
|
||||
<Filter>Gui\settings</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="rpcs3qt\game_list.h">
|
||||
<Filter>Gui\game list</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
|||
|
|
@ -1,423 +0,0 @@
|
|||
#include "gamepads_settings_dialog.h"
|
||||
#include "pad_settings_dialog.h"
|
||||
#include "qt_utils.h"
|
||||
|
||||
#include "../Emu/Io/PadHandler.h"
|
||||
#include "../ds4_pad_handler.h"
|
||||
#ifdef _WIN32
|
||||
#include "../xinput_pad_handler.h"
|
||||
#include "../mm_joystick_handler.h"
|
||||
#elif HAVE_LIBEVDEV
|
||||
#include "../evdev_joystick_handler.h"
|
||||
#endif
|
||||
#include "../keyboard_pad_handler.h"
|
||||
#include "../Emu/Io/Null/NullPadHandler.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QInputDialog>
|
||||
#include <QMessageBox>
|
||||
|
||||
inline std::string sstr(const QString& _in) { return _in.toStdString(); }
|
||||
constexpr auto qstr = QString::fromStdString;
|
||||
|
||||
inline bool CreateConfigFile(const QString& dir, const QString& name)
|
||||
{
|
||||
QString input_dir = qstr(fs::get_config_dir()) + "/InputConfigs/";
|
||||
if (!QDir().mkdir(input_dir) && !QDir().exists(input_dir))
|
||||
{
|
||||
LOG_ERROR(GENERAL, "Failed to create dir %s", sstr(input_dir));
|
||||
return false;
|
||||
}
|
||||
if (!QDir().mkdir(dir) && !QDir().exists(dir))
|
||||
{
|
||||
LOG_ERROR(GENERAL, "Failed to create dir %s", sstr(dir));
|
||||
return false;
|
||||
}
|
||||
|
||||
QString filename = dir + name + ".yml";
|
||||
QFile new_file(filename);
|
||||
|
||||
if (!new_file.open(QIODevice::WriteOnly))
|
||||
{
|
||||
LOG_ERROR(GENERAL, "Failed to create file %s", sstr(filename));
|
||||
return false;
|
||||
}
|
||||
|
||||
new_file.close();
|
||||
return true;
|
||||
};
|
||||
|
||||
// taken from https://stackoverflow.com/a/30818424/8353754
|
||||
// because size policies won't work as expected (see similar bugs in Qt bugtracker)
|
||||
inline void resizeComboBoxView(QComboBox* combo)
|
||||
{
|
||||
int max_width = 0;
|
||||
QFontMetrics fm(combo->font());
|
||||
for (int i = 0; i < combo->count(); ++i)
|
||||
{
|
||||
int width = fm.width(combo->itemText(i));
|
||||
if (width > max_width) max_width = width;
|
||||
}
|
||||
if (combo->view()->minimumWidth() < max_width)
|
||||
{
|
||||
// add scrollbar width and margin
|
||||
max_width += combo->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
|
||||
max_width += combo->view()->autoScrollMargin();
|
||||
combo->view()->setMinimumWidth(max_width);
|
||||
}
|
||||
};
|
||||
|
||||
gamepads_settings_dialog::gamepads_settings_dialog(QWidget* parent)
|
||||
: QDialog(parent)
|
||||
{
|
||||
setWindowTitle(tr("Gamepads Settings"));
|
||||
|
||||
// read tooltips from json
|
||||
QFile json_file(":/Json/tooltips.json");
|
||||
json_file.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
QJsonObject json_input = QJsonDocument::fromJson(json_file.readAll()).object().value("input").toObject();
|
||||
json_file.close();
|
||||
|
||||
QVBoxLayout *dialog_layout = new QVBoxLayout();
|
||||
QHBoxLayout *all_players = new QHBoxLayout();
|
||||
|
||||
g_cfg_input.from_default();
|
||||
g_cfg_input.load();
|
||||
|
||||
for (int i = 0; i < MAX_PLAYERS; i++)
|
||||
{
|
||||
QGroupBox *grp_player = new QGroupBox(QString(tr("Player %1").arg(i+1)));
|
||||
|
||||
QVBoxLayout *ppad_layout = new QVBoxLayout();
|
||||
|
||||
co_inputtype[i] = new QComboBox();
|
||||
co_inputtype[i]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
|
||||
co_inputtype[i]->view()->setTextElideMode(Qt::ElideNone);
|
||||
#ifdef WIN32
|
||||
co_inputtype[i]->setToolTip(json_input["padHandlerBox"].toString());
|
||||
#else
|
||||
co_inputtype[i]->setToolTip(json_input["padHandlerBox_Linux"].toString());
|
||||
#endif
|
||||
ppad_layout->addWidget(co_inputtype[i]);
|
||||
|
||||
co_deviceID[i] = new QComboBox();
|
||||
co_deviceID[i]->setEnabled(false);
|
||||
co_deviceID[i]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
|
||||
co_deviceID[i]->view()->setTextElideMode(Qt::ElideNone);
|
||||
ppad_layout->addWidget(co_deviceID[i]);
|
||||
|
||||
co_profile[i] = new QComboBox();
|
||||
co_profile[i]->setEnabled(false);
|
||||
co_profile[i]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
|
||||
co_profile[i]->view()->setTextElideMode(Qt::ElideNone);
|
||||
ppad_layout->addWidget(co_profile[i]);
|
||||
|
||||
QHBoxLayout *button_layout = new QHBoxLayout();
|
||||
bu_new_profile[i] = new QPushButton(tr("Add Profile"));
|
||||
bu_new_profile[i]->setEnabled(false);
|
||||
bu_config[i] = new QPushButton(tr("Configure"));
|
||||
bu_config[i]->setEnabled(false);
|
||||
button_layout->setContentsMargins(0,0,0,0);
|
||||
button_layout->addWidget(bu_config[i]);
|
||||
button_layout->addWidget(bu_new_profile[i]);
|
||||
ppad_layout->addLayout(button_layout);
|
||||
|
||||
grp_player->setLayout(ppad_layout);
|
||||
grp_player->setFixedSize(grp_player->sizeHint());
|
||||
|
||||
// fill comboboxes after setting the groupbox's size to prevent stretch
|
||||
std::vector<std::string> str_inputs = g_cfg_input.player[0]->handler.to_list();
|
||||
for (int index = 0; index < str_inputs.size(); index++)
|
||||
{
|
||||
co_inputtype[i]->addItem(qstr(str_inputs[index]));
|
||||
}
|
||||
resizeComboBoxView(co_inputtype[i]);
|
||||
|
||||
all_players->addWidget(grp_player);
|
||||
|
||||
if (i == 3)
|
||||
{
|
||||
dialog_layout->addLayout(all_players);
|
||||
all_players = new QHBoxLayout();
|
||||
all_players->addStretch();
|
||||
}
|
||||
}
|
||||
|
||||
all_players->addStretch();
|
||||
dialog_layout->addLayout(all_players);
|
||||
|
||||
QHBoxLayout *buttons_layout = new QHBoxLayout();
|
||||
QPushButton *ok_button = new QPushButton(tr("OK"));
|
||||
QPushButton *cancel_button = new QPushButton(tr("Cancel"));
|
||||
QPushButton *refresh_button = new QPushButton(tr("Refresh"));
|
||||
buttons_layout->addWidget(ok_button);
|
||||
buttons_layout->addWidget(refresh_button);
|
||||
buttons_layout->addWidget(cancel_button);
|
||||
buttons_layout->addStretch();
|
||||
dialog_layout->addLayout(buttons_layout);
|
||||
|
||||
setLayout(dialog_layout);
|
||||
layout()->setSizeConstraint(QLayout::SetFixedSize);
|
||||
|
||||
auto configure_combos = [=]
|
||||
{
|
||||
//Set the values from config
|
||||
for (int i = 0; i < MAX_PLAYERS; i++)
|
||||
{
|
||||
// No extra loops are necessary because setCurrentText does it for us
|
||||
co_inputtype[i]->setCurrentText(qstr(g_cfg_input.player[i]->handler.to_string()));
|
||||
// Device will be empty on some rare occasions, so fill them by force
|
||||
ChangeInputType(i);
|
||||
}
|
||||
};
|
||||
|
||||
for (int i = 0; i < MAX_PLAYERS; i++)
|
||||
{
|
||||
connect(co_inputtype[i], &QComboBox::currentTextChanged, [=]
|
||||
{
|
||||
ChangeInputType(i);
|
||||
});
|
||||
connect(co_deviceID[i], &QComboBox::currentTextChanged, [=](const QString& dev)
|
||||
{
|
||||
std::string device = sstr(dev);
|
||||
if (!g_cfg_input.player[i]->device.from_string(device))
|
||||
{
|
||||
//Something went wrong
|
||||
LOG_ERROR(GENERAL, "Failed to convert device string: %s", device);
|
||||
return;
|
||||
}
|
||||
});
|
||||
connect(co_profile[i], &QComboBox::currentTextChanged, [=](const QString& prof)
|
||||
{
|
||||
std::string profile = sstr(prof);
|
||||
if (!g_cfg_input.player[i]->profile.from_string(profile))
|
||||
{
|
||||
//Something went wrong
|
||||
LOG_ERROR(GENERAL, "Failed to convert profile string: %s", profile);
|
||||
return;
|
||||
}
|
||||
});
|
||||
connect(bu_config[i], &QAbstractButton::clicked, [=]
|
||||
{
|
||||
ClickConfigButton(i);
|
||||
});
|
||||
connect(bu_new_profile[i], &QAbstractButton::clicked, [=]
|
||||
{
|
||||
QInputDialog* dialog = new QInputDialog(this);
|
||||
dialog->setWindowTitle(tr("Choose a unique name"));
|
||||
dialog->setLabelText(tr("Profile Name: "));
|
||||
dialog->setFixedSize(500, 100);
|
||||
|
||||
while (dialog->exec() != QDialog::Rejected)
|
||||
{
|
||||
QString friendlyName = dialog->textValue();
|
||||
if (friendlyName == "")
|
||||
{
|
||||
QMessageBox::warning(this, tr("Error"), tr("Name cannot be empty"));
|
||||
continue;
|
||||
}
|
||||
if (friendlyName.contains("."))
|
||||
{
|
||||
QMessageBox::warning(this, tr("Error"), tr("Must choose a name without '.'"));
|
||||
continue;
|
||||
}
|
||||
if (co_profile[i]->findText(friendlyName) != -1)
|
||||
{
|
||||
QMessageBox::warning(this, tr("Error"), tr("Please choose a non-existing name"));
|
||||
continue;
|
||||
}
|
||||
if (CreateConfigFile(qstr(PadHandlerBase::get_config_dir(g_cfg_input.player[i]->handler)), friendlyName))
|
||||
{
|
||||
co_profile[i]->addItem(friendlyName);
|
||||
co_profile[i]->setCurrentText(friendlyName);
|
||||
}
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
connect(ok_button, &QPushButton::pressed, this, &gamepads_settings_dialog::SaveExit);
|
||||
connect(cancel_button, &QPushButton::pressed, this, &gamepads_settings_dialog::CancelExit);
|
||||
connect(refresh_button, &QPushButton::pressed, [=] { configure_combos(); });
|
||||
|
||||
configure_combos();
|
||||
}
|
||||
|
||||
void gamepads_settings_dialog::SaveExit()
|
||||
{
|
||||
//Check for invalid selection
|
||||
for (int i = 0; i < MAX_PLAYERS; i++)
|
||||
{
|
||||
if (co_deviceID[i]->currentData() == -1)
|
||||
{
|
||||
g_cfg_input.player[i]->handler.from_default();
|
||||
g_cfg_input.player[i]->device.from_default();
|
||||
g_cfg_input.player[i]->profile.from_default();
|
||||
}
|
||||
}
|
||||
|
||||
g_cfg_input.save();
|
||||
|
||||
QDialog::accept();
|
||||
}
|
||||
|
||||
void gamepads_settings_dialog::CancelExit()
|
||||
{
|
||||
//Reloads config from file or defaults
|
||||
g_cfg_input.from_default();
|
||||
g_cfg_input.load();
|
||||
|
||||
QDialog::accept();
|
||||
}
|
||||
|
||||
std::shared_ptr<PadHandlerBase> gamepads_settings_dialog::GetHandler(pad_handler type)
|
||||
{
|
||||
std::shared_ptr<PadHandlerBase> ret_handler;
|
||||
|
||||
switch (type)
|
||||
{
|
||||
case pad_handler::null:
|
||||
ret_handler = std::make_unique<NullPadHandler>();
|
||||
break;
|
||||
case pad_handler::keyboard:
|
||||
ret_handler = std::make_unique<keyboard_pad_handler>();
|
||||
break;
|
||||
case pad_handler::ds4:
|
||||
ret_handler = std::make_unique<ds4_pad_handler>();
|
||||
break;
|
||||
#ifdef _MSC_VER
|
||||
case pad_handler::xinput:
|
||||
ret_handler = std::make_unique<xinput_pad_handler>();
|
||||
break;
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
case pad_handler::mm:
|
||||
ret_handler = std::make_unique<mm_joystick_handler>();
|
||||
break;
|
||||
#endif
|
||||
#ifdef HAVE_LIBEVDEV
|
||||
case pad_handler::evdev:
|
||||
ret_handler = std::make_unique<evdev_joystick_handler>();
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
return ret_handler;
|
||||
}
|
||||
|
||||
void gamepads_settings_dialog::ChangeInputType(int player)
|
||||
{
|
||||
std::string handler = sstr(co_inputtype[player]->currentText());
|
||||
std::string device = g_cfg_input.player[player]->device.to_string();
|
||||
std::string profile = g_cfg_input.player[player]->profile.to_string();
|
||||
|
||||
// Change this player's current handler
|
||||
if (!g_cfg_input.player[player]->handler.from_string(handler))
|
||||
{
|
||||
//Something went wrong
|
||||
LOG_ERROR(GENERAL, "Failed to convert input string:%s", handler);
|
||||
return;
|
||||
}
|
||||
|
||||
// Get this player's current handler and it's currently available devices
|
||||
std::shared_ptr<PadHandlerBase> cur_pad_handler = GetHandler(g_cfg_input.player[player]->handler);
|
||||
std::vector<std::string> list_devices = cur_pad_handler->ListDevices();
|
||||
|
||||
// Refill the device combobox with currently available devices
|
||||
co_deviceID[player]->clear();
|
||||
|
||||
bool force_enable = true; // enable configs even with disconnected devices
|
||||
|
||||
switch (cur_pad_handler->m_type)
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
case pad_handler::xinput:
|
||||
{
|
||||
QString name_string = qstr(cur_pad_handler->name_string());
|
||||
for (int i = 0; i < cur_pad_handler->max_devices(); i++)
|
||||
{
|
||||
co_deviceID[player]->addItem(name_string + QString::number(i), i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
default:
|
||||
for (int i = 0; i < list_devices.size(); i++)
|
||||
{
|
||||
co_deviceID[player]->addItem(qstr(list_devices[i]), i);
|
||||
}
|
||||
force_enable = false;
|
||||
break;
|
||||
}
|
||||
|
||||
// Handle empty device list
|
||||
bool device_found = list_devices.size() > 0;
|
||||
co_deviceID[player]->setEnabled(force_enable || device_found);
|
||||
|
||||
if (force_enable || device_found)
|
||||
{
|
||||
co_deviceID[player]->setCurrentText(qstr(device));
|
||||
}
|
||||
else
|
||||
{
|
||||
co_deviceID[player]->addItem(tr("No Device Detected"), -1);
|
||||
}
|
||||
|
||||
bool config_enabled = force_enable || (device_found && cur_pad_handler->has_config());
|
||||
co_profile[player]->clear();
|
||||
|
||||
// update profile list if possible
|
||||
if (config_enabled)
|
||||
{
|
||||
QString s_profile_dir = qstr(PadHandlerBase::get_config_dir(cur_pad_handler->m_type));
|
||||
QStringList profiles = gui::utils::get_dir_entries(QDir(s_profile_dir), QStringList() << "*.yml");
|
||||
|
||||
if (profiles.isEmpty())
|
||||
{
|
||||
QString def_name = "Default Profile";
|
||||
if (!CreateConfigFile(s_profile_dir, def_name))
|
||||
{
|
||||
config_enabled = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
co_profile[player]->addItem(def_name);
|
||||
co_profile[player]->setCurrentText(def_name);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (const auto& prof : profiles)
|
||||
{
|
||||
co_profile[player]->addItem(prof);
|
||||
}
|
||||
co_profile[player]->setCurrentText(qstr(profile));
|
||||
}
|
||||
}
|
||||
|
||||
if (!config_enabled)
|
||||
co_profile[player]->addItem(tr("No Profiles"));
|
||||
|
||||
// enable configuration and profile list if possible
|
||||
bu_config[player]->setEnabled(config_enabled);
|
||||
bu_new_profile[player]->setEnabled(config_enabled);
|
||||
co_profile[player]->setEnabled(config_enabled);
|
||||
|
||||
// update view
|
||||
resizeComboBoxView(co_deviceID[player]);
|
||||
resizeComboBoxView(co_profile[player]);
|
||||
}
|
||||
|
||||
void gamepads_settings_dialog::ClickConfigButton(int player)
|
||||
{
|
||||
// Get this player's current handler and open its pad settings dialog
|
||||
std::shared_ptr<PadHandlerBase> cur_pad_handler = GetHandler(g_cfg_input.player[player]->handler);
|
||||
if (cur_pad_handler->has_config())
|
||||
{
|
||||
std::string device = sstr(co_deviceID[player]->currentText());
|
||||
std::string profile = sstr(co_profile[player]->currentText());
|
||||
pad_settings_dialog dlg(device, profile, cur_pad_handler);
|
||||
dlg.exec();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <QDialog>
|
||||
#include <QVBoxLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QComboBox>
|
||||
#include <QPushButton>
|
||||
#include <QListView>
|
||||
|
||||
#include "../Emu/System.h"
|
||||
#include "../../Utilities/Config.h"
|
||||
#include "../../Utilities/File.h"
|
||||
#include "../Emu/Io/PadHandler.h"
|
||||
|
||||
class gamepads_settings_dialog : public QDialog
|
||||
{
|
||||
const int MAX_PLAYERS = 7;
|
||||
|
||||
protected:
|
||||
std::shared_ptr<PadHandlerBase> GetHandler(pad_handler type);
|
||||
void ChangeInputType(int player);
|
||||
void ClickConfigButton(int player);
|
||||
void SaveExit();
|
||||
void CancelExit();
|
||||
|
||||
protected:
|
||||
QComboBox *co_inputtype[7];
|
||||
QComboBox *co_deviceID[7];
|
||||
QComboBox *co_profile[7];
|
||||
QPushButton *bu_config[7];
|
||||
QPushButton *bu_new_profile[7];
|
||||
|
||||
public:
|
||||
gamepads_settings_dialog(QWidget* parent);
|
||||
~gamepads_settings_dialog() = default;
|
||||
};
|
||||
|
|
@ -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(); });
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,27 +3,11 @@
|
|||
#include <QButtonGroup>
|
||||
#include <QDialog>
|
||||
#include <QEvent>
|
||||
#include <QKeyEvent>
|
||||
#include <QLabel>
|
||||
#include <QTabWidget>
|
||||
#include <QTimer>
|
||||
|
||||
#include "keyboard_pad_handler.h"
|
||||
#include "Utilities/types.h"
|
||||
#include "Utilities/Config.h"
|
||||
#include "Emu/Io/PadHandler.h"
|
||||
#include "stdafx.h"
|
||||
#include "Emu/System.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "xinput_pad_handler.h"
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
#include "mm_joystick_handler.h"
|
||||
#endif
|
||||
#ifdef HAVE_LIBEVDEV
|
||||
#include "evdev_joystick_handler.h"
|
||||
#endif
|
||||
#include "ds4_pad_handler.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
|
@ -34,6 +18,8 @@ class pad_settings_dialog : public QDialog
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
const int MAX_PLAYERS = 7;
|
||||
|
||||
enum button_ids
|
||||
{
|
||||
id_pad_begin, // begin
|
||||
|
|
@ -74,6 +60,7 @@ class pad_settings_dialog : public QDialog
|
|||
|
||||
id_reset_parameters,
|
||||
id_blacklist,
|
||||
id_refresh,
|
||||
id_ok,
|
||||
id_cancel
|
||||
};
|
||||
|
|
@ -85,12 +72,26 @@ class pad_settings_dialog : public QDialog
|
|||
QString text;
|
||||
};
|
||||
|
||||
public:
|
||||
explicit pad_settings_dialog(QWidget *parent = nullptr);
|
||||
~pad_settings_dialog();
|
||||
|
||||
private Q_SLOTS:
|
||||
void OnPadButtonClicked(int id);
|
||||
void OnTabChanged(int index);
|
||||
void RefreshInputTypes();
|
||||
void ChangeInputType();
|
||||
/** Save the Pad Configuration to the current Pad Handler Config File */
|
||||
void SaveProfile();
|
||||
void SaveExit();
|
||||
void CancelExit();
|
||||
|
||||
private:
|
||||
Ui::pad_settings_dialog *ui;
|
||||
|
||||
// TabWidget
|
||||
QTabWidget* m_tabs;
|
||||
|
||||
// Button Mapping
|
||||
QButtonGroup* m_padButtons;
|
||||
u32 m_button_id = id_pad_begin;
|
||||
|
|
@ -102,14 +103,18 @@ private:
|
|||
int rx = 0;
|
||||
int ry = 0;
|
||||
|
||||
// Rumble
|
||||
s32 m_min_force;
|
||||
s32 m_max_force;
|
||||
|
||||
// Backup for standard button palette
|
||||
QPalette m_palette;
|
||||
|
||||
// Pad Handlers
|
||||
pad_handler m_handler_type;
|
||||
std::shared_ptr<PadHandlerBase> m_handler;
|
||||
pad_config m_handler_cfg;
|
||||
std::string m_device_name;
|
||||
std::string m_profile;
|
||||
|
||||
// Remap Timer
|
||||
const int MAX_SECONDS = 5;
|
||||
|
|
@ -119,27 +124,28 @@ private:
|
|||
// Input timer. Its Callback handles the input
|
||||
QTimer m_timer_input;
|
||||
|
||||
/** Resets the view to default. Resets the Remap Timer */
|
||||
void ReactivateButtons();
|
||||
|
||||
/** Repaints a stick deadzone preview label */
|
||||
void RepaintPreviewLabel(QLabel* l, int dz, int w, int x, int y);
|
||||
|
||||
public:
|
||||
explicit pad_settings_dialog(const std::string& device, const std::string& profile, std::shared_ptr<PadHandlerBase> handler, QWidget *parent = nullptr);
|
||||
~pad_settings_dialog();
|
||||
|
||||
/** Handle keyboard handler input */
|
||||
void keyPressEvent(QKeyEvent *keyEvent) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
bool eventFilter(QObject* object, QEvent* event) override;
|
||||
|
||||
/** Update all the Button Labels with current button mapping */
|
||||
void UpdateLabel(bool is_reset = false);
|
||||
|
||||
/** Enable/Disable Buttons while trying to remap an other */
|
||||
void SwitchButtons(bool is_enabled);
|
||||
|
||||
/** Save the Pad Configuration to the current Pad Handler Config File */
|
||||
void SaveConfig();
|
||||
/** Resets the view to default. Resets the Remap Timer */
|
||||
void ReactivateButtons();
|
||||
|
||||
void InitButtons();
|
||||
void ReloadButtons();
|
||||
|
||||
void ChangeProfile();
|
||||
|
||||
/** Repaints a stick deadzone preview label */
|
||||
void RepaintPreviewLabel(QLabel* l, int dz, int w, int x, int y);
|
||||
|
||||
std::shared_ptr<PadHandlerBase> GetHandler(pad_handler type);
|
||||
|
||||
protected:
|
||||
/** Handle keyboard handler input */
|
||||
void keyPressEvent(QKeyEvent *keyEvent) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
bool eventFilter(QObject* object, QEvent* event) override;
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue