StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1348'

Browse Source
This commit is contained in:
tux3 2015-03-06 23:57:47 +01:00
commit 3901bebf90
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainwindow.ui
View File

@ -982,7 +982,7 @@ QSplitter:handle{
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../res.qrc"> <iconset resource="../res.qrc">
<normaloff>:/img/status/dot_away.png</normaloff>:/img/status/dot_away.png</iconset> <normaloff>:/img/status/dot_away_2x.png</normaloff>:/img/status/dot_away_2x.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>

8
src/widget/widget.cpp
View File

@ -414,19 +414,19 @@ void Widget::onStatusSet(Status status)
{ {
case Status::Online: case Status::Online:
ui->statusButton->setProperty("status" ,"online"); ui->statusButton->setProperty("status" ,"online");
ui->statusButton->setIcon(QIcon(":img/status/dot_online.png")); ui->statusButton->setIcon(QIcon(":img/status/dot_online_2x.png"));
break; break;
case Status::Away: case Status::Away:
ui->statusButton->setProperty("status" ,"away"); ui->statusButton->setProperty("status" ,"away");
ui->statusButton->setIcon(QIcon(":img/status/dot_idle.png")); ui->statusButton->setIcon(QIcon(":img/status/dot_idle_2x.png"));
break; break;
case Status::Busy: case Status::Busy:
ui->statusButton->setProperty("status" ,"busy"); ui->statusButton->setProperty("status" ,"busy");
ui->statusButton->setIcon(QIcon(":img/status/dot_busy.png")); ui->statusButton->setIcon(QIcon(":img/status/dot_busy_2x.png"));
break; break;
case Status::Offline: case Status::Offline:
ui->statusButton->setProperty("status" ,"offline"); ui->statusButton->setProperty("status" ,"offline");
ui->statusButton->setIcon(QIcon(":img/status/dot_away.png")); ui->statusButton->setIcon(QIcon(":img/status/dot_away_2x.png"));
break; break;
} }
updateTrayIcon(); updateTrayIcon();