optimize settings application

This commit is contained in:
BreadFish64 2018-07-02 16:53:34 -05:00
parent 4564fc5baa
commit f649c443d9
8 changed files with 3 additions and 9 deletions

View File

@ -61,7 +61,6 @@ void ConfigureAudio::applyConfiguration() {
Settings::values.audio_device_id = Settings::values.audio_device_id =
ui->audio_device_combo_box->itemText(ui->audio_device_combo_box->currentIndex()) ui->audio_device_combo_box->itemText(ui->audio_device_combo_box->currentIndex())
.toStdString(); .toStdString();
Settings::Apply();
} }
void ConfigureAudio::updateAudioDevices(int sink_index) { void ConfigureAudio::updateAudioDevices(int sink_index) {

View File

@ -285,7 +285,6 @@ void ConfigureCamera::applyConfiguration() {
Settings::values.camera_name = camera_name; Settings::values.camera_name = camera_name;
Settings::values.camera_config = camera_config; Settings::values.camera_config = camera_config;
Settings::values.camera_flip = camera_flip; Settings::values.camera_flip = camera_flip;
Settings::Apply();
} }
ConfigureCamera::CameraPosition ConfigureCamera::getCameraSelection() { ConfigureCamera::CameraPosition ConfigureCamera::getCameraSelection() {

View File

@ -44,7 +44,6 @@ void ConfigureDebug::applyConfiguration() {
Log::Filter filter; Log::Filter filter;
filter.ParseFilterString(Settings::values.log_filter); filter.ParseFilterString(Settings::values.log_filter);
Log::SetGlobalFilter(filter); Log::SetGlobalFilter(filter);
Settings::Apply();
} }
void ConfigureDebug::retranslateUi() { void ConfigureDebug::retranslateUi() {

View File

@ -68,7 +68,6 @@ void ConfigureGeneral::applyConfiguration() {
Settings::values.region_value = ui->region_combobox->currentIndex() - 1; Settings::values.region_value = ui->region_combobox->currentIndex() - 1;
Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked(); Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
Settings::Apply();
} }
void ConfigureGeneral::onLanguageChanged(int index) { void ConfigureGeneral::onLanguageChanged(int index) {

View File

@ -62,7 +62,6 @@ void ConfigureGraphics::applyConfiguration() {
Settings::values.layout_option = Settings::values.layout_option =
static_cast<Settings::LayoutOption>(ui->layout_combobox->currentIndex()); static_cast<Settings::LayoutOption>(ui->layout_combobox->currentIndex());
Settings::values.swap_screen = ui->swap_screen->isChecked(); Settings::values.swap_screen = ui->swap_screen->isChecked();
Settings::Apply();
} }
void ConfigureGraphics::retranslateUi() { void ConfigureGraphics::retranslateUi() {

View File

@ -186,8 +186,6 @@ void ConfigureInput::applyConfiguration() {
[](const Common::ParamPackage& param) { return param.Serialize(); }); [](const Common::ParamPackage& param) { return param.Serialize(); });
std::transform(analogs_param.begin(), analogs_param.end(), Settings::values.analogs.begin(), std::transform(analogs_param.begin(), analogs_param.end(), Settings::values.analogs.begin(),
[](const Common::ParamPackage& param) { return param.Serialize(); }); [](const Common::ParamPackage& param) { return param.Serialize(); });
Settings::Apply();
} }
void ConfigureInput::loadConfiguration() { void ConfigureInput::loadConfiguration() {

View File

@ -61,7 +61,6 @@ void ConfigureWeb::applyConfiguration() {
tr("Username and token were not verified. The changes to your " tr("Username and token were not verified. The changes to your "
"username and/or token have not been saved.")); "username and/or token have not been saved."));
} }
Settings::Apply();
} }
void ConfigureWeb::RefreshTelemetryID() { void ConfigureWeb::RefreshTelemetryID() {

View File

@ -1154,10 +1154,12 @@ void GMainWindow::OnConfigure() {
ConfigureDialog configureDialog(this); ConfigureDialog configureDialog(this);
connect(&configureDialog, &ConfigureDialog::languageChanged, this, connect(&configureDialog, &ConfigureDialog::languageChanged, this,
&GMainWindow::OnLanguageChanged); &GMainWindow::OnLanguageChanged);
auto old_theme = UISettings::values.theme;
auto result = configureDialog.exec(); auto result = configureDialog.exec();
if (result == QDialog::Accepted) { if (result == QDialog::Accepted) {
configureDialog.applyConfiguration(); configureDialog.applyConfiguration();
UpdateUITheme(); if (UISettings::values.theme != old_theme)
UpdateUITheme();
emit UpdateThemedIcons(); emit UpdateThemedIcons();
SyncMenuUISettings(); SyncMenuUISettings();
config->Save(); config->Save();