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

* fixed up the display of PGP linked name etc.

Browse source 
* made createIdentity work (plumbing)
 * disabled editId until GXS supports it.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-07 21:40:07 +00:00
parent 0327b47ccc
commit 1b865612c5
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -228,7 +228,8 @@ void IdDialog::insertIdDetails(uint32_t token)
{ {
ui.pushButton_Reputation->setEnabled(false); ui.pushButton_Reputation->setEnabled(false);
ui.pushButton_Delete->setEnabled(true); ui.pushButton_Delete->setEnabled(true);
ui.pushButton_EditId->setEnabled(true); // No Editing Ids yet!
//ui.pushButton_EditId->setEnabled(true);
} }
else else
{ {
@ -393,7 +394,16 @@ void IdDialog::insertIdList(uint32_t token)
item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId)); item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId));
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID) if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
{ {
item->setText(RSID_COL_IDTYPE, "PGP Linked Id"); if (data.mPgpKnown)
{
RsPeerDetails details;
rsPeers->getGPGDetails(data.mPgpId, details);
item->setText(RSID_COL_IDTYPE, QString::fromStdString(details.name));
}
else
{
item->setText(RSID_COL_IDTYPE, "PGP Linked Id");
}
} }
else else
{ {

11
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View file

@ -200,6 +200,7 @@ void IdEditDialog::updateId()
RsGxsIdGroup rid; RsGxsIdGroup rid;
// Must set, Nickname, KeyId(if existing), mIdType, GpgId. // Must set, Nickname, KeyId(if existing), mIdType, GpgId.
rid.mMeta.mGroupName = ui.lineEdit_Nickname->text().toStdString(); rid.mMeta.mGroupName = ui.lineEdit_Nickname->text().toStdString();
if (rid.mMeta.mGroupName.size() < 2) if (rid.mMeta.mGroupName.size() < 2)
@ -238,8 +239,14 @@ void IdEditDialog::updateId()
//rid.mGpgEmail = ""; //rid.mGpgEmail = "";
} }
// TODO.
//rsIdentity->updateIdentity(rid); // Can only create Identities for the moment!
RsIdentityParameters params;
params.nickname = rid.mMeta.mGroupName;
params.isPgpLinked = (ui.radioButton_GpgId->isChecked());
uint32_t dummyToken = 0;
rsIdentity->createIdentity(dummyToken, params);
hide(); hide();
return; return;