Fix saving initial settings
This commit is contained in:
parent
e3624eed30
commit
0fd61945c7
|
@ -138,8 +138,6 @@ AppearanceSettingsPage::~AppearanceSettingsPage() {
|
|||
void AppearanceSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
|
||||
QPalette p = QApplication::palette();
|
||||
|
@ -217,6 +215,8 @@ void AppearanceSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_appearancesettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void AppearanceSettingsPage::Save() {
|
||||
|
|
|
@ -86,8 +86,6 @@ void BackendSettingsPage::Load() {
|
|||
engineloaded_ = false;
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
|
||||
Engine::EngineType enginetype = Engine::EngineTypeFromName(s.value("engine", EngineName(Engine::None)).toString());
|
||||
|
@ -185,6 +183,7 @@ void BackendSettingsPage::Load() {
|
|||
RgPreampChanged(ui_->stickslider_replaygainpreamp->value());
|
||||
|
||||
Init(ui_->layout_backendsettingspage->parentWidget());
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
// Check if engine, output or device is set to a different setting than the configured to force saving settings.
|
||||
|
||||
|
|
|
@ -149,7 +149,6 @@ BehaviourSettingsPage::~BehaviourSettingsPage() {
|
|||
void BehaviourSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
s.beginGroup(kSettingsGroup);
|
||||
|
||||
#ifndef Q_OS_MACOS
|
||||
|
@ -225,6 +224,8 @@ void BehaviourSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_behavioursettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void BehaviourSettingsPage::Save() {
|
||||
|
|
|
@ -149,7 +149,6 @@ void CollectionSettingsPage::Load() {
|
|||
}
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
ui_->auto_open->setChecked(s.value("auto_open", true).toBool());
|
||||
|
@ -195,6 +194,7 @@ void CollectionSettingsPage::Load() {
|
|||
ui_->disk_cache_in_use->setText((dialog()->app()->collection_model()->icon_cache_disk_size() == 0 ? "empty" : Utilities::PrettySize(dialog()->app()->collection_model()->icon_cache_disk_size())));
|
||||
|
||||
Init(ui_->layout_collectionsettingspage->parentWidget());
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -125,9 +125,8 @@ ContextSettingsPage::~ContextSettingsPage() { delete ui_; }
|
|||
void ContextSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
|
||||
ui_->context_custom_text1->setText(s.value(kSettingsTitleFmt, "%title% - %artist%").toString());
|
||||
ui_->context_custom_text2->setText(s.value(kSettingsSummaryFmt, "%album%").toString());
|
||||
|
||||
|
@ -157,6 +156,8 @@ void ContextSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_contextsettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void ContextSettingsPage::Save() {
|
||||
|
|
|
@ -73,8 +73,6 @@ CoversSettingsPage::~CoversSettingsPage() { delete ui_; }
|
|||
|
||||
void CoversSettingsPage::Load() {
|
||||
|
||||
if (!QSettings().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
ui_->providers->clear();
|
||||
|
||||
QList<CoverProvider*> cover_providers_sorted = dialog()->app()->cover_providers()->List();
|
||||
|
@ -89,6 +87,8 @@ void CoversSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_coverssettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void CoversSettingsPage::Save() {
|
||||
|
|
|
@ -73,8 +73,6 @@ LyricsSettingsPage::~LyricsSettingsPage() { delete ui_; }
|
|||
|
||||
void LyricsSettingsPage::Load() {
|
||||
|
||||
if (!QSettings().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
ui_->providers->clear();
|
||||
|
||||
QList<LyricsProvider*> lyrics_providers_sorted = dialog()->app()->lyrics_providers()->List();
|
||||
|
@ -89,6 +87,8 @@ void LyricsSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_lyricssettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void LyricsSettingsPage::Save() {
|
||||
|
|
|
@ -66,8 +66,6 @@ MoodbarSettingsPage::~MoodbarSettingsPage() { delete ui_; }
|
|||
void MoodbarSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
ui_->moodbar_enabled->setChecked(s.value("enabled", false).toBool());
|
||||
ui_->moodbar_show->setChecked(s.value("show", false).toBool());
|
||||
|
@ -79,6 +77,8 @@ void MoodbarSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_moodbarsettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void MoodbarSettingsPage::Save() {
|
||||
|
|
|
@ -51,7 +51,6 @@ NetworkProxySettingsPage::~NetworkProxySettingsPage() { delete ui_; }
|
|||
void NetworkProxySettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(NetworkProxyFactory::kSettingsGroup);
|
||||
NetworkProxyFactory::Mode mode = NetworkProxyFactory::Mode(s.value("mode", NetworkProxyFactory::Mode_System).toInt());
|
||||
|
@ -80,6 +79,8 @@ void NetworkProxySettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_networkproxysettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void NetworkProxySettingsPage::Save() {
|
||||
|
|
|
@ -56,8 +56,6 @@
|
|||
class QHideEvent;
|
||||
class QShowEvent;
|
||||
|
||||
//const char *NotificationsSettingsPage::kSettingsGroup = "Notifications";
|
||||
|
||||
NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog* dialog)
|
||||
: SettingsPage(dialog), ui_(new Ui_NotificationsSettingsPage), pretty_popup_(new OSDPretty(OSDPretty::Mode_Draggable)) {
|
||||
|
||||
|
@ -142,7 +140,6 @@ void NotificationsSettingsPage::hideEvent(QHideEvent*) {
|
|||
void NotificationsSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(OSDBase::kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(OSDBase::kSettingsGroup);
|
||||
OSDBase::Behaviour osd_behaviour = OSDBase::Behaviour(s.value("Behaviour", OSDBase::Native).toInt());
|
||||
|
@ -202,6 +199,8 @@ void NotificationsSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_notificationssettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(OSDBase::kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void NotificationsSettingsPage::Save() {
|
||||
|
|
|
@ -43,8 +43,6 @@ class NotificationsSettingsPage : public SettingsPage {
|
|||
explicit NotificationsSettingsPage(SettingsDialog *dialog);
|
||||
~NotificationsSettingsPage() override;
|
||||
|
||||
//static const char *kSettingsGroup;
|
||||
|
||||
void Load() override;
|
||||
void Save() override;
|
||||
|
||||
|
|
|
@ -49,8 +49,6 @@ PlaylistSettingsPage::~PlaylistSettingsPage() {
|
|||
void PlaylistSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
|
@ -97,6 +95,8 @@ void PlaylistSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_playlistsettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void PlaylistSettingsPage::Save() {
|
||||
|
|
|
@ -98,6 +98,8 @@ void QobuzSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_qobuzsettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void QobuzSettingsPage::Save() {
|
||||
|
|
|
@ -123,6 +123,8 @@ void ScrobblerSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_scrobblersettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void ScrobblerSettingsPage::Save() {
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <QString>
|
||||
|
||||
#include "osd/osdbase.h"
|
||||
#include "core/logging.h"
|
||||
|
||||
class QCheckBox;
|
||||
class QComboBox;
|
||||
|
|
|
@ -101,7 +101,6 @@ bool GlobalShortcutsSettingsPage::IsEnabled() const {
|
|||
void GlobalShortcutsSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
s.beginGroup(kSettingsGroup);
|
||||
|
||||
GlobalShortcuts *manager = dialog()->global_shortcuts_manager();
|
||||
|
@ -180,6 +179,8 @@ void GlobalShortcutsSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_globalshortcutssettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void GlobalShortcutsSettingsPage::Save() {
|
||||
|
|
|
@ -65,8 +65,6 @@ SubsonicSettingsPage::~SubsonicSettingsPage() { delete ui_; }
|
|||
void SubsonicSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
ui_->enable->setChecked(s.value("enabled", false).toBool());
|
||||
ui_->server_url->setText(s.value("url").toString());
|
||||
|
@ -81,6 +79,8 @@ void SubsonicSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_subsonicsettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void SubsonicSettingsPage::Save() {
|
||||
|
|
|
@ -85,8 +85,6 @@ TidalSettingsPage::~TidalSettingsPage() { delete ui_; }
|
|||
void TidalSettingsPage::Load() {
|
||||
|
||||
QSettings s;
|
||||
if (!s.contains(kSettingsGroup)) set_changed();
|
||||
|
||||
s.beginGroup(kSettingsGroup);
|
||||
ui_->enable->setChecked(s.value("enabled", false).toBool());
|
||||
ui_->oauth->setChecked(s.value("oauth", true).toBool());
|
||||
|
@ -120,6 +118,8 @@ void TidalSettingsPage::Load() {
|
|||
|
||||
Init(ui_->layout_tidalsettingspage->parentWidget());
|
||||
|
||||
if (!QSettings().childGroups().contains(kSettingsGroup)) set_changed();
|
||||
|
||||
}
|
||||
|
||||
void TidalSettingsPage::Save() {
|
||||
|
|
Loading…
Reference in New Issue