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

Posted:

Browse source 
- Used GxsGroupFrameDialog
- Added tabbed interface
- Added user notify

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-22 15:04:36 +00:00
parent c6103b7535
commit 30fcab1bff
20 changed files with 1703 additions and 1546 deletions
Download patch file Download diff file Expand all files Collapse all files

34
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp
View file

@ -125,8 +125,8 @@ void GxsChannelPostsWidget::updateDisplay(bool complete)
{
if (complete) {
/* Fill complete */
requestGroupData(mChannelId);
requestPosts(mChannelId);
requestGroupData();
requestPosts();
return;
}
@ -144,7 +144,7 @@ void GxsChannelPostsWidget::updateDisplay(bool complete)
if (!mChannelId.isNull() && std::find(grpIds.begin(), grpIds.end(), mChannelId) != grpIds.end()) {
updateGroup = true;
/* Do we need to fill all posts? */
requestPosts(mChannelId);
requestPosts();
} else {
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs;
getAllMsgIds(msgs);
@ -153,13 +153,13 @@ void GxsChannelPostsWidget::updateDisplay(bool complete)
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> >::const_iterator mit = msgs.find(mChannelId);
if(mit != msgs.end())
{
requestRelatedPosts(mChannelId, mit->second);
requestRelatedPosts(mit->second);
}
}
}
if (updateGroup) {
requestGroupData(mChannelId);
requestGroupData();
}
}
@ -247,6 +247,10 @@ void GxsChannelPostsWidget::createMsg()
return;
}
if (!IS_GROUP_SUBSCRIBED(mSubscribeFlags)) {
return;
}
CreateGxsChannelMsg *msgDialog = new CreateGxsChannelMsg(mChannelId);
msgDialog->show();
@ -619,7 +623,7 @@ void GxsChannelPostsWidget::clearPosts()
/** Request / Response of Data ********************************/
/*********************** **** **** **** ***********************/
void GxsChannelPostsWidget::requestGroupData(const RsGxsGroupId &grpId)
void GxsChannelPostsWidget::requestGroupData()
{
#ifdef DEBUG_CHANNEL
std::cerr << "GxsChannelPostsWidget::requestGroupData()";
@ -630,7 +634,7 @@ void GxsChannelPostsWidget::requestGroupData(const RsGxsGroupId &grpId)
mChannelQueue->cancelActiveRequestTokens(TOKEN_TYPE_GROUP_DATA);
if (grpId.isNull()) {
if (mChannelId.isNull()) {
mStateHelper->setActive(TOKEN_TYPE_GROUP_DATA, false);
mStateHelper->setLoading(TOKEN_TYPE_GROUP_DATA, false);
mStateHelper->clear(TOKEN_TYPE_GROUP_DATA);
@ -647,7 +651,7 @@ void GxsChannelPostsWidget::requestGroupData(const RsGxsGroupId &grpId)
emit groupChanged(this);
std::list<RsGxsGroupId> groupIds;
groupIds.push_back(grpId);
groupIds.push_back(mChannelId);
RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
@ -684,7 +688,7 @@ void GxsChannelPostsWidget::loadGroupData(const uint32_t &token)
emit groupChanged(this);
}
void GxsChannelPostsWidget::requestPosts(const RsGxsGroupId &grpId)
void GxsChannelPostsWidget::requestPosts()
{
#ifdef DEBUG_CHANNEL
std::cerr << "GxsChannelPostsWidget::requestPosts()";
@ -696,7 +700,7 @@ void GxsChannelPostsWidget::requestPosts(const RsGxsGroupId &grpId)
mChannelQueue->cancelActiveRequestTokens(TOKEN_TYPE_POSTS);
if (grpId.isNull()) {
if (mChannelId.isNull()) {
mStateHelper->setActive(TOKEN_TYPE_POSTS, false);
mStateHelper->setLoading(TOKEN_TYPE_POSTS, false);
mStateHelper->clear(TOKEN_TYPE_POSTS);
@ -708,7 +712,7 @@ void GxsChannelPostsWidget::requestPosts(const RsGxsGroupId &grpId)
emit groupChanged(this);
std::list<RsGxsGroupId> groupIds;
groupIds.push_back(grpId);
groupIds.push_back(mChannelId);
RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
@ -735,7 +739,7 @@ void GxsChannelPostsWidget::loadPosts(const uint32_t &token)
emit groupChanged(this);
}
void GxsChannelPostsWidget::requestRelatedPosts(const RsGxsGroupId &grpId, const std::vector<RsGxsMessageId> &msgIds)
void GxsChannelPostsWidget::requestRelatedPosts(const std::vector<RsGxsMessageId> &msgIds)
{
#ifdef DEBUG_CHANNEL
std::cerr << "GxsChannelPostsWidget::requestRelatedPosts()";
@ -744,7 +748,7 @@ void GxsChannelPostsWidget::requestRelatedPosts(const RsGxsGroupId &grpId, const
mChannelQueue->cancelActiveRequestTokens(TOKEN_TYPE_RELATEDPOSTS);
if (grpId.isNull()) {
if (mChannelId.isNull()) {
mStateHelper->setActive(TOKEN_TYPE_POSTS, false);
mStateHelper->setLoading(TOKEN_TYPE_POSTS, false);
mStateHelper->clear(TOKEN_TYPE_POSTS);
@ -766,7 +770,7 @@ void GxsChannelPostsWidget::requestRelatedPosts(const RsGxsGroupId &grpId, const
uint32_t token;
std::vector<RsGxsGrpMsgIdPair> relatedMsgIds;
for (std::vector<RsGxsMessageId>::const_iterator msgIt = msgIds.begin(); msgIt != msgIds.end(); ++msgIt) {
relatedMsgIds.push_back(RsGxsGrpMsgIdPair(grpId, *msgIt));
relatedMsgIds.push_back(RsGxsGrpMsgIdPair(mChannelId, *msgIt));
}
mChannelQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, relatedMsgIds, TOKEN_TYPE_RELATEDPOSTS);
}
@ -800,7 +804,7 @@ void GxsChannelPostsWidget::acknowledgeMessageUpdate(const uint32_t &token)
rsGxsChannels->acknowledgeMsg(token, msgId);
if (msgId.first == mChannelId)
{
requestPosts(mChannelId);
requestPosts();
}
}