diff --git a/img/status/dot_busy.png b/img/status/dot_busy.png new file mode 100644 index 000000000..316bbdb1d Binary files /dev/null and b/img/status/dot_busy.png differ diff --git a/img/status/dot_busy_2x.png b/img/status/dot_busy_2x.png new file mode 100644 index 000000000..77f6c981a Binary files /dev/null and b/img/status/dot_busy_2x.png differ diff --git a/img/status/dot_busy_notification.png b/img/status/dot_busy_notification.png new file mode 100644 index 000000000..4a2bde641 Binary files /dev/null and b/img/status/dot_busy_notification.png differ diff --git a/res.qrc b/res.qrc index 5f56c9c1f..5fa97da39 100644 --- a/res.qrc +++ b/res.qrc @@ -97,5 +97,8 @@ ui/window/restoreButtonPressed.png ui/friendList/friendList.css ui/window/window.css + img/status/dot_busy.png + img/status/dot_busy_2x.png + img/status/dot_busy_notification.png diff --git a/widget/widget.cpp b/widget/widget.cpp index f51fa7850..956638e75 100644 --- a/widget/widget.cpp +++ b/widget/widget.cpp @@ -277,8 +277,10 @@ void Widget::onStatusSet(Status status) { if (status == Status::Online) ui->statImg->setPixmap(QPixmap(":img/status/dot_online_2x.png")); - else if (status == Status::Busy || status == Status::Away) + else if (status == Status::Away) ui->statImg->setPixmap(QPixmap(":img/status/dot_idle_2x.png")); + else if (status == Status::Busy) + ui->statImg->setPixmap(QPixmap(":img/status/dot_busy_2x.png")); else if (status == Status::Offline) ui->statImg->setPixmap(QPixmap(":img/status/dot_away_2x.png")); } @@ -508,10 +510,14 @@ void Widget::updateFriendStatusLights(int friendId) f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online.png")); else if (status == Status::Online && f->hasNewMessages == 1) f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png")); - else if ((status == Status::Busy || status == Status::Away) && f->hasNewMessages == 0) + else if (status == Status::Away && f->hasNewMessages == 0) f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_idle.png")); - else if ((status == Status::Busy || status == Status::Away) && f->hasNewMessages == 1) + else if (status == Status::Away && f->hasNewMessages == 1) f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_idle_notification.png")); + else if (status == Status::Busy && f->hasNewMessages == 0) + f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_busy.png")); + else if (status == Status::Busy && f->hasNewMessages == 1) + f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_busy_notification.png")); else if (status == Status::Offline && f->hasNewMessages == 0) f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_away.png")); else if (status == Status::Offline && f->hasNewMessages == 1)