Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved display of circle creator ID

Browse Source
This commit is contained in:
csoler 2016-03-25 20:58:10 -04:00
parent d1b09b93b9
commit 9efc29fff3
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ CreateCircleDialog::CreateCircleDialog()
mIsExternalCircle = true; mIsExternalCircle = true;
mClearList = true; mClearList = true;
ui.idChooser->loadIds(0,RsGxsId()); //ui.idChooser->loadIds(0,RsGxsId());
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId()); ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId());
} }
@ -116,7 +116,6 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool
mReadOnly=readonly; mReadOnly=readonly;
mClearList = clearList; mClearList = clearList;
requestCircle(circleId);
if(readonly) if(readonly)
ui.headerFrame->setHeaderText(tr("Circle Details")); ui.headerFrame->setHeaderText(tr("Circle Details"));
@ -128,7 +127,17 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool
ui.radioButton_Restricted->setEnabled(!readonly) ; ui.radioButton_Restricted->setEnabled(!readonly) ;
ui.circleName->setReadOnly(readonly) ; ui.circleName->setReadOnly(readonly) ;
ui.idChooser->setEnabled(!readonly) ; if(readonly)
{
ui.circleAdminLabel->setVisible(true) ;
ui.idChooser->setVisible(false) ;
}
else
{
ui.circleAdminLabel->setVisible(false) ;
ui.idChooser->setVisible(true) ;
}
ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Update")); ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Update"));
ui.addButton->setEnabled(!readonly) ; ui.addButton->setEnabled(!readonly) ;
@ -142,6 +151,7 @@ void CreateCircleDialog::editExistingId(const RsGxsGroupId &circleId, const bool
ui.addButton->hide() ; ui.addButton->hide() ;
ui.removeButton->hide() ; ui.removeButton->hide() ;
} }
requestCircle(circleId);
} }
@ -199,6 +209,7 @@ void CreateCircleDialog::setupForPersonalCircle()
ui.frame_PgpTypes->hide(); ui.frame_PgpTypes->hide();
//ui.frame_Distribution->hide(); //ui.frame_Distribution->hide();
ui.idChooserLabel->hide(); ui.idChooserLabel->hide();
ui.circleAdminLabel->hide();
ui.idChooser->hide(); ui.idChooser->hide();
//ui.toolButton_NewId->hide(); //ui.toolButton_NewId->hide();
@ -215,6 +226,7 @@ void CreateCircleDialog::setupForExternalCircle()
ui.frame_PgpTypes->show(); ui.frame_PgpTypes->show();
ui.frame_Distribution->show(); ui.frame_Distribution->show();
ui.idChooserLabel->show(); ui.idChooserLabel->show();
ui.circleAdminLabel->show();
ui.idChooser->show(); ui.idChooser->show();
//ui.toolButton_NewId->show(); //ui.toolButton_NewId->show();
@ -377,7 +389,7 @@ void CreateCircleDialog::createCircle()
std::cerr << "CreateCircleDialog::createCircle() No AuthorId Chosen!"; std::cerr << "CreateCircleDialog::createCircle() No AuthorId Chosen!";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
}//switch (ui.idChooser->getChosenId(authorId)) }
/* copy Ids from GUI */ /* copy Ids from GUI */
@ -595,14 +607,31 @@ void CreateCircleDialog::updateCircleGUI()
std::cerr << std::endl; std::cerr << std::endl;
} }
// set preferredId.
ui.idChooser->loadIds(0,mCircleGroup.mMeta.mAuthorId);
/* setup personal or external circle */ /* setup personal or external circle */
if (isExternal) if (isExternal)
setupForExternalCircle(); setupForExternalCircle();
else else
setupForPersonalCircle(); setupForPersonalCircle();
// set preferredId.
std::cerr << "LoadCircle: setting author id to be " << mCircleGroup.mMeta.mAuthorId << std::endl;
//ui.idChooser->loadIds(0,mCircleGroup.mMeta.mAuthorId);
if(mReadOnly)
{
ui.circleAdminLabel->setId(mCircleGroup.mMeta.mAuthorId) ;
ui.idChooser->setVisible(false) ;
}
else
{
std::set<RsGxsId> ids ;
ids.insert(mCircleGroup.mMeta.mAuthorId) ;
ui.idChooser->setDefaultId(mCircleGroup.mMeta.mAuthorId) ;
ui.idChooser->setChosenId(mCircleGroup.mMeta.mAuthorId) ;
ui.idChooser->setIdConstraintSet(ids) ;
ui.idChooser->setFlags(IDCHOOSER_ID_REQUIRED | IDCHOOSER_NO_CREATE) ;
ui.circleAdminLabel->setVisible(false) ;
}
} }
void CreateCircleDialog::requestCircle(const RsGxsGroupId &groupId) void CreateCircleDialog::requestCircle(const RsGxsGroupId &groupId)

12
retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
View File

@ -265,6 +265,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="GxsIdLabel" name="circleAdminLabel">
<property name="text">
<string>[Circle Admin]</string>
</property>
</widget>
</item>
<item> <item>
<widget class="GxsIdChooser" name="idChooser"> <widget class="GxsIdChooser" name="idChooser">
<property name="toolTip"> <property name="toolTip">
@ -386,6 +393,11 @@
<extends>QComboBox</extends> <extends>QComboBox</extends>
<header>gui/gxs/GxsCircleChooser.h</header> <header>gui/gxs/GxsCircleChooser.h</header>
</customwidget> </customwidget>
<customwidget>
<class>GxsIdLabel</class>
<extends>QLabel</extends>
<header>gui/gxs/GxsIdLabel.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>