Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-07 00:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed filter in FriendList.

Browse source
This commit is contained in:
thunder2 2015-08-26 19:26:20 +02:00
parent 217c9b9538
commit 641a433f97
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -88,6 +88,7 @@
#define ROLE_SORT_STANDARD_GROUP Qt::UserRole + 3
#define ROLE_SORT_NAME Qt::UserRole + 4
#define ROLE_SORT_STATE Qt::UserRole + 5
#define ROLE_FILTER Qt::UserRole + 6
#define TYPE_GPG 0
#define TYPE_SSL 1
@ -1049,6 +1050,9 @@ void FriendList::insertPeers()
sslTextLabel->setVisible(!sslText.isEmpty());
}
// Filter
sslItem->setData(COLUMN_NAME, ROLE_FILTER, sslName);
if (std::find(privateChatIds.begin(), privateChatIds.end(), sslDetail.id) != privateChatIds.end()) {
// private chat is available
sslOverlayIcon = QPixmap(":/images/chat.png");
@ -1160,6 +1164,9 @@ void FriendList::insertPeers()
gpgTextLabel->setVisible(!gpgText.isEmpty());
}
// Filter
gpgItem->setData(COLUMN_NAME, ROLE_FILTER, gpgName);
gpgItem->setData(COLUMN_LAST_CONTACT, Qt::DisplayRole, showInfoAtGpgItem ? QVariant(bestLastContact) : "");
gpgItem->setData(COLUMN_LAST_CONTACT, ROLE_SORT_NAME, showInfoAtGpgItem ? QVariant(bestLastContact) : "");
gpgItem->setText(COLUMN_IP, showInfoAtGpgItem ? bestIP : "");
@ -1189,6 +1196,9 @@ void FriendList::insertPeers()
QString groupName = GroupDefs::name(*groupInfo);
groupItem->setText(COLUMN_NAME, QString("%1 (%2/%3)").arg(groupName).arg(onlineCount).arg(availableCount));
// Filter
groupItem->setData(COLUMN_NAME, ROLE_FILTER, groupName);
/* Sort data */
groupItem->setData(COLUMN_NAME, ROLE_SORT_NAME, groupName);
}
@ -2254,7 +2264,7 @@ void FriendList::setShowGroups(bool show)
void FriendList::filterItems(const QString &text)
{
mFilterText = text;
ui->peerTreeWidget->filterItems(COLUMN_NAME, mFilterText);
ui->peerTreeWidget->filterItems(COLUMN_NAME, mFilterText, ROLE_FILTER);
}
/**