diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 5ffdfaa9..7082d4e2 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -71,9 +71,9 @@ UserSettings::load(std::optional<QString> profile)
enlargeEmojiOnlyMessages_ =
settings.value(QStringLiteral("user/timeline/enlarge_emoji_only_msg"), false).toBool();
markdown_ = settings.value(QStringLiteral("user/markdown_enabled"), true).toBool();
+ invertEnterKey_ = settings.value(QStringLiteral("user/invert_enter_key"), false).toBool();
bubbles_ = settings.value(QStringLiteral("user/bubbles_enabled"), false).toBool();
smallAvatars_ = settings.value(QStringLiteral("user/small_avatars_enabled"), false).toBool();
- invertEnterKey_ = settings.value(QStringLiteral("user/invert_enter_key"), false).toBool();
animateImagesOnHover_ =
settings.value(QStringLiteral("user/animate_images_on_hover"), false).toBool();
typingNotifications_ =
@@ -291,6 +291,17 @@ UserSettings::setMarkdown(bool state)
}
void
+UserSettings::setInvertEnterKey(bool state)
+{
+ if (state == invertEnterKey_)
+ return;
+
+ invertEnterKey_ = state;
+ emit invertEnterKeyChanged(state);
+ save();
+}
+
+void
UserSettings::setBubbles(bool state)
{
if (state == bubbles_)
@@ -311,17 +322,6 @@ UserSettings::setSmallAvatars(bool state)
}
void
-UserSettings::setInvertEnterKey(bool state)
-{
- if (state == invertEnterKey_)
- return;
-
- invertEnterKey_ = state;
- emit invertEnterKeyChanged(state);
- save();
-}
-
-void
UserSettings::setAnimateImagesOnHover(bool state)
{
if (state == animateImagesOnHover_)
@@ -832,9 +832,9 @@ UserSettings::save()
settings.setValue(QStringLiteral("read_receipts"), readReceipts_);
settings.setValue(QStringLiteral("group_view"), groupView_);
settings.setValue(QStringLiteral("markdown_enabled"), markdown_);
+ settings.setValue(QStringLiteral("invert_enter_key"), invertEnterKey_);
settings.setValue(QStringLiteral("bubbles_enabled"), bubbles_);
settings.setValue(QStringLiteral("small_avatars_enabled"), smallAvatars_);
- settings.setValue(QStringLiteral("invert_enter_key"), invertEnterKey_);
settings.setValue(QStringLiteral("animate_images_on_hover"), animateImagesOnHover_);
settings.setValue(QStringLiteral("desktop_notifications"), hasDesktopNotifications_);
settings.setValue(QStringLiteral("alert_on_notification"), hasAlertOnNotification_);
@@ -940,12 +940,12 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
return tr("Communities sidebar");
case Markdown:
return tr("Send messages as Markdown");
+ case InvertEnterKey:
+ return tr("Use shift+enter to send and enter to start a new line");
case Bubbles:
return tr("Enable message bubbles");
case SmallAvatars:
return tr("Enable small Avatars");
- case InvertEnterKey:
- return tr("Use shift+enter to send and enter to start a new line");
case AnimateImagesOnHover:
return tr("Play animated images only on hover");
case TypingNotifications:
@@ -1076,12 +1076,12 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
return i->groupView();
case Markdown:
return i->markdown();
+ case InvertEnterKey:
+ return i->invertEnterKey();
case Bubbles:
return i->bubbles();
case SmallAvatars:
return i->smallAvatars();
- case InvertEnterKey:
- return i->invertEnterKey();
case AnimateImagesOnHover:
return i->animateImagesOnHover();
case TypingNotifications:
@@ -1218,15 +1218,15 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
return tr(
"Allow using markdown in messages.\nWhen disabled, all messages are sent as a plain "
"text.");
+ case InvertEnterKey:
+ return tr(
+ "Invert the behavior of the enter key in the text input, making it send the message "
+ "when shift+enter is pressed and starting a new line when enter is pressed.");
case Bubbles:
return tr(
"Messages get a bubble background. This also triggers some layout changes (WIP).");
case SmallAvatars:
return tr("Avatars are resized to fit above the message.");
- case InvertEnterKey:
- return tr(
- "Invert the behavior of the enter key in the text input, making it send the message "
- "when shift+enter is pressed and starting a new line when enter is pressed.");
case AnimateImagesOnHover:
return tr("Plays media like GIFs or WEBPs only when explicitly hovering over them.");
case TypingNotifications:
@@ -1364,9 +1364,9 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
case StartInTray:
case GroupView:
case Markdown:
+ case InvertEnterKey:
case Bubbles:
case SmallAvatars:
- case InvertEnterKey:
case AnimateImagesOnHover:
case TypingNotifications:
case SortByImportance:
@@ -1590,23 +1590,23 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
} else
return false;
}
- case Bubbles: {
+ case InvertEnterKey: {
if (value.userType() == QMetaType::Bool) {
- i->setBubbles(value.toBool());
+ i->setInvertEnterKey(value.toBool());
return true;
} else
return false;
}
- case SmallAvatars: {
+ case Bubbles: {
if (value.userType() == QMetaType::Bool) {
- i->setSmallAvatars(value.toBool());
+ i->setBubbles(value.toBool());
return true;
} else
return false;
}
- case InvertEnterKey: {
+ case SmallAvatars: {
if (value.userType() == QMetaType::Bool) {
- i->setInvertEnterKey(value.toBool());
+ i->setSmallAvatars(value.toBool());
return true;
} else
return false;
@@ -2013,15 +2013,15 @@ UserSettingsModel::UserSettingsModel(QObject *p)
connect(s.get(), &UserSettings::markdownChanged, this, [this]() {
emit dataChanged(index(Markdown), index(Markdown), {Value});
});
+ connect(s.get(), &UserSettings::invertEnterKeyChanged, this, [this]() {
+ emit dataChanged(index(InvertEnterKey), index(InvertEnterKey), {Value});
+ });
connect(s.get(), &UserSettings::bubblesChanged, this, [this]() {
emit dataChanged(index(Bubbles), index(Bubbles), {Value});
});
connect(s.get(), &UserSettings::smallAvatarsChanged, this, [this]() {
emit dataChanged(index(SmallAvatars), index(SmallAvatars), {Value});
});
- connect(s.get(), &UserSettings::invertEnterKeyChanged, this, [this]() {
- emit dataChanged(index(InvertEnterKey), index(InvertEnterKey), {Value});
- });
connect(s.get(), &UserSettings::groupViewStateChanged, this, [this]() {
emit dataChanged(index(GroupView), index(GroupView), {Value});
});
diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index 8e4bc43b..3bd0f833 100644
--- a/src/UserSettingsPage.h
+++ b/src/UserSettingsPage.h
@@ -39,10 +39,10 @@ class UserSettings final : public QObject
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 bubbles READ bubbles WRITE setBubbles NOTIFY bubblesChanged)
- Q_PROPERTY(bool smallAvatars READ smallAvatars WRITE setSmallAvatars NOTIFY smallAvatarsChanged)
Q_PROPERTY(
bool invertEnterKey READ invertEnterKey WRITE setInvertEnterKey NOTIFY invertEnterKeyChanged)
+ Q_PROPERTY(bool bubbles READ bubbles WRITE setBubbles NOTIFY bubblesChanged)
+ Q_PROPERTY(bool smallAvatars READ smallAvatars WRITE setSmallAvatars NOTIFY smallAvatarsChanged)
Q_PROPERTY(bool animateImagesOnHover READ animateImagesOnHover WRITE setAnimateImagesOnHover
NOTIFY animateImagesOnHoverChanged)
Q_PROPERTY(bool typingNotifications READ typingNotifications WRITE setTypingNotifications NOTIFY
@@ -154,9 +154,9 @@ public:
void setEmojiFontFamily(QString family);
void setGroupView(bool state);
void setMarkdown(bool state);
+ void setInvertEnterKey(bool state);
void setBubbles(bool state);
void setSmallAvatars(bool state);
- void setInvertEnterKey(bool state);
void setAnimateImagesOnHover(bool state);
void setReadReceipts(bool state);
void setTypingNotifications(bool state);
@@ -217,9 +217,9 @@ public:
bool privacyScreen() const { return privacyScreen_; }
int privacyScreenTimeout() const { return privacyScreenTimeout_; }
bool markdown() const { return markdown_; }
+ bool invertEnterKey() const { return invertEnterKey_; }
bool bubbles() const { return bubbles_; }
bool smallAvatars() const { return smallAvatars_; }
- bool invertEnterKey() const { return invertEnterKey_; }
bool animateImagesOnHover() const { return animateImagesOnHover_; }
bool typingNotifications() const { return typingNotifications_; }
bool sortByImportance() const { return sortByImportance_; }
@@ -282,9 +282,9 @@ signals:
void trayChanged(bool state);
void startInTrayChanged(bool state);
void markdownChanged(bool state);
+ void invertEnterKeyChanged(bool state);
void bubblesChanged(bool state);
void smallAvatarsChanged(bool state);
- void invertEnterKeyChanged(bool state);
void animateImagesOnHoverChanged(bool state);
void typingNotificationsChanged(bool state);
void buttonInTimelineChanged(bool state);
@@ -346,9 +346,9 @@ private:
bool startInTray_;
bool groupView_;
bool markdown_;
+ bool invertEnterKey_;
bool bubbles_;
bool smallAvatars_;
- bool invertEnterKey_;
bool animateImagesOnHover_;
bool typingNotifications_;
bool sortByImportance_;
@@ -439,9 +439,9 @@ class UserSettingsModel final : public QAbstractListModel
TypingNotifications,
ReadReceipts,
Markdown,
+ InvertEnterKey,
Bubbles,
SmallAvatars,
- InvertEnterKey,
SidebarSection,
GroupView,
SortByImportance,
|
