Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some changes for groups:

Browse Source 
- Show user groups without assigned friends too, the standard groups are hidden without assigned friends
- Show the standard groups in he tree first, than the user groups


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3525 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-23 08:37:03 +00:00
parent addb330205
commit 09925c1bd5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -675,7 +675,8 @@ void PeersDialog::insertPeers()
if (groupIt != groupInfoList.end()) { if (groupIt != groupInfoList.end()) {
groupInfo = &(*groupIt); groupInfo = &(*groupIt);
if (groupInfo->peerIds.size() == 0) { if ((groupInfo->flag & RS_GROUP_FLAG_STANDARD) && groupInfo->peerIds.size() == 0) {
// don't show empty standard groups
groupIt++; groupIt++;
continue; continue;
} }
@ -804,7 +805,7 @@ void PeersDialog::insertPeers()
availableCount++; availableCount++;
gpgItem->setText(COLUMN_NAME, QString::fromStdString(detail.name)); gpgItem->setText(COLUMN_NAME, QString::fromStdString(detail.name));
gpgItem->setData(COLUMN_NAME, ROLE_SORT, "1 " + QString::fromStdString(detail.name)); gpgItem->setData(COLUMN_NAME, ROLE_SORT, "2 " + QString::fromStdString(detail.name));
// remove items that are not friends anymore // remove items that are not friends anymore
int childCount = gpgItem->childCount(); int childCount = gpgItem->childCount();
@ -1043,12 +1044,13 @@ void PeersDialog::insertPeers()
} }
if (groupInfo && groupItem) { if (groupInfo && groupItem) {
if (groupItem->childCount() == 0) { if ((groupInfo->flag & RS_GROUP_FLAG_STANDARD) && groupItem->childCount() == 0) {
// there are some dead id's assigned // there are some dead id's assigned
groupItem->setHidden(true); groupItem->setHidden(true);
} else { } else {
groupItem->setText(COLUMN_NAME, QString("%1 (%2/%3)").arg(GroupDefs::name(*groupInfo)).arg(onlineCount).arg(availableCount)); groupItem->setText(COLUMN_NAME, QString("%1 (%2/%3)").arg(GroupDefs::name(*groupInfo)).arg(onlineCount).arg(availableCount));
groupItem->setData(COLUMN_NAME, ROLE_SORT, "0 " + QString::fromUtf8(groupInfo->name.c_str())); // show first the standard groups, than the user groups
groupItem->setData(COLUMN_NAME, ROLE_SORT, ((groupInfo->flag & RS_GROUP_FLAG_STANDARD) ? "0 " : "1 ") + QString::fromUtf8(groupInfo->name.c_str()));
} }
} }