Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-23 22:01:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bugs in setting read status

Browse Source
This commit is contained in:
csoler 2020-09-26 14:41:20 +02:00
parent 2561b9bc7e
commit 2a51da2291
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
View File

@ -94,15 +94,9 @@ void BoardPostDisplayWidgetBase::makeUpVote()
void BoardPostDisplayWidgetBase::setReadStatus(bool isNew, bool isUnread) void BoardPostDisplayWidgetBase::setReadStatus(bool isNew, bool isUnread)
{ {
if (isUnread) if (isUnread)
{
readButton()->setChecked(true);
readButton()->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-unread.png")); readButton()->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-unread.png"));
}
else else
{
readButton()->setChecked(false);
readButton()->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png")); readButton()->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-read.png"));
}
newLabel()->setVisible(isNew); newLabel()->setVisible(isNew);
} }
@ -123,8 +117,10 @@ void BoardPostDisplayWidgetBase::loadComments(bool e)
emit commentsRequested(mPost.mMeta.mMsgId,e); emit commentsRequested(mPost.mMeta.mMsgId,e);
} }
void BoardPostDisplayWidgetBase::readToggled(bool s) void BoardPostDisplayWidgetBase::readToggled()
{ {
bool s = IS_MSG_UNREAD(mPost.mMeta.mMsgStatus);
emit changeReadStatusRequested(mPost.mMeta.mMsgId,s); emit changeReadStatusRequested(mPost.mMeta.mMsgId,s);
} }
void BoardPostDisplayWidgetBase::showAuthorInPeople() void BoardPostDisplayWidgetBase::showAuthorInPeople()
@ -163,7 +159,7 @@ void BoardPostDisplayWidgetBase::setup()
QObject::connect(commentButton(), SIGNAL(toggled(bool)), this, SLOT(loadComments(bool))); QObject::connect(commentButton(), SIGNAL(toggled(bool)), this, SLOT(loadComments(bool)));
QObject::connect(voteUpButton(), SIGNAL(clicked()), this, SLOT(makeUpVote())); QObject::connect(voteUpButton(), SIGNAL(clicked()), this, SLOT(makeUpVote()));
QObject::connect(voteDownButton(), SIGNAL(clicked()), this, SLOT(makeDownVote())); QObject::connect(voteDownButton(), SIGNAL(clicked()), this, SLOT(makeDownVote()));
QObject::connect(readButton(), SIGNAL(toggled(bool)), this, SLOT(readToggled(bool))); QObject::connect(readButton(), SIGNAL(clicked()), this, SLOT(readToggled()));
QAction *CopyLinkAction = new QAction(QIcon(""),tr("Copy RetroShare Link"), this); QAction *CopyLinkAction = new QAction(QIcon(""),tr("Copy RetroShare Link"), this);
connect(CopyLinkAction, SIGNAL(triggered()), this, SLOT(copyMessageLink())); connect(CopyLinkAction, SIGNAL(triggered()), this, SLOT(copyMessageLink()));
@ -173,6 +169,8 @@ void BoardPostDisplayWidgetBase::setup()
int S = QFontMetricsF(font()).height() ; int S = QFontMetricsF(font()).height() ;
readButton()->setChecked(false);
voteUpButton()->setIconSize(QSize(S*1.5,S*1.5)); voteUpButton()->setIconSize(QSize(S*1.5,S*1.5));
voteDownButton()->setIconSize(QSize(S*1.5,S*1.5)); voteDownButton()->setIconSize(QSize(S*1.5,S*1.5));
commentButton()->setIconSize(QSize(S*1.5,S*1.5)); commentButton()->setIconSize(QSize(S*1.5,S*1.5));

2
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
View File

@ -82,7 +82,7 @@ protected slots:
void loadComments(bool e); void loadComments(bool e);
void showAuthorInPeople(); void showAuthorInPeople();
void readToggled(bool); void readToggled();
void setReadStatus(bool isNew, bool isUnread) ; void setReadStatus(bool isNew, bool isUnread) ;
void makeUpVote() ; void makeUpVote() ;
void makeDownVote() ; void makeDownVote() ;

2
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_card.ui
View File

@ -298,7 +298,7 @@
<normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset> <normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>

2
retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_compact.ui
View File

@ -330,7 +330,7 @@
<normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset> <normaloff>:/images/message-state-unread.png</normaloff>:/images/message-state-unread.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>