diff --git a/img/status/dot_away.svg b/img/status/away.svg
similarity index 100%
rename from img/status/dot_away.svg
rename to img/status/away.svg
diff --git a/img/status/away_notification.svg b/img/status/away_notification.svg
new file mode 100644
index 000000000..a7ee46443
--- /dev/null
+++ b/img/status/away_notification.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/img/status/dot_busy.svg b/img/status/busy.svg
similarity index 100%
rename from img/status/dot_busy.svg
rename to img/status/busy.svg
diff --git a/img/status/busy_notification.svg b/img/status/busy_notification.svg
new file mode 100644
index 000000000..e7cae2bec
--- /dev/null
+++ b/img/status/busy_notification.svg
@@ -0,0 +1,41 @@
+
+
\ No newline at end of file
diff --git a/img/status/dot_away_notification.svg b/img/status/dot_away_notification.svg
deleted file mode 100644
index 640810a61..000000000
--- a/img/status/dot_away_notification.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
diff --git a/img/status/dot_busy_notification.svg b/img/status/dot_busy_notification.svg
deleted file mode 100644
index c1e7d0a27..000000000
--- a/img/status/dot_busy_notification.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/img/status/dot_offline_notification.svg b/img/status/dot_offline_notification.svg
deleted file mode 100644
index 24eb6cdd4..000000000
--- a/img/status/dot_offline_notification.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
diff --git a/img/status/dot_online_notification.svg b/img/status/dot_online_notification.svg
deleted file mode 100644
index 9d1549817..000000000
--- a/img/status/dot_online_notification.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/img/status/dot_groupchat.svg b/img/status/groupchat.svg
similarity index 100%
rename from img/status/dot_groupchat.svg
rename to img/status/groupchat.svg
diff --git a/img/status/dot_groupchat_newmessages.svg b/img/status/groupchat_newmessages.svg
similarity index 100%
rename from img/status/dot_groupchat_newmessages.svg
rename to img/status/groupchat_newmessages.svg
diff --git a/img/status/dot_groupchat_notification.svg b/img/status/groupchat_notification.svg
similarity index 100%
rename from img/status/dot_groupchat_notification.svg
rename to img/status/groupchat_notification.svg
diff --git a/img/status/dot_invisible.svg b/img/status/invisible.svg
similarity index 100%
rename from img/status/dot_invisible.svg
rename to img/status/invisible.svg
diff --git a/img/status/dot_offline.svg b/img/status/offline.svg
similarity index 100%
rename from img/status/dot_offline.svg
rename to img/status/offline.svg
diff --git a/img/status/offline_notification.svg b/img/status/offline_notification.svg
new file mode 100644
index 000000000..53bb34986
--- /dev/null
+++ b/img/status/offline_notification.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/img/status/dot_online.svg b/img/status/online.svg
similarity index 100%
rename from img/status/dot_online.svg
rename to img/status/online.svg
diff --git a/img/status/online_notification.svg b/img/status/online_notification.svg
new file mode 100644
index 000000000..d988dd155
--- /dev/null
+++ b/img/status/online_notification.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/res.qrc b/res.qrc
index 1eb97b5de..bac33714b 100644
--- a/res.qrc
+++ b/res.qrc
@@ -21,17 +21,17 @@
img/settings/general.png
img/settings/identity.png
img/settings/privacy.png
- img/status/dot_away.svg
- img/status/dot_away_notification.svg
- img/status/dot_busy.svg
- img/status/dot_busy_notification.svg
- img/status/dot_groupchat.svg
- img/status/dot_groupchat_newmessages.svg
- img/status/dot_groupchat_notification.svg
- img/status/dot_offline.svg
- img/status/dot_offline_notification.svg
- img/status/dot_online.svg
- img/status/dot_online_notification.svg
+ img/status/away.svg
+ img/status/away_notification.svg
+ img/status/busy.svg
+ img/status/busy_notification.svg
+ img/status/groupchat.svg
+ img/status/groupchat_newmessages.svg
+ img/status/groupchat_notification.svg
+ img/status/offline.svg
+ img/status/offline_notification.svg
+ img/status/online.svg
+ img/status/online_notification.svg
img/taskbar/dark/taskbar_online.svg
img/taskbar/dark/taskbar_away.svg
img/taskbar/dark/taskbar_busy.svg
diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp
index 3299385a4..275d21164 100644
--- a/src/widget/contentdialog.cpp
+++ b/src/widget/contentdialog.cpp
@@ -493,10 +493,10 @@ void ContentDialog::updateTitleAndStatusIcon()
Status currentStatus = activeChatroomWidget->getFriend()->getStatus();
- QMap icons{{Status::Online, QIcon(":/img/status/dot_online.svg")},
- {Status::Away, QIcon(":/img/status/dot_away.svg")},
- {Status::Busy, QIcon(":/img/status/dot_busy.svg")},
- {Status::Offline, QIcon(":/img/status/dot_offline.svg")}};
+ QMap icons{{Status::Online, QIcon(":/img/status/online.svg")},
+ {Status::Away, QIcon(":/img/status/away.svg")},
+ {Status::Busy, QIcon(":/img/status/busy.svg")},
+ {Status::Offline, QIcon(":/img/status/offline.svg")}};
setWindowIcon(icons[currentStatus]);
}
diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
index 5227904af..8c2675bf2 100644
--- a/src/widget/friendwidget.cpp
+++ b/src/widget/friendwidget.cpp
@@ -63,7 +63,7 @@ FriendWidget::FriendWidget(const Friend* f, bool compact)
, isDefaultAvatar{true}
{
avatar->setPixmap(QPixmap(":/img/contact.svg"));
- statusPic.setPixmap(QPixmap(":/img/status/dot_offline.svg"));
+ statusPic.setPixmap(QPixmap(":/img/status/offline.svg"));
statusPic.setMargin(3);
nameLabel->setText(f->getDisplayedName());
nameLabel->setTextFormat(Qt::PlainText);
@@ -300,14 +300,14 @@ void FriendWidget::setAsInactiveChatroom()
void FriendWidget::updateStatusLight()
{
static const QString statuses[] = {
- ":img/status/dot_online.svg",
- ":img/status/dot_online_notification.svg",
- ":img/status/dot_away.svg",
- ":img/status/dot_away_notification.svg",
- ":img/status/dot_busy.svg",
- ":img/status/dot_busy_notification.svg",
- ":img/status/dot_offline.svg",
- ":img/status/dot_offline_notification.svg",
+ ":img/status/online.svg",
+ ":img/status/online_notification.svg",
+ ":img/status/away.svg",
+ ":img/status/away_notification.svg",
+ ":img/status/busy.svg",
+ ":img/status/busy_notification.svg",
+ ":img/status/offline.svg",
+ ":img/status/offline_notification.svg",
};
const bool event = frnd->getEventFlag();
diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp
index d48946f38..36dfc9488 100644
--- a/src/widget/groupwidget.cpp
+++ b/src/widget/groupwidget.cpp
@@ -45,7 +45,7 @@ GroupWidget::GroupWidget(int groupId, const QString& name, bool compact)
, groupId{groupId}
{
avatar->setPixmap(Style::scaleSvgImage(":img/group.svg", avatar->width(), avatar->height()));
- statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
+ statusPic.setPixmap(QPixmap(":img/status/online.svg"));
statusPic.setMargin(3);
nameLabel->setText(name);
@@ -179,10 +179,10 @@ void GroupWidget::updateStatusLight()
Group* g = GroupList::findGroup(groupId);
if (!g->getEventFlag()) {
- statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
+ statusPic.setPixmap(QPixmap(":img/status/online.svg"));
statusPic.setMargin(3);
} else {
- statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.svg"));
+ statusPic.setPixmap(QPixmap(":img/status/online_notification.svg"));
statusPic.setMargin(0);
}
}
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index be0efe72b..19b3f3ab5 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -2188,13 +2188,13 @@ QString Widget::getStatusIconPath(Status status)
{
switch (status) {
case Status::Online:
- return ":/img/status/dot_online.svg";
+ return ":/img/status/online.svg";
case Status::Away:
- return ":/img/status/dot_away.svg";
+ return ":/img/status/away.svg";
case Status::Busy:
- return ":/img/status/dot_busy.svg";
+ return ":/img/status/busy.svg";
case Status::Offline:
- return ":/img/status/dot_offline.svg";
+ return ":/img/status/offline.svg";
}
qWarning() << "Status unknown";
assert(false);