midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3610 from BreadFish64/update-icons-signal

Browse Source 
QT: add themed icon update signal
This commit is contained in:
James Rowe 2018-03-30 09:40:36 -06:00 committed by GitHub
commit 11b9d303da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/citra_qt/main.cpp
View File

@ -112,6 +112,9 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
ui.setupUi(this); ui.setupUi(this);
statusBar()->hide(); statusBar()->hide();
default_theme_paths = QIcon::themeSearchPaths();
UpdateUITheme();
InitializeWidgets(); InitializeWidgets();
InitializeDebugWidgets(); InitializeDebugWidgets();
InitializeRecentFileMenuActions(); InitializeRecentFileMenuActions();
@ -130,9 +133,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan); game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan);
default_theme_paths = QIcon::themeSearchPaths();
UpdateUITheme();
// Show one-time "callout" messages to the user // Show one-time "callout" messages to the user
ShowCallouts(); ShowCallouts();
@ -1249,6 +1249,7 @@ void GMainWindow::UpdateUITheme() {
QIcon::setThemeName(":/icons/default"); QIcon::setThemeName(":/icons/default");
} }
QIcon::setThemeSearchPaths(theme_paths); QIcon::setThemeSearchPaths(theme_paths);
emit UpdateThemedIcons();
} }
void GMainWindow::LoadTranslation() { void GMainWindow::LoadTranslation() {

2
src/citra_qt/main.h
View File

@ -74,6 +74,8 @@ signals:
void UpdateProgress(size_t written, size_t total); void UpdateProgress(size_t written, size_t total);
void CIAInstallReport(Service::AM::InstallStatus status, QString filepath); void CIAInstallReport(Service::AM::InstallStatus status, QString filepath);
void CIAInstallFinished(); void CIAInstallFinished();
// Signal that tells widgets to update icons to use the current theme
void UpdateThemedIcons();
private: private:
void InitializeWidgets(); void InitializeWidgets();