archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 10:18:40 +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. // Only attempt to load a config if changes occurred.
if (m_current_gui_config != ui->combo_configs->currentText()) if (m_current_gui_config != ui->combo_configs->currentText())
{ {
OnApplyConfig(); OnApplyGuiConfig();
} }
if (m_current_stylesheet != m_gui_settings->GetValue(gui::m_currentStylesheet).toString()) 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); apply_gui_options(true);
m_gui_settings->Reset(true); m_gui_settings->Reset(true);
Q_EMIT GuiSettingsSyncRequest(true); Q_EMIT GuiSettingsSyncRequest(true);
AddConfigs(); AddGuiConfigs();
AddStylesheets(); AddStylesheets();
apply_gui_options(); apply_gui_options();
} }
}); });
connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentConfig); connect(ui->pb_backup_config, &QAbstractButton::clicked, this, &settings_dialog::OnBackupCurrentGuiConfig);
connect(ui->pb_apply_config, &QAbstractButton::clicked, this, &settings_dialog::OnApplyConfig); 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_apply_stylesheet, &QAbstractButton::clicked, this, &settings_dialog::OnApplyStylesheet);
connect(ui->pb_open_folder, &QAbstractButton::clicked, [=, this]() 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); color_dialog(gui::tr_icon_color, tr("Choose trophy manager icon color", "Settings: color dialog"), ui->pb_tr_icon_color);
}); });
AddConfigs(); AddGuiConfigs();
AddStylesheets(); 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(); 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); QInputDialog* dialog = new QInputDialog(this);
dialog->setWindowTitle(tr("Choose a unique name", "Backup GUI config")); 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(); 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 GuiRepaintRequest();
void EmuSettingsApplied(); void EmuSettingsApplied();
private Q_SLOTS: private Q_SLOTS:
void OnBackupCurrentConfig(); void OnBackupCurrentGuiConfig();
void OnApplyConfig(); void OnApplyGuiConfig();
void OnApplyStylesheet(); void OnApplyStylesheet();
private: private:
void EnhanceSlider(emu_settings_type settings_type, QSlider* slider, QLabel* label, const QString& label_text); 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; QSlider* m_current_slider = nullptr;
// Emulator tab // Emulator tab
void AddConfigs(); void AddGuiConfigs();
void AddStylesheets(); void AddStylesheets();
QString m_current_stylesheet; QString m_current_stylesheet;
QString m_current_gui_config; QString m_current_gui_config;