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

simplified comment in GxsIdDetails and hid columns in new ForumModel

Browse source
This commit is contained in:
csoler 2018-11-26 23:07:05 +01:00
parent b179cb5796
commit 73e285805e
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View file

@ -973,7 +973,7 @@ QString nickname ;
if (details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) if (details.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)
{ {
comment += QString("<br/>%1:%2 ").arg(QApplication::translate("GxsIdDetails", "Authentication"), QApplication::translate("GxsIdDetails", "Signed&nbsp;by")); comment += QString("<br/>%1: ").arg(QApplication::translate("GxsIdDetails", "Node"));
if (details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN) if (details.mFlags & RS_IDENTITY_FLAGS_PGP_KNOWN)
{ {
@ -985,8 +985,8 @@ QString nickname ;
else else
comment += QApplication::translate("GxsIdDetails", "unknown Key"); comment += QApplication::translate("GxsIdDetails", "unknown Key");
} }
else //else
comment += QString("<br/>%1:&nbsp;%2").arg(QApplication::translate("GxsIdDetails", "Authentication"), QApplication::translate("GxsIdDetails", "anonymous")); // comment += QString("<br/>%1:&nbsp;%2").arg(QApplication::translate("GxsIdDetails", "Node:"), QApplication::translate("GxsIdDetails", "anonymous"));
if(details.mReputation.mFriendsPositiveVotes || details.mReputation.mFriendsNegativeVotes) if(details.mReputation.mFriendsPositiveVotes || details.mReputation.mFriendsNegativeVotes)
{ {

2
retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
View file

@ -1029,6 +1029,7 @@ QModelIndex RsGxsForumModel::getIndexOfMessage(const RsGxsMessageId& mid) const
return QModelIndex(); return QModelIndex();
} }
#ifdef TO_REMVOVE
void RsGxsForumModel::test_iterator() const void RsGxsForumModel::test_iterator() const
{ {
const_iterator it(*this); const_iterator it(*this);
@ -1133,6 +1134,7 @@ RsGxsForumModel::const_iterator::operator bool() const
{ {
return kid >= 0; return kid >= 0;
} }
#endif
static void recursPrintModel(const std::vector<ForumModelPostEntry>& entries,ForumModelIndex index,int depth) static void recursPrintModel(const std::vector<ForumModelPostEntry>& entries,ForumModelIndex index,int depth)
{ {

3
retroshare-gui/src/gui/gxsforums/GxsForumModel.h
View file

@ -82,6 +82,8 @@ public:
QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;} QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
QModelIndex getIndexOfMessage(const RsGxsMessageId& mid) const; QModelIndex getIndexOfMessage(const RsGxsMessageId& mid) const;
#ifdef TO_REMOVE
QModelIndex getNextIndex(const QModelIndex& i,bool unread_only) const; QModelIndex getNextIndex(const QModelIndex& i,bool unread_only) const;
class const_iterator class const_iterator
@ -101,6 +103,7 @@ public:
const RsGxsForumModel& model; const RsGxsForumModel& model;
}; };
void test_iterator() const; void test_iterator() const;
#endif
// This method will asynchroneously update the data // This method will asynchroneously update the data
void setForum(const RsGxsGroupId& forumGroup); void setForum(const RsGxsGroupId& forumGroup);

6
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View file

@ -350,7 +350,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
ui->newmessageButton->setText(tr("Reply")); ui->newmessageButton->setText(tr("Reply"));
ui->newthreadButton->setText(tr("New thread")); ui->newthreadButton->setText(tr("New thread"));
connect(ui->threadTreeWidget, SIGNAL(clicked(QModelIndex)), this, SLOT(changedThread(QModelIndex))); //connect(ui->threadTreeWidget, SIGNAL(clicked(QModelIndex)), this, SLOT(changedThread(QModelIndex)));
connect(ui->threadTreeWidget, SIGNAL(clicked(QModelIndex)), this, SLOT(clickedThread(QModelIndex))); connect(ui->threadTreeWidget, SIGNAL(clicked(QModelIndex)), this, SLOT(clickedThread(QModelIndex)));
connect(ui->viewBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changedViewBox())); connect(ui->viewBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changedViewBox()));
@ -409,6 +409,8 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
ttheader->resizeSection (RsGxsForumModel::COLUMN_THREAD_READ, 24*f); ttheader->resizeSection (RsGxsForumModel::COLUMN_THREAD_READ, 24*f);
QHeaderView_setSectionResizeModeColumn(ttheader, RsGxsForumModel::COLUMN_THREAD_READ, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(ttheader, RsGxsForumModel::COLUMN_THREAD_READ, QHeaderView::Fixed);
ttheader->hideSection (RsGxsForumModel::COLUMN_THREAD_CONTENT); ttheader->hideSection (RsGxsForumModel::COLUMN_THREAD_CONTENT);
ttheader->hideSection (RsGxsForumModel::COLUMN_THREAD_MSGID);
ttheader->hideSection (RsGxsForumModel::COLUMN_THREAD_DATA);
ui->progressBar->hide(); ui->progressBar->hide();
ui->progressText->hide(); ui->progressText->hide();
@ -929,6 +931,8 @@ void GxsForumThreadWidget::clickedThread(QModelIndex index)
mThreadModel->getPostData(index,fmpe); mThreadModel->getPostData(index,fmpe);
mThreadModel->setMsgReadStatus(index, IS_MSG_UNREAD(fmpe.mMsgStatus),false); mThreadModel->setMsgReadStatus(index, IS_MSG_UNREAD(fmpe.mMsgStatus),false);
} }
else
changedThread(index);
} }
void GxsForumThreadWidget::calculateIconsAndFonts(QTreeWidgetItem *item, bool &hasReadChilddren, bool &hasUnreadChilddren) void GxsForumThreadWidget::calculateIconsAndFonts(QTreeWidgetItem *item, bool &hasReadChilddren, bool &hasUnreadChilddren)