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

fixed bug causing some own identities to not be editable

Browse source
This commit is contained in:
csoler 2020-10-16 22:40:58 +02:00
parent acd61fd531
commit a65c59aa2a
2 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

39
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -188,7 +188,7 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog)
mMyCircleItem = NULL ; mMyCircleItem = NULL ;
/* Setup UI helper */ /* Setup UI helper */
mStateHelper = new UIStateHelper(this); mStateHelper = new UIStateHelper(this);
// mStateHelper->addWidget(IDDIALOG_IDLIST, ui->idTreeWidget); // mStateHelper->addWidget(IDDIALOG_IDLIST, ui->idTreeWidget);
mStateHelper->addLoadPlaceholder(IDDIALOG_IDLIST, ui->idTreeWidget, false); mStateHelper->addLoadPlaceholder(IDDIALOG_IDLIST, ui->idTreeWidget, false);
mStateHelper->addClear(IDDIALOG_IDLIST, ui->idTreeWidget); mStateHelper->addClear(IDDIALOG_IDLIST, ui->idTreeWidget);
@ -235,7 +235,7 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog)
//mStateHelper->addWidget(IDDIALOG_REPLIST, ui->treeWidget_RepList); //mStateHelper->addWidget(IDDIALOG_REPLIST, ui->treeWidget_RepList);
//mStateHelper->addLoadPlaceholder(IDDIALOG_REPLIST, ui->treeWidget_RepList); //mStateHelper->addLoadPlaceholder(IDDIALOG_REPLIST, ui->treeWidget_RepList);
//mStateHelper->addClear(IDDIALOG_REPLIST, ui->treeWidget_RepList); //mStateHelper->addClear(IDDIALOG_REPLIST, ui->treeWidget_RepList);
/* Connect signals */ /* Connect signals */
@ -374,7 +374,7 @@ IdDialog::IdDialog(QWidget *parent) : MainPage(parent), ui(new Ui::IdDialog)
QHeaderView_setSectionResizeModeColumn(idheader, RSID_COL_VOTES, QHeaderView::ResizeToContents); QHeaderView_setSectionResizeModeColumn(idheader, RSID_COL_VOTES, QHeaderView::ResizeToContents);
mStateHelper->setActive(IDDIALOG_IDDETAILS, false); mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
mStateHelper->setActive(IDDIALOG_REPLIST, false); mStateHelper->setActive(IDDIALOG_REPLIST, false);
QString hlp_str = tr( QString hlp_str = tr(
" <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Identities</h1> \ " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Identities</h1> \
@ -601,7 +601,7 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, true); mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, true);
std::vector<bool> expanded_top_level_items; std::vector<bool> expanded_top_level_items;
std::set<RsGxsCircleId> expanded_circle_items; std::set<RsGxsCircleId> expanded_circle_items;
@ -1276,9 +1276,6 @@ void IdDialog::updateSelection()
void IdDialog::updateIdList() void IdDialog::updateIdList()
{ {
//Disable by default, will be enable by insertIdDetails()
ui->removeIdentity->setEnabled(false);
ui->editIdentity->setEnabled(false);
//int accept = filter; //int accept = filter;
@ -1505,7 +1502,7 @@ void IdDialog::loadIdentities(const std::map<RsGxsGroupId,RsGxsIdGroup>& ids_set
} }
int accept = filter; int accept = filter;
mStateHelper->setActive(IDDIALOG_IDLIST, true); mStateHelper->setActive(IDDIALOG_IDLIST, true);
RsPgpId ownPgpId = rsPeers->getGPGOwnId(); RsPgpId ownPgpId = rsPeers->getGPGOwnId();
@ -1596,15 +1593,15 @@ void IdDialog::updateIdentity()
{ {
if (mId.isNull()) if (mId.isNull())
{ {
mStateHelper->setActive(IDDIALOG_IDDETAILS, false); mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
mStateHelper->setLoading(IDDIALOG_IDDETAILS, false); mStateHelper->setLoading(IDDIALOG_IDDETAILS, false);
mStateHelper->clear(IDDIALOG_IDDETAILS); mStateHelper->clear(IDDIALOG_IDDETAILS);
clearPerson(); clearPerson();
return; return;
} }
mStateHelper->setLoading(IDDIALOG_IDDETAILS, true); mStateHelper->setLoading(IDDIALOG_IDDETAILS, true);
RsThread::async([this]() RsThread::async([this]()
{ {
@ -1642,11 +1639,11 @@ void IdDialog::updateIdentity()
void IdDialog::loadIdentity(RsGxsIdGroup data) void IdDialog::loadIdentity(RsGxsIdGroup data)
{ {
mStateHelper->setLoading(IDDIALOG_IDDETAILS, false); mStateHelper->setLoading(IDDIALOG_IDDETAILS, false);
/* get details from libretroshare */ /* get details from libretroshare */
mStateHelper->setActive(IDDIALOG_IDDETAILS, true); mStateHelper->setActive(IDDIALOG_IDDETAILS, true);
/* get GPG Details from rsPeers */ /* get GPG Details from rsPeers */
RsPgpId ownPgpId = rsPeers->getGPGOwnId(); RsPgpId ownPgpId = rsPeers->getGPGOwnId();
@ -1749,20 +1746,20 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
if (isOwnId) if (isOwnId)
{ {
mStateHelper->setWidgetEnabled(ui->ownOpinion_CB, false); mStateHelper->setWidgetEnabled(ui->ownOpinion_CB, false);
mStateHelper->setWidgetEnabled(ui->autoBanIdentities_CB, false); mStateHelper->setWidgetEnabled(ui->autoBanIdentities_CB, false);
ui->editIdentity->setEnabled(true); // ui->editIdentity->setEnabled(true);
ui->removeIdentity->setEnabled(true); // ui->removeIdentity->setEnabled(true);
ui->chatIdentity->setEnabled(false); ui->chatIdentity->setEnabled(false);
ui->inviteButton->setEnabled(false); ui->inviteButton->setEnabled(false);
} }
else else
{ {
// No Reputation yet! // No Reputation yet!
mStateHelper->setWidgetEnabled(ui->ownOpinion_CB, true); mStateHelper->setWidgetEnabled(ui->ownOpinion_CB, true);
mStateHelper->setWidgetEnabled(ui->autoBanIdentities_CB, true); mStateHelper->setWidgetEnabled(ui->autoBanIdentities_CB, true);
ui->editIdentity->setEnabled(false); // ui->editIdentity->setEnabled(false);
ui->removeIdentity->setEnabled(false); // ui->removeIdentity->setEnabled(false);
ui->chatIdentity->setEnabled(true); ui->chatIdentity->setEnabled(true);
ui->inviteButton->setEnabled(true); ui->inviteButton->setEnabled(true);
} }

2
retroshare-gui/src/gui/Identity/IdDialog.h
View file

@ -158,7 +158,7 @@ private:
RsEventsHandlerId_t mEventHandlerId_identity; RsEventsHandlerId_t mEventHandlerId_identity;
RsEventsHandlerId_t mEventHandlerId_circles; RsEventsHandlerId_t mEventHandlerId_circles;
/* UI - Designer */ /* UI - Designer */
Ui::IdDialog *ui; Ui::IdDialog *ui;
}; };