|
|
|
@ -50,6 +50,7 @@ UserSettings::load() |
|
|
|
hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool(); |
|
|
|
hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool(); |
|
|
|
isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool(); |
|
|
|
isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool(); |
|
|
|
isGroupViewEnabled_ = settings.value("user/group_view", true).toBool(); |
|
|
|
isGroupViewEnabled_ = settings.value("user/group_view", true).toBool(); |
|
|
|
|
|
|
|
isMarkdownEnabled_ = settings.value("user/markdown_enabled", true).toBool(); |
|
|
|
isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool(); |
|
|
|
isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool(); |
|
|
|
isReadReceiptsEnabled_ = settings.value("user/read_receipts", true).toBool(); |
|
|
|
isReadReceiptsEnabled_ = settings.value("user/read_receipts", true).toBool(); |
|
|
|
theme_ = settings.value("user/theme", defaultTheme_).toString(); |
|
|
|
theme_ = settings.value("user/theme", defaultTheme_).toString(); |
|
|
|
@ -126,6 +127,7 @@ UserSettings::save() |
|
|
|
settings.setValue("typing_notifications", isTypingNotificationsEnabled_); |
|
|
|
settings.setValue("typing_notifications", isTypingNotificationsEnabled_); |
|
|
|
settings.setValue("read_receipts", isReadReceiptsEnabled_); |
|
|
|
settings.setValue("read_receipts", isReadReceiptsEnabled_); |
|
|
|
settings.setValue("group_view", isGroupViewEnabled_); |
|
|
|
settings.setValue("group_view", isGroupViewEnabled_); |
|
|
|
|
|
|
|
settings.setValue("markdown_enabled", isMarkdownEnabled_); |
|
|
|
settings.setValue("desktop_notifications", hasDesktopNotifications_); |
|
|
|
settings.setValue("desktop_notifications", hasDesktopNotifications_); |
|
|
|
settings.setValue("theme", theme()); |
|
|
|
settings.setValue("theme", theme()); |
|
|
|
settings.setValue("font_family", font_); |
|
|
|
settings.setValue("font_family", font_); |
|
|
|
@ -167,70 +169,46 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge |
|
|
|
topBarLayout_->addWidget(backBtn_, 1, Qt::AlignLeft | Qt::AlignVCenter); |
|
|
|
topBarLayout_->addWidget(backBtn_, 1, Qt::AlignLeft | Qt::AlignVCenter); |
|
|
|
topBarLayout_->addStretch(1); |
|
|
|
topBarLayout_->addStretch(1); |
|
|
|
|
|
|
|
|
|
|
|
auto trayOptionLayout_ = new QHBoxLayout; |
|
|
|
auto addSetting = [this, &font](QString labelText) { |
|
|
|
trayOptionLayout_->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
auto layout = new QHBoxLayout; |
|
|
|
auto trayLabel = new QLabel(tr("Minimize to tray"), this); |
|
|
|
layout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
trayLabel->setFont(font); |
|
|
|
|
|
|
|
trayToggle_ = new Toggle(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
trayOptionLayout_->addWidget(trayLabel); |
|
|
|
auto label = new QLabel(labelText, this); |
|
|
|
trayOptionLayout_->addWidget(trayToggle_, 0, Qt::AlignRight); |
|
|
|
label->setFont(font); |
|
|
|
|
|
|
|
|
|
|
|
auto startInTrayOptionLayout_ = new QHBoxLayout; |
|
|
|
auto toggle = new Toggle(this); |
|
|
|
startInTrayOptionLayout_->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
|
|
|
|
auto startInTrayLabel = new QLabel(tr("Start in tray"), this); |
|
|
|
|
|
|
|
startInTrayLabel->setFont(font); |
|
|
|
|
|
|
|
startInTrayToggle_ = new Toggle(this); |
|
|
|
|
|
|
|
if (!settings_->isTrayEnabled()) |
|
|
|
|
|
|
|
startInTrayToggle_->setDisabled(true); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
startInTrayOptionLayout_->addWidget(startInTrayLabel); |
|
|
|
layout->addWidget(label); |
|
|
|
startInTrayOptionLayout_->addWidget(startInTrayToggle_, 0, Qt::AlignRight); |
|
|
|
layout->addWidget(toggle, 0, Qt::AlignRight); |
|
|
|
|
|
|
|
|
|
|
|
auto groupViewLayout = new QHBoxLayout; |
|
|
|
return std::pair{layout, toggle}; |
|
|
|
groupViewLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
}; |
|
|
|
auto groupViewLabel = new QLabel(tr("Group's sidebar"), this); |
|
|
|
|
|
|
|
groupViewLabel->setFont(font); |
|
|
|
|
|
|
|
groupViewToggle_ = new Toggle(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
groupViewLayout->addWidget(groupViewLabel); |
|
|
|
QHBoxLayout *trayOptionLayout_ = nullptr; |
|
|
|
groupViewLayout->addWidget(groupViewToggle_, 0, Qt::AlignRight); |
|
|
|
std::tie(trayOptionLayout_, trayToggle_) = addSetting(tr("Minimize to tray")); |
|
|
|
|
|
|
|
|
|
|
|
auto avatarViewLayout = new QHBoxLayout; |
|
|
|
QHBoxLayout *startInTrayOptionLayout_ = nullptr; |
|
|
|
avatarViewLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
std::tie(startInTrayOptionLayout_, startInTrayToggle_) = addSetting(tr("Start in tray")); |
|
|
|
auto avatarViewLabel = new QLabel(tr("Circular Avatars"), this); |
|
|
|
if (!settings_->isTrayEnabled()) |
|
|
|
avatarViewLabel->setFont(font); |
|
|
|
startInTrayToggle_->setDisabled(true); |
|
|
|
avatarCircles_ = new Toggle(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
avatarViewLayout->addWidget(avatarViewLabel); |
|
|
|
|
|
|
|
avatarViewLayout->addWidget(avatarCircles_, 0, Qt::AlignRight); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
auto typingLayout = new QHBoxLayout; |
|
|
|
QHBoxLayout *groupViewLayout = nullptr; |
|
|
|
typingLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
std::tie(groupViewLayout, groupViewToggle_) = addSetting(tr("Group's sidebar")); |
|
|
|
auto typingLabel = new QLabel(tr("Typing notifications"), this); |
|
|
|
|
|
|
|
typingLabel->setFont(font); |
|
|
|
|
|
|
|
typingNotifications_ = new Toggle(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typingLayout->addWidget(typingLabel); |
|
|
|
QHBoxLayout *avatarViewLayout = nullptr; |
|
|
|
typingLayout->addWidget(typingNotifications_, 0, Qt::AlignRight); |
|
|
|
std::tie(avatarViewLayout, avatarCircles_) = addSetting(tr("Circular Avatars")); |
|
|
|
|
|
|
|
|
|
|
|
auto receiptsLayout = new QHBoxLayout; |
|
|
|
QHBoxLayout *typingLayout = nullptr; |
|
|
|
receiptsLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
std::tie(typingLayout, typingNotifications_) = addSetting(tr("Typing notifications")); |
|
|
|
auto receiptsLabel = new QLabel(tr("Read receipts"), this); |
|
|
|
|
|
|
|
receiptsLabel->setFont(font); |
|
|
|
|
|
|
|
readReceipts_ = new Toggle(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
receiptsLayout->addWidget(receiptsLabel); |
|
|
|
QHBoxLayout *receiptsLayout = nullptr; |
|
|
|
receiptsLayout->addWidget(readReceipts_, 0, Qt::AlignRight); |
|
|
|
std::tie(receiptsLayout, readReceipts_) = addSetting(tr("Read receipts")); |
|
|
|
|
|
|
|
|
|
|
|
auto desktopLayout = new QHBoxLayout; |
|
|
|
QHBoxLayout *markdownLayout = nullptr; |
|
|
|
desktopLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
std::tie(markdownLayout, markdownEnabled_) = addSetting(tr("Send messages as markdown")); |
|
|
|
auto desktopLabel = new QLabel(tr("Desktop notifications"), this); |
|
|
|
|
|
|
|
desktopLabel->setFont(font); |
|
|
|
|
|
|
|
desktopNotifications_ = new Toggle(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
desktopLayout->addWidget(desktopLabel); |
|
|
|
QHBoxLayout *desktopLayout = nullptr; |
|
|
|
desktopLayout->addWidget(desktopNotifications_, 0, Qt::AlignRight); |
|
|
|
std::tie(desktopLayout, desktopNotifications_) = addSetting(tr("Desktop notifications")); |
|
|
|
|
|
|
|
|
|
|
|
auto scaleFactorOptionLayout = new QHBoxLayout; |
|
|
|
auto scaleFactorOptionLayout = new QHBoxLayout; |
|
|
|
scaleFactorOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
scaleFactorOptionLayout->setContentsMargins(0, OptionMargin, 0, OptionMargin); |
|
|
|
@ -385,6 +363,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge |
|
|
|
mainLayout_->addWidget(new HorizontalLine(this)); |
|
|
|
mainLayout_->addWidget(new HorizontalLine(this)); |
|
|
|
mainLayout_->addLayout(typingLayout); |
|
|
|
mainLayout_->addLayout(typingLayout); |
|
|
|
mainLayout_->addLayout(receiptsLayout); |
|
|
|
mainLayout_->addLayout(receiptsLayout); |
|
|
|
|
|
|
|
mainLayout_->addLayout(markdownLayout); |
|
|
|
mainLayout_->addLayout(desktopLayout); |
|
|
|
mainLayout_->addLayout(desktopLayout); |
|
|
|
mainLayout_->addWidget(new HorizontalLine(this)); |
|
|
|
mainLayout_->addWidget(new HorizontalLine(this)); |
|
|
|
|
|
|
|
|
|
|
|
@ -466,6 +445,10 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge |
|
|
|
settings_->setAvatarCircles(!isDisabled); |
|
|
|
settings_->setAvatarCircles(!isDisabled); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
connect(markdownEnabled_, &Toggle::toggled, this, [this](bool isDisabled) { |
|
|
|
|
|
|
|
settings_->setMarkdownEnabled(!isDisabled); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
connect(typingNotifications_, &Toggle::toggled, this, [this](bool isDisabled) { |
|
|
|
connect(typingNotifications_, &Toggle::toggled, this, [this](bool isDisabled) { |
|
|
|
settings_->setTypingNotifications(!isDisabled); |
|
|
|
settings_->setTypingNotifications(!isDisabled); |
|
|
|
}); |
|
|
|
}); |
|
|
|
@ -496,8 +479,10 @@ UserSettingsPage::showEvent(QShowEvent *) |
|
|
|
trayToggle_->setState(!settings_->isTrayEnabled()); |
|
|
|
trayToggle_->setState(!settings_->isTrayEnabled()); |
|
|
|
startInTrayToggle_->setState(!settings_->isStartInTrayEnabled()); |
|
|
|
startInTrayToggle_->setState(!settings_->isStartInTrayEnabled()); |
|
|
|
groupViewToggle_->setState(!settings_->isGroupViewEnabled()); |
|
|
|
groupViewToggle_->setState(!settings_->isGroupViewEnabled()); |
|
|
|
|
|
|
|
avatarCircles_->setState(!settings_->isAvatarCirclesEnabled()); |
|
|
|
typingNotifications_->setState(!settings_->isTypingNotificationsEnabled()); |
|
|
|
typingNotifications_->setState(!settings_->isTypingNotificationsEnabled()); |
|
|
|
readReceipts_->setState(!settings_->isReadReceiptsEnabled()); |
|
|
|
readReceipts_->setState(!settings_->isReadReceiptsEnabled()); |
|
|
|
|
|
|
|
markdownEnabled_->setState(!settings_->isMarkdownEnabled()); |
|
|
|
desktopNotifications_->setState(!settings_->hasDesktopNotifications()); |
|
|
|
desktopNotifications_->setState(!settings_->hasDesktopNotifications()); |
|
|
|
deviceIdValue_->setText(QString::fromStdString(http::client()->device_id())); |
|
|
|
deviceIdValue_->setText(QString::fromStdString(http::client()->device_id())); |
|
|
|
|
|
|
|
|
|
|
|
|
Nicolas Werner
5 years ago