diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index cfc58189..ce42242e 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Raum verlassen - + Accept Akzeptieren @@ -491,7 +491,13 @@ -- Entschlüsselungsfehler (Fehler bei Suche nach megolm Schlüsseln in Datenbank) -- - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + -- Entschlüsselungsfehler (%1) -- + + + Message redaction failed: %1 Nachricht zurückziehen fehlgeschlagen: %1 @@ -522,13 +528,7 @@ -- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) -- - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - -- Entschlüsselungsfehler (%1) -- - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. -- Verschlüsseltes Event (Unbekannter Eventtyp) -- @@ -782,7 +782,7 @@ UserSettingsPage - + Minimize to tray Ins Benachrichtigungsfeld minimieren @@ -811,6 +811,11 @@ Typing notifications Schreibbenachrichtigungen + + + Sort rooms by unreads + + Read receipts @@ -857,7 +862,7 @@ Gerätefingerabdruck - + Session Keys Sitzungsschlüssel @@ -877,22 +882,22 @@ VERSCHLÜSSELUNG - + GENERAL ALLGEMEINES - + INTERFACE - + Emoji Font Family - + Open Sessions File Öffne Sessions Datei diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 0d374cf5..36297298 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Βγές - + Accept Αποδοχή @@ -491,7 +491,13 @@ - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + + + + Message redaction failed: %1 @@ -522,13 +528,7 @@ - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. @@ -782,7 +782,7 @@ UserSettingsPage - + Minimize to tray Ελαχιστοποίηση @@ -811,6 +811,11 @@ Typing notifications + + + Sort rooms by unreads + + Read receipts @@ -857,7 +862,7 @@ - + Session Keys @@ -877,22 +882,22 @@ - + GENERAL ΓΕΝΙΚΑ - + INTERFACE - + Emoji Font Family - + Open Sessions File diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index c97a4ac2..a712d979 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Leave room - + Accept Accept @@ -491,7 +491,13 @@ -- Decryption Error (failed to retrieve megolm keys from db) -- - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + -- Decryption Error (%1) -- + + + Message redaction failed: %1 Message redaction failed: %1 @@ -522,13 +528,7 @@ -- Encrypted Event (No keys found for decryption) -- - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - -- Decryption Error (%1) -- - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. -- Encrypted Event (Unknown event type) -- @@ -782,7 +782,7 @@ UserSettingsPage - + Minimize to tray Minimize to tray @@ -811,6 +811,11 @@ Typing notifications Typing notifications + + + Sort rooms by unreads + + Read receipts @@ -857,7 +862,7 @@ Device Fingerprint - + Session Keys Session Keys @@ -877,22 +882,22 @@ ENCRYPTION - + GENERAL GENERAL - + INTERFACE - + Emoji Font Family - + Open Sessions File Open Sessions File diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 8659d560..08137a43 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Poistu huoneesta - + Accept Hyväksy @@ -491,7 +491,13 @@ -- Virhe purkaessa salausta (megolm-avaimien hakeminen tietokannasta epäonnistui) -- - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + -- Virhe purkaessa salausta (%1) -- + + + Message redaction failed: %1 Viestin poisto epäonnistui: %1 @@ -522,13 +528,7 @@ -- Salattu viesti (salauksen purkuavaimia ei löydetty) -- - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - -- Virhe purkaessa salausta (%1) -- - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. -- Salattu viesti (tuntematon viestityyppi) -- @@ -782,7 +782,7 @@ UserSettingsPage - + Minimize to tray Pienennä ilmoitusalueelle @@ -811,6 +811,11 @@ Typing notifications Kirjoitusilmoitukset + + + Sort rooms by unreads + + Read receipts @@ -857,7 +862,7 @@ Laitteen sormenjälki - + Session Keys Istunnon avaimet @@ -877,22 +882,22 @@ SALAUS - + GENERAL YLEISET ASETUKSET - + INTERFACE - + Emoji Font Family - + Open Sessions File Avaa Istuntoavaintiedosto diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 6efe8252..eb835410 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -372,12 +372,12 @@ RoomInfoListItem - + Leave room Quitter le salon - + Accept Accepter @@ -492,7 +492,13 @@ - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + + + + Message redaction failed: %1 @@ -523,13 +529,7 @@ - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. @@ -783,7 +783,7 @@ UserSettingsPage - + Minimize to tray Réduire à la barre des tâches @@ -812,6 +812,11 @@ Typing notifications Notifications d'écriture + + + Sort rooms by unreads + + Read receipts @@ -858,7 +863,7 @@ - + Session Keys @@ -878,22 +883,22 @@ - + GENERAL GÉNÉRAL - + INTERFACE - + Emoji Font Family - + Open Sessions File diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts index 05528a42..bdde216d 100644 --- a/resources/langs/nheko_ja.ts +++ b/resources/langs/nheko_ja.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room 部屋を出る - + Accept 容認 @@ -491,7 +491,13 @@ -- 復号エラー (データベースからmegolm鍵を取得できませんでした) -- - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + -- 復号エラー (%1) -- + + + Message redaction failed: %1 メッセージを編集できませんでした: %1 @@ -522,13 +528,7 @@ -- 暗号化イベント (復号鍵が見つかりません) -- - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - -- 復号エラー (%1) -- - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. -- 暗号化イベント (不明なイベント型です) -- @@ -781,7 +781,7 @@ UserSettingsPage - + Minimize to tray トレイへ最小化 @@ -810,6 +810,11 @@ Typing notifications 入力状態の通知 + + + Sort rooms by unreads + + Read receipts @@ -856,7 +861,7 @@ デバイスの指紋 - + Session Keys セッション鍵 @@ -876,22 +881,22 @@ 暗号化 - + GENERAL 全般 - + INTERFACE - + Emoji Font Family - + Open Sessions File セッションファイルを開く diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index 79e82714..906b2819 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Kamer verlaten - + Accept Accepteren @@ -491,7 +491,13 @@ - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + + + + Message redaction failed: %1 @@ -522,13 +528,7 @@ - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. @@ -782,7 +782,7 @@ UserSettingsPage - + Minimize to tray Minimaliseren naar systeemvak @@ -811,6 +811,11 @@ Typing notifications Meldingen bij typen van berichten + + + Sort rooms by unreads + + Read receipts @@ -857,7 +862,7 @@ - + Session Keys @@ -877,22 +882,22 @@ - + GENERAL ALGEMEEN - + INTERFACE - + Emoji Font Family - + Open Sessions File diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 774868db..44dbb0e1 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Opuść pokój - + Accept Akceptuj @@ -491,7 +491,13 @@ - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + + + + Message redaction failed: %1 Redagowanie wiadomości nie powiodło się: %1 @@ -522,13 +528,7 @@ - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. @@ -783,7 +783,7 @@ UserSettingsPage - + Minimize to tray Zminimalizuj do paska zadań @@ -812,6 +812,11 @@ Typing notifications Powiadomienia o pisaniu + + + Sort rooms by unreads + + Read receipts @@ -858,7 +863,7 @@ Odcisk palca urządzenia - + Session Keys @@ -878,22 +883,22 @@ SZYFROWANIE - + GENERAL OGÓLNE - + INTERFACE - + Emoji Font Family - + Open Sessions File diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 0dce43f5..5753cc6f 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room Покинуть комнату - + Accept Принять @@ -491,7 +491,13 @@ - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + + + + Message redaction failed: %1 Ошибка редактирования сообщения: %1 @@ -522,13 +528,7 @@ - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. @@ -783,7 +783,7 @@ UserSettingsPage - + Minimize to tray Сворачивать в системную панель @@ -812,6 +812,11 @@ Typing notifications Сообщать о наборе сообщения + + + Sort rooms by unreads + + Read receipts @@ -858,7 +863,7 @@ Отпечаток устройства - + Session Keys Ключи сеанса @@ -878,22 +883,22 @@ ШИФРОВАНИЕ - + GENERAL ГЛАВНОЕ - + INTERFACE - + Emoji Font Family - + Open Sessions File Открыть файл сеансов diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index 8bd4c750..cd826123 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -371,12 +371,12 @@ RoomInfoListItem - + Leave room 离开聊天室 - + Accept 接受 @@ -491,7 +491,13 @@ - + + -- Decryption Error (%1) -- + Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1. + + + + Message redaction failed: %1 删除消息失败：%1 @@ -522,13 +528,7 @@ - - -- Decryption Error (%1) -- - Placeholder, when the message can't be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1. - - - - + -- Encrypted Event (Unknown event type) -- Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet. @@ -781,7 +781,7 @@ UserSettingsPage - + Minimize to tray 最小化至托盘 @@ -810,6 +810,11 @@ Typing notifications 打字通知 + + + Sort rooms by unreads + + Read receipts @@ -856,7 +861,7 @@ 设备指纹 - + Session Keys 会话密钥 @@ -876,22 +881,22 @@ 加密 - + GENERAL 通用 - + INTERFACE - + Emoji Font Family - + Open Sessions File 打开会话文件 diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 029444a3..91ecd58a 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -100,7 +100,7 @@ ChatPage::ChatPage(QSharedPointer userSettings, QWidget *parent) user_info_widget_ = new UserInfoWidget(sideBar_); user_mentions_popup_ = new popups::UserMentions(); - room_list_ = new RoomList(sideBar_); + room_list_ = new RoomList(userSettings, sideBar_); connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom); sideBarLayout_->addWidget(user_info_widget_); diff --git a/src/RoomInfoListItem.cpp b/src/RoomInfoListItem.cpp index 61fb5e47..cc5f5776 100644 --- a/src/RoomInfoListItem.cpp +++ b/src/RoomInfoListItem.cpp @@ -26,6 +26,7 @@ #include "Config.h" #include "RoomInfoListItem.h" #include "Splitter.h" +#include "UserSettingsPage.h" #include "Utils.h" #include "ui/Menu.h" #include "ui/Ripple.h" @@ -99,7 +100,10 @@ RoomInfoListItem::init(QWidget *parent) menu_->addAction(leaveRoom_); } -RoomInfoListItem::RoomInfoListItem(QString room_id, const RoomInfo &info, QWidget *parent) +RoomInfoListItem::RoomInfoListItem(QString room_id, + const RoomInfo &info, + QSharedPointer userSettings, + QWidget *parent) : QWidget(parent) , roomType_{info.is_invite ? RoomType::Invited : RoomType::Joined} , roomId_(std::move(room_id)) @@ -107,6 +111,7 @@ RoomInfoListItem::RoomInfoListItem(QString room_id, const RoomInfo &info, QWidge , isPressed_(false) , unreadMsgCount_(0) , unreadHighlightedMsgCount_(0) + , settings(userSettings) { init(parent); } @@ -324,6 +329,34 @@ RoomInfoListItem::updateUnreadMessageCount(int count, int highlightedCount) update(); } +enum NotificationImportance : short +{ + ImportanceDisabled = -1, + AllEventsRead = 0, + NewMessage = 1, + NewMentions = 2, + Invite = 3 +}; + +short int +RoomInfoListItem::calculateImportance() const +{ + // Returns the degree of importance of the unread messages in the room. + // If sorting by importance is disabled in settings, this only ever + // returns ImportanceDisabled or Invite + if (isInvite()) { + return Invite; + } else if (!settings->isSortByImportanceEnabled()) { + return ImportanceDisabled; + } else if (unreadHighlightedMsgCount_) { + return NewMentions; + } else if (unreadMsgCount_) { + return NewMessage; + } else { + return AllEventsRead; + } +} + void RoomInfoListItem::setPressedState(bool state) { diff --git a/src/RoomInfoListItem.h b/src/RoomInfoListItem.h index c1ee533d..e609f4d8 100644 --- a/src/RoomInfoListItem.h +++ b/src/RoomInfoListItem.h @@ -25,6 +25,7 @@ #include #include "CacheStructs.h" +#include "UserSettingsPage.h" #include "ui/Avatar.h" class Menu; @@ -63,11 +64,16 @@ class RoomInfoListItem : public QWidget Q_PROPERTY(QColor btnTextColor READ btnTextColor WRITE setBtnTextColor) public: - RoomInfoListItem(QString room_id, const RoomInfo &info, QWidget *parent = nullptr); + RoomInfoListItem(QString room_id, + const RoomInfo &info, + QSharedPointer userSettings, + QWidget *parent = nullptr); void updateUnreadMessageCount(int count, int highlightedCount); void clearUnreadMessageCount() { updateUnreadMessageCount(0, 0); }; + short int calculateImportance() const; + QString roomId() { return roomId_; } bool isPressed() const { return isPressed_; } int unreadMessageCount() const { return unreadMsgCount_; } @@ -128,7 +134,7 @@ public: roomType_ = RoomType::Joined; } - bool isInvite() { return roomType_ == RoomType::Invited; } + bool isInvite() const { return roomType_ == RoomType::Invited; } void setReadState(bool hasUnreadMessages) { if (hasUnreadMessages_ != hasUnreadMessages) { @@ -214,4 +220,6 @@ private: QColor bubbleBgColor_; QColor bubbleFgColor_; + + QSharedPointer settings; }; diff --git a/src/RoomList.cpp b/src/RoomList.cpp index 6feb4f76..1c7c340d 100644 --- a/src/RoomList.cpp +++ b/src/RoomList.cpp @@ -16,6 +16,7 @@ */ #include +#include #include #include @@ -26,11 +27,13 @@ #include "MainWindow.h" #include "RoomInfoListItem.h" #include "RoomList.h" +#include "UserSettingsPage.h" #include "Utils.h" #include "ui/OverlayModal.h" -RoomList::RoomList(QWidget *parent) +RoomList::RoomList(QSharedPointer userSettings, QWidget *parent) : QWidget(parent) + , settings(userSettings) { topLayout_ = new QVBoxLayout(this); topLayout_->setSpacing(0); @@ -62,12 +65,16 @@ RoomList::RoomList(QWidget *parent) topLayout_->addWidget(scrollArea_); connect(this, &RoomList::updateRoomAvatarCb, this, &RoomList::updateRoomAvatar); + connect(userSettings.data(), + &UserSettings::roomSortingChanged, + this, + &RoomList::sortRoomsByLastMessage); } void RoomList::addRoom(const QString &room_id, const RoomInfo &info) { - auto room_item = new RoomInfoListItem(room_id, info, scrollArea_); + auto room_item = new RoomInfoListItem(room_id, info, settings, scrollArea_); room_item->setRoomName(QString::fromStdString(std::move(info.name))); connect(room_item, &RoomInfoListItem::clicked, this, &RoomList::highlightSelectedRoom); @@ -122,6 +129,8 @@ RoomList::updateUnreadMessageCount(const QString &roomid, int count, int highlig rooms_[roomid]->updateUnreadMessageCount(count, highlightedCount); calculateUnreadMessageCount(); + + sortRoomsByLastMessage(); } void @@ -328,30 +337,51 @@ RoomList::updateRoomDescription(const QString &roomid, const DescInfo &info) emit sortRoomsByLastMessage(); } +struct room_sort +{ + bool operator()(const RoomInfoListItem *a, const RoomInfoListItem *b) const + { + // Sort by "importance" (i.e. invites before mentions before + // notifs before new events before old events), then secondly + // by recency. + + // Checking importance first + const auto a_importance = a->calculateImportance(); + const auto b_importance = b->calculateImportance(); + if (a_importance != b_importance) { + return a_importance > b_importance; + } + + // Now sort by recency + // Zero if empty, otherwise the time that the event occured + const uint64_t a_recency = a->lastMessageInfo().userid.isEmpty() + ? 0 + : a->lastMessageInfo().datetime.toMSecsSinceEpoch(); + const uint64_t b_recency = b->lastMessageInfo().userid.isEmpty() + ? 0 + : b->lastMessageInfo().datetime.toMSecsSinceEpoch(); + return a_recency > b_recency; + } +}; + void RoomList::sortRoomsByLastMessage() { isSortPending_ = false; - std::multimap> times; + std::multiset times; for (int ii = 0; ii < contentsLayout_->count(); ++ii) { auto room = qobject_cast(contentsLayout_->itemAt(ii)->widget()); if (!room) continue; - - // Not a room message. - if (room->isInvite()) - times.emplace(std::numeric_limits::max(), room); - else if (room->lastMessageInfo().userid.isEmpty()) - times.emplace(0, room); else - times.emplace(room->lastMessageInfo().datetime.toMSecsSinceEpoch(), room); + times.insert(room); } for (auto it = times.cbegin(); it != times.cend(); ++it) { - const auto roomWidget = it->second; + const auto roomWidget = *it; const auto currentIndex = contentsLayout_->indexOf(roomWidget); const auto newIndex = std::distance(times.cbegin(), it); @@ -468,7 +498,7 @@ RoomList::updateRoom(const QString &room_id, const RoomInfo &info) void RoomList::addInvitedRoom(const QString &room_id, const RoomInfo &info) { - auto room_item = new RoomInfoListItem(room_id, info, scrollArea_); + auto room_item = new RoomInfoListItem(room_id, info, settings, scrollArea_); connect(room_item, &RoomInfoListItem::acceptInvite, this, &RoomList::acceptInvite); connect(room_item, &RoomInfoListItem::declineInvite, this, &RoomList::declineInvite); diff --git a/src/RoomList.h b/src/RoomList.h index fef552c6..a0151f92 100644 --- a/src/RoomList.h +++ b/src/RoomList.h @@ -23,6 +23,9 @@ #include #include +#include "CacheStructs.h" +#include "UserSettingsPage.h" + class LeaveRoomDialog; class OverlayModal; class RoomInfoListItem; @@ -35,7 +38,7 @@ class RoomList : public QWidget Q_OBJECT public: - explicit RoomList(QWidget *parent = nullptr); + explicit RoomList(QSharedPointer userSettings, QWidget *parent = nullptr); void initialize(const QMap &info); void sync(const std::map &info); @@ -100,4 +103,5 @@ private: QString selectedRoom_; bool isSortPending_ = false; + QSharedPointer settings; }; diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 930b1b7b..6cd9a95c 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -58,6 +58,7 @@ UserSettings::load() isButtonsInTimelineEnabled_ = settings.value("user/timeline/buttons", true).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(); @@ -135,6 +136,7 @@ UserSettings::save() settings.setValue("font_size", baseFontSize_); settings.setValue("typing_notifications", isTypingNotificationsEnabled_); + settings.setValue("minor_events", sortByImportance_); settings.setValue("read_receipts", isReadReceiptsEnabled_); settings.setValue("group_view", isGroupViewEnabled_); settings.setValue("markdown_enabled", isMarkdownEnabled_); @@ -197,6 +199,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge groupViewToggle_ = new Toggle{this}; timelineButtonsToggle_ = new Toggle{this}; typingNotifications_ = new Toggle{this}; + sortByImportance_ = new Toggle{this}; readReceipts_ = new Toggle{this}; markdownEnabled_ = new Toggle{this}; desktopNotifications_ = new Toggle{this}; @@ -300,6 +303,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge boxWrap(tr("Group's sidebar"), groupViewToggle_); boxWrap(tr("Show buttons in timeline"), timelineButtonsToggle_); boxWrap(tr("Typing notifications"), typingNotifications_); + boxWrap(tr("Sort rooms by unreads"), sortByImportance_); formLayout_->addRow(new HorizontalLine{this}); boxWrap(tr("Read receipts"), readReceipts_); boxWrap(tr("Send messages as Markdown"), markdownEnabled_); @@ -401,6 +405,10 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge settings_->setTypingNotifications(!isDisabled); }); + connect(sortByImportance_, &Toggle::toggled, this, [this](bool isDisabled) { + settings_->setSortByImportance(!isDisabled); + }); + connect(timelineButtonsToggle_, &Toggle::toggled, this, [this](bool isDisabled) { settings_->setButtonsInTimeline(!isDisabled); }); @@ -439,6 +447,7 @@ UserSettingsPage::showEvent(QShowEvent *) groupViewToggle_->setState(!settings_->isGroupViewEnabled()); avatarCircles_->setState(!settings_->isAvatarCirclesEnabled()); typingNotifications_->setState(!settings_->isTypingNotificationsEnabled()); + sortByImportance_->setState(!settings_->isSortByImportanceEnabled()); timelineButtonsToggle_->setState(!settings_->isButtonsInTimelineEnabled()); readReceipts_->setState(!settings_->isReadReceiptsEnabled()); markdownEnabled_->setState(!settings_->isMarkdownEnabled()); diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index ca5a213c..1c20214e 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -87,6 +87,12 @@ public: save(); } + void setSortByImportance(bool state) + { + sortByImportance_ = state; + emit roomSortingChanged(); + } + void setButtonsInTimeline(bool state) { isButtonsInTimelineEnabled_ = state; @@ -112,6 +118,7 @@ public: bool isAvatarCirclesEnabled() const { return avatarCircles_; } 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 hasDesktopNotifications() const { return hasDesktopNotifications_; } @@ -121,6 +128,7 @@ public: signals: void groupViewStateChanged(bool state); + void roomSortingChanged(); private: // Default to system theme if QT_QPA_PLATFORMTHEME var is set. @@ -134,6 +142,7 @@ private: bool isGroupViewEnabled_; bool isMarkdownEnabled_; bool isTypingNotificationsEnabled_; + bool sortByImportance_; bool isButtonsInTimelineEnabled_; bool isReadReceiptsEnabled_; bool hasDesktopNotifications_; @@ -185,6 +194,7 @@ private: Toggle *groupViewToggle_; Toggle *timelineButtonsToggle_; Toggle *typingNotifications_; + Toggle *sortByImportance_; Toggle *readReceipts_; Toggle *markdownEnabled_; Toggle *desktopNotifications_;