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

Improvements of People dialog. Patch from Phenom (slightly modified).

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-12 20:07:12 +00:00
parent 20786dbfeb
commit d79f5e10fb
12 changed files with 1020 additions and 992 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file

@ -101,11 +101,9 @@ CreateCircleDialog::~CreateCircleDialog()
void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool &clearList /*= true*/)
{
std::cerr << "CreateCircleDialog::editExistingId() : " << circleId;
std::cerr << std::endl;
/* load this circle */
mIsExistingCircle = true;
mClearList = clearList;
requestCircle(circleId);
@ -240,15 +238,6 @@ void CreateCircleDialog::addCircle(const RsGxsCircleDetails &cirDetails)
QString nickname = QString::fromUtf8(gxs_details.mNickname.c_str());
QString idtype = tr("Anon Id");
/** Can we have known peers on mUnknownPeers (TODO)
if (gxs_details.mPgpKnown) {
RsPeerDetails details;
rsPeers->getGPGDetails(gxs_details.mPgpId, details);
idtype = QString::fromUtf8(details.name.c_str());
}else{
idtype = tr("PGP Linked Id");
}//if (gxs_details.mPgpKnown)*/
addMember(keyId, idtype, nickname);
}//if(!gxs_id.isNull() && rsIdentity->getIdDetails(gxs_id,gxs_details))
@ -487,7 +476,7 @@ void CreateCircleDialog::loadCircle(uint32_t token)
QTreeWidget *tree = ui.treeWidget_membership;
if (!mClearList) tree->clear();
if (mClearList) tree->clear();
std::vector<RsGxsCircleGroup> groups;
if (!rsGxsCircles->getGroupData(token, groups)) {