Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

proper sorting of peers by connection state in permission matrix (patch from Sehraf)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-04-26 19:09:35 +00:00
parent 03afc77f65
commit 67ced81660
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
View File

@ -32,6 +32,7 @@
#include <QMouseEvent> #include <QMouseEvent>
#include "RSPermissionMatrixWidget.h" #include "RSPermissionMatrixWidget.h"
#include <retroshare/rsstatus.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <retroshare/rsservicecontrol.h> #include <retroshare/rsservicecontrol.h>
@ -123,6 +124,7 @@ void RSPermissionMatrixWidget::switchPermission(uint32_t service,const RsPeerId&
rsServiceControl->updateServicePermissions(service,serv_perms); rsServiceControl->updateServicePermissions(service,serv_perms);
} }
void RSPermissionMatrixWidget::switchPermission(uint32_t service) void RSPermissionMatrixWidget::switchPermission(uint32_t service)
{ {
RsServicePermissions serv_perms ; RsServicePermissions serv_perms ;
@ -143,6 +145,7 @@ void RSPermissionMatrixWidget::switchPermission(uint32_t service)
rsServiceControl->updateServicePermissions(service,serv_perms); rsServiceControl->updateServicePermissions(service,serv_perms);
} }
void RSPermissionMatrixWidget::mouseMoveEvent(QMouseEvent *e) void RSPermissionMatrixWidget::mouseMoveEvent(QMouseEvent *e)
{ {
uint32_t service_id ; uint32_t service_id ;
@ -173,6 +176,48 @@ RSPermissionMatrixWidget::~RSPermissionMatrixWidget()
delete _painter; delete _painter;
} }
bool sortRsPeerIdByStatusNameLocation(const RsPeerId &a, const RsPeerId &b)
{
RsPeerDetails detailsA, detailsB;
rsPeers->getPeerDetails(a, detailsA);
rsPeers->getPeerDetails(b, detailsB);
QString stringA, stringB;
// connection state
switch (detailsA.connectState) {
case RS_PEER_CONNECTSTATE_CONNECTED_TCP:
case RS_PEER_CONNECTSTATE_CONNECTED_TOR:
case RS_PEER_CONNECTSTATE_CONNECTED_UDP:
case RS_PEER_CONNECTSTATE_CONNECTED_UNKNOWN:
stringA = "a";
break;
default:
stringA = "b";
break;
}
switch (detailsB.connectState) {
case RS_PEER_CONNECTSTATE_CONNECTED_TCP:
case RS_PEER_CONNECTSTATE_CONNECTED_TOR:
case RS_PEER_CONNECTSTATE_CONNECTED_UDP:
case RS_PEER_CONNECTSTATE_CONNECTED_UNKNOWN:
stringB = "a";
break;
default:
stringB = "b";
break;
}
// name
stringA += QString::fromUtf8(detailsA.name.c_str());
stringB += QString::fromUtf8(detailsB.name.c_str());
// location
stringA += QString::fromUtf8(detailsA.location.c_str());
stringB += QString::fromUtf8(detailsB.location.c_str());
return stringA.toLower() < stringB.toLower();
}
/** Overloads default QWidget::paintEvent. Draws the actual /** Overloads default QWidget::paintEvent. Draws the actual
* bandwidth graph. */ * bandwidth graph. */
void RSPermissionMatrixWidget::paintEvent(QPaintEvent *) void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
@ -196,6 +241,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
// draw one line per friend. // draw one line per friend.
std::list<RsPeerId> ssllist ; std::list<RsPeerId> ssllist ;
rsPeers->getFriendList(ssllist) ; rsPeers->getFriendList(ssllist) ;
ssllist.sort(sortRsPeerIdByStatusNameLocation);
RsPeerServiceInfo ownServices; RsPeerServiceInfo ownServices;
rsServiceControl->getOwnServices(ownServices); rsServiceControl->getOwnServices(ownServices);
@ -487,6 +533,7 @@ bool RSPermissionMatrixWidget::computeServiceAndPeer(int x,int y,uint32_t& servi
return true ; return true ;
} }
bool RSPermissionMatrixWidget::computeServiceGlobalSwitch(int x,int y,uint32_t& service_id) const bool RSPermissionMatrixWidget::computeServiceGlobalSwitch(int x,int y,uint32_t& service_id) const
{ {
// 1 - make sure that x and y are on a widget // 1 - make sure that x and y are on a widget
@ -508,6 +555,7 @@ bool RSPermissionMatrixWidget::computeServiceGlobalSwitch(int x,int y,uint32_t&
return true ; return true ;
} }
void RSPermissionMatrixWidget::defaultPermissionSwitched(uint32_t ServiceId,bool b) void RSPermissionMatrixWidget::defaultPermissionSwitched(uint32_t ServiceId,bool b)
{ {
NOT_IMPLEMENTED ; NOT_IMPLEMENTED ;