From 77d275c7f0dd2fe9a938ce39ed457fee4cc906bb Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 7 May 2023 20:22:24 +0200
Subject: [PATCH 1/3] Fixed margins to remove wasting spaces

Fixed margins to remove wasting spaces
Fixed to hide desc groupbox instead of only desc text,
---
 retroshare-gui/src/gui/TheWire/PulseAddDialog.ui | 12 ++++++++++++
 retroshare-gui/src/gui/TheWire/PulseMessage.ui   |  9 +++++++++
 retroshare-gui/src/gui/TheWire/PulseReply.ui     | 12 ++++++++++++
 retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp    |  2 +-
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui     |  2 +-
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index 25738136d..c09119a40 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -235,6 +235,18 @@
    <item>
     <widget class="QFrame" name="frame_input">
      <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QTextEdit" name="textEdit_Pulse">
         <property name="font">
diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.ui b/retroshare-gui/src/gui/TheWire/PulseMessage.ui
index 09b64f780..46e4d8cd5 100644
--- a/retroshare-gui/src/gui/TheWire/PulseMessage.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseMessage.ui
@@ -14,9 +14,18 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
    <property name="topMargin">
     <number>0</number>
    </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="0" rowspan="2">
     <widget class="QWidget" name="widget_indent" native="true">
      <property name="enabled">
diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.ui b/retroshare-gui/src/gui/TheWire/PulseReply.ui
index 3f85dc164..497d606de 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReply.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseReply.ui
@@ -25,6 +25,18 @@
    <string notr="true"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QFrame" name="plainFrame">
      <property name="sizePolicy">
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index 8b5923657..5afb5414b 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -370,7 +370,7 @@ void GxsGroupDialog::setupVisibility()
 
 	ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
 
-	ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
+	ui.groupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
 
 	ui.distribGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION);
 	ui.distributionLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION);
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index 11dcb0613..867652e01 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>746</width>
-    <height>590</height>
+    <height>533</height>
    </rect>
   </property>
   <property name="windowTitle">

From 9c6bfc784712dbdb37ed46d05257e98124e5a6f8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 9 May 2023 10:33:34 +0200
Subject: [PATCH 2/3] added missing updateIcon() in messageUserNotify

---
 retroshare-gui/src/gui/msgs/MessageUserNotify.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
index 5414802e0..b29f264fb 100644
--- a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
@@ -94,7 +94,8 @@ void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> e
 
 	std::set<RsMailMessageId>::const_iterator it;
 
-	switch (fe->mMailStatusEventCode) {
+    switch (fe->mMailStatusEventCode)
+    {
 	case RsMailStatusEventCode::NEW_MESSAGE:
 		for (it = fe->mChangedMsgIds.begin(); it != fe->mChangedMsgIds.end(); ++it) {
 			MessageInfo msgInfo;
@@ -102,7 +103,8 @@ void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> e
 					NotifyQt::getInstance()->addToaster(RS_POPUP_MSG, msgInfo.msgId.c_str(), msgInfo.title.c_str(), msgInfo.msg.c_str() );
 			}
 		}
-		break;
+        updateIcon();
+        break;
 	case RsMailStatusEventCode::MESSAGE_CHANGED:
 	case RsMailStatusEventCode::MESSAGE_REMOVED:
 		updateIcon();

From f54be58088fe92d62ea51291e965f4c19b4d3ae1 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 12 May 2023 20:41:27 +0200
Subject: [PATCH 3/3] Use ElidedLabel on PeerItem to not stretch the widget

* Use ElidedLabel on PeerItem to not stretch the widget
---
 retroshare-gui/src/gui/feeds/PeerItem.ui | 179 ++++++++++++-----------
 1 file changed, 95 insertions(+), 84 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index cf66466f3..603002f7f 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>476</width>
-    <height>262</height>
+    <height>283</height>
    </rect>
   </property>
   <property name="autoFillBackground">
@@ -59,6 +59,9 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
+         <property name="verticalSpacing">
+          <number>0</number>
+         </property>
          <item row="0" column="0" rowspan="2">
           <widget class="AvatarWidget" name="avatar" native="true">
            <property name="minimumSize">
@@ -75,90 +78,11 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <layout class="QGridLayout" name="peerName_GL">
-           <item row="0" column="0">
-            <widget class="QLabel" name="peerNameLabel">
-             <property name="font">
-              <font>
-               <pointsize>17</pointsize>
-              </font>
-             </property>
-             <property name="text">
-              <string notr="true">Peer Name</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="titleLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="font">
-              <font>
-               <pointsize>11</pointsize>
-               <weight>75</weight>
-               <italic>true</italic>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string notr="true">Connected</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="0" column="2">
-          <layout class="QHBoxLayout" name="last_HL">
-           <item>
-            <spacer name="last_HSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>190</width>
-               <height>13</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="lastLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string notr="true">TextLabel</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="1" colspan="2">
+         <item row="1" column="1" colspan="4">
           <layout class="QHBoxLayout" name="buttons_HL">
+           <property name="spacing">
+            <number>6</number>
+           </property>
            <item>
             <widget class="QToolButton" name="sendmsgButton">
              <property name="focusPolicy">
@@ -266,6 +190,87 @@
            </item>
           </layout>
          </item>
+         <item row="0" column="1" colspan="4">
+          <layout class="QGridLayout" name="peerName_GL">
+           <property name="verticalSpacing">
+            <number>6</number>
+           </property>
+           <item row="0" column="2">
+            <widget class="QLabel" name="lastLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string notr="true">TextLabel</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="ElidedLabel" name="peerNameLabel">
+             <property name="font">
+              <font>
+               <pointsize>17</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string notr="true">Peer Name</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <spacer name="last_HSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>190</width>
+               <height>13</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="1" column="0" colspan="2">
+            <widget class="ElidedLabel" name="titleLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <pointsize>11</pointsize>
+               <weight>75</weight>
+               <italic>true</italic>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string notr="true">Connected</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
         </layout>
        </widget>
       </item>
@@ -526,6 +531,12 @@
    <header>gui/common/AvatarWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>