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, ¬ify); //#endif addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, ¬ify); + addPage(idDialog = new IdDialog(ui->stackPages), grp, ¬ify); addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, ¬ify); + addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, ¬ify); addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, ¬ify); addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, ¬ify); addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, ¬ify); - addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, ¬ify); addPage(postedDialog = new PostedDialog(ui->stackPages), grp, ¬ify); - addPage(idDialog = new IdDialog(ui->stackPages), grp, ¬ify); #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 @@ - News Feed + Log entries @@ -109,7 +109,7 @@ Qt::NoFocus - + :/icons/help_64.png:/icons/help_64.png @@ -155,7 +155,6 @@ - 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 @@ 3 + + 120 + false - Friend nodes + Trusted nodes AlignCenter