diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp index 940a69645..296c35986 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.cpp +++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp @@ -176,10 +176,10 @@ void PeerItem::updateItem() ipLabel->setText(QString::fromStdString(out.str())); } - time_t now = time(NULL); connLabel->setText(QString::fromStdString(details.autoconnect)); - lastLabel->setText(QString::fromStdString( - RsPeerLastConnectString(now - details.lastConnect))); + QDateTime date = QDateTime::fromTime_t(details.lastConnect); + QString stime = date.toString(Qt::LocalDate); + lastLabel-> setText(stime); /* do buttons */ chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED); diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui index 59b41ba48..5e231a031 100644 --- a/retroshare-gui/src/gui/feeds/PeerItem.ui +++ b/retroshare-gui/src/gui/feeds/PeerItem.ui @@ -7,7 +7,7 @@ 0 0 652 - 323 + 282 @@ -263,7 +263,7 @@ border-radius: 10px} - :/images/ddeny.png:/images/ddeny.png + :/images/removefriend16.png:/images/removefriend16.png @@ -349,11 +349,11 @@ border-radius: 10px} QFrame::Raised - - - + + + - + @@ -376,7 +376,11 @@ border-radius: 10px} - RsId: + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:600; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Peer Id:</span></p></body></html> @@ -419,10 +423,49 @@ border-radius: 10px} + + + + + 75 + true + + + + IP Address + + + + + + + + 75 + true + + + + Connection Method + + + + + + + + 75 + true + + + + Last Contact: + + + - + @@ -488,73 +531,6 @@ border-radius: 10px} - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - - - - - 75 - true - - - - IP Address - - - - - - - - 75 - true - - - - Connection Method - - - - - - - - 75 - true - - - - Last Contact: - - - - - - - @@ -598,6 +574,19 @@ border-radius: 10px} + + + + Qt::Vertical + + + + 20 + 40 + + + +