diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp index 39739a6d9..6b05b2f95 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp @@ -32,6 +32,8 @@ #include "gui/common/FilesDefs.h" #include "util/DateTime.h" +#define IMAGE_WIRE ":icons/wire.png" + Q_DECLARE_METATYPE(RsWireGroup) /** Constructor */ @@ -102,7 +104,8 @@ void PulseViewGroup::setup() else { // default. - QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(100,100, Qt::KeepAspectRatio, Qt::SmoothTransformation); + QPixmap pixmap = GxsIdDetails::makeDefaultGroupIcon(mGroup->mMeta.mGroupId, IMAGE_WIRE, GxsIdDetails::ORIGINAL); + pixmap = pixmap.scaled(100,100, Qt::KeepAspectRatio, Qt::SmoothTransformation); label_headshot->setPixmap(pixmap); } diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp index de4ac6061..63d771896 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp @@ -35,6 +35,8 @@ #include #include +#define IMAGE_WIRE ":icons/wire.png" + static QImage getCirclePhoto(const QImage original, int sizePhoto) { QImage target(sizePhoto, sizePhoto, QImage::Format_ARGB32_Premultiplied); @@ -99,7 +101,7 @@ void WireGroupItem::setup() else { // default. - QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32, Qt::KeepAspectRatio, Qt::SmoothTransformation); + QPixmap pixmap = GxsIdDetails::makeDefaultGroupIcon(mGroup.mMeta.mGroupId, IMAGE_WIRE, GxsIdDetails::ORIGINAL); label_headshot->setPixmap(pixmap); } diff --git a/retroshare-gui/src/gui/feeds/WireNotifyPostItem.ui b/retroshare-gui/src/gui/feeds/WireNotifyPostItem.ui index fbbf716cb..4c6b19b7a 100644 --- a/retroshare-gui/src/gui/feeds/WireNotifyPostItem.ui +++ b/retroshare-gui/src/gui/feeds/WireNotifyPostItem.ui @@ -6,8 +6,8 @@ 0 0 - 822 - 175 + 530 + 273 @@ -41,14 +41,20 @@ true - QFrame::Shape::Box + QFrame::StyledPanel - QFrame::Shadow::Sunken + QFrame::Raised + + 9 + + + 0 + @@ -76,7 +82,7 @@ - Qt::Orientation::Vertical + Qt::Vertical @@ -97,6 +103,7 @@ 12 + 75 true true @@ -117,6 +124,7 @@ 11 + 75 true true @@ -132,10 +140,24 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + 75 true @@ -163,6 +185,9 @@ TextLabel + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + @@ -175,6 +200,7 @@ 11 + 75 false true @@ -196,7 +222,7 @@ - Qt::FocusPolicy::NoFocus + Qt::NoFocus Toggle Message Read Status @@ -221,7 +247,7 @@ - Qt::FocusPolicy::NoFocus + Qt::NoFocus Unsubscribe From Wire @@ -233,9 +259,6 @@ - - Qt::Orientation::Horizontal - 40 @@ -253,7 +276,7 @@ - Qt::FocusPolicy::NoFocus + Qt::NoFocus Copy RetroShare Link @@ -269,7 +292,7 @@ - Qt::FocusPolicy::NoFocus + Qt::NoFocus Expand @@ -289,7 +312,7 @@ - Qt::FocusPolicy::NoFocus + Qt::NoFocus Set as read and remove item @@ -309,7 +332,7 @@ - Qt::FocusPolicy::NoFocus + Qt::NoFocus Remove Item @@ -344,50 +367,42 @@ - QFrame::Shape::Box + QFrame::Box - QFrame::Shadow::Sunken + QFrame::Sunken - - - 5 + + + + 5 + 41 + 17 + 25 + - - 5 + + + 0 + 0 + - - 5 + + true - - 5 + + 6 - - - - - 0 - 0 - - - - true - - - 6 - - - -1 - - - true - - - Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByKeyboard|Qt::TextInteractionFlag::TextSelectableByMouse - - - - + + -1 + + + true + + + Qt::NoTextInteraction + + @@ -395,9 +410,6 @@ - - Qt::Orientation::Vertical - 20 diff --git a/retroshare-gui/src/gui/icons/wire.png b/retroshare-gui/src/gui/icons/wire.png index ed0c82334..0927c8c1d 100644 Binary files a/retroshare-gui/src/gui/icons/wire.png and b/retroshare-gui/src/gui/icons/wire.png differ