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

Disabled stuff - so it will compile.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-11-05 22:32:52 +00:00
parent 17e42f1ceb
commit 076e07d5d9
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,11 +171,12 @@ void IdDialog::insertIdDetails(uint32_t token)
ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName)); ui.lineEdit_Nickname->setText(QString::fromStdString(data.mMeta.mGroupName));
//ui.lineEdit_KeyId->setText(QString::fromStdString(data.mKeyId)); //ui.lineEdit_KeyId->setText(QString::fromStdString(data.mKeyId));
ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId)); ui.lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId));
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mGpgIdHash)); ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId)); //ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId));
ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName)); //ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName));
ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail)); //ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail));
#if 0
if (data.mIdType & RSID_RELATION_YOURSELF) if (data.mIdType & RSID_RELATION_YOURSELF)
{ {
ui.radioButton_IdYourself->setChecked(true); ui.radioButton_IdYourself->setChecked(true);
@ -210,6 +211,7 @@ void IdDialog::insertIdDetails(uint32_t token)
ui.pushButton_Delete->setEnabled(false); ui.pushButton_Delete->setEnabled(false);
ui.pushButton_EditId->setEnabled(false); ui.pushButton_EditId->setEnabled(false);
} }
#endif
} }
void IdDialog::checkUpdate() void IdDialog::checkUpdate()
@ -315,6 +317,7 @@ void IdDialog::insertIdList(uint32_t token)
{ {
ok = true; ok = true;
} }
#if 0
else if (data.mIdType & RSID_TYPE_PSEUDONYM) else if (data.mIdType & RSID_TYPE_PSEUDONYM)
{ {
if (acceptPseudo) if (acceptPseudo)
@ -351,6 +354,7 @@ void IdDialog::insertIdList(uint32_t token)
} }
} }
} }
#endif
if (!ok) if (!ok)
{ {
@ -363,7 +367,7 @@ void IdDialog::insertIdList(uint32_t token)
//item->setText(RSID_COL_KEYID, QString::fromStdString(data.mKeyId)); //item->setText(RSID_COL_KEYID, QString::fromStdString(data.mKeyId));
item->setText(RSID_COL_NICKNAME, QString::fromStdString(data.mMeta.mGroupName)); item->setText(RSID_COL_NICKNAME, QString::fromStdString(data.mMeta.mGroupName));
item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId)); item->setText(RSID_COL_KEYID, QString::fromStdString(data.mMeta.mGroupId));
item->setText(RSID_COL_IDTYPE, QString::fromStdString(rsIdTypeToString(data.mIdType))); //item->setText(RSID_COL_IDTYPE, QString::fromStdString(rsIdTypeToString(data.mIdType)));
tree->addTopLevelItem(item); tree->addTopLevelItem(item);
} }

35
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View File

@ -146,7 +146,8 @@ void IdEditDialog::loadExistingId(uint32_t token)
data = datavector[0]; data = datavector[0];
bool pseudo = (data.mIdType & RSID_TYPE_PSEUDONYM);
bool pseudo = false; //(data.mIdType & RSID_TYPE_PSEUDONYM);
if (pseudo) if (pseudo)
{ {
@ -175,13 +176,13 @@ void IdEditDialog::loadExistingId(uint32_t token)
} }
else else
{ {
ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mGpgIdHash)); ui.lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash));
if (data.mGpgIdKnown) if (0) //if (data.mGpgIdKnown)
{ {
ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId)); //ui.lineEdit_GpgId->setText(QString::fromStdString(data.mGpgId));
ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName)); //ui.lineEdit_GpgName->setText(QString::fromStdString(data.mGpgName));
ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail)); //ui.lineEdit_GpgEmail->setText(QString::fromStdString(data.mGpgEmail));
} }
else else
{ {
@ -208,7 +209,7 @@ void IdEditDialog::updateId()
return; return;
} }
rid.mIdType = RSID_RELATION_YOURSELF; //rid.mIdType = RSID_RELATION_YOURSELF;
if (ui.checkBox_NewId->isChecked()) if (ui.checkBox_NewId->isChecked())
{ {
rid.mMeta.mGroupId = ""; rid.mMeta.mGroupId = "";
@ -220,21 +221,21 @@ void IdEditDialog::updateId()
if (ui.radioButton_GpgId->isChecked()) if (ui.radioButton_GpgId->isChecked())
{ {
rid.mIdType |= RSID_TYPE_REALID; //rid.mIdType |= RSID_TYPE_REALID;
rid.mGpgId = ui.lineEdit_GpgId->text().toStdString(); //rid.mGpgId = ui.lineEdit_GpgId->text().toStdString();
rid.mGpgIdHash = ui.lineEdit_GpgHash->text().toStdString(); rid.mPgpIdHash = ui.lineEdit_GpgHash->text().toStdString();
rid.mGpgName = ui.lineEdit_GpgName->text().toStdString(); //rid.mGpgName = ui.lineEdit_GpgName->text().toStdString();
rid.mGpgEmail = ui.lineEdit_GpgEmail->text().toStdString(); //rid.mGpgEmail = ui.lineEdit_GpgEmail->text().toStdString();
} }
else else
{ {
rid.mIdType |= RSID_TYPE_PSEUDONYM; //rid.mIdType |= RSID_TYPE_PSEUDONYM;
rid.mGpgId = ""; //rid.mGpgId = "";
rid.mGpgIdHash = ""; rid.mPgpIdHash = "";
rid.mGpgName = ""; //rid.mGpgName = "";
rid.mGpgEmail = ""; //rid.mGpgEmail = "";
} }
// TODO. // TODO.