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

Merge pull request #2754 from csoler/v0.6-BugFixing_30

Browse Source 
Various bug fixes
This commit is contained in:
csoler 2023-07-19 20:35:11 +02:00 committed by GitHub
commit 5c52509e27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/common/ElidedLabel.cpp
View File

@ -258,6 +258,10 @@ void ElidedLabel::mousePressEvent(QMouseEvent *ev)
return; // eat event return; // eat event
} }
QLabel::mousePressEvent(ev); QLabel::mousePressEvent(ev);
if(ev->buttons()==Qt::RightButton)
emit rightClicked(ev->pos());
else
emit clicked(ev->pos()); emit clicked(ev->pos());
} }

1
retroshare-gui/src/gui/common/ElidedLabel.h
View File

@ -77,6 +77,7 @@ protected:
signals: signals:
void elisionChanged(bool elided); void elisionChanged(bool elided);
void rightClicked(QPoint pos);
void clicked(QPoint pos); void clicked(QPoint pos);
private: private:

10
retroshare-gui/src/gui/msgs/MessageModel.cpp
View File

@ -459,14 +459,6 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
case COLUMN_THREAD_SPAM: return QVariant((fmpe.msgflags & RS_MSG_SPAM)? 1:0); case COLUMN_THREAD_SPAM: return QVariant((fmpe.msgflags & RS_MSG_SPAM)? 1:0);
case COLUMN_THREAD_TO: {
QString name;
if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.to.toStdString()),name))
return name;
return ""; //Not Found
}
case COLUMN_THREAD_AUTHOR:{ case COLUMN_THREAD_AUTHOR:{
QString name; QString name;
@ -474,6 +466,8 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
return name; return name;
return ""; //Not Found return ""; //Not Found
} }
case COLUMN_THREAD_TO: // fallthrough. In this case, the "to" field is not filled because the msg potentially has multiple destinations.
default: default:
return displayRole(fmpe,column); return displayRole(fmpe,column);
} }