diff --git a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc index f6cf0b441..b26e6b7da 100644 --- a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc +++ b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc @@ -1,5 +1,8 @@ - - images/compose.png - + + images/compose.png + images/like.png + images/reply.png + images/retweet.png + diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp index c3843c497..5c7a00fea 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp @@ -51,6 +51,25 @@ void WireGroupItem::setup() label_authorId->setId(mGroup.mMeta.mAuthorId); frame_details->setVisible(false); + if (mGroup.mHeadshot.mData ) + { + QPixmap pixmap; + if (GxsIdDetails::loadPixmapFromData( + mGroup.mHeadshot.mData, + mGroup.mHeadshot.mSize, + pixmap,GxsIdDetails::ORIGINAL)) + { + pixmap = pixmap.scaled(32,32); + label_headshot->setPixmap(pixmap); + } + } + else + { + // default. + QPixmap pixmap = QPixmap(":/icons/wire.png").scaled(32,32); + label_headshot->setPixmap(pixmap); + } + RsIdentityDetails idDetails ; rsIdentity->getIdDetails(mGroup.mMeta.mAuthorId,idDetails); @@ -59,6 +78,7 @@ void WireGroupItem::setup() if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) pixmap = GxsIdDetails::makeDefaultIcon(mGroup.mMeta.mAuthorId,GxsIdDetails::SMALL); + pixmap = pixmap.scaled(24,24); label_avatar->setPixmap(pixmap); connect(toolButton_show, SIGNAL(clicked()), this, SLOT(show())); diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui index b0d53f4c6..eeb793614 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui @@ -38,7 +38,7 @@ - + 32 @@ -102,6 +102,13 @@ QFrame::Raised + + + + Avatar + + + diff --git a/retroshare-gui/src/gui/TheWire/images/like.png b/retroshare-gui/src/gui/TheWire/images/like.png new file mode 100644 index 000000000..cd0cd99ef Binary files /dev/null and b/retroshare-gui/src/gui/TheWire/images/like.png differ diff --git a/retroshare-gui/src/gui/TheWire/images/reply.png b/retroshare-gui/src/gui/TheWire/images/reply.png new file mode 100644 index 000000000..c2f5fdf62 Binary files /dev/null and b/retroshare-gui/src/gui/TheWire/images/reply.png differ diff --git a/retroshare-gui/src/gui/TheWire/images/retweet.png b/retroshare-gui/src/gui/TheWire/images/retweet.png new file mode 100644 index 000000000..e5272b6ba Binary files /dev/null and b/retroshare-gui/src/gui/TheWire/images/retweet.png differ