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 'pr1950'

Browse Source
This commit is contained in:
tux3 2015-07-01 15:16:12 +02:00
commit 1758928b4f
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/widget/friendlistwidget.cpp
View File

@ -53,7 +53,7 @@ bool last7DaysWasLastMonth()
return QDate::currentDate().addDays(-7).month() == QDate::currentDate().month();
}
Time getTime(const QDate date)
Time getTime(const QDate& date)
{
if (date == QDate())
return Never;
@ -231,11 +231,14 @@ void FriendListWidget::setMode(Mode mode)
activityLayout->addWidget(categoryLastWeek);
QDate currentDate = QDate::currentDate();
if (last7DaysWasLastMonth())
//if (last7DaysWasLastMonth())
{
CategoryWidget* categoryThisMonth = new CategoryWidget(this);
categoryThisMonth->setName(tr("This month", "Category for sorting friends by activity"));
activityLayout->addWidget(categoryThisMonth);
categoryThisMonth->setVisible(last7DaysWasLastMonth());
if (categoryThisMonth->isVisible())
currentDate = currentDate.addMonths(-1);
}
@ -276,8 +279,6 @@ void FriendListWidget::setMode(Mode mode)
{
QDate activityDate = getDateFriend(contact);
Time time = getTime(activityDate);
if (!last7DaysWasLastMonth())
time = static_cast<Time>(time-1);
CategoryWidget* categoryWidget = dynamic_cast<CategoryWidget*>(activityLayout->itemAt(time)->widget());
categoryWidget->addFriendWidget(contact->getFriendWidget(), contact->getStatus());
}
@ -649,6 +650,17 @@ void FriendListWidget::moveWidget(FriendWidget* w, Status s, bool add)
}
}
void FriendListWidget::updateActivityDate(const QDate& date)
{
if (mode != Activity)
return;
CategoryWidget* categoryWidget = static_cast<CategoryWidget*>(activityLayout->itemAt(getTime(date))->widget());
categoryWidget->updateStatus();
categoryWidget->setVisible(categoryWidget->hasChatrooms());
}
// update widget after add/delete/hide/show
void FriendListWidget::reDraw()
{

1
src/widget/friendlistwidget.h
View File

@ -60,6 +60,7 @@ public:
void cycleContacts(GenericChatroomWidget* activeChatroomWidget, bool forward);
QVector<CircleWidget*> getAllCircles();
void updateActivityDate(const QDate& date);
void reDraw();
signals:

3
src/widget/widget.cpp
View File

@ -907,8 +907,11 @@ void Widget::updateFriendActivity(Friend *frnd)
QDate date = Settings::getInstance().getFriendActivity(frnd->getToxId());
if (date != QDate::currentDate())
{
// Update old activity before after new one. Store old date first.
QDate oldDate = Settings::getInstance().getFriendActivity(frnd->getToxId());
Settings::getInstance().setFriendActivity(frnd->getToxId(), QDate::currentDate());
contactListWidget->moveWidget(frnd->getFriendWidget(), frnd->getStatus());
contactListWidget->updateActivityDate(oldDate);
}
}