Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-24 08:41:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added column with IP for connected peers (modified patch from Phenom)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-07-04 20:11:36 +00:00
parent 3208cf9e3a
commit 66d38ff1bb
3 changed files with 79 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

51
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -72,11 +72,12 @@
#define IMAGE_PASTELINK ":/images/pasterslink.png" #define IMAGE_PASTELINK ":/images/pasterslink.png"
#define IMAGE_GROUP24 ":/images/user/group24.png" #define IMAGE_GROUP24 ":/images/user/group24.png"
#define COLUMN_COUNT 4 #define COLUMN_COUNT 5
#define COLUMN_NAME 0 #define COLUMN_NAME 0
#define COLUMN_STATE 1 #define COLUMN_STATE 1
#define COLUMN_LAST_CONTACT 2 #define COLUMN_LAST_CONTACT 2
#define COLUMN_AVATAR 3 #define COLUMN_AVATAR 3
#define COLUMN_IP 4
#define COLUMN_DATA 0 // column for storing the userdata id #define COLUMN_DATA 0 // column for storing the userdata id
@ -123,6 +124,7 @@ FriendList::FriendList(QWidget *parent) :
m_compareRole->setRole(COLUMN_NAME, ROLE_SORT); m_compareRole->setRole(COLUMN_NAME, ROLE_SORT);
m_compareRole->setRole(COLUMN_STATE, ROLE_SORT); m_compareRole->setRole(COLUMN_STATE, ROLE_SORT);
m_compareRole->setRole(COLUMN_LAST_CONTACT, ROLE_SORT); m_compareRole->setRole(COLUMN_LAST_CONTACT, ROLE_SORT);
m_compareRole->setRole(COLUMN_IP, ROLE_SORT);
m_compareRole->setRole(COLUMN_AVATAR, ROLE_STANDARD); m_compareRole->setRole(COLUMN_AVATAR, ROLE_STANDARD);
connect(ui->peerTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(peerTreeWidgetCostumPopupMenu())); connect(ui->peerTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(peerTreeWidgetCostumPopupMenu()));
@ -136,6 +138,7 @@ FriendList::FriendList(QWidget *parent) :
connect(ui->actionShowStatusColumn, SIGNAL(triggered(bool)), this, SLOT(setShowStatusColumn(bool))); connect(ui->actionShowStatusColumn, SIGNAL(triggered(bool)), this, SLOT(setShowStatusColumn(bool)));
connect(ui->actionShowAvatarColumn, SIGNAL(triggered(bool)), this, SLOT(setShowAvatarColumn(bool))); connect(ui->actionShowAvatarColumn, SIGNAL(triggered(bool)), this, SLOT(setShowAvatarColumn(bool)));
connect(ui->actionShowLastContactColumn, SIGNAL(triggered(bool)), this, SLOT(setShowLastContactColumn(bool))); connect(ui->actionShowLastContactColumn, SIGNAL(triggered(bool)), this, SLOT(setShowLastContactColumn(bool)));
connect(ui->actionShowIPColumn, SIGNAL(triggered(bool)), this, SLOT(setShowIPColumn(bool)));
connect(ui->actionHideState, SIGNAL(triggered(bool)), this, SLOT(setHideState(bool))); connect(ui->actionHideState, SIGNAL(triggered(bool)), this, SLOT(setHideState(bool)));
connect(ui->actionRootIsDecorated, SIGNAL(triggered(bool)), this, SLOT(setRootIsDecorated(bool))); connect(ui->actionRootIsDecorated, SIGNAL(triggered(bool)), this, SLOT(setRootIsDecorated(bool)));
connect(ui->actionShowGroups, SIGNAL(triggered(bool)), this, SLOT(setShowGroups(bool))); connect(ui->actionShowGroups, SIGNAL(triggered(bool)), this, SLOT(setShowGroups(bool)));
@ -143,6 +146,7 @@ FriendList::FriendList(QWidget *parent) :
connect(ui->actionSortByName, SIGNAL(triggered()), this, SLOT(setSortByName())); connect(ui->actionSortByName, SIGNAL(triggered()), this, SLOT(setSortByName()));
connect(ui->actionSortByState, SIGNAL(triggered()), this, SLOT(setSortByState())); connect(ui->actionSortByState, SIGNAL(triggered()), this, SLOT(setSortByState()));
connect(ui->actionSortByLastContact, SIGNAL(triggered()), this, SLOT(setSortByLastContact())); connect(ui->actionSortByLastContact, SIGNAL(triggered()), this, SLOT(setSortByLastContact()));
connect(ui->actionSortByIP, SIGNAL(triggered()), this, SLOT(setSortByIP()));
connect(ui->actionSortPeersAscendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersAscendingOrder())); connect(ui->actionSortPeersAscendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersAscendingOrder()));
connect(ui->actionSortPeersDescendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersDescendingOrder())); connect(ui->actionSortPeersDescendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersDescendingOrder()));
@ -185,6 +189,7 @@ void FriendList::processSettings(bool bLoad)
// state of the columns // state of the columns
setShowStatusColumn(Settings->value("showStatusColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_STATE)).toBool()); setShowStatusColumn(Settings->value("showStatusColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_STATE)).toBool());
setShowLastContactColumn(Settings->value("showLastContactColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT)).toBool()); setShowLastContactColumn(Settings->value("showLastContactColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT)).toBool());
setShowIPColumn(Settings->value("showIPColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_IP)).toBool());
setShowAvatarColumn(Settings->value("showAvatarColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR)).toBool()); setShowAvatarColumn(Settings->value("showAvatarColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR)).toBool());
// states // states
@ -213,6 +218,7 @@ void FriendList::processSettings(bool bLoad)
// state of the columns // state of the columns
Settings->setValue("showStatusColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_STATE)); Settings->setValue("showStatusColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_STATE));
Settings->setValue("showLastContactColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT)); Settings->setValue("showLastContactColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT));
Settings->setValue("showIPColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_IP));
Settings->setValue("showAvatarColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR)); Settings->setValue("showAvatarColumn", !ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR));
// states // states
@ -255,6 +261,7 @@ void FriendList::initializeHeader(bool afterLoadSettings)
header->setResizeMode(COLUMN_NAME, QHeaderView::Stretch); header->setResizeMode(COLUMN_NAME, QHeaderView::Stretch);
header->setResizeMode(COLUMN_STATE, QHeaderView::Interactive); header->setResizeMode(COLUMN_STATE, QHeaderView::Interactive);
header->setResizeMode(COLUMN_LAST_CONTACT, QHeaderView::Interactive); header->setResizeMode(COLUMN_LAST_CONTACT, QHeaderView::Interactive);
header->setResizeMode(COLUMN_IP, QHeaderView::Interactive);
header->setResizeMode(COLUMN_AVATAR, QHeaderView::Fixed); header->setResizeMode(COLUMN_AVATAR, QHeaderView::Fixed);
if (!afterLoadSettings) { if (!afterLoadSettings) {
@ -544,6 +551,7 @@ void FriendList::insertPeers()
bool isStatusColumnHidden = ui->peerTreeWidget->isColumnHidden(COLUMN_STATE); bool isStatusColumnHidden = ui->peerTreeWidget->isColumnHidden(COLUMN_STATE);
bool isAvatarColumnHidden = ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR); bool isAvatarColumnHidden = ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR);
bool isIPColumnHidden = ui->peerTreeWidget->isColumnHidden(COLUMN_IP);
std::list<StatusInfo> statusInfo; std::list<StatusInfo> statusInfo;
rsStatus->getStatusList(statusInfo); rsStatus->getStatusList(statusInfo);
@ -829,6 +837,7 @@ void FriendList::insertPeers()
QString bestCustomStateString;// for gpg item QString bestCustomStateString;// for gpg item
std::list<std::string> sslContacts; std::list<std::string> sslContacts;
QDateTime lastContact; QDateTime lastContact;
QString itemIP;
rsPeers->getAssociatedSSLIds(detail.gpg_id, sslContacts); rsPeers->getAssociatedSSLIds(detail.gpg_id, sslContacts);
for (std::list<std::string>::iterator sslIt = sslContacts.begin(); sslIt != sslContacts.end(); sslIt++) { for (std::list<std::string>::iterator sslIt = sslContacts.begin(); sslIt != sslContacts.end(); sslIt++) {
@ -909,6 +918,15 @@ void FriendList::insertPeers()
lastContact = sslLastContact; lastContact = sslLastContact;
} }
/* IP */
QString sslItemIP = (sslDetail.state & RS_PEER_STATE_CONNECTED)?QString(sslDetail.extAddr.c_str()):QString("---");
sslItem->setData(COLUMN_IP, Qt::DisplayRole, QVariant(sslItemIP));
sslItem->setData(COLUMN_IP, ROLE_SORT, sslItemIP);
if (sslItemIP != itemIP) {
itemIP = sslItemIP;
}
/* change color and icon */ /* change color and icon */
QIcon sslIcon; QIcon sslIcon;
QFont sslFont; QFont sslFont;
@ -1101,6 +1119,8 @@ void FriendList::insertPeers()
gpgItem->setIcon(COLUMN_NAME, gpgIcon); gpgItem->setIcon(COLUMN_NAME, gpgIcon);
gpgItem->setData(COLUMN_LAST_CONTACT, Qt::DisplayRole, QVariant(lastContact)); gpgItem->setData(COLUMN_LAST_CONTACT, Qt::DisplayRole, QVariant(lastContact));
gpgItem->setData(COLUMN_LAST_CONTACT, ROLE_SORT, "2 " + lastContact.toString("yyyyMMdd_hhmmss")); gpgItem->setData(COLUMN_LAST_CONTACT, ROLE_SORT, "2 " + lastContact.toString("yyyyMMdd_hhmmss"));
gpgItem->setData(COLUMN_IP, Qt::DisplayRole, QVariant());
gpgItem->setData(COLUMN_IP, ROLE_SORT, "2 " + itemIP);
if (openPeers != NULL && openPeers->find(gpgId) != openPeers->end()) { if (openPeers != NULL && openPeers->find(gpgId) != openPeers->end()) {
gpgItem->setExpanded(true); gpgItem->setExpanded(true);
@ -1699,6 +1719,18 @@ void FriendList::setShowLastContactColumn(bool show)
} }
} }
void FriendList::setShowIPColumn(bool show)
{
bool isColumnVisible = !ui->peerTreeWidget->isColumnHidden(COLUMN_IP);
if (isColumnVisible != show) {
ui->peerTreeWidget->setColumnHidden(COLUMN_IP, !show);
updateHeader();
insertPeers();
}
}
void FriendList::setShowAvatarColumn(bool show) void FriendList::setShowAvatarColumn(bool show)
{ {
bool isColumnVisible = !ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR); bool isColumnVisible = !ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR);
@ -1724,7 +1756,9 @@ void FriendList::setHideState(bool hidden)
*/ */
void FriendList::updateHeader() void FriendList::updateHeader()
{ {
if (ui->peerTreeWidget->isColumnHidden(COLUMN_STATE) && ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT)) { if (ui->peerTreeWidget->isColumnHidden(COLUMN_STATE) \
&& ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT) \
&& ui->peerTreeWidget->isColumnHidden(COLUMN_IP)) {
ui->peerTreeWidget->setHeaderHidden(true); ui->peerTreeWidget->setHeaderHidden(true);
} else { } else {
ui->peerTreeWidget->setHeaderHidden(false); ui->peerTreeWidget->setHeaderHidden(false);
@ -1749,6 +1783,12 @@ void FriendList::setSortByLastContact()
sortPeersDescendingOrder(); sortPeersDescendingOrder();
} }
void FriendList::setSortByIP()
{
ui->peerTreeWidget->sortByColumn(COLUMN_IP);
sortPeersDescendingOrder();
}
void FriendList::sortPeersAscendingOrder() void FriendList::sortPeersAscendingOrder()
{ {
ui->peerTreeWidget->sortByColumn(ui->peerTreeWidget->sortColumn(), Qt::AscendingOrder); ui->peerTreeWidget->sortByColumn(ui->peerTreeWidget->sortColumn(), Qt::AscendingOrder);
@ -1894,11 +1934,13 @@ QMenu *FriendList::createDisplayMenu()
QMenu *menu = displayMenu->addMenu(tr("Columns")); QMenu *menu = displayMenu->addMenu(tr("Columns"));
menu->addAction(ui->actionShowAvatarColumn); menu->addAction(ui->actionShowAvatarColumn);
menu->addAction(ui->actionShowLastContactColumn); menu->addAction(ui->actionShowLastContactColumn);
menu->addAction(ui->actionShowIPColumn);
menu->addAction(ui->actionShowStatusColumn); menu->addAction(ui->actionShowStatusColumn);
menu = displayMenu->addMenu(tr("Sort by")); menu = displayMenu->addMenu(tr("Sort by"));
menu->addAction(ui->actionSortByName); menu->addAction(ui->actionSortByName);
menu->addAction(ui->actionSortByState); menu->addAction(ui->actionSortByState);
menu->addAction(ui->actionSortByLastContact); menu->addAction(ui->actionSortByLastContact);
menu->addAction(ui->actionSortByIP);
displayMenu->addAction(ui->actionHideOfflineFriends); displayMenu->addAction(ui->actionHideOfflineFriends);
displayMenu->addAction(ui->actionHideState); displayMenu->addAction(ui->actionHideState);
displayMenu->addAction(ui->actionRootIsDecorated); displayMenu->addAction(ui->actionRootIsDecorated);
@ -1908,6 +1950,7 @@ QMenu *FriendList::createDisplayMenu()
group->addAction(ui->actionSortByName); group->addAction(ui->actionSortByName);
group->addAction(ui->actionSortByState); group->addAction(ui->actionSortByState);
group->addAction(ui->actionSortByLastContact); group->addAction(ui->actionSortByLastContact);
group->addAction(ui->actionSortByIP);
return displayMenu; return displayMenu;
} }
@ -1924,11 +1967,15 @@ void FriendList::updateMenu()
case COLUMN_LAST_CONTACT: case COLUMN_LAST_CONTACT:
ui->actionSortByLastContact->setChecked(true); ui->actionSortByLastContact->setChecked(true);
break; break;
case COLUMN_IP:
ui->actionSortByIP->setChecked(true);
break;
case COLUMN_AVATAR: case COLUMN_AVATAR:
break; break;
} }
ui->actionShowStatusColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_STATE)); ui->actionShowStatusColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_STATE));
ui->actionShowLastContactColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT)); ui->actionShowLastContactColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_LAST_CONTACT));
ui->actionShowIPColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_IP));
ui->actionShowAvatarColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR)); ui->actionShowAvatarColumn->setChecked(!ui->peerTreeWidget->isColumnHidden(COLUMN_AVATAR));
ui->actionHideOfflineFriends->setChecked(mHideUnconnected); ui->actionHideOfflineFriends->setChecked(mHideUnconnected);
ui->actionHideState->setChecked(mHideState); ui->actionHideState->setChecked(mHideState);

2
retroshare-gui/src/gui/common/FriendList.h
View file

@ -86,11 +86,13 @@ public slots:
void setHideState(bool hidden); void setHideState(bool hidden);
void setShowStatusColumn(bool show); void setShowStatusColumn(bool show);
void setShowLastContactColumn(bool show); void setShowLastContactColumn(bool show);
void setShowIPColumn(bool show);
void setShowAvatarColumn(bool show); void setShowAvatarColumn(bool show);
void setRootIsDecorated(bool show); void setRootIsDecorated(bool show);
void setSortByName(); void setSortByName();
void setSortByState(); void setSortByState();
void setSortByLastContact(); void setSortByLastContact();
void setSortByIP();
void sortPeersAscendingOrder(); void sortPeersAscendingOrder();
void sortPeersDescendingOrder(); void sortPeersDescendingOrder();

29
retroshare-gui/src/gui/common/FriendList.ui
View file

@ -51,7 +51,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="columnCount"> <property name="columnCount">
<number>4</number> <number>5</number>
</property> </property>
<attribute name="headerStretchLastSection"> <attribute name="headerStretchLastSection">
<bool>false</bool> <bool>false</bool>
@ -76,6 +76,11 @@
<string>Avatar</string> <string>Avatar</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>IP</string>
</property>
</column>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -207,6 +212,28 @@
<string>Show Groups</string> <string>Show Groups</string>
</property> </property>
</action> </action>
<action name="actionSortByIP">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>IP</string>
</property>
<property name="toolTip">
<string>Sort by IP</string>
</property>
</action>
<action name="actionShowIPColumn">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>IP</string>
</property>
<property name="toolTip">
<string>Show IP Column</string>
</property>
</action>
</widget> </widget>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>