mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-20 06:50:40 -04:00
show forum author in gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
451718660a
commit
c080609168
3 changed files with 33 additions and 6 deletions
9
TODO.txt
9
TODO.txt
|
@ -13,13 +13,13 @@ To be done
|
||||||
0001 [X] forums - middle horisontal bar - always shows *by anonymous* (from noname) [fixed, also removed useless thread line]
|
0001 [X] forums - middle horisontal bar - always shows *by anonymous* (from noname) [fixed, also removed useless thread line]
|
||||||
0002 [X] remove useless column in forums "signed by" (last column) (from electron)
|
0002 [X] remove useless column in forums "signed by" (last column) (from electron)
|
||||||
0003 [ ] main window must close on ESC (from noname)
|
0003 [ ] main window must close on ESC (from noname)
|
||||||
0004 [ ] show storage time of forums/channels/posted in gui (from cave)
|
0004 [X] show storage time of forums/channels/posted in gui (from cave)
|
||||||
0005 [ ] if keysigning is not working -> hide or remove it (from cave) cyril: keep it, but add more info about how to use/interpret it.
|
0005 [ ] if keysigning is not working -> hide or remove it (from cave) cyril: keep it, but add more info about how to use/interpret it.
|
||||||
0006 [ ] implement default gxs id (from cave) cyril: you mean system-wide default gxs id? That would be a good thing to have.
|
0006 [ ] implement default gxs id (from cave) cyril: you mean system-wide default gxs id? That would be a good thing to have.
|
||||||
0007 [ ] *getting started* - need to say about chatservers (from noname)
|
0007 [ ] *getting started* - need to say about chatservers (from noname)
|
||||||
comment: chatservers are inofficial and may go down at any time. which one should we mention?
|
comment: chatservers are inofficial and may go down at any time. which one should we mention?
|
||||||
cyril: we could add a link to a search for RS chat servers in duckduck go
|
cyril: we could add a link to a search for RS chat servers in duckduck go
|
||||||
0008 [ ] forum livetime too short (from noname) cyril: expand it to 1 year
|
0008 [X] forum livetime too short (from noname) cyril: expand it to 1 year
|
||||||
0009 [ ] Settings -> Server -> show discovery information in statusbar. I've never seen any discovery info since the switch to
|
0009 [ ] Settings -> Server -> show discovery information in statusbar. I've never seen any discovery info since the switch to
|
||||||
disc v2 - so i guess this option can be removed (from sehraf) cyril: that can be fixed. The link between GUI and discovery2 can
|
disc v2 - so i guess this option can be removed (from sehraf) cyril: that can be fixed. The link between GUI and discovery2 can
|
||||||
be restored. Also we should get rid of the code for discovery(1)
|
be restored. Also we should get rid of the code for discovery(1)
|
||||||
|
@ -171,6 +171,8 @@ E [X] PGP signatures are not transmited by discovery2.
|
||||||
[X] Default layout should use toolbars. The "menu" look is inneficient
|
[X] Default layout should use toolbars. The "menu" look is inneficient
|
||||||
[X] replace sound tooltip "sound off" by "sound is on, click to turn off"
|
[X] replace sound tooltip "sound off" by "sound is on, click to turn off"
|
||||||
[X] rtt statistic is duplicated in statistics provided by VOIP, so remove it from file transfers
|
[X] rtt statistic is duplicated in statistics provided by VOIP, so remove it from file transfers
|
||||||
|
[ ] add tooltips in in permission matrix when hovering over the top most button/service name
|
||||||
|
explain what the service does and the dependencies
|
||||||
|
|
||||||
Messages
|
Messages
|
||||||
H [X] distant messages should be made async-ed
|
H [X] distant messages should be made async-ed
|
||||||
|
@ -192,6 +194,9 @@ H [X] marking all as read in channels takes time. The channel icon should
|
||||||
[X] allow to post on channels when attachment is not in shared files. Just display a warning.
|
[X] allow to post on channels when attachment is not in shared files. Just display a warning.
|
||||||
M [ ] popularity calculation seems wrong. To reproduce: create a new channel and subscribe to it from
|
M [ ] popularity calculation seems wrong. To reproduce: create a new channel and subscribe to it from
|
||||||
another location with many friends => popularity is too big at that location (should be 1)
|
another location with many friends => popularity is too big at that location (should be 1)
|
||||||
|
the problem seems to be in RsGxsNetService::handleRecvSyncMessage
|
||||||
|
peers send RsNxsSyncMsg for unsubscribed groups (they are not suppliers then)
|
||||||
|
nor sure what role RsGxsNetService::loadList plays here
|
||||||
[ ] show group owner in channel/forum/posted's details tab
|
[ ] show group owner in channel/forum/posted's details tab
|
||||||
|
|
||||||
Chat lobbies
|
Chat lobbies
|
||||||
|
|
|
@ -681,11 +681,28 @@ static void cleanupItems (QList<QTreeWidgetItem *> &items)
|
||||||
items.clear();
|
items.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GxsForumThreadWidget::insertGroupData(const RsGxsForumGroup &group)
|
void GxsForumThreadWidget::insertGroupData()
|
||||||
{
|
{
|
||||||
#ifdef DEBUG_FORUMS
|
#ifdef DEBUG_FORUMS
|
||||||
std::cerr << "GxsForumThreadWidget::insertGroupData" << std::endl;
|
std::cerr << "GxsForumThreadWidget::insertGroupData" << std::endl;
|
||||||
#endif
|
#endif
|
||||||
|
const RsGxsForumGroup& group = mForumGroup;
|
||||||
|
|
||||||
|
QString author;
|
||||||
|
if(group.mMeta.mAuthorId.isNull())
|
||||||
|
author = tr("no author");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RsIdentityDetails details;
|
||||||
|
if(!rsIdentity->getIdDetails(group.mMeta.mAuthorId, details))
|
||||||
|
{
|
||||||
|
// try again later
|
||||||
|
QTimer::singleShot(200, this, SLOT(insertGroupData()));
|
||||||
|
author = tr("loading...");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
author = QString::fromUtf8(details.mNickname.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
mSubscribeFlags = group.mMeta.mSubscribeFlags;
|
mSubscribeFlags = group.mMeta.mSubscribeFlags;
|
||||||
ui->forumName->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));
|
ui->forumName->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));
|
||||||
|
@ -693,6 +710,7 @@ void GxsForumThreadWidget::insertGroupData(const RsGxsForumGroup &group)
|
||||||
mForumDescription = QString("<b>%1: \t</b>%2<br/>").arg(tr("Forum name"), QString::fromUtf8( group.mMeta.mGroupName.c_str()));
|
mForumDescription = QString("<b>%1: \t</b>%2<br/>").arg(tr("Forum name"), QString::fromUtf8( group.mMeta.mGroupName.c_str()));
|
||||||
mForumDescription += QString("<b>%1: \t</b>%2<br/>").arg(tr("Subscribers")).arg(group.mMeta.mPop);
|
mForumDescription += QString("<b>%1: \t</b>%2<br/>").arg(tr("Subscribers")).arg(group.mMeta.mPop);
|
||||||
mForumDescription += QString("<b>%1: \t</b>%2<br/>").arg(tr("Posts (at neighbor nodes)")).arg(group.mMeta.mVisibleMsgCount);
|
mForumDescription += QString("<b>%1: \t</b>%2<br/>").arg(tr("Posts (at neighbor nodes)")).arg(group.mMeta.mVisibleMsgCount);
|
||||||
|
mForumDescription += QString("<b>%1: \t</b>%2<br/>").arg(tr("Author"), author);
|
||||||
mForumDescription += QString("<b>%1: </b><br/><br/>%2").arg(tr("Description"), QString::fromUtf8(group.mDescription.c_str()));
|
mForumDescription += QString("<b>%1: </b><br/><br/>%2").arg(tr("Description"), QString::fromUtf8(group.mDescription.c_str()));
|
||||||
|
|
||||||
ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(mSubscribeFlags));
|
ui->subscribeToolButton->setSubscribed(IS_GROUP_SUBSCRIBED(mSubscribeFlags));
|
||||||
|
@ -1792,7 +1810,8 @@ void GxsForumThreadWidget::loadGroupData(const uint32_t &token)
|
||||||
|
|
||||||
if (groups.size() == 1)
|
if (groups.size() == 1)
|
||||||
{
|
{
|
||||||
insertGroupData(groups[0]);
|
mForumGroup = groups[0];
|
||||||
|
insertGroupData();
|
||||||
|
|
||||||
mStateHelper->setActive(mTokenTypeGroupData, true);
|
mStateHelper->setActive(mTokenTypeGroupData, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#define GXSFORUMTHREADWIDGET_H
|
#define GXSFORUMTHREADWIDGET_H
|
||||||
|
|
||||||
#include "gui/gxs/GxsMessageFrameWidget.h"
|
#include "gui/gxs/GxsMessageFrameWidget.h"
|
||||||
|
#include <retroshare/rsgxsforums.h>
|
||||||
|
|
||||||
class QTreeWidgetItem;
|
class QTreeWidgetItem;
|
||||||
class RSTreeWidgetItemCompareRole;
|
class RSTreeWidgetItemCompareRole;
|
||||||
|
@ -131,8 +132,9 @@ private:
|
||||||
|
|
||||||
void requestGroupData();
|
void requestGroupData();
|
||||||
void loadGroupData(const uint32_t &token);
|
void loadGroupData(const uint32_t &token);
|
||||||
void insertGroupData(const RsGxsForumGroup &group);
|
private slots:
|
||||||
|
void insertGroupData();
|
||||||
|
private:
|
||||||
void requestMessageData(const RsGxsGrpMsgIdPair &msgId);
|
void requestMessageData(const RsGxsGrpMsgIdPair &msgId);
|
||||||
void loadMessageData(const uint32_t &token);
|
void loadMessageData(const uint32_t &token);
|
||||||
void requestMsgData_ReplyMessage(const RsGxsGrpMsgIdPair &msgId);
|
void requestMsgData_ReplyMessage(const RsGxsGrpMsgIdPair &msgId);
|
||||||
|
@ -141,6 +143,7 @@ private:
|
||||||
private:
|
private:
|
||||||
RsGxsGroupId mLastForumID;
|
RsGxsGroupId mLastForumID;
|
||||||
RsGxsMessageId mThreadId;
|
RsGxsMessageId mThreadId;
|
||||||
|
RsGxsForumGroup mForumGroup;
|
||||||
QString mForumDescription;
|
QString mForumDescription;
|
||||||
int mSubscribeFlags;
|
int mSubscribeFlags;
|
||||||
bool mInProcessSettings;
|
bool mInProcessSettings;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue