Show the unread message count on the window title

This commit is contained in:
Konstantinos Sideris 2017-04-15 19:04:02 +03:00
parent e02dd2b8c5
commit e1d48367f8
6 changed files with 41 additions and 1 deletions

View file

@ -48,8 +48,10 @@ public:
signals:
void close();
void changeWindowTitle(const QString &msg);
private slots:
void showUnreadMessageNotification(int count);
void updateTopBarAvatar(const QString &roomid, const QPixmap &img);
void updateOwnProfileInfo(const QUrl &avatar_url, const QString &display_name);
void setOwnAvatar(const QPixmap &img);

View file

@ -42,6 +42,7 @@ public:
inline bool isPressed();
inline RoomInfo info();
inline void setAvatar(const QImage &avatar_image);
inline int unreadMessageCount();
signals:
void clicked(const RoomInfo &info_);
@ -82,6 +83,11 @@ private:
int unread_msg_count_;
};
inline int RoomInfoListItem::unreadMessageCount()
{
return unread_msg_count_;
}
inline bool RoomInfoListItem::isPressed()
{
return is_pressed_;

View file

@ -48,6 +48,7 @@ public:
signals:
void roomChanged(const RoomInfo &info);
void totalUnreadMessageCountUpdated(int count);
public slots:
void updateRoomAvatar(const QString &roomid, const QPixmap &img);
@ -55,6 +56,8 @@ public slots:
void updateUnreadMessageCount(const QString &roomid, int count);
private:
void calculateUnreadMessageCount();
Ui::RoomList *ui;
QMap<QString, RoomInfoListItem *> rooms_;

View file

@ -64,11 +64,17 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
view_manager_,
SLOT(setHistoryView(const RoomInfo &)));
// TODO: Better pass the whole RoomInfo struct instead of the roomid.
connect(view_manager_,
SIGNAL(unreadMessages(const QString &, int)),
room_list_,
SLOT(updateUnreadMessageCount(const QString &, int)));
connect(room_list_,
SIGNAL(totalUnreadMessageCountUpdated(int)),
this,
SLOT(showUnreadMessageNotification(int)));
connect(text_input_,
SIGNAL(sendTextMessage(const QString &)),
view_manager_,
@ -206,6 +212,15 @@ void ChatPage::changeTopRoomInfo(const RoomInfo &info)
current_room_ = info;
}
void ChatPage::showUnreadMessageNotification(int count)
{
// TODO: Make the default title a const.
if (count == 0)
emit changeWindowTitle("nheko");
else
emit changeWindowTitle(QString("nheko (%1)").arg(count));
}
ChatPage::~ChatPage()
{
sync_timer_->stop();

View file

@ -51,6 +51,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(register_page_, SIGNAL(backButtonClicked()), this, SLOT(showWelcomePage()));
connect(chat_page_, SIGNAL(close()), this, SLOT(showWelcomePage()));
connect(chat_page_, SIGNAL(changeWindowTitle(QString)), this, SLOT(setWindowTitle(QString)));
connect(client_.data(),
SIGNAL(loginSuccess(QString, QString, QString)),

View file

@ -89,6 +89,18 @@ void RoomList::updateUnreadMessageCount(const QString &roomid, int count)
}
rooms_[roomid]->updateUnreadMessageCount(count);
calculateUnreadMessageCount();
}
void RoomList::calculateUnreadMessageCount()
{
int total_unread_msgs = 0;
for (const auto &room : rooms_)
total_unread_msgs += room->unreadMessageCount();
emit totalUnreadMessageCountUpdated(total_unread_msgs);
}
void RoomList::setInitialRooms(const Rooms &rooms)
@ -132,11 +144,12 @@ void RoomList::highlightSelectedRoom(const RoomInfo &info)
return;
}
// TODO: Send a read receipt for the last event.
auto room = rooms_[info.id()];
room->clearUnreadMessageCount();
calculateUnreadMessageCount();
for (auto it = rooms_.constBegin(); it != rooms_.constEnd(); it++) {
if (it.key() != info.id())
it.value()->setPressedState(false);