The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10593 from AdmiralCurtiss/interface-pane-signal-block

Browse Source 
Qt/InterfacePane: Don't trigger config change events when populating GUI.
This commit is contained in:
Admiral H. Curtiss 2022-05-08 20:43:09 +02:00 committed by GitHub
commit 6e54233eb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Source/Core/DolphinQt/Settings/InterfacePane.cpp
View File

@ -23,6 +23,7 @@
#include "Core/Config/UISettings.h" #include "Core/Config/UISettings.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/QtUtils/SignalBlocking.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
#include "UICommon/GameFile.h" #include "UICommon/GameFile.h"
@ -237,21 +238,24 @@ void InterfacePane::ConnectLayout()
void InterfacePane::LoadConfig() void InterfacePane::LoadConfig()
{ {
m_checkbox_use_builtin_title_database->setChecked( SignalBlocking(m_checkbox_use_builtin_title_database)
Config::Get(Config::MAIN_USE_BUILT_IN_TITLE_DATABASE)); ->setChecked(Config::Get(Config::MAIN_USE_BUILT_IN_TITLE_DATABASE));
m_checkbox_show_debugging_ui->setChecked(Settings::Instance().IsDebugModeEnabled()); SignalBlocking(m_checkbox_show_debugging_ui)
m_combobox_language->setCurrentIndex(m_combobox_language->findData( ->setChecked(Settings::Instance().IsDebugModeEnabled());
SignalBlocking(m_combobox_language)
->setCurrentIndex(m_combobox_language->findData(
QString::fromStdString(Config::Get(Config::MAIN_INTERFACE_LANGUAGE)))); QString::fromStdString(Config::Get(Config::MAIN_INTERFACE_LANGUAGE))));
m_combobox_theme->setCurrentIndex( SignalBlocking(m_combobox_theme)
->setCurrentIndex(
m_combobox_theme->findText(QString::fromStdString(Config::Get(Config::MAIN_THEME_NAME)))); m_combobox_theme->findText(QString::fromStdString(Config::Get(Config::MAIN_THEME_NAME))));
const QString userstyle = Settings::Instance().GetCurrentUserStyle(); const QString userstyle = Settings::Instance().GetCurrentUserStyle();
const int index = m_combobox_userstyle->findData(QFileInfo(userstyle).fileName()); const int index = m_combobox_userstyle->findData(QFileInfo(userstyle).fileName());
if (index > 0) if (index > 0)
m_combobox_userstyle->setCurrentIndex(index); SignalBlocking(m_combobox_userstyle)->setCurrentIndex(index);
m_checkbox_use_userstyle->setChecked(Settings::Instance().AreUserStylesEnabled()); SignalBlocking(m_checkbox_use_userstyle)->setChecked(Settings::Instance().AreUserStylesEnabled());
const bool visible = m_checkbox_use_userstyle->isChecked(); const bool visible = m_checkbox_use_userstyle->isChecked();
@ -259,23 +263,28 @@ void InterfacePane::LoadConfig()
m_label_userstyle->setVisible(visible); m_label_userstyle->setVisible(visible);
// Render Window Options // Render Window Options
m_checkbox_top_window->setChecked(Settings::Instance().IsKeepWindowOnTopEnabled()); SignalBlocking(m_checkbox_top_window)
m_checkbox_confirm_on_stop->setChecked(Config::Get(Config::MAIN_CONFIRM_ON_STOP)); ->setChecked(Settings::Instance().IsKeepWindowOnTopEnabled());
m_checkbox_use_panic_handlers->setChecked(Config::Get(Config::MAIN_USE_PANIC_HANDLERS)); SignalBlocking(m_checkbox_confirm_on_stop)->setChecked(Config::Get(Config::MAIN_CONFIRM_ON_STOP));
m_checkbox_enable_osd->setChecked(Config::Get(Config::MAIN_OSD_MESSAGES)); SignalBlocking(m_checkbox_use_panic_handlers)
m_checkbox_show_active_title->setChecked(Config::Get(Config::MAIN_SHOW_ACTIVE_TITLE)); ->setChecked(Config::Get(Config::MAIN_USE_PANIC_HANDLERS));
m_checkbox_pause_on_focus_lost->setChecked(Config::Get(Config::MAIN_PAUSE_ON_FOCUS_LOST)); SignalBlocking(m_checkbox_enable_osd)->setChecked(Config::Get(Config::MAIN_OSD_MESSAGES));
m_checkbox_use_covers->setChecked(Config::Get(Config::MAIN_USE_GAME_COVERS)); SignalBlocking(m_checkbox_show_active_title)
m_checkbox_focused_hotkeys->setChecked(Config::Get(Config::MAIN_FOCUSED_HOTKEYS)); ->setChecked(Config::Get(Config::MAIN_SHOW_ACTIVE_TITLE));
m_radio_cursor_visible_movement->setChecked(Settings::Instance().GetCursorVisibility() == SignalBlocking(m_checkbox_pause_on_focus_lost)
Config::ShowCursor::OnMovement); ->setChecked(Config::Get(Config::MAIN_PAUSE_ON_FOCUS_LOST));
m_radio_cursor_visible_always->setChecked(Settings::Instance().GetCursorVisibility() == SignalBlocking(m_checkbox_use_covers)->setChecked(Config::Get(Config::MAIN_USE_GAME_COVERS));
Config::ShowCursor::Constantly); SignalBlocking(m_checkbox_focused_hotkeys)->setChecked(Config::Get(Config::MAIN_FOCUSED_HOTKEYS));
m_radio_cursor_visible_never->setChecked(Settings::Instance().GetCursorVisibility() == SignalBlocking(m_radio_cursor_visible_movement)
Config::ShowCursor::Never); ->setChecked(Settings::Instance().GetCursorVisibility() == Config::ShowCursor::OnMovement);
SignalBlocking(m_radio_cursor_visible_always)
->setChecked(Settings::Instance().GetCursorVisibility() == Config::ShowCursor::Constantly);
SignalBlocking(m_radio_cursor_visible_never)
->setChecked(Settings::Instance().GetCursorVisibility() == Config::ShowCursor::Never);
m_checkbox_lock_mouse->setChecked(Settings::Instance().GetLockCursor()); SignalBlocking(m_checkbox_lock_mouse)->setChecked(Settings::Instance().GetLockCursor());
m_checkbox_disable_screensaver->setChecked(Config::Get(Config::MAIN_DISABLE_SCREENSAVER)); SignalBlocking(m_checkbox_disable_screensaver)
->setChecked(Config::Get(Config::MAIN_DISABLE_SCREENSAVER));
} }
void InterfacePane::OnSaveConfig() void InterfacePane::OnSaveConfig()