From dcab611d779a8f48e398076cb39a6a9cf3be7a21 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 16 Feb 2017 09:53:54 +0100 Subject: [PATCH] improved layout of Home page --- retroshare-gui/src/gui/ChatLobbyWidget.cpp | 4 +- retroshare-gui/src/gui/HomePage.ui | 201 +++++++++++---------- 2 files changed, 105 insertions(+), 100 deletions(-) diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp index 904bb8c4f..37dd2c734 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp +++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp @@ -847,7 +847,7 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) if( (*it).lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED) text += "\n\n"+tr("You will need to create a non anonymous identity in order to join this chat room.") ; else - text += "\n\n"+tr("You will need to create an identity in order to join chat lobbies.") ; + text += "\n\n"+tr("You will need to create an identity in order to join chat rooms.") ; } ui.lobbyInfoLabel->setText(text); @@ -861,7 +861,7 @@ void ChatLobbyWidget::showBlankPage(ChatLobbyId id) ui.lobbypeers_lineEdit->clear(); ui.lobbysec_lineEdit->clear(); - QString text = tr("No chat room selected. \nSelect chat rooms at left to show details.\nDouble click lobbies to enter and chat.") ; + QString text = tr("No chat room selected. \nSelect chat rooms at left to show details.\nDouble click a chat room to enter and chat.") ; ui.lobbyInfoLabel->setText(text) ; } diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index 6a53ecbc9..ec327d40f 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -6,8 +6,8 @@ 0 0 - 886 - 584 + 1558 + 699 @@ -17,7 +17,7 @@ - + 0 0 @@ -33,6 +33,71 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + + + + + + 11 + + + + + + + Did you receive a certificate from a friend? + + + + + + + Add friends certificate + + + + :/icons/png/invite.png:/icons/png/invite.png + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + false + + + + + + @@ -44,6 +109,33 @@ 2 + + + + + Courier New + + + + + + + + + + QPlainTextEdit::NoWrap + + + true + + + 80 + + + false + + + @@ -58,7 +150,7 @@ - The text below is your Retroshare certificate. Copy and share it with your friends + The text below is your own Retroshare certificate. Send it to your friends Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft @@ -97,53 +189,8 @@ - - - - - Courier New - - - - - - - - - - QPlainTextEdit::NoWrap - - - true - - - 80 - - - false - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - @@ -152,7 +199,7 @@ - RetroShare is an Open Source cross-platform, + Open Source cross-platform, private and secure decentralized commmunication platform. @@ -161,58 +208,16 @@ private and secure decentralized commmunication platform. - - - - - - - - - - - 11 - - - - - - - You get certificate from your friend? - - - - - - - Add friends certificate - - - - :/icons/png/invite.png:/icons/png/invite.png - - - - 24 - 24 - - - - Qt::ToolButtonTextBesideIcon - - - false - - - - - - + label + addFrame + label_2 + addframe + label_3 - +