archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 02:08:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Qt: Rename some functions in settings_dialog

Browse source
This commit is contained in:
Megamouse 2020-04-23 18:17:31 +02:00
parent 72ab5f05f4
commit af854835b2
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -1526,7 +1526,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
// Only attempt to load a config if changes occurred.
if (m_current_gui_config != ui->combo_configs->currentText())
{
OnApplyConfig();
OnApplyGuiConfig();
}
if (m_current_stylesheet != m_gui_settings->GetValue(gui::m_currentStylesheet).toString())
{
@ -1547,14 +1547,14 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
apply_gui_options(true);
m_gui_settings->Reset(true);
Q_EMIT GuiSettingsSyncRequest(true);
AddConfigs();
AddGuiConfigs();
AddStylesheets();
apply_gui_options();
}
});
connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentConfig);
connect(ui->pb_apply_config, &QAbstractButton::clicked, this, &settings_dialog::OnApplyConfig);
connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentGuiConfig);
connect(ui->pb_apply_config, &QAbstractButton::clicked, this, &settings_dialog::OnApplyGuiConfig);
connect(ui->pb_apply_stylesheet, &QAbstractButton::clicked, this, &settings_dialog::OnApplyStylesheet);
connect(ui->pb_open_folder, &QAbstractButton::clicked, [=, this]()
@ -1630,7 +1630,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
color_dialog(gui::tr_icon_color, tr("Choose trophy manager icon color", "Settings: color dialog"), ui->pb_tr_icon_color);
});
AddConfigs();
AddGuiConfigs();
AddStylesheets();
}
@ -1744,7 +1744,7 @@ void settings_dialog::SnapSlider(QSlider *slider, int interval)
});
}
void settings_dialog::AddConfigs()
void settings_dialog::AddGuiConfigs()
{
ui->combo_configs->clear();
@ -1794,7 +1794,7 @@ void settings_dialog::AddStylesheets()
}
}
void settings_dialog::OnBackupCurrentConfig()
void settings_dialog::OnBackupCurrentGuiConfig()
{
QInputDialog* dialog = new QInputDialog(this);
dialog->setWindowTitle(tr("Choose a unique name", "Backup GUI config"));
@ -1831,7 +1831,7 @@ void settings_dialog::OnBackupCurrentConfig()
}
}
void settings_dialog::OnApplyConfig()
void settings_dialog::OnApplyGuiConfig()
{
const QString new_config = ui->combo_configs->currentText();

6
rpcs3/rpcs3qt/settings_dialog.h
View file

@ -31,8 +31,8 @@ Q_SIGNALS:
void GuiRepaintRequest();
void EmuSettingsApplied();
private Q_SLOTS:
void OnBackupCurrentConfig();
void OnApplyConfig();
void OnBackupCurrentGuiConfig();
void OnApplyGuiConfig();
void OnApplyStylesheet();
private:
void EnhanceSlider(emu_settings_type settings_type, QSlider* slider, QLabel* label, const QString& label_text);
@ -42,7 +42,7 @@ private:
QSlider* m_current_slider = nullptr;
// Emulator tab
void AddConfigs();
void AddGuiConfigs();
void AddStylesheets();
QString m_current_stylesheet;
QString m_current_gui_config;