From c51ee19e8f25085efe2f65e40554b91b9c2edc32 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Sun, 26 Feb 2017 21:41:45 +0100
Subject: [PATCH] Some consistence fixes in GUI

---
 retroshare-gui/src/gui/FriendsDialog.h      | 2 +-
 retroshare-gui/src/gui/MainWindow.cpp       | 4 ++--
 retroshare-gui/src/gui/NewsFeed.ui          | 5 ++---
 retroshare-gui/src/gui/common/FriendList.ui | 5 ++++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h
index 6b464c130..499c78f37 100644
--- a/retroshare-gui/src/gui/FriendsDialog.h
+++ b/retroshare-gui/src/gui/FriendsDialog.h
@@ -57,7 +57,7 @@ public:
     ~FriendsDialog ();
 
     virtual QIcon iconPixmap() const { return QIcon(IMAGE_NETWORK) ; } //MainPage
-    virtual QString pageName() const { return tr("Trusted nodes") ; } //MainPage
+	virtual QString pageName() const { return tr("Network") ; } //MainPage
     virtual QString helpText() const { return ""; } //MainPage
 
     virtual UserNotify *getUserNotify(QObject *parent);
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index b3c746fee..07ab07a4b 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -361,13 +361,13 @@ void MainWindow::initStackedPage()
 //  addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify);
 //#endif
   addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
+  addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
   addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify);
+  addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
   addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify);
   addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify);
   addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, &notify);
-  addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
   addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
-  addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
 
   #ifdef RS_USE_NEW_PEOPLE_DIALOG
   PeopleDialog *peopleDialog = NULL;
diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui
index a74582bcf..baf108650 100644
--- a/retroshare-gui/src/gui/NewsFeed.ui
+++ b/retroshare-gui/src/gui/NewsFeed.ui
@@ -69,7 +69,7 @@
       <item>
        <widget class="StyledLabel" name="titleBarLabel">
         <property name="text">
-         <string>News Feed</string>
+         <string>Log entries</string>
         </property>
        </widget>
       </item>
@@ -109,7 +109,7 @@
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
-         <iconset resource="images.qrc">
+         <iconset resource="icons.qrc">
           <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
         </property>
         <property name="iconSize">
@@ -155,7 +155,6 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="images.qrc"/>
   <include location="icons.qrc"/>
  </resources>
  <connections/>
diff --git a/retroshare-gui/src/gui/common/FriendList.ui b/retroshare-gui/src/gui/common/FriendList.ui
index d1fb3122d..d6f64ff5b 100644
--- a/retroshare-gui/src/gui/common/FriendList.ui
+++ b/retroshare-gui/src/gui/common/FriendList.ui
@@ -73,12 +73,15 @@
      <property name="columnCount">
       <number>3</number>
      </property>
+     <attribute name="headerDefaultSectionSize">
+      <number>120</number>
+     </attribute>
      <attribute name="headerStretchLastSection">
       <bool>false</bool>
      </attribute>
      <column>
       <property name="text">
-       <string>Friend nodes</string>
+       <string>Trusted nodes</string>
       </property>
       <property name="textAlignment">
        <set>AlignCenter</set>