From 3312faf3ea545c16c0e2fab3104c311ae2fb5b56 Mon Sep 17 00:00:00 2001 From: drbob Date: Sun, 17 May 2020 19:56:58 +1000 Subject: [PATCH] fixup button labels are prefix headers --- retroshare-gui/src/gui/TheWire/PulseReply.cpp | 2 - retroshare-gui/src/gui/TheWire/PulseReply.ui | 33 ++------------ .../src/gui/TheWire/PulseTopLevel.ui | 43 ++++++------------- .../src/gui/TheWire/PulseViewItem.cpp | 4 ++ 4 files changed, 20 insertions(+), 62 deletions(-) diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.cpp b/retroshare-gui/src/gui/TheWire/PulseReply.cpp index 3f3a11719..baa960d27 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReply.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseReply.cpp @@ -124,8 +124,6 @@ void PulseReply::setReferenceString(QString ref) { if (ref.size() == 0) { - // appear to have duplicated here.... - // widget_prefix->setVisible(false); widget_reply_header->setVisible(false); } else diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.ui b/retroshare-gui/src/gui/TheWire/PulseReply.ui index 67bb24484..78a6d7ab7 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReply.ui +++ b/retroshare-gui/src/gui/TheWire/PulseReply.ui @@ -152,7 +152,7 @@ border-radius: 10px} - RPL + REPLY @@ -196,7 +196,7 @@ border-radius: 10px} - RET + REPUBLISH @@ -240,7 +240,7 @@ border-radius: 10px} - LIK + LIKE @@ -284,32 +284,7 @@ border-radius: 10px} - LNK - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 + SHOW diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui index 1a197905a..feb31abee 100644 --- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui +++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui @@ -106,7 +106,7 @@ border-radius: 10px} - TMP VIEW PARENT + SHOW PARENT @@ -229,8 +229,14 @@ border-radius: 10px} + + + 0 + 25 + + - TMP VIEW + SHOW GROUP @@ -464,7 +470,7 @@ border-radius: 10px} - RPL + REPLY @@ -508,7 +514,7 @@ border-radius: 10px} - RET + REPUBLISH @@ -552,7 +558,7 @@ border-radius: 10px} - LIK + LIKE @@ -596,32 +602,7 @@ border-radius: 10px} - LNK - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 + SHOW diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp index d0d3c2d07..fe84df5b9 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp +++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp @@ -294,6 +294,10 @@ void PulseDataItem::showPulse() { setReference(mPulse->mPulseType & WIRE_PULSE_RESPONSE_MASK, mPulse->mRefGroupId, mPulse->mRefGroupName); } + else + { + setReference(0, mPulse->mRefGroupId, mPulse->mRefGroupName); + } } }