From 3400f2b9470b20cc295564e3244348112edeafdd Mon Sep 17 00:00:00 2001 From: David Sansome Date: Wed, 21 Apr 2010 11:24:22 +0000 Subject: [PATCH] Don't lose the library settings when opening the settings dialog and accepting it without navigating to the Library tab. --- src/libraryconfig.cpp | 4 ++++ src/libraryconfig.h | 1 + src/settingsdialog.cpp | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/libraryconfig.cpp b/src/libraryconfig.cpp index eeff35c65..ad3e2fc93 100644 --- a/src/libraryconfig.cpp +++ b/src/libraryconfig.cpp @@ -85,6 +85,10 @@ void LibraryConfig::Save() { } void LibraryConfig::showEvent(QShowEvent *) { + Load(); +} + +void LibraryConfig::Load() { QSettings s; s.beginGroup(LibraryView::kSettingsGroup); diff --git a/src/libraryconfig.h b/src/libraryconfig.h index a04c83cfc..8c70d23de 100644 --- a/src/libraryconfig.h +++ b/src/libraryconfig.h @@ -32,6 +32,7 @@ class LibraryConfig : public QWidget { void SetModel(LibraryDirectoryModel* model); public slots: + void Load(); void Save(); protected: diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 39cbe6a1a..698f80da6 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -246,6 +246,8 @@ void SettingsDialog::showEvent(QShowEvent*) { ui_.notifications_bg_preset->setItemData(2, QColor(color), Qt::DecorationRole); UpdatePopupVisible(); + ui_.library_config->Load(); + loading_settings_ = false; }