From d34b2e885a72e65d94578e77811dbb57ec4361b6 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 3 Apr 2016 17:11:13 -0400 Subject: [PATCH] allow to change the author ID of a group during update. Set proper value in group author widget --- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 7 +++++-- retroshare-gui/src/gui/gxs/GxsIdChooser.cpp | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index 2eb3dd72c..3c2858ca7 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -468,6 +468,9 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) ui.distributionValueLabel->setText(distribution_string) ; ui.idChooser->loadIds(0, mGrpMeta.mAuthorId); + + if(!mGrpMeta.mAuthorId.isNull()) + ui.idChooser->setChosenId(mGrpMeta.mAuthorId) ; updateCircleOptions(); } @@ -552,7 +555,7 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta) std::cerr << " Invalid GroupName"; std::cerr << std::endl; return false; - }//if(name.isEmpty()) + } // Fill in the MetaData as best we can. meta.mGroupName = std::string(name.toUtf8()); @@ -565,7 +568,7 @@ bool GxsGroupDialog::prepareGroupMetaData(RsGroupMetaData &meta) std::cerr << " Invalid Circles"; std::cerr << std::endl; return false; - }//if (!setCircleParameters(meta)) + } std::cerr << "void GxsGroupDialog::prepareGroupMetaData() meta.mCircleType: "; std::cerr << meta.mCircleType << " Internal: " << meta.mInternalCircle; diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp index ea54de337..9ce07b77b 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp @@ -113,6 +113,9 @@ void GxsIdChooser::loadIds(uint32_t chooserFlags, const RsGxsId &defId) mDefaultId = defId; clear(); mFirstLoad = true; + + updateDisplay(true); + update(); // Qt flush } void GxsIdChooser::setDefaultId(const RsGxsId &defId)