From 7096a61e2149c2016549d3fcb2c9e9ca54ee66f3 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 15 Mar 2015 15:38:24 +0000 Subject: [PATCH] 0008 Display connexion address in statusDefs Connect State (Patch from G10H4ck) git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IPv6@8032 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/common/StatusDefs.cpp | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/retroshare-gui/src/gui/common/StatusDefs.cpp b/retroshare-gui/src/gui/common/StatusDefs.cpp index 954d1413d..0d2033519 100644 --- a/retroshare-gui/src/gui/common/StatusDefs.cpp +++ b/retroshare-gui/src/gui/common/StatusDefs.cpp @@ -183,18 +183,23 @@ QString StatusDefs::connectStateString(RsPeerDetails &details) break; } - if (details.connectStateString.empty() == false) { - if (stateString.isEmpty() == false) { - stateString += ": "; - } + if (!details.connectStateString.empty()) + { + if (!stateString.isEmpty()) stateString += ": "; stateString += QString::fromStdString(details.connectStateString); } + else if (!details.connectAddr.empty()) + { + if (!stateString.isEmpty()) stateString += ": ["; + stateString += QString::fromStdString(details.connectAddr); + stateString += "]:"; + stateString += QString::number(details.connectPort); + } /* HACK to display DHT Status info too */ - if (details.foundDHT) { - if (stateString.isEmpty() == false) { - stateString += ", "; - } + if (details.foundDHT) + { + if (!stateString.isEmpty()) stateString += ", "; stateString += qApp->translate("StatusDefs", "DHT: Contact"); }