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 pull request #6 from tux3/master

Browse Source 
Rebase on upstream
This commit is contained in:
Nobody of note. 2014-07-06 14:17:44 -07:00
commit eaadb4d244
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widget/widget.cpp
View File

@ -661,13 +661,19 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons
newMessageAlert(); newMessageAlert();
g->hasNewMessages = 1; g->hasNewMessages = 1;
g->userWasMentioned = 1; g->userWasMentioned = 1;
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png")); if (useNativeTheme)
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
else
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_notification.png"));
} }
else else
if (g->hasNewMessages == 0) if (g->hasNewMessages == 0)
{ {
g->hasNewMessages = 1; g->hasNewMessages = 1;
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png")); if (useNativeTheme)
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
else
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat_newmessages.png"));
} }
} }
} }
@ -711,7 +717,10 @@ void Widget::onGroupWidgetClicked(GroupWidget* widget)
{ {
g->hasNewMessages = 0; g->hasNewMessages = 0;
g->userWasMentioned = 0; g->userWasMentioned = 0;
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png")); if (useNativeTheme)
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
else
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png"));
} }
} }
@ -747,6 +756,8 @@ Group *Widget::createGroup(int groupId)
QWidget* widget = ui->friendList->widget(); QWidget* widget = ui->friendList->widget();
QLayout* layout = widget->layout(); QLayout* layout = widget->layout();
layout->addWidget(newgroup->widget); layout->addWidget(newgroup->widget);
if (useNativeTheme)
newgroup->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
updateFriendListWidth(); updateFriendListWidth();
connect(newgroup->widget, SIGNAL(groupWidgetClicked(GroupWidget*)), this, SLOT(onGroupWidgetClicked(GroupWidget*))); connect(newgroup->widget, SIGNAL(groupWidgetClicked(GroupWidget*)), this, SLOT(onGroupWidgetClicked(GroupWidget*)));
connect(newgroup->widget, SIGNAL(removeGroup(int)), this, SLOT(removeGroup(int))); connect(newgroup->widget, SIGNAL(removeGroup(int)), this, SLOT(removeGroup(int)));
@ -814,7 +825,10 @@ bool Widget::event(QEvent * e)
Group* g = GroupList::findGroup(activeGroupWidget->groupId); Group* g = GroupList::findGroup(activeGroupWidget->groupId);
g->hasNewMessages = 0; g->hasNewMessages = 0;
g->userWasMentioned = 0; g->userWasMentioned = 0;
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png")); if (useNativeTheme)
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
else
g->widget->statusPic.setPixmap(QPixmap(":img/status/dot_groupchat.png"));
} }
} }
else if (e->type() == QEvent::WindowDeactivate && !useNativeTheme) else if (e->type() == QEvent::WindowDeactivate && !useNativeTheme)