From af55623ecfd2358305333a0f99f8f23fabc5cc15 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 4 Feb 2021 21:50:30 +0100 Subject: [PATCH] Home page ui improvements * some ui improvements * Fixed the help link --- retroshare-gui/src/gui/HomePage.cpp | 3 +- retroshare-gui/src/gui/HomePage.ui | 527 ++++++++++-------- .../src/gui/qss/stylesheet/Standard.qss | 29 +- 3 files changed, 317 insertions(+), 242 deletions(-) diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp index e57525f9d..7cb992072 100644 --- a/retroshare-gui/src/gui/HomePage.cpp +++ b/retroshare-gui/src/gui/HomePage.cpp @@ -58,6 +58,7 @@ HomePage::HomePage(QWidget *parent) : updateCertificate(); connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addFriend())); + connect(ui->copyIDButton, SIGNAL(clicked()), this, SLOT(copyId())); QAction *WebMailAction = new QAction(QIcon(),tr("Invite via WebMail"), this); connect(WebMailAction, SIGNAL(triggered()), this, SLOT(webMail())); @@ -343,7 +344,7 @@ void HomePage::webMail() void HomePage::openWebHelp() { - QDesktopServices::openUrl(QUrl(QString("https://retroshare.readthedocs.io"))); + QDesktopServices::openUrl(QUrl(QString("https://retroshare.readthedocs.io/en/latest/"))); } void HomePage::toggleUseOldFormat() diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index 16dd9080a..ec503ff3d 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -14,25 +14,6 @@ Form - - - - - 0 - 0 - - - - - - - :/images/logo/logo_web_nobackground.png - - - Qt::AlignCenter - - - @@ -50,23 +31,7 @@ private and secure decentralized communication platform. - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 94 - 408 - - - - - + Qt::Horizontal @@ -82,73 +47,57 @@ private and secure decentralized communication platform. + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 94 + 408 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 40 + + + + - - - - 0 - 0 - + + + + 11 + - - - - - - 11 - - - - - - - Did you receive a Retroshare id from a friend? - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Add friend - - - - :/icons/png/invite.png:/icons/png/invite.png - - - - 24 - 24 - - - - Qt::ToolButtonTextBesideIcon - - - false - - - - + + Did you receive a Retroshare id from a friend? + + + Qt::AlignCenter + - + @@ -160,24 +109,12 @@ private and secure decentralized communication platform. - QFrame::StyledPanel + QFrame::NoFrame - QFrame::Raised + QFrame::Plain - - - - - 11 - - - - Do you need help with Retroshare? - - - @@ -201,131 +138,263 @@ private and secure decentralized communication platform. + + + + + 0 + 0 + + + + + + + :/images/logo/logo_web_nobackground.png + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Add friend + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + false + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + - - - Qt::Vertical + + + + 11 + - - QSizePolicy::Expanding + + Do you need help with Retroshare? - - - 20 - 40 - + + Qt::AlignCenter - + - - - 6 - - - 0 - - - - - - 0 - 0 - - - - - Courier New - 10 - 75 - true - - - - Qt::DefaultContextMenu - - - - - - false - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - Qt::NoFocus - - - <html><head/><body><p>Share your RetroShare ID</p></body></html> - - - - :/icons/svg/share.svg:/icons/svg/share.svg - - - - 24 - 24 - - - - QToolButton::InstantPopup - - - true - - - - - - - - 0 - 0 - - - - - 11 - - - - This is your Retroshare ID. Copy and share with your friends! - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - ... - - - - :/icons/help_64.png:/icons/help_64.png - - - true - - - true - - - - + + + + 0 + + + 0 + + + 0 + + + 6 + + + 6 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Qt::NoFocus + + + <html><head/><body><p>Share your RetroShare ID</p></body></html> + + + + :/icons/svg/share.svg:/icons/svg/share.svg + + + + 24 + 24 + + + + QToolButton::InstantPopup + + + true + + + + + + + + 0 + 0 + + + + + 11 + + + + This is your Retroshare ID. Copy and share with your friends! + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + ... + + + + :/icons/png/copy.png:/icons/png/copy.png + + + + + + + + 0 + 0 + + + + + Courier New + 10 + 75 + true + + + + Qt::DefaultContextMenu + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + 67 + 68 + + + + + + + + ... + + + + :/icons/help_64.png:/icons/help_64.png + + + true + + + true + + + + + diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 72464c99b..a7402d308 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -802,24 +802,12 @@ HomePage QPlainTextEdit#userCertEdit { background: transparent; } -HomePage QFrame#addframe{ - border: 2px solid #0099cc; - border-radius: 6px; - background: white; -} - ConnectFriendWizard QFrame#friendFrame { border: 2px solid #0099cc; border-radius: 6px; background: white; } -HomePage QFrame#helpframe{ - border: 2px solid #009933; - border-radius: 6px; - background: white; -} - StartDialog QPushButton#loadButton { border-image: url(:/images/btn_blue.png) 4; border-width: 4; @@ -1191,3 +1179,20 @@ BoardsCommentsItem QLabel#subjectLabel, QLabel#titleLabel , QLabel#nameLabel { font: bold; } +HomePage QToolButton#addButton { + font: bold; + font-size: 15pt; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; +} + +HomePage QToolButton#addButton:hover { + background: #03b1f3; + border-radius: 4px; + min-width: 4em; + padding: 2px; +}