1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr2689'

This commit is contained in:
tux3 2015-12-15 19:54:10 +01:00
commit db2dbf459b
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -119,6 +119,10 @@ void Widget::init()
{
ui->setupUi(this);
QIcon themeIcon = QIcon::fromTheme("qtox");
if (!themeIcon.isNull())
setWindowIcon(themeIcon);
timer = new QTimer();
timer->start(1000);
offlineMsgTimer = new QTimer();
@ -427,7 +431,7 @@ void Widget::updateIcons()
status = QStringLiteral("offline");
}
QIcon ico;
QIcon ico = QIcon::fromTheme("qtox-" + status);
if (ico.isNull())
{
QString color = Settings::getInstance().getLightTrayIcon() ? "light" : "dark";