mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional cleanup

Browse Source
This commit is contained in:
rainmakerv2 2025-02-04 09:10:26 +08:00
parent 48c071640e
commit fd73d0aec8
2 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/qt_gui/control_settings.cpp
View File

@ -28,9 +28,14 @@ ControlSettings::ControlSettings(std::shared_ptr<GameInfoClass> game_info_get, Q
});
connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &QWidget::close);
connect(ui->KBMButton, &QPushButton::clicked, this, &ControlSettings::KBMClicked);
connect(ui->ProfileComboBox, &QComboBox::currentTextChanged, this,
&ControlSettings::OnProfileChanged);
connect(ui->KBMButton, &QPushButton::clicked, this, [this] {
auto KBMWindow = new EditorDialog(this);
KBMWindow->exec();
});
connect(ui->ProfileComboBox, &QComboBox::currentTextChanged, this, [this] {
GetGameTitle();
SetUIValuestoMappings();
});
connect(ui->LeftDeadzoneSlider, &QSlider::valueChanged, this,
[this](int value) { ui->LeftDeadzoneValue->setText(QString::number(value)); });
@ -82,11 +87,9 @@ void ControlSettings::SaveControllerConfig(bool CloseOnSave) {
}
std::string config_id;
if (ui->ProfileComboBox->currentText() == "Common Config") {
config_id = ("default");
} else {
config_id = (ui->ProfileComboBox->currentText().toStdString());
}
config_id = (ui->ProfileComboBox->currentText() == "Common Config")
? "default"
: ui->ProfileComboBox->currentText().toStdString();
const auto config_file = Config::GetFoolproofKbmConfigFile(config_id);
int lineCount = 0;
@ -225,22 +228,10 @@ void ControlSettings::SaveControllerConfig(bool CloseOnSave) {
std::vector<std::string> save;
bool CurrentLineEmpty = false, LastLineEmpty = false;
for (auto const& line : lines) {
if (CurrentLineEmpty) {
LastLineEmpty = true;
} else {
LastLineEmpty = false;
}
if (line.empty()) {
CurrentLineEmpty = true;
} else {
CurrentLineEmpty = false;
}
if (CurrentLineEmpty && LastLineEmpty)
continue;
save.push_back(line);
LastLineEmpty = CurrentLineEmpty ? true : false;
CurrentLineEmpty = line.empty() ? true : false;
if (!CurrentLineEmpty || !LastLineEmpty)
save.push_back(line);
}
std::ofstream output_file(config_file);
@ -324,11 +315,9 @@ void ControlSettings::AddBoxItems() {
void ControlSettings::SetUIValuestoMappings() {
std::string config_id;
if (ui->ProfileComboBox->currentText() == "Common Config") {
config_id = ("default");
} else {
config_id = (ui->ProfileComboBox->currentText().toStdString());
}
config_id = (ui->ProfileComboBox->currentText() == "Common Config")
? "default"
: ui->ProfileComboBox->currentText().toStdString();
const auto config_file = Config::GetFoolproofKbmConfigFile(config_id);
std::ifstream file(config_file);
@ -344,19 +333,16 @@ void ControlSettings::SetUIValuestoMappings() {
lineCount++;
line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
if (line.empty()) {
if (line.empty())
continue;
}
std::size_t comment_pos = line.find('#');
if (comment_pos != std::string::npos) {
if (comment_pos != std::string::npos)
line = line.substr(0, comment_pos);
}
std::size_t equal_pos = line.find('=');
if (equal_pos == std::string::npos) {
if (equal_pos == std::string::npos)
continue;
}
std::string output_string = line.substr(0, equal_pos);
std::string input_string = line.substr(equal_pos + 1);
@ -509,14 +495,4 @@ void ControlSettings::GetGameTitle() {
}
}
void ControlSettings::OnProfileChanged() {
GetGameTitle();
SetUIValuestoMappings();
}
void ControlSettings::KBMClicked() {
auto KBMWindow = new EditorDialog(this);
KBMWindow->exec();
}
ControlSettings::~ControlSettings() {}

27
src/qt_gui/control_settings.h
View File

@ -14,6 +14,19 @@ public:
explicit ControlSettings(std::shared_ptr<GameInfoClass> game_info_get,
QWidget* parent = nullptr);
~ControlSettings();
private Q_SLOTS:
void SaveControllerConfig(bool CloseOnSave);
void SetDefault();
private:
std::unique_ptr<Ui::ControlSettings> ui;
std::shared_ptr<GameInfoClass> m_game_info;
void AddBoxItems();
void SetUIValuestoMappings();
void GetGameTitle();
const std::vector<std::string> ControllerInputs = {
"cross", "circle", "square", "triangle", "l1",
"r1", "l2", "r2", "l3",
@ -36,18 +49,4 @@ public:
const QStringList StickOutputs = {"axis_left_x", "axis_left_y", "axis_right_x", "axis_right_y",
"unmapped"};
private Q_SLOTS:
void SaveControllerConfig(bool CloseOnSave);
void SetDefault();
void OnProfileChanged();
void KBMClicked();
private:
std::unique_ptr<Ui::ControlSettings> ui;
std::shared_ptr<GameInfoClass> m_game_info;
void AddBoxItems();
void SetUIValuestoMappings();
void GetGameTitle();
};