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

fixed small bug in debug output; cleanup debug output

Browse source
This commit is contained in:
csoler 2016-03-25 18:21:37 -04:00
parent 44cadc22b2
commit 3d45947e5b
1 changed files with 67 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,8 @@
#include <algorithm> #include <algorithm>
//#define DEBUG_CREATE_CIRCLE_DIALOG 1
#define CREATECIRCLEDIALOG_CIRCLEINFO 2 #define CREATECIRCLEDIALOG_CIRCLEINFO 2
#define CREATECIRCLEDIALOG_IDINFO 3 #define CREATECIRCLEDIALOG_IDINFO 3
@ -116,6 +118,9 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool
mClearList = clearList; mClearList = clearList;
requestCircle(circleId); requestCircle(circleId);
if(readonly)
ui.headerFrame->setHeaderText(tr("Circle Details"));
else
ui.headerFrame->setHeaderText(tr("Edit Circle")); ui.headerFrame->setHeaderText(tr("Edit Circle"));
ui.radioButton_Public->setEnabled(!readonly) ; ui.radioButton_Public->setEnabled(!readonly) ;
@ -262,8 +267,10 @@ void CreateCircleDialog::addMember(const QString& keyId, const QString& idtype,
for(int i = 0; i < count; ++i){ for(int i = 0; i < count; ++i){
QTreeWidgetItem *item = tree->topLevelItem(i); QTreeWidgetItem *item = tree->topLevelItem(i);
if (keyId == item->text(RSCIRCLEID_COL_KEYID)) { if (keyId == item->text(RSCIRCLEID_COL_KEYID)) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::addMember() Already is a Member: " << keyId.toStdString(); std::cerr << "CreateCircleDialog::addMember() Already is a Member: " << keyId.toStdString();
std::cerr << std::endl; std::cerr << std::endl;
#endif
return; return;
}//if (keyId == item->text(RSCIRCLEID_COL_KEYID)) }//if (keyId == item->text(RSCIRCLEID_COL_KEYID))
}//for(int i = 0; i < count; ++i) }//for(int i = 0; i < count; ++i)
@ -331,8 +338,10 @@ void CreateCircleDialog::createCircle()
return ; return ;
} }
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle()"; std::cerr << "CreateCircleDialog::createCircle()";
std::cerr << std::endl; std::cerr << std::endl;
#endif
QString name = ui.circleName->text(); QString name = ui.circleName->text();
@ -355,15 +364,19 @@ void CreateCircleDialog::createCircle()
case GxsIdChooser::KnowId: case GxsIdChooser::KnowId:
case GxsIdChooser::UnKnowId: case GxsIdChooser::UnKnowId:
circle.mMeta.mAuthorId = authorId; circle.mMeta.mAuthorId = authorId;
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() AuthorId: " << authorId; std::cerr << "CreateCircleDialog::createCircle() AuthorId: " << authorId;
std::cerr << std::endl; std::cerr << std::endl;
#endif
break; break;
case GxsIdChooser::NoId: case GxsIdChooser::NoId:
case GxsIdChooser::None: case GxsIdChooser::None:
default: default: ;
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() No AuthorId Chosen!"; std::cerr << "CreateCircleDialog::createCircle() No AuthorId Chosen!";
std::cerr << std::endl; std::cerr << std::endl;
#endif
}//switch (ui.idChooser->getChosenId(authorId)) }//switch (ui.idChooser->getChosenId(authorId))
@ -387,8 +400,10 @@ void CreateCircleDialog::createCircle()
} }
circle.mInvitedMembers.insert(key_id_gxs) ; circle.mInvitedMembers.insert(key_id_gxs) ;
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString(); std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString();
std::cerr << std::endl; std::cerr << std::endl;
#endif
} }
else else
{ {
@ -401,8 +416,10 @@ void CreateCircleDialog::createCircle()
} }
circle.mLocalFriends.insert(key_id_pgp) ; circle.mLocalFriends.insert(key_id_pgp) ;
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString(); std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
std::cerr << std::endl; std::cerr << std::endl;
#endif
} }
} }
@ -419,38 +436,50 @@ void CreateCircleDialog::createCircle()
if (mIsExternalCircle) if (mIsExternalCircle)
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() External Circle"; std::cerr << "CreateCircleDialog::createCircle() External Circle";
std::cerr << std::endl; std::cerr << std::endl;
#endif
// set distribution from GUI. // set distribution from GUI.
circle.mMeta.mCircleId.clear() ; circle.mMeta.mCircleId.clear() ;
if (ui.radioButton_Public->isChecked()) { if (ui.radioButton_Public->isChecked()) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Public Circle"; std::cerr << "CreateCircleDialog::createCircle() Public Circle";
std::cerr << std::endl; std::cerr << std::endl;
#endif
circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_PUBLIC; circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_PUBLIC;
} else if (ui.radioButton_Self->isChecked()) { } else if (ui.radioButton_Self->isChecked()) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() ExtSelfRef Circle"; std::cerr << "CreateCircleDialog::createCircle() ExtSelfRef Circle";
std::cerr << std::endl; std::cerr << std::endl;
#endif
circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_EXT_SELF; circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_EXT_SELF;
} else if (ui.radioButton_Restricted->isChecked()) { } else if (ui.radioButton_Restricted->isChecked()) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() External (Other) Circle"; std::cerr << "CreateCircleDialog::createCircle() External (Other) Circle";
std::cerr << std::endl; std::cerr << std::endl;
#endif
circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_EXTERNAL; circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_EXTERNAL;
/* grab circle ID from chooser */ /* grab circle ID from chooser */
RsGxsCircleId chosenId; RsGxsCircleId chosenId;
if (ui.circleComboBox->getChosenCircle(chosenId)) { if (ui.circleComboBox->getChosenCircle(chosenId)) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() ChosenId: " << chosenId; std::cerr << "CreateCircleDialog::createCircle() ChosenId: " << chosenId;
std::cerr << std::endl; std::cerr << std::endl;
#endif
circle.mMeta.mCircleId = chosenId; circle.mMeta.mCircleId = chosenId;
} else {//if (ui.circleComboBox->getChosenCircle(chosenId)) } else {//if (ui.circleComboBox->getChosenCircle(chosenId))
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Error no Id Chosen"; std::cerr << "CreateCircleDialog::createCircle() Error no Id Chosen";
std::cerr << std::endl; std::cerr << std::endl;
#endif
QMessageBox::warning(this, tr("RetroShare"),tr("No Restriction Circle Selected"), QMessageBox::Ok, QMessageBox::Ok); QMessageBox::warning(this, tr("RetroShare"),tr("No Restriction Circle Selected"), QMessageBox::Ok, QMessageBox::Ok);
return; return;
@ -464,8 +493,10 @@ void CreateCircleDialog::createCircle()
} }
else else
{//if (mIsExternalCircle) {//if (mIsExternalCircle)
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Personal Circle"; std::cerr << "CreateCircleDialog::createCircle() Personal Circle";
std::cerr << std::endl; std::cerr << std::endl;
#endif
// set personal distribution // set personal distribution
circle.mMeta.mCircleId.clear() ; circle.mMeta.mCircleId.clear() ;
@ -476,20 +507,24 @@ void CreateCircleDialog::createCircle()
if(mIsExistingCircle) if(mIsExistingCircle)
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl; std::cerr << "CreateCircleDialog::updateCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
std::cerr << "CreateCircleDialog::updateCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl; std::cerr << "CreateCircleDialog::updateCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl;
std::cerr << "CreateCircleDialog::updateCircle() : mGroupId: " << circle.mMeta.mGroupId << std::endl; std::cerr << "CreateCircleDialog::updateCircle() : mGroupId: " << circle.mMeta.mGroupId << std::endl;
std::cerr << "CreateCircleDialog::updateCircle() Checks and Balances Okay - calling service proper.."<< std::endl; std::cerr << "CreateCircleDialog::updateCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
#endif
rsGxsCircles->updateGroup(token, circle); rsGxsCircles->updateGroup(token, circle);
} }
else else
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl; std::cerr << "CreateCircleDialog::createCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
std::cerr << "CreateCircleDialog::createCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl; std::cerr << "CreateCircleDialog::createCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl;
std::cerr << "CreateCircleDialog::createCircle() Checks and Balances Okay - calling service proper.."<< std::endl; std::cerr << "CreateCircleDialog::createCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
#endif
rsGxsCircles->createGroup(token, circle); rsGxsCircles->createGroup(token, circle);
} }
@ -499,14 +534,18 @@ void CreateCircleDialog::createCircle()
void CreateCircleDialog::updateCircleGUI() void CreateCircleDialog::updateCircleGUI()
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircleGUI()"; std::cerr << "CreateCircleDialog::updateCircleGUI()";
std::cerr << std::endl; std::cerr << std::endl;
#endif
ui.circleName->setText(QString::fromUtf8(mCircleGroup.mMeta.mGroupName.c_str())); ui.circleName->setText(QString::fromUtf8(mCircleGroup.mMeta.mGroupName.c_str()));
bool isExternal = true; bool isExternal = true;
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircleGUI() : CIRCLETYPE: " << mCircleGroup.mMeta.mCircleType; std::cerr << "CreateCircleDialog::updateCircleGUI() : CIRCLETYPE: " << mCircleGroup.mMeta.mCircleType;
std::cerr << std::endl; std::cerr << std::endl;
#endif
ui.radioButton_Public->setChecked(false); ui.radioButton_Public->setChecked(false);
ui.radioButton_Self->setChecked(false); ui.radioButton_Self->setChecked(false);
@ -515,24 +554,33 @@ void CreateCircleDialog::updateCircleGUI()
switch(mCircleGroup.mMeta.mCircleType) { switch(mCircleGroup.mMeta.mCircleType) {
#ifdef RS_ALLOW_LOCAL_CIRCLES #ifdef RS_ALLOW_LOCAL_CIRCLES
case GXS_CIRCLE_TYPE_LOCAL: case GXS_CIRCLE_TYPE_LOCAL:
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircleGUI() : LOCAL CIRCLETYPE"; std::cerr << "CreateCircleDialog::updateCircleGUI() : LOCAL CIRCLETYPE";
std::cerr << std::endl; std::cerr << std::endl;
#endif
isExternal = false; isExternal = false;
break; break;
#endif #endif
case GXS_CIRCLE_TYPE_PUBLIC: case GXS_CIRCLE_TYPE_PUBLIC:
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircleGUI() : PUBLIC CIRCLETYPE"; std::cerr << "CreateCircleDialog::updateCircleGUI() : PUBLIC CIRCLETYPE";
std::cerr << std::endl; std::cerr << std::endl;
#endif
ui.radioButton_Public->setChecked(true); ui.radioButton_Public->setChecked(true);
break; break;
case GXS_CIRCLE_TYPE_EXT_SELF: case GXS_CIRCLE_TYPE_EXT_SELF:
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)"<< std::endl; std::cerr << "CreateCircleDialog::updateCircleGUI() : EXT_SELF CIRCLE (fallthrough)"<< std::endl;
#endif
case GXS_CIRCLE_TYPE_EXTERNAL: case GXS_CIRCLE_TYPE_EXTERNAL:
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE"<< std::endl; std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE"<< std::endl;
#endif
if (RsGxsGroupId(mCircleGroup.mMeta.mCircleId) == mCircleGroup.mMeta.mGroupId) if (RsGxsGroupId(mCircleGroup.mMeta.mCircleId) == mCircleGroup.mMeta.mGroupId)
ui.radioButton_Self->setChecked(true); ui.radioButton_Self->setChecked(true);
@ -567,8 +615,10 @@ void CreateCircleDialog::requestCircle(const RsGxsGroupId &groupId)
std::list<RsGxsGroupId> groupIds; std::list<RsGxsGroupId> groupIds;
groupIds.push_back(groupId); groupIds.push_back(groupId);
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::requestCircle() Requesting Group Summary(" << groupId << ")"; std::cerr << "CreateCircleDialog::requestCircle() Requesting Group Summary(" << groupId << ")";
std::cerr << std::endl; std::cerr << std::endl;
#endif
uint32_t token; uint32_t token;
mCircleQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, CREATECIRCLEDIALOG_CIRCLEINFO); mCircleQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, CREATECIRCLEDIALOG_CIRCLEINFO);
@ -576,8 +626,10 @@ void CreateCircleDialog::requestCircle(const RsGxsGroupId &groupId)
void CreateCircleDialog::loadCircle(uint32_t token) void CreateCircleDialog::loadCircle(uint32_t token)
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::loadCircle(" << token << ")"; std::cerr << "CreateCircleDialog::loadCircle(" << token << ")";
std::cerr << std::endl; std::cerr << std::endl;
#endif
QTreeWidget *tree = ui.treeWidget_membership; QTreeWidget *tree = ui.treeWidget_membership;
@ -588,18 +640,19 @@ void CreateCircleDialog::loadCircle(uint32_t token)
std::cerr << "CreateCircleDialog::loadCircle() Error getting GroupData"; std::cerr << "CreateCircleDialog::loadCircle() Error getting GroupData";
std::cerr << std::endl; std::cerr << std::endl;
return; return;
}//if (!rsGxsCircles->getGroupData(token, groups)) }
if (groups.size() != 1) { if (groups.size() != 1) {
std::cerr << "CreateCircleDialog::loadCircle() Error Group.size() != 1"; std::cerr << "CreateCircleDialog::loadCircle() Error Group.size() != 1";
std::cerr << std::endl; std::cerr << std::endl;
return; return;
}//if (groups.size() != 1) }
std::cerr << "CreateCircleDialog::loadCircle() LoadedGroup.meta: " << mCircleGroup.mMeta;
std::cerr << std::endl;
mCircleGroup = groups[0]; mCircleGroup = groups[0];
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::loadCircle() LoadedGroup.meta: " << mCircleGroup.mMeta << std::endl;
#endif
updateCircleGUI(); updateCircleGUI();
} }
@ -645,8 +698,10 @@ void CreateCircleDialog::requestGxsIdentities()
RsTokReqOptions opts; RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::requestIdentities()"; std::cerr << "CreateCircleDialog::requestIdentities()";
std::cerr << std::endl; std::cerr << std::endl;
#endif
uint32_t token; uint32_t token;
mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, CREATECIRCLEDIALOG_IDINFO); mIdQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, CREATECIRCLEDIALOG_IDINFO);
@ -654,8 +709,10 @@ void CreateCircleDialog::requestGxsIdentities()
void CreateCircleDialog::loadIdentities(uint32_t token) void CreateCircleDialog::loadIdentities(uint32_t token)
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::loadIdentities(" << token << ")"; std::cerr << "CreateCircleDialog::loadIdentities(" << token << ")";
std::cerr << std::endl; std::cerr << std::endl;
#endif
QTreeWidget *tree = ui.treeWidget_IdList; QTreeWidget *tree = ui.treeWidget_IdList;
@ -689,8 +746,10 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
}//else if (data.mPgpKnown) }//else if (data.mPgpKnown)
if (!ok) { if (!ok) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::insertIdentities() Skipping ID: " << data.mMeta.mGroupId; std::cerr << "CreateCircleDialog::insertIdentities() Skipping ID: " << data.mMeta.mGroupId;
std::cerr << std::endl; std::cerr << std::endl;
#endif
continue; continue;
}//if (!ok) }//if (!ok)
@ -736,8 +795,10 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
void CreateCircleDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req) void CreateCircleDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
{ {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::loadRequest() UserType: " << req.mUserType; std::cerr << "CreateCircleDialog::loadRequest() UserType: " << req.mUserType;
std::cerr << std::endl; std::cerr << std::endl;
#endif
if (queue == mCircleQueue) { if (queue == mCircleQueue) {
/* now switch on req */ /* now switch on req */