diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index c8e6eb09..528dce85 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -25,7 +25,7 @@ MouseArea {
messageContextMenu.show(model.id, model.type, model.isEncrypted, row)
}
Rectangle {
- color: (settings.isMessageHoverHighlightEnabled && parent.containsMouse) ? colors.base : "transparent"
+ color: (settings.messageHoverHighlight && parent.containsMouse) ? colors.base : "transparent"
anchors.fill: row
}
RowLayout {
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 90abc63e..2b55b91e 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -255,7 +255,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
text_input_, &TextInputWidget::startedTyping, this, &ChatPage::sendTypingNotifications);
connect(typingRefresher_, &QTimer::timeout, this, &ChatPage::sendTypingNotifications);
connect(text_input_, &TextInputWidget::stoppedTyping, this, [this]() {
- if (!userSettings_->isTypingNotificationsEnabled())
+ if (!userSettings_->typingNotifications())
return;
typingRefresher_->stop();
@@ -482,7 +482,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
activateWindow();
});
- setGroupViewState(userSettings_->isGroupViewEnabled());
+ setGroupViewState(userSettings_->groupView());
connect(userSettings_.data(),
&UserSettings::groupViewStateChanged,
@@ -1207,7 +1207,7 @@ ChatPage::unbanUser(QString userid, QString reason)
void
ChatPage::sendTypingNotifications()
{
- if (!userSettings_->isTypingNotificationsEnabled())
+ if (!userSettings_->typingNotifications())
return;
http::client()->start_typing(
@@ -1343,7 +1343,7 @@ ChatPage::hideSideBars()
void
ChatPage::showSideBars()
{
- if (userSettings_->isGroupViewEnabled())
+ if (userSettings_->groupView())
communitiesList_->show();
sideBar_->show();
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index c6abdca2..cc1d868b 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -148,7 +148,7 @@ MainWindow::MainWindow(QWidget *parent)
QSettings settings;
- trayIcon_->setVisible(userSettings_->isTrayEnabled());
+ trayIcon_->setVisible(userSettings_->tray());
if (hasActiveUser()) {
QString token = settings.value("auth/access_token").toString();
@@ -286,7 +286,7 @@ void
MainWindow::closeEvent(QCloseEvent *event)
{
if (!qApp->isSavingSession() && isVisible() && pageSupportsTray() &&
- userSettings_->isTrayEnabled()) {
+ userSettings_->tray()) {
event->ignore();
hide();
}
diff --git a/src/RoomInfoListItem.cpp b/src/RoomInfoListItem.cpp
index ad774360..f234b59b 100644
--- a/src/RoomInfoListItem.cpp
+++ b/src/RoomInfoListItem.cpp
@@ -451,7 +451,7 @@ RoomInfoListItem::calculateImportance() const
// returns ImportanceDisabled or Invite
if (isInvite()) {
return Invite;
- } else if (!settings->isSortByImportanceEnabled()) {
+ } else if (!settings->sortByImportance()) {
return ImportanceDisabled;
} else if (unreadHighlightedMsgCount_) {
return NewMentions;
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 393b4861..38b76404 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -52,53 +52,53 @@ void
UserSettings::load()
{
QSettings settings;
- isTrayEnabled_ = settings.value("user/window/tray", false).toBool();
- hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool();
- isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool();
- isGroupViewEnabled_ = settings.value("user/group_view", true).toBool();
- isButtonsInTimelineEnabled_ = settings.value("user/timeline/buttons", true).toBool();
- timelineMaxWidth_ = settings.value("user/timeline/max_width", 0).toInt();
- isMessageHoverHighlightEnabled_ =
+ tray_ = settings.value("user/window/tray", false).toBool();
+ hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool();
+ startInTray_ = settings.value("user/window/start_in_tray", false).toBool();
+ groupView_ = settings.value("user/group_view", true).toBool();
+ buttonsInTimeline_ = settings.value("user/timeline/buttons", true).toBool();
+ timelineMaxWidth_ = settings.value("user/timeline/max_width", 0).toInt();
+ messageHoverHighlight_ =
settings.value("user/timeline/message_hover_highlight", false).toBool();
- isEnlargeEmojiOnlyMessagesEnabled_ =
+ enlargeEmojiOnlyMessages_ =
settings.value("user/timeline/enlarge_emoji_only_msg", false).toBool();
- isMarkdownEnabled_ = settings.value("user/markdown_enabled", true).toBool();
- isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool();
- sortByImportance_ = settings.value("user/sort_by_unread", true).toBool();
- isReadReceiptsEnabled_ = settings.value("user/read_receipts", true).toBool();
- theme_ = settings.value("user/theme", defaultTheme_).toString();
- font_ = settings.value("user/font_family", "default").toString();
- avatarCircles_ = settings.value("user/avatar_circles", true).toBool();
- decryptSidebar_ = settings.value("user/decrypt_sidebar", true).toBool();
- emojiFont_ = settings.value("user/emoji_font_family", "default").toString();
- baseFontSize_ = settings.value("user/font_size", QFont().pointSizeF()).toDouble();
+ markdown_ = settings.value("user/markdown_enabled", true).toBool();
+ typingNotifications_ = settings.value("user/typing_notifications", true).toBool();
+ sortByImportance_ = settings.value("user/sort_by_unread", true).toBool();
+ readReceipts_ = settings.value("user/read_receipts", true).toBool();
+ theme_ = settings.value("user/theme", defaultTheme_).toString();
+ font_ = settings.value("user/font_family", "default").toString();
+ avatarCircles_ = settings.value("user/avatar_circles", true).toBool();
+ decryptSidebar_ = settings.value("user/decrypt_sidebar", true).toBool();
+ emojiFont_ = settings.value("user/emoji_font_family", "default").toString();
+ baseFontSize_ = settings.value("user/font_size", QFont().pointSizeF()).toDouble();
applyTheme();
}
void
UserSettings::setMessageHoverHighlight(bool state)
{
- if (state == isMessageHoverHighlightEnabled_)
+ if (state == messageHoverHighlight_)
return;
- isMessageHoverHighlightEnabled_ = state;
+ messageHoverHighlight_ = state;
emit messageHoverHighlightChanged(state);
save();
}
void
UserSettings::setEnlargeEmojiOnlyMessages(bool state)
{
- if (state == isEnlargeEmojiOnlyMessagesEnabled_)
+ if (state == enlargeEmojiOnlyMessages_)
return;
- isEnlargeEmojiOnlyMessagesEnabled_ = state;
+ enlargeEmojiOnlyMessages_ = state;
emit enlargeEmojiOnlyMessagesChanged(state);
save();
}
void
UserSettings::setTray(bool state)
{
- if (state == isTrayEnabled_)
+ if (state == tray_)
return;
- isTrayEnabled_ = state;
+ tray_ = state;
emit trayChanged(state);
save();
}
@@ -106,9 +106,9 @@ UserSettings::setTray(bool state)
void
UserSettings::setStartInTray(bool state)
{
- if (state == isStartInTrayEnabled_)
+ if (state == startInTray_)
return;
- isStartInTrayEnabled_ = state;
+ startInTray_ = state;
emit startInTrayChanged(state);
save();
}
@@ -116,19 +116,19 @@ UserSettings::setStartInTray(bool state)
void
UserSettings::setGroupView(bool state)
{
- if (isGroupViewEnabled_ != state)
+ if (groupView_ != state)
emit groupViewStateChanged(state);
- isGroupViewEnabled_ = state;
+ groupView_ = state;
save();
}
void
-UserSettings::setMarkdownEnabled(bool state)
+UserSettings::setMarkdown(bool state)
{
- if (state == isMarkdownEnabled_)
+ if (state == markdown_)
return;
- isMarkdownEnabled_ = state;
+ markdown_ = state;
emit markdownChanged(state);
save();
}
@@ -136,9 +136,9 @@ UserSettings::setMarkdownEnabled(bool state)
void
UserSettings::setReadReceipts(bool state)
{
- if (state == isReadReceiptsEnabled_)
+ if (state == readReceipts_)
return;
- isReadReceiptsEnabled_ = state;
+ readReceipts_ = state;
emit readReceiptsChanged(state);
save();
}
@@ -146,9 +146,9 @@ UserSettings::setReadReceipts(bool state)
void
UserSettings::setTypingNotifications(bool state)
{
- if (state == isTypingNotificationsEnabled_)
+ if (state == typingNotifications_)
return;
- isTypingNotificationsEnabled_ = state;
+ typingNotifications_ = state;
emit typingNotificationsChanged(state);
save();
}
@@ -166,9 +166,9 @@ UserSettings::setSortByImportance(bool state)
void
UserSettings::setButtonsInTimeline(bool state)
{
- if (state == isButtonsInTimelineEnabled_)
+ if (state == buttonsInTimeline_)
return;
- isButtonsInTimelineEnabled_ = state;
+ buttonsInTimeline_ = state;
emit buttonInTimelineChanged(state);
save();
}
@@ -314,25 +314,25 @@ UserSettings::save()
settings.beginGroup("user");
settings.beginGroup("window");
- settings.setValue("tray", isTrayEnabled_);
- settings.setValue("start_in_tray", isStartInTrayEnabled_);
+ settings.setValue("tray", tray_);
+ settings.setValue("start_in_tray", startInTray_);
settings.endGroup();
settings.beginGroup("timeline");
- settings.setValue("buttons", isButtonsInTimelineEnabled_);
- settings.setValue("message_hover_highlight", isMessageHoverHighlightEnabled_);
- settings.setValue("enlarge_emoji_only_msg", isEnlargeEmojiOnlyMessagesEnabled_);
+ settings.setValue("buttons", buttonsInTimeline_);
+ settings.setValue("message_hover_highlight", messageHoverHighlight_);
+ settings.setValue("enlarge_emoji_only_msg", enlargeEmojiOnlyMessages_);
settings.setValue("max_width", timelineMaxWidth_);
settings.endGroup();
settings.setValue("avatar_circles", avatarCircles_);
settings.setValue("decrypt_sidebar", decryptSidebar_);
settings.setValue("font_size", baseFontSize_);
- settings.setValue("typing_notifications", isTypingNotificationsEnabled_);
+ settings.setValue("typing_notifications", typingNotifications_);
settings.setValue("minor_events", sortByImportance_);
- settings.setValue("read_receipts", isReadReceiptsEnabled_);
- settings.setValue("group_view", isGroupViewEnabled_);
- settings.setValue("markdown_enabled", isMarkdownEnabled_);
+ settings.setValue("read_receipts", readReceipts_);
+ settings.setValue("group_view", groupView_);
+ settings.setValue("markdown_enabled", markdown_);
settings.setValue("desktop_notifications", hasDesktopNotifications_);
settings.setValue("theme", theme());
settings.setValue("font_family", font_);
@@ -399,7 +399,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
enlargeEmojiOnlyMessages_ = new Toggle{this};
sortByImportance_ = new Toggle{this};
readReceipts_ = new Toggle{this};
- markdownEnabled_ = new Toggle{this};
+ markdown_ = new Toggle{this};
desktopNotifications_ = new Toggle{this};
scaleFactorCombo_ = new QComboBox{this};
fontSizeCombo_ = new QComboBox{this};
@@ -407,7 +407,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
emojiFontSelectionCombo_ = new QComboBox{this};
timelineMaxWidthSpin_ = new QSpinBox{this};
- if (!settings_->isTrayEnabled())
+ if (!settings_->tray())
startInTrayToggle_->setDisabled(true);
avatarCircles_->setFixedSize(64, 48);
@@ -548,7 +548,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
tr("Show if your message was read.\nStatus is displayed next to timestamps."));
boxWrap(
tr("Send messages as Markdown"),
- markdownEnabled_,
+ markdown_,
tr("Allow using markdown in messages.\nWhen disabled, all messages are sent as a plain "
"text."));
boxWrap(tr("Desktop notifications"),
@@ -629,63 +629,63 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
connect(emojiFontSelectionCombo_,
static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
[this](const QString &family) { settings_->setEmojiFontFamily(family.trimmed()); });
- connect(trayToggle_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setTray(!isDisabled);
- if (isDisabled) {
+ connect(trayToggle_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setTray(!disabled);
+ if (disabled) {
startInTrayToggle_->setDisabled(true);
} else {
startInTrayToggle_->setEnabled(true);
}
- emit trayOptionChanged(!isDisabled);
+ emit trayOptionChanged(!disabled);
});
- connect(startInTrayToggle_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setStartInTray(!isDisabled);
+ connect(startInTrayToggle_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setStartInTray(!disabled);
});
- connect(groupViewToggle_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setGroupView(!isDisabled);
+ connect(groupViewToggle_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setGroupView(!disabled);
});
- connect(decryptSidebar_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setDecryptSidebar(!isDisabled);
+ connect(decryptSidebar_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setDecryptSidebar(!disabled);
emit decryptSidebarChanged();
});
- connect(avatarCircles_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setAvatarCircles(!isDisabled);
+ connect(avatarCircles_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setAvatarCircles(!disabled);
});
- connect(markdownEnabled_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setMarkdownEnabled(!isDisabled);
+ connect(markdown_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setMarkdown(!disabled);
});
- connect(typingNotifications_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setTypingNotifications(!isDisabled);
+ connect(typingNotifications_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setTypingNotifications(!disabled);
});
- connect(sortByImportance_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setSortByImportance(!isDisabled);
+ connect(sortByImportance_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setSortByImportance(!disabled);
});
- connect(timelineButtonsToggle_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setButtonsInTimeline(!isDisabled);
+ connect(timelineButtonsToggle_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setButtonsInTimeline(!disabled);
});
- connect(readReceipts_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setReadReceipts(!isDisabled);
+ connect(readReceipts_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setReadReceipts(!disabled);
});
- connect(desktopNotifications_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setDesktopNotifications(!isDisabled);
+ connect(desktopNotifications_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setDesktopNotifications(!disabled);
});
- connect(messageHoverHighlight_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setMessageHoverHighlight(!isDisabled);
+ connect(messageHoverHighlight_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setMessageHoverHighlight(!disabled);
});
- connect(enlargeEmojiOnlyMessages_, &Toggle::toggled, this, [this](bool isDisabled) {
- settings_->setEnlargeEmojiOnlyMessages(!isDisabled);
+ connect(enlargeEmojiOnlyMessages_, &Toggle::toggled, this, [this](bool disabled) {
+ settings_->setEnlargeEmojiOnlyMessages(!disabled);
});
connect(timelineMaxWidthSpin_,
@@ -714,19 +714,19 @@ UserSettingsPage::showEvent(QShowEvent *)
utils::restoreCombobox(themeCombo_, settings_->theme());
// FIXME: Toggle treats true as "off"
- trayToggle_->setState(!settings_->isTrayEnabled());
- startInTrayToggle_->setState(!settings_->isStartInTrayEnabled());
- groupViewToggle_->setState(!settings_->isGroupViewEnabled());
- decryptSidebar_->setState(!settings_->isDecryptSidebarEnabled());
- avatarCircles_->setState(!settings_->isAvatarCirclesEnabled());
- typingNotifications_->setState(!settings_->isTypingNotificationsEnabled());
- sortByImportance_->setState(!settings_->isSortByImportanceEnabled());
- timelineButtonsToggle_->setState(!settings_->isButtonsInTimelineEnabled());
- readReceipts_->setState(!settings_->isReadReceiptsEnabled());
- markdownEnabled_->setState(!settings_->isMarkdownEnabled());
+ trayToggle_->setState(!settings_->tray());
+ startInTrayToggle_->setState(!settings_->startInTray());
+ groupViewToggle_->setState(!settings_->groupView());
+ decryptSidebar_->setState(!settings_->decryptSidebar());
+ avatarCircles_->setState(!settings_->avatarCircles());
+ typingNotifications_->setState(!settings_->typingNotifications());
+ sortByImportance_->setState(!settings_->sortByImportance());
+ timelineButtonsToggle_->setState(!settings_->buttonsInTimeline());
+ readReceipts_->setState(!settings_->readReceipts());
+ markdown_->setState(!settings_->markdown());
desktopNotifications_->setState(!settings_->hasDesktopNotifications());
- messageHoverHighlight_->setState(!settings_->isMessageHoverHighlightEnabled());
- enlargeEmojiOnlyMessages_->setState(!settings_->isEnlargeEmojiOnlyMessagesEnabled());
+ messageHoverHighlight_->setState(!settings_->messageHoverHighlight());
+ enlargeEmojiOnlyMessages_->setState(!settings_->enlargeEmojiOnlyMessages());
deviceIdValue_->setText(QString::fromStdString(http::client()->device_id()));
timelineMaxWidthSpin_->setValue(settings_->timelineMaxWidth());
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index cade8c22..fb807067 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -40,30 +40,27 @@ class UserSettings : public QObject
Q_OBJECT
Q_PROPERTY(QString theme READ theme WRITE setTheme NOTIFY themeChanged)
- Q_PROPERTY(bool isMessageHoverHighlightEnabled READ isMessageHoverHighlightEnabled WRITE
+ Q_PROPERTY(bool messageHoverHighlight READ messageHoverHighlight WRITE
setMessageHoverHighlight NOTIFY messageHoverHighlightChanged)
- Q_PROPERTY(bool enlargeEmojiOnlyMessages READ isEnlargeEmojiOnlyMessagesEnabled WRITE
+ Q_PROPERTY(bool enlargeEmojiOnlyMessages READ enlargeEmojiOnlyMessages WRITE
setEnlargeEmojiOnlyMessages NOTIFY enlargeEmojiOnlyMessagesChanged)
- Q_PROPERTY(bool trayEnabled READ isTrayEnabled WRITE setTray NOTIFY trayChanged)
- Q_PROPERTY(bool startInTrayEnabled READ isStartInTrayEnabled WRITE setStartInTray NOTIFY
- startInTrayChanged)
- Q_PROPERTY(bool groupViewEnabled READ isGroupViewEnabled WRITE setGroupView NOTIFY
- groupViewStateChanged)
+ Q_PROPERTY(bool tray READ tray WRITE setTray NOTIFY trayChanged)
+ Q_PROPERTY(bool startInTray READ startInTray WRITE setStartInTray NOTIFY startInTrayChanged)
+ Q_PROPERTY(bool groupView READ groupView WRITE setGroupView NOTIFY groupViewStateChanged)
+ Q_PROPERTY(bool markdown READ markdown WRITE setMarkdown NOTIFY markdownChanged)
+ Q_PROPERTY(bool typingNotifications READ typingNotifications WRITE setTypingNotifications
+ NOTIFY typingNotificationsChanged)
+ Q_PROPERTY(bool sortByImportance READ sortByImportance WRITE setSortByImportance NOTIFY
+ roomSortingChanged)
+ Q_PROPERTY(bool buttonsInTimeline READ buttonsInTimeline WRITE setButtonsInTimeline NOTIFY
+ buttonInTimelineChanged)
Q_PROPERTY(
- bool markdown READ isMarkdownEnabled WRITE setMarkdownEnabled NOTIFY markdownChanged)
- Q_PROPERTY(bool typingNotifications READ isTypingNotificationsEnabled WRITE
- setTypingNotifications NOTIFY typingNotificationsChanged)
- Q_PROPERTY(bool sortByImportance READ isSortByImportanceEnabled WRITE setSortByImportance
- NOTIFY roomSortingChanged)
- Q_PROPERTY(bool buttonsInTimeline READ isButtonsInTimelineEnabled WRITE setButtonsInTimeline
- NOTIFY buttonInTimelineChanged)
- Q_PROPERTY(bool readReceipts READ isReadReceiptsEnabled WRITE setReadReceipts NOTIFY
- readReceiptsChanged)
+ bool readReceipts READ readReceipts WRITE setReadReceipts NOTIFY readReceiptsChanged)
Q_PROPERTY(bool desktopNotifications READ hasDesktopNotifications WRITE
setDesktopNotifications NOTIFY desktopNotificationsChanged)
- Q_PROPERTY(bool avatarCircles READ isAvatarCirclesEnabled WRITE setAvatarCircles NOTIFY
- avatarCirclesChanged)
- Q_PROPERTY(bool decryptSidebar READ isDecryptSidebarEnabled WRITE setDecryptSidebar NOTIFY
+ Q_PROPERTY(
+ bool avatarCircles READ avatarCircles WRITE setAvatarCircles NOTIFY avatarCirclesChanged)
+ Q_PROPERTY(bool decryptSidebar READ decryptSidebar WRITE setDecryptSidebar NOTIFY
decryptSidebarChanged)
Q_PROPERTY(int timelineMaxWidth READ timelineMaxWidth WRITE setTimelineMaxWidth NOTIFY
timelineMaxWidthChanged)
@@ -87,7 +84,7 @@ public:
void setFontFamily(QString family);
void setEmojiFontFamily(QString family);
void setGroupView(bool state);
- void setMarkdownEnabled(bool state);
+ void setMarkdown(bool state);
void setReadReceipts(bool state);
void setTypingNotifications(bool state);
void setSortByImportance(bool state);
@@ -98,21 +95,18 @@ public:
void setDecryptSidebar(bool state);
QString theme() const { return !theme_.isEmpty() ? theme_ : defaultTheme_; }
- bool isMessageHoverHighlightEnabled() const { return isMessageHoverHighlightEnabled_; }
- bool isEnlargeEmojiOnlyMessagesEnabled() const
- {
- return isEnlargeEmojiOnlyMessagesEnabled_;
- }
- bool isTrayEnabled() const { return isTrayEnabled_; }
- bool isStartInTrayEnabled() const { return isStartInTrayEnabled_; }
- bool isGroupViewEnabled() const { return isGroupViewEnabled_; }
- bool isAvatarCirclesEnabled() const { return avatarCircles_; }
- bool isDecryptSidebarEnabled() const { return decryptSidebar_; }
- bool isMarkdownEnabled() const { return isMarkdownEnabled_; }
- bool isTypingNotificationsEnabled() const { return isTypingNotificationsEnabled_; }
- bool isSortByImportanceEnabled() const { return sortByImportance_; }
- bool isButtonsInTimelineEnabled() const { return isButtonsInTimelineEnabled_; }
- bool isReadReceiptsEnabled() const { return isReadReceiptsEnabled_; }
+ bool messageHoverHighlight() const { return messageHoverHighlight_; }
+ bool enlargeEmojiOnlyMessages() const { return enlargeEmojiOnlyMessages_; }
+ bool tray() const { return tray_; }
+ bool startInTray() const { return startInTray_; }
+ bool groupView() const { return groupView_; }
+ bool avatarCircles() const { return avatarCircles_; }
+ bool decryptSidebar() const { return decryptSidebar_; }
+ bool markdown() const { return markdown_; }
+ bool typingNotifications() const { return typingNotifications_; }
+ bool sortByImportance() const { return sortByImportance_; }
+ bool buttonsInTimeline() const { return buttonsInTimeline_; }
+ bool readReceipts() const { return readReceipts_; }
bool hasDesktopNotifications() const { return hasDesktopNotifications_; }
int timelineMaxWidth() const { return timelineMaxWidth_; }
double fontSize() const { return baseFontSize_; }
@@ -146,16 +140,16 @@ private:
? "light"
: "system";
QString theme_;
- bool isMessageHoverHighlightEnabled_;
- bool isEnlargeEmojiOnlyMessagesEnabled_;
- bool isTrayEnabled_;
- bool isStartInTrayEnabled_;
- bool isGroupViewEnabled_;
- bool isMarkdownEnabled_;
- bool isTypingNotificationsEnabled_;
+ bool messageHoverHighlight_;
+ bool enlargeEmojiOnlyMessages_;
+ bool tray_;
+ bool startInTray_;
+ bool groupView_;
+ bool markdown_;
+ bool typingNotifications_;
bool sortByImportance_;
- bool isButtonsInTimelineEnabled_;
- bool isReadReceiptsEnabled_;
+ bool buttonsInTimeline_;
+ bool readReceipts_;
bool hasDesktopNotifications_;
bool avatarCircles_;
bool decryptSidebar_;
@@ -212,7 +206,7 @@ private:
Toggle *enlargeEmojiOnlyMessages_;
Toggle *sortByImportance_;
Toggle *readReceipts_;
- Toggle *markdownEnabled_;
+ Toggle *markdown_;
Toggle *desktopNotifications_;
Toggle *avatarCircles_;
Toggle *decryptSidebar_;
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 89882e9d..30abe506 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -19,7 +19,7 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents)
void
TimelineViewManager::updateEncryptedDescriptions()
{
- auto decrypt = settings->isDecryptSidebarEnabled();
+ auto decrypt = settings->decryptSidebar();
QHash<QString, QSharedPointer<TimelineModel>>::iterator i;
for (i = models.begin(); i != models.end(); ++i) {
auto ptr = i.value();
@@ -114,7 +114,7 @@ TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
const auto &room_model = models.value(QString::fromStdString(room_id));
room_model->addEvents(room.timeline);
- if (ChatPage::instance()->userSettings()->isTypingNotificationsEnabled()) {
+ if (ChatPage::instance()->userSettings()->typingNotifications()) {
std::vector<QString> typing;
typing.reserve(room.ephemeral.typing.size());
for (const auto &user : room.ephemeral.typing) {
@@ -134,7 +134,7 @@ TimelineViewManager::addRoom(const QString &room_id)
{
if (!models.contains(room_id)) {
QSharedPointer<TimelineModel> newRoom(new TimelineModel(this, room_id));
- newRoom->setDecryptDescription(settings->isDecryptSidebarEnabled());
+ newRoom->setDecryptDescription(settings->decryptSidebar());
connect(newRoom.data(),
&TimelineModel::newEncryptedImage,
@@ -218,7 +218,7 @@ TimelineViewManager::queueTextMessage(const QString &msg)
mtx::events::msg::Text text = {};
text.body = msg.trimmed().toStdString();
- if (settings->isMarkdownEnabled()) {
+ if (settings->markdown()) {
text.formatted_body = utils::markdownToHtml(msg).toStdString();
// Don't send formatted_body, when we don't need to
@@ -246,7 +246,7 @@ TimelineViewManager::queueTextMessage(const QString &msg)
// NOTE(Nico): rich replies always need a formatted_body!
text.format = "org.matrix.custom.html";
- if (settings->isMarkdownEnabled())
+ if (settings->markdown())
text.formatted_body =
utils::getFormattedQuoteBody(related, utils::markdownToHtml(msg))
.toStdString();
@@ -269,7 +269,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
mtx::events::msg::Emote emote;
emote.body = msg.trimmed().toStdString();
- if (html != msg.trimmed().toHtmlEscaped() && settings->isMarkdownEnabled()) {
+ if (html != msg.trimmed().toHtmlEscaped() && settings->markdown()) {
emote.formatted_body = html.toStdString();
emote.format = "org.matrix.custom.html";
}
|
