From c26d500349a0827ff831b051899cff5931212e54 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 12 Feb 2021 21:49:45 +0100
Subject: [PATCH] Ui fixes on Appearance and Plugins Page

* Update help string for Activity feed
---
 retroshare-gui/src/gui/NewsFeed.cpp           |  9 +-
 .../src/gui/settings/AppearancePage.ui        | 84 +++++++++++--------
 .../src/gui/settings/PluginsPage.ui           | 47 +++++------
 3 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index ff31a3f6a..4d552735e 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -112,15 +112,18 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed),
     ui->feedOptionsButton->hide();	// (csoler) Hidden until we repare the system to display a specific settings page.
 
 QString hlp_str = tr(
- " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;News Feed</h1>                                                          \
+ " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Activity Feed</h1>                                                          \
    <p>The Activity Feed displays the last events on your network, sorted by the time you received them.                \
    This gives you a summary of the activity of your friends.                                                       \
    You can configure which events to show by pressing on <b>Options</b>. </p>                                      \
    <p>The various events shown are:                                                                                \
    <ul>                                                                                                         \
    <li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li> \
-   <li>Channel and Forum posts</li>                                                                            \
-   <li>New Channels and Forums you can subscribe to</li>                                                       \
+   <li>Channel, Forum and Board posts</li>                                                                            \
+   <li>Circle membership requests and invites</li>                                                                            \
+   <li>New Channels, Forums and Boards you can subscribe to</li>                                                       \
+   <li>Channel and Board comments</li>                                                                 \
+   <li>New Mail messages</li>                                                                 \
    <li>Private messages from your friends</li>                                                                 \
    </ul> </p>                                                                                                      \
  ") ;
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui
index 5a27a8f28..a06a4933e 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.ui
+++ b/retroshare-gui/src/gui/settings/AppearancePage.ui
@@ -249,40 +249,9 @@
          <enum>QFrame::NoFrame</enum>
         </property>
         <layout class="QGridLayout" name="frameToolListStyleGLayout">
-         <item row="1" column="0">
-          <widget class="QComboBox" name="cmboTollButtonsSize">
-           <item>
-            <property name="text">
-             <string>Icon Size = 8x8</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 16x16</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 24x24</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 32x32</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 64x64</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Icon Size = 128x128</string>
-            </property>
-           </item>
-          </widget>
-         </item>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
          <item row="2" column="0">
           <widget class="QComboBox" name="cmboTollButtonsStyle">
            <item>
@@ -333,6 +302,53 @@
            </property>
           </spacer>
          </item>
+         <item row="1" column="0">
+          <widget class="QComboBox" name="cmboTollButtonsSize">
+           <item>
+            <property name="text">
+             <string>Icon Size = 8x8</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 16x16</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 24x24</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 32x32</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 64x64</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Icon Size = 128x128</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item row="1" column="1" rowspan="2">
+          <spacer name="horizontalSpacer">
+           <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>
diff --git a/retroshare-gui/src/gui/settings/PluginsPage.ui b/retroshare-gui/src/gui/settings/PluginsPage.ui
index 3da9a5696..064df8b89 100644
--- a/retroshare-gui/src/gui/settings/PluginsPage.ui
+++ b/retroshare-gui/src/gui/settings/PluginsPage.ui
@@ -7,28 +7,21 @@
     <x>0</x>
     <y>0</y>
     <width>423</width>
-    <height>514</height>
+    <height>375</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
    <enum>Qt::NoContextMenu</enum>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="QCheckBox" name="enableAll">
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text">
-      <string>Authorize all plugins</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Plugins</string>
      </property>
@@ -52,7 +45,7 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>345</width>
+           <width>385</width>
            <height>16</height>
           </rect>
          </property>
@@ -85,8 +78,14 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox_2">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>100</height>
+      </size>
+     </property>
      <property name="title">
       <string>Plugin look-up directories</string>
      </property>
@@ -104,18 +103,18 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="0">
+    <widget class="QCheckBox" name="enableAll">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+     <property name="text">
+      <string>Authorize all plugins</string>
      </property>
-    </spacer>
+    </widget>
    </item>
   </layout>
  </widget>