From d5f372fae8c9e6486a30106b25376bc10d86e217 Mon Sep 17 00:00:00 2001 From: Ivanov Juriy Date: Fri, 29 Aug 2014 13:23:00 +0400 Subject: [PATCH] Add peer port column to PeerListWidget. Closes #1650. --- src/properties/peerlistdelegate.h | 2 +- src/properties/peerlistwidget.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/properties/peerlistdelegate.h b/src/properties/peerlistdelegate.h index c819c544b..f6ad975d9 100644 --- a/src/properties/peerlistdelegate.h +++ b/src/properties/peerlistdelegate.h @@ -39,7 +39,7 @@ class PeerListDelegate: public QItemDelegate { Q_OBJECT public: - enum PeerListColumns {COUNTRY, IP, CONNECTION, FLAGS, CLIENT, PROGRESS, DOWN_SPEED, UP_SPEED, + enum PeerListColumns {COUNTRY, IP, PORT, CONNECTION, FLAGS, CLIENT, PROGRESS, DOWN_SPEED, UP_SPEED, TOT_DOWN, TOT_UP, IP_HIDDEN, COL_COUNT}; public: diff --git a/src/properties/peerlistwidget.cpp b/src/properties/peerlistwidget.cpp index 22bded031..0929ba8e9 100644 --- a/src/properties/peerlistwidget.cpp +++ b/src/properties/peerlistwidget.cpp @@ -62,6 +62,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent): m_listModel = new QStandardItemModel(0, PeerListDelegate::COL_COUNT); m_listModel->setHeaderData(PeerListDelegate::COUNTRY, Qt::Horizontal, QVariant()); // Country flag column m_listModel->setHeaderData(PeerListDelegate::IP, Qt::Horizontal, tr("IP")); + m_listModel->setHeaderData(PeerListDelegate::PORT, Qt::Horizontal, tr("Port")); m_listModel->setHeaderData(PeerListDelegate::FLAGS, Qt::Horizontal, tr("Flags")); m_listModel->setHeaderData(PeerListDelegate::CONNECTION, Qt::Horizontal, tr("Connection")); m_listModel->setHeaderData(PeerListDelegate::CLIENT, Qt::Horizontal, tr("Client", "i.e.: Client application")); @@ -371,6 +372,7 @@ QStandardItem* PeerListWidget::addPeer(const QString& ip, const peer_info& peer) m_listModel->insertRow(row); m_listModel->setData(m_listModel->index(row, PeerListDelegate::IP), ip); m_listModel->setData(m_listModel->index(row, PeerListDelegate::IP), ip, Qt::ToolTipRole); + m_listModel->setData(m_listModel->index(row, PeerListDelegate::PORT), QString::number(peer.ip.port())); m_listModel->setData(m_listModel->index(row, PeerListDelegate::IP_HIDDEN), ip); if (m_displayFlags) { const QIcon ico = GeoIPManager::CountryISOCodeToIcon(peer.country); @@ -411,6 +413,7 @@ void PeerListWidget::updatePeer(const QString& ip, const peer_info& peer) { m_listModel->setData(m_listModel->index(row, PeerListDelegate::CONNECTION), getConnectionString(peer)); QString flags, tooltip; getFlags(peer, flags, tooltip); + m_listModel->setData(m_listModel->index(row, PeerListDelegate::PORT), QString::number(peer.ip.port())); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), flags); m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), tooltip, Qt::ToolTipRole); m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), misc::toQStringU(peer.client));