From ae098607dc20f75ca0fa5cd4275f8a147885d2b8 Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Tue, 24 Feb 2026 20:51:37 +0100 Subject: [PATCH 1/2] Fix wire post notify --- .../src/gui/feeds/WireNotifyPostItem.ui | 120 ++++++++++-------- 1 file changed, 66 insertions(+), 54 deletions(-) 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 From 770ee67e9413e9f7da8aff6d22302621cff29004 Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Sat, 28 Feb 2026 14:31:18 +0100 Subject: [PATCH 2/2] Added to use makeDefaultGroupIcon for wire --- .../src/gui/TheWire/PulseViewGroup.cpp | 5 ++++- .../src/gui/TheWire/WireGroupItem.cpp | 4 +++- retroshare-gui/src/gui/icons/wire.png | Bin 2355 -> 3164 bytes 3 files changed, 7 insertions(+), 2 deletions(-) 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/icons/wire.png b/retroshare-gui/src/gui/icons/wire.png index ed0c82334ddc4378359743f5a3c18520fc6a9a6a..0927c8c1d913dd13cdc70b8c2d6f03df6c03abf0 100644 GIT binary patch delta 3136 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 X?XmF@^v{-RFbELs-R$aYk7oP>EL%Uf