added settingsdialog cancel

This commit is contained in:
fourtf
2017-01-24 19:51:57 +01:00
parent ad4c2901af
commit de8f6d1e82
8 changed files with 112 additions and 37 deletions
+4 -3
View File
@@ -16,7 +16,7 @@ Settings::Settings()
, portable(false)
, wordTypeMask(messages::Word::Default)
, theme(this->settingsItems, "theme", "dark")
, user(this->settingsItems, "selectedUser", "")
, selectedUser(this->settingsItems, "selectedUser", "")
, emoteScale(this->settingsItems, "emoteScale", 1.0)
, scaleEmotesByLineHeight(this->settingsItems, "scaleEmotesByLineHeight",
false)
@@ -65,7 +65,7 @@ void
Settings::save()
{
for (auto &item : settingsItems) {
item.get().save(settings);
this->settings.setValue(item.get().getName(), item.get().getVariant());
}
}
@@ -74,7 +74,8 @@ Settings::load()
{
for (auto &item : settingsItems) {
qDebug() << "Loading settings for " << item.get().getName();
item.get().load(settings);
item.get().setVariant(this->settings.value(item.get().getName()));
}
}