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

removed EXTERNAL/PERSONNAL options from GxsCircleChooser

Browse Source
This commit is contained in:
csoler 2016-07-11 18:30:12 -04:00
parent d089e2ef1a
commit 45b189c080
4 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View File

@ -103,7 +103,7 @@ CreateCircleDialog::CreateCircleDialog()
#endif #endif
//ui.idChooser->loadIds(0,RsGxsId()); //ui.idChooser->loadIds(0,RsGxsId());
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId()); ui.circleComboBox->loadCircles(RsGxsCircleId());
} }
CreateCircleDialog::~CreateCircleDialog() CreateCircleDialog::~CreateCircleDialog()
@ -604,7 +604,7 @@ void CreateCircleDialog::updateCircleGUI()
else else
ui.radioButton_Restricted->setChecked(true); ui.radioButton_Restricted->setChecked(true);
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mCircleGroup.mMeta.mCircleId); ui.circleComboBox->loadCircles(mCircleGroup.mMeta.mCircleId);
break; break;

14
retroshare-gui/src/gui/gxs/GxsCircleChooser.cpp
View File

@ -31,14 +31,13 @@
/** Constructor */ /** Constructor */
GxsCircleChooser::GxsCircleChooser(QWidget *parent) GxsCircleChooser::GxsCircleChooser(QWidget *parent)
: QComboBox(parent), mFlags(0) : QComboBox(parent)
{ {
return; return;
} }
void GxsCircleChooser::loadCircles(uint32_t chooserFlags, const RsGxsCircleId &defaultId) void GxsCircleChooser::loadCircles(const RsGxsCircleId &defaultId)
{ {
mFlags = chooserFlags;
mDefaultCircleId = defaultId; mDefaultCircleId = defaultId;
loadGxsCircles(); loadGxsCircles();
} }
@ -68,14 +67,7 @@ bool MakeGxsCircleDesc(const RsGxsCircleId &id, QString &desc)
void GxsCircleChooser::loadGxsCircles() void GxsCircleChooser::loadGxsCircles()
{ {
std::list<RsGxsCircleId> ids; std::list<RsGxsCircleId> ids;
if (mFlags & GXS_CIRCLE_CHOOSER_EXTERNAL) rsGxsCircles->getCircleExternalIdList(ids);
{
rsGxsCircles->getCircleExternalIdList(ids);
}
if (mFlags & GXS_CIRCLE_CHOOSER_PERSONAL)
{
rsGxsCircles->getCirclePersonalIdList(ids);
}
if (ids.empty()) if (ids.empty())
{ {

8
retroshare-gui/src/gui/gxs/GxsCircleChooser.h
View File

@ -28,11 +28,6 @@
#include <QComboBox> #include <QComboBox>
#include <retroshare/rsgxscircles.h> #include <retroshare/rsgxscircles.h>
#define GXS_CIRCLE_CHOOSER_EXTERNAL 0x0001
#define GXS_CIRCLE_CHOOSER_PERSONAL 0x0002
#define GXS_CIRCLE_CHOOSER_ALLCIRCLES 0x0003 // OR of other two.
class GxsCircleChooser : public QComboBox class GxsCircleChooser : public QComboBox
{ {
Q_OBJECT Q_OBJECT
@ -40,12 +35,11 @@ class GxsCircleChooser : public QComboBox
public: public:
GxsCircleChooser(QWidget *parent = NULL); GxsCircleChooser(QWidget *parent = NULL);
void loadCircles(uint32_t chooserFlags, const RsGxsCircleId &defaultId); void loadCircles(const RsGxsCircleId &defaultId);
bool getChosenCircle(RsGxsCircleId &id); bool getChosenCircle(RsGxsCircleId &id);
private: private:
void loadGxsCircles(); void loadGxsCircles();
uint32_t mFlags;
RsGxsCircleId mDefaultCircleId; RsGxsCircleId mDefaultCircleId;
}; };

8
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
View File

@ -124,7 +124,7 @@ void GxsGroupDialog::init()
/* Setup Reasonable Defaults */ /* Setup Reasonable Defaults */
ui.idChooser->loadIds(0,RsGxsId()); ui.idChooser->loadIds(0,RsGxsId());
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId()); ui.circleComboBox->loadCircles(RsGxsCircleId());
ui.localComboBox->loadGroups(0, RsNodeGroupId()); ui.localComboBox->loadGroups(0, RsNodeGroupId());
ui.groupDesc->setPlaceholderText(tr("Set a descriptive description here")); ui.groupDesc->setPlaceholderText(tr("Set a descriptive description here"));
@ -315,8 +315,6 @@ void GxsGroupDialog::setupDefaults()
ui.typeGroup_3->setEnabled(false); ui.typeGroup_3->setEnabled(false);
ui.typeLocal_3->setEnabled(false); ui.typeLocal_3->setEnabled(false);
#endif #endif
ui.typeLocal->setEnabled(false); // for now, since local circles not fully tested.
ui.typeLocal->setToolTip(tr("This feature is not yet available, but it will be available very soon!")); // for now, since local circles not fully tested.
} }
void GxsGroupDialog::setupVisibility() void GxsGroupDialog::setupVisibility()
@ -459,8 +457,8 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
distribution_string = tr("Restricted to circle:") ; distribution_string = tr("Restricted to circle:") ;
ui.localComboBox->setVisible(false) ; ui.localComboBox->setVisible(false) ;
ui.distributionCircleComboBox->setVisible(true) ; ui.distributionCircleComboBox->setVisible(true) ;
ui.distributionCircleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId); ui.distributionCircleComboBox->loadCircles(mGrpMeta.mCircleId);
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, mGrpMeta.mCircleId); ui.circleComboBox->loadCircles(mGrpMeta.mCircleId);
break; break;
default: default:
std::cerr << "CreateCircleDialog::updateCircleGUI() INVALID mCircleType"; std::cerr << "CreateCircleDialog::updateCircleGUI() INVALID mCircleType";