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

added patch from AsamK to show the availability status of peers at the level of locations instead of GPG keys

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-09-23 17:06:07 +00:00
parent dd474cfddf
commit 3ed0c1d885
1 changed files with 49 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

102
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -870,6 +870,8 @@ void FriendsDialog::insertPeers()
bool gpg_connected = false; bool gpg_connected = false;
bool gpg_online = false; bool gpg_online = false;
bool gpg_hasPrivateChat = false; bool gpg_hasPrivateChat = false;
int bestPeerState = 0; // for gpg item
unsigned int bestRSState = 0; // for gpg item
std::list<std::string> sslContacts; std::list<std::string> sslContacts;
rsPeers->getAssociatedSSLIds(detail.gpg_id, sslContacts); rsPeers->getAssociatedSSLIds(detail.gpg_id, sslContacts);
@ -948,13 +950,55 @@ void FriendsDialog::insertPeers()
QFont sslFont; QFont sslFont;
QColor sslColor; QColor sslColor;
if (sslDetail.state & RS_PEER_STATE_CONNECTED) { if (sslDetail.state & RS_PEER_STATE_CONNECTED) {
// get the status info for this ssl id
int peerState = 0;
int rsState = 0;
std::list<StatusInfo>::iterator it;
for(it = statusInfo.begin(); it != statusInfo.end(); it++) {
if(it->id == sslId){
rsState = it->status;
switch (rsState) {
case RS_STATUS_INACTIVE:
peerState = PEER_STATE_INACTIVE;
break;
case RS_STATUS_ONLINE:
peerState = PEER_STATE_ONLINE;
break;
case RS_STATUS_AWAY:
peerState = PEER_STATE_AWAY;
break;
case RS_STATUS_BUSY:
peerState = PEER_STATE_BUSY;
break;
}
/* find the best ssl contact for the gpg item */
if (bestPeerState == 0 || peerState < bestPeerState) {
/* first ssl contact or higher state */
bestPeerState = peerState;
bestRSState = rsState;
} else if (peerState == bestPeerState) {
/* equal state ... use first */
}
break;
}
}
sslItem->setHidden(false); sslItem->setHidden(false);
gpg_connected = true; gpg_connected = true;
sslIcon = QIcon(":/images/connect_established.png"); sslIcon = QIcon(":/images/connect_established.png");
if (rsState == 0) {
sslFont.setBold(true); sslFont.setBold(true);
sslColor = Qt::darkBlue; sslColor = Qt::darkBlue;
} else {
sslFont = StatusDefs::font(rsState);
sslColor = StatusDefs::textColor(rsState);
}
} else if (sslDetail.state & RS_PEER_STATE_ONLINE) { } else if (sslDetail.state & RS_PEER_STATE_ONLINE) {
sslItem->setHidden(hideUnconnected); sslItem->setHidden(hideUnconnected);
gpg_online = true; gpg_online = true;
@ -992,64 +1036,12 @@ void FriendsDialog::insertPeers()
} }
} }
int bestPeerState = 0; // for gpg item
int i = 0;
QIcon gpgIcon; QIcon gpgIcon;
if (gpg_connected) { if (gpg_connected) {
gpgItem->setHidden(false); gpgItem->setHidden(false);
onlineCount++; onlineCount++;
std::string bestSslId; // for gpg item
unsigned int bestRSState = 0; // for gpg item
std::list<StatusInfo>::iterator it;
for(it = statusInfo.begin(); it != statusInfo.end() ; it++) {
// don't forget the kids
std::list<std::string>::iterator cont_it;
for (cont_it = sslContacts.begin(); cont_it != sslContacts.end(); cont_it++) {
if((it->id == *cont_it) && (rsPeers->isOnline(*cont_it))){
int peerState = 0;
switch (it->status) {
case RS_STATUS_INACTIVE:
peerState = PEER_STATE_INACTIVE;
break;
case RS_STATUS_ONLINE:
peerState = PEER_STATE_ONLINE;
break;
case RS_STATUS_AWAY:
peerState = PEER_STATE_AWAY;
break;
case RS_STATUS_BUSY:
peerState = PEER_STATE_BUSY;
break;
}
/* find the best ssl contact for the gpg item */
if (bestPeerState == 0) {
/* first ssl contact */
bestPeerState = peerState;
bestSslId = *cont_it;
bestRSState = it->status;
} else if (peerState < bestPeerState) {
/* higher state */
bestPeerState = peerState;
bestSslId = *cont_it;
bestRSState = it->status;
} else if (peerState == bestPeerState) {
/* equal state ... use first */
}
}
}
}
if (bestPeerState == 0) { if (bestPeerState == 0) {
// show as online // show as online
bestPeerState = PEER_STATE_ONLINE; bestPeerState = PEER_STATE_ONLINE;
@ -1058,7 +1050,7 @@ void FriendsDialog::insertPeers()
QColor textColor = StatusDefs::textColor(bestRSState); QColor textColor = StatusDefs::textColor(bestRSState);
QFont font = StatusDefs::font(bestRSState); QFont font = StatusDefs::font(bestRSState);
for(i = 0; i < COLUMN_COUNT; i++) { for(int i = 0; i < COLUMN_COUNT; i++) {
gpgItem->setTextColor(i, textColor); gpgItem->setTextColor(i, textColor);
gpgItem->setFont(i, font); gpgItem->setFont(i, font);
} }
@ -1086,7 +1078,7 @@ void FriendsDialog::insertPeers()
QFont font; QFont font;
font.setBold(true); font.setBold(true);
for(i = 0; i < COLUMN_COUNT; i++) { for(int i = 0; i < COLUMN_COUNT; i++) {
gpgItem->setTextColor(i,(Qt::black)); gpgItem->setTextColor(i,(Qt::black));
gpgItem->setFont(i,font); gpgItem->setFont(i,font);
} }
@ -1103,7 +1095,7 @@ void FriendsDialog::insertPeers()
QColor textColor = StatusDefs::textColor(RS_STATUS_OFFLINE); QColor textColor = StatusDefs::textColor(RS_STATUS_OFFLINE);
QFont font = StatusDefs::font(RS_STATUS_OFFLINE); QFont font = StatusDefs::font(RS_STATUS_OFFLINE);
for(i = 0; i < COLUMN_COUNT; i++) { for(int i = 0; i < COLUMN_COUNT; i++) {
gpgItem->setTextColor(i, textColor); gpgItem->setTextColor(i, textColor);
gpgItem->setFont(i, font); gpgItem->setFont(i, font);
} }