From 6692b2be49a8fbaed86407514a40f3d37f767947 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 7 Dec 2019 16:39:00 +0100 Subject: [PATCH] improved Node page look & feel --- .../src/gui/settings/CryptoPage.cpp | 17 +- retroshare-gui/src/gui/settings/CryptoPage.ui | 681 ++++++++++-------- 2 files changed, 410 insertions(+), 288 deletions(-) diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 3ac626834..df444323e 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -57,7 +57,8 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags) // hide profile manager as it causes bugs when generating a new profile. //ui.profile_Button->hide() ; - connect(ui.createNewNode_PB,SIGNAL(clicked()), this, SLOT(profilemanager())); + connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager())); + ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime())); } @@ -78,6 +79,10 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ ) ui.pgpid->setText(QString::fromStdString(detail.gpg_id.toStdString())); ui.pgpfingerprint->setText(misc::fingerPrintStyleSplit(QString::fromStdString(detail.fpr.toStdString()))); + std::string invite ; + rsPeers->getShortInvite(invite,rsPeers->getOwnId(),true,false); + ui.retroshareid->setText(QString::fromUtf8(invite.c_str())); + /* set retroshare version */ ui.version->setText(Rshare::retroshareVersion(true)); @@ -87,6 +92,16 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ ) int friends = ids.size(); ui.friendsEdit->setText(QString::number(friends)); + + + QString string ; + string = rsFiles->getPartialsDirectory().c_str(); + QString datadir = string; + if(datadir.contains("Partials")) + { + datadir.replace("Partials",""); + } + ui.labelpath->setText(datadir); } load() ; } diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 0e2af06f2..50c0c84fb 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -6,15 +6,15 @@ 0 0 - 1531 - 678 + 644 + 459 - 1 + 0 @@ -22,15 +22,180 @@ - - - QFrame::Box - - - QFrame::Sunken - + - + + + + Retroshare ID: + + + + + + + Statistics: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + PGP fingerprint: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Location ID: + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + Export Profile: + + + + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Online since: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Location: + + + + @@ -60,64 +225,7 @@ - - - - - 0 - 0 - - - - - 100 - 0 - - - - Name: - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Location: - - - - + @@ -136,153 +244,14 @@ - - - - - 0 - 0 - - - - - 100 - 0 - - + + - Location ID: + Export - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - PGP Id : - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - - - - - 75 - true - - - - TextLabel - - - - - - - PGP fingerprint: - - - - - - - - - - QFrame::Box - - - QFrame::Sunken - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Friend nodes: - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - + @@ -301,68 +270,18 @@ - - - - - 0 - 0 - - - - - 100 - 0 - - + + - Online since: + Show statistics - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - 75 - true - - - - TextLabel - - - - + + + 6 + @@ -394,16 +313,211 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Profile path: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Friend nodes: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/info16.png + + + + + + + + 75 + true + + + + Profile + + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Name: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + PGP Id : + + + + + + + + 75 + true + + + + TextLabel + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 75 + true + + + + TextLabel + + + - - - - show statistics window - - - @@ -412,7 +526,7 @@ 20 - 205 + 40 @@ -423,8 +537,8 @@ Certificate - - + + @@ -451,7 +565,7 @@ - + @@ -494,13 +608,6 @@ - - - - Create new node... - - -