From 66ecc8df769b7d3862844d2754adad75008442f1 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 16 Jan 2021 21:53:19 +0100
Subject: [PATCH] Fixed Group Chat toaster to use No Frame

* Fixed Group Chat toaster to use No Frame
* Hide unused widget on People Dialog
---
 .../src/gui/People/PeopleDialog.cpp           |  1 +
 retroshare-gui/src/gui/People/PeopleDialog.ui | 80 +++----------------
 .../src/gui/toaster/GroupChatToaster.cpp      |  2 +-
 3 files changed, 14 insertions(+), 69 deletions(-)

diff --git a/retroshare-gui/src/gui/People/PeopleDialog.cpp b/retroshare-gui/src/gui/People/PeopleDialog.cpp
index e06129905..42bf448a4 100644
--- a/retroshare-gui/src/gui/People/PeopleDialog.cpp
+++ b/retroshare-gui/src/gui/People/PeopleDialog.cpp
@@ -69,6 +69,7 @@ PeopleDialog::PeopleDialog(QWidget *parent)
 	tabWidget->removeTab(1);
 	//hide circle flow widget not functional yet
 	pictureFlowWidgetExternal->hide();
+	widgetExternal->hide();
 
 	//need erase QtCreator Layout first(for Win)
 	delete idExternal->layout();
diff --git a/retroshare-gui/src/gui/People/PeopleDialog.ui b/retroshare-gui/src/gui/People/PeopleDialog.ui
index bf5b7239f..416496a8a 100644
--- a/retroshare-gui/src/gui/People/PeopleDialog.ui
+++ b/retroshare-gui/src/gui/People/PeopleDialog.ui
@@ -20,76 +20,25 @@
    <string/>
   </property>
   <layout class="QGridLayout" name="titleBarLayout">
-   <property name="margin">
+   <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">
-    <widget class="QFrame" name="titleBarFrame">
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <layout class="QHBoxLayout">
-      <property name="margin">
-       <number>2</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="titleBarPixmap">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../images.qrc">:/images/identity/identities_32.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="StyledLabel" name="titleBarLabel">
-        <property name="text">
-         <string>People</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="titleBarSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="enabled">
       <bool>true</bool>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabExternal">
       <property name="sizePolicy">
@@ -129,7 +78,7 @@
            <layout class="QVBoxLayout"/>
           </widget>
          </widget>
-         <widget class="QWidget" name="widgetExternal">
+         <widget class="QFrame" name="widgetExternal">
           <layout class="QGridLayout" name="layoutExternal">
            <item row="0" column="0">
             <widget class="QLabel" name="label_External">
@@ -234,11 +183,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>StyledLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/StyledLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>PictureFlow</class>
    <extends>QWidget</extends>
diff --git a/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp b/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp
index 7a11c02dd..64d49f605 100644
--- a/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp
+++ b/retroshare-gui/src/gui/toaster/GroupChatToaster.cpp
@@ -37,7 +37,7 @@ GroupChatToaster::GroupChatToaster(const RsPeerId &peerId, const QString &messag
 	/* set informations */
 	ui.textLabel->setText(RsHtml().formatText(NULL, message, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE));
 	ui.toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(peerId).c_str()));
-	ui.avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME);
+	ui.avatarWidget->setFrameType(AvatarWidget::NO_FRAME);
 	ui.avatarWidget->setDefaultAvatar(":/images/user/personal64.png");
     ui.avatarWidget->setId(ChatId(peerId));
 }