diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index 299fd5bf5..a739bb175 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -19,6 +19,7 @@ * Boston, MA 02110-1301, USA. ****************************************************************/ +#include #include #include #include @@ -27,9 +28,12 @@ #include "CryptoPage.h" #include "util/misc.h" +#include "util/DateTime.h" #include +#include #include //for rsPeers variable +#include //for rsPeers variable /** Constructor */ CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags) @@ -38,7 +42,7 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - connect(ui.copykeyButton, SIGNAL(clicked()), this, SLOT(copyPublicKey())); +// connect(ui.copykeyButton, SIGNAL(clicked()), this, SLOT(copyPublicKey())); connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(fileSaveAs())); connect(ui._includeSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(load())); connect(ui._copyLink_PB, SIGNAL(clicked()), this, SLOT(copyRSLink())); @@ -48,7 +52,45 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags) #ifdef Q_WS_WIN #endif + connect(ui.profile_Button,SIGNAL(clicked()), this, SLOT(profilemanager())); + + ui.onlinesince->setText(DateTime::formatLongDateTime(QDateTime::currentDateTime())); } +void CryptoPage::profilemanager() +{ + ProfileManager profilemanager; + profilemanager.exec(); +} +void CryptoPage::showEvent ( QShowEvent * /*event*/ ) +{ + RsPeerDetails detail; + if (rsPeers->getPeerDetails(rsPeers->getOwnId(),detail)) + { + ui.name->setText(QString::fromUtf8(detail.name.c_str())); + ui.country->setText(QString::fromUtf8(detail.location.c_str())); + + ui.peerid->setText(QString::fromStdString(detail.id)); + ui.pgpid->setText(QString::fromStdString(detail.gpg_id)); + + /* set retroshare version */ + std::map::iterator vit; + std::map versions; + bool retv = rsDisc->getDiscVersions(versions); + if (retv && versions.end() != (vit = versions.find(detail.id))) + { + ui.version->setText(QString::fromStdString(vit->second)); + } + + std::list ids; + ids.clear(); + rsPeers->getGPGAcceptedList(ids); + int friends = ids.size(); + + ui.friendsEdit->setText(QString::number(friends)); + } + load() ; +} + CryptoPage::~CryptoPage() { diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h index 0f1994269..5655d1226 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.h +++ b/retroshare-gui/src/gui/settings/CryptoPage.h @@ -46,7 +46,8 @@ class CryptoPage : public ConfigPage virtual void load(); void copyPublicKey(); void copyRSLink() ; - + virtual void showEvent ( QShowEvent * event ); + void profilemanager(); bool fileSave(); bool fileSaveAs(); diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui index 3c119f8d0..de6d2becd 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.ui +++ b/retroshare-gui/src/gui/settings/CryptoPage.ui @@ -6,91 +6,497 @@ 0 0 - 542 - 355 + 650 + 566 - - - - Public Key - - - - - - - false - - - - false - - - - - - - - - - Copy my Key to Clipboard - - - Copy Key - - - - - - - Save Key into a file - - - Save Key - - - - - - - Qt::Horizontal - - - - 278 - 20 - - - - - - - - Include signatures - - - - - - - Copy RetroShare link to clipboard - - - - - - - Use old key format - - - true + + + + 0 + + + Profile + + + + + + + + Qt::NoFocus + + + Profile Manager + + + + :/images/contact_new.png:/images/contact_new.png + + + + 22 + 22 + + + + Qt::ToolButtonTextBesideIcon + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QFrame::Box + + + QFrame::Sunken + + + + + + + + + 16 + 16 + + + + :/images/info16.png + + + + + + + + 11 + 75 + true + + + + Public Information + + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Name: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Location: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Location ID: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Identity ID: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + + + QFrame::Box + + + QFrame::Sunken + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Number of Friends: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Software Version: + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + Online since: + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + 0 + 0 + + + + + 75 + true + + + + TextLabel + + + + + + + + + + 16 + 16 + + + + + + + :/images/info16.png + + + + + + + + 11 + 75 + true + + + + Other Information + + + + + + + + + + + + Qt::Vertical + + + + 20 + 205 + + + + + + + + + Certificate + + + + + + + false + + + + false + + + + + + + + + Copy link to clipboard + + + + + + + Save Key into a file + + + Save Key + + + + + + + Use old key format + + + true + + + + + + + Include signatures + + + + + + + - + + + diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 0b2531481..81580b417 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -216,6 +216,10 @@ void ServerPage::load() ui._max_tr_up_per_sec_SB->setValue(rsTurtle->getMaxTRForwardRate()) ; ui._turtle_enabled_CB->setChecked(rsTurtle->enabled()) ; + + ui.ipAddressList->clear(); + for(std::list::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it) + ui.ipAddressList->addItem(QString::fromStdString(*it)); } void ServerPage::toggleTurtleRouting(bool b) diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index 0b8a66dd5..3d1778929 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -306,15 +306,19 @@ peers still need to trust each other to allow connection. - - - If you uncheck this, RetroShare will not use tunnel connection between peers that are firewalled and cannot connect directly. This is independent from F2F routing (turtle router). - + - Allow Tunnel Connection + Known / Previous IPs: - - true + + + + + + + 16777215 + 150 + @@ -362,13 +366,14 @@ behind a firewall or a VPN. - allowTunnelConnectionCB showDiscStatusBar allowIpDeterminationCB IPServersLV textlabel_ext textlabel_netLimited + ipAddressList + label_7 @@ -447,6 +452,19 @@ behind a firewall or a VPN. + + + + If you uncheck this, RetroShare will not use tunnel connection between peers that are firewalled and cannot connect directly. This is independent from F2F routing (turtle router). + + + Allow Tunnel Connection + + + true + + + @@ -538,7 +556,6 @@ The default value is 20. extAddress extPort dynDNS - allowTunnelConnectionCB showDiscStatusBar totalDownloadRate totalUploadRate