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

added button to show/add all possible ids into external group, not only signed ones

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7356 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-05-09 21:08:25 +00:00
parent 097ba1655d
commit 72a61959e2
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,11 @@ CreateCircleDialog::CreateCircleDialog()
ui.removeButton->setEnabled(false); ui.removeButton->setEnabled(false);
ui.addButton->setEnabled(false); ui.addButton->setEnabled(false);
ui.radioButton_ListKnownPGP->setChecked(true); ui.radioButton_ListAll->setChecked(true);
QObject::connect(ui.radioButton_ListAll, SIGNAL(toggled(bool)), this, SLOT(updateCircleGUI())) ;
QObject::connect(ui.radioButton_ListAllPGP, SIGNAL(toggled(bool)), this, SLOT(updateCircleGUI())) ;
QObject::connect(ui.radioButton_ListKnownPGP, SIGNAL(toggled(bool)), this, SLOT(updateCircleGUI())) ;
mIsExistingCircle = false; mIsExistingCircle = false;
mIsExternalCircle = true; mIsExternalCircle = true;
@ -541,6 +545,7 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
std::list<std::string> ids; std::list<std::string> ids;
std::list<std::string>::iterator it; std::list<std::string>::iterator it;
bool acceptAnonymous = ui.radioButton_ListAll->isChecked();
bool acceptAllPGP = ui.radioButton_ListAllPGP->isChecked(); bool acceptAllPGP = ui.radioButton_ListAllPGP->isChecked();
bool acceptKnownPGP = ui.radioButton_ListKnownPGP->isChecked(); bool acceptKnownPGP = ui.radioButton_ListKnownPGP->isChecked();
@ -560,15 +565,16 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
/* do filtering */ /* do filtering */
bool ok = false; bool ok = false;
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
{
if (acceptAllPGP)
{ {
if (acceptAnonymous)
ok = true; ok = true;
else if (acceptAllPGP)
{
ok = data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID ;
} }
else if (data.mPgpKnown) else if (data.mPgpKnown)
{ {
ok = true; ok = data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID ;
} }
} }

11
retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
View file

@ -146,17 +146,24 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QRadioButton" name="radioButton_ListAll">
<property name="text">
<string>All</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QRadioButton" name="radioButton_ListAllPGP"> <widget class="QRadioButton" name="radioButton_ListAllPGP">
<property name="text"> <property name="text">
<string>All PGP IDs</string> <string>Signed</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="radioButton_ListKnownPGP"> <widget class="QRadioButton" name="radioButton_ListKnownPGP">
<property name="text"> <property name="text">
<string>Known PGP IDs</string> <string>Signed by known nodes</string>
</property> </property>
</widget> </widget>
</item> </item>