Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 11:16:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added columns for last used statistics on pgp keys in network dialog. Fixed bug due to missing Qt connection

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-27 10:43:34 +00:00
parent e667e6b790
commit 02890c737a
2 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -56,6 +56,7 @@
#define COLUMN_PEERNAME 1 #define COLUMN_PEERNAME 1
#define COLUMN_PEERID 4 #define COLUMN_PEERID 4
#define COLUMN_LAST_USED 5
RsCertId getNeighRsCertId(QTreeWidgetItem *i); RsCertId getNeighRsCertId(QTreeWidgetItem *i);
@ -80,12 +81,12 @@ NetworkDialog::NetworkDialog(QWidget *parent)
connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString))); connect( ui.filterLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(filterItems(QString)));
connect( ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int))); connect( ui.filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int)));
connect( ui.showUnvalidKeys, SIGNAL(clicked()), this, SLOT(insertConnect())); connect( ui.showUnvalidKeys, SIGNAL(clicked()), this, SLOT(securedUpdateDisplay()));
/* hide the Tree +/- */ /* hide the Tree +/- */
ui.connecttreeWidget -> setRootIsDecorated( false ); ui.connecttreeWidget -> setRootIsDecorated( false );
ui.connecttreeWidget -> setColumnCount(5); ui.connecttreeWidget -> setColumnCount(6);
ui.unvalidGPGkeyWidget-> setColumnCount(5); ui.unvalidGPGkeyWidget-> setColumnCount(6);
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * _header = ui.connecttreeWidget->header () ; QHeaderView * _header = ui.connecttreeWidget->header () ;
@ -94,11 +95,13 @@ NetworkDialog::NetworkDialog(QWidget *parent)
_header->setResizeMode (2, QHeaderView::Interactive); _header->setResizeMode (2, QHeaderView::Interactive);
_header->setResizeMode (3, QHeaderView::Interactive); _header->setResizeMode (3, QHeaderView::Interactive);
_header->setResizeMode (4, QHeaderView::Interactive); _header->setResizeMode (4, QHeaderView::Interactive);
_header->setResizeMode (5, QHeaderView::Interactive);
_header->resizeSection ( 0, 25 ); _header->resizeSection ( 0, 25 );
_header->resizeSection ( 1, 200 ); _header->resizeSection ( 1, 200 );
_header->resizeSection ( 2, 200 ); _header->resizeSection ( 2, 200 );
_header->resizeSection ( 3, 200 ); _header->resizeSection ( 3, 200 );
_header->resizeSection ( 5, 75 );
// set header text aligment // set header text aligment
QTreeWidgetItem * headerItem = ui.connecttreeWidget->headerItem(); QTreeWidgetItem * headerItem = ui.connecttreeWidget->headerItem();
@ -107,6 +110,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
headerItem->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter); headerItem->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter);
headerItem->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter); headerItem->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter);
headerItem->setTextAlignment(4, Qt::AlignVCenter); headerItem->setTextAlignment(4, Qt::AlignVCenter);
headerItem->setTextAlignment(5, Qt::AlignVCenter);
/* hide the Tree +/- */ /* hide the Tree +/- */
ui.unvalidGPGkeyWidget -> setRootIsDecorated( false ); ui.unvalidGPGkeyWidget -> setRootIsDecorated( false );
@ -117,11 +121,13 @@ NetworkDialog::NetworkDialog(QWidget *parent)
ui.unvalidGPGkeyWidget->header()->setResizeMode (2, QHeaderView::Interactive); ui.unvalidGPGkeyWidget->header()->setResizeMode (2, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (3, QHeaderView::Interactive); ui.unvalidGPGkeyWidget->header()->setResizeMode (3, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (4, QHeaderView::Interactive); ui.unvalidGPGkeyWidget->header()->setResizeMode (4, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->setResizeMode (5, QHeaderView::Interactive);
ui.unvalidGPGkeyWidget->header()->resizeSection ( 0, 25 ); ui.unvalidGPGkeyWidget->header()->resizeSection ( 0, 25 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 1, 200 ); ui.unvalidGPGkeyWidget->header()->resizeSection ( 1, 200 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 2, 200 ); ui.unvalidGPGkeyWidget->header()->resizeSection ( 2, 200 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 3, 200 ); ui.unvalidGPGkeyWidget->header()->resizeSection ( 3, 200 );
ui.unvalidGPGkeyWidget->header()->resizeSection ( 5, 75 );
// set header text aligment // set header text aligment
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter);
@ -129,6 +135,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter); ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(4, Qt::AlignVCenter); ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(4, Qt::AlignVCenter);
ui.unvalidGPGkeyWidget->headerItem()->setTextAlignment(5, Qt::AlignVCenter);
ui.connecttreeWidget->sortItems( 1, Qt::AscendingOrder ); ui.connecttreeWidget->sortItems( 1, Qt::AscendingOrder );
ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder ); ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder );
@ -363,6 +370,7 @@ void NetworkDialog::insertConnect()
QList<QTreeWidgetItem *> validItems; QList<QTreeWidgetItem *> validItems;
QList<QTreeWidgetItem *> unvalidItems; QList<QTreeWidgetItem *> unvalidItems;
for(it = neighs.begin(); it != neighs.end(); it++) for(it = neighs.begin(); it != neighs.end(); it++)
{ {
#ifdef NET_DEBUG #ifdef NET_DEBUG
@ -424,13 +432,30 @@ void NetworkDialog::insertConnect()
default: item->setText(2,tr("Untrusted peer")) ; break ; default: item->setText(2,tr("Untrusted peer")) ; break ;
} }
QString PeerAuthenticationString = tr("Unknown") ;
/* (3) has me auth */ /* (3) has me auth */
QString PeerAuthenticationString ;
if (detail.hasSignedMe) if (detail.hasSignedMe)
PeerAuthenticationString = tr("Has authenticated me"); PeerAuthenticationString = tr("Has authenticated me");
else
PeerAuthenticationString = tr("Unknown");
item->setText(3,PeerAuthenticationString) ; item->setText(3,PeerAuthenticationString) ;
uint64_t last_time_used = now - detail.lastUsed ;
QString lst_used_str ;
if(last_time_used < 3600)
lst_used_str = tr("Last hour") ;
else if(last_time_used < 86400)
lst_used_str = tr("Today") ;
else if(last_time_used > 86400 * 15000)
lst_used_str = tr("Never");
else
lst_used_str = QString::number( (int)( last_time_used / 86400 ))+" "+tr("days ago") ;
item->setText(COLUMN_LAST_USED,lst_used_str) ;
/** /**
* Determinated the Background Color * Determinated the Background Color
*/ */

10
retroshare-gui/src/gui/NetworkDialog.ui
View file

@ -125,6 +125,11 @@
<string>Cert Id</string> <string>Cert Id</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>Last used</string>
</property>
</column>
</widget> </widget>
<widget class="QTreeWidget" name="unvalidGPGkeyWidget"> <widget class="QTreeWidget" name="unvalidGPGkeyWidget">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@ -170,6 +175,11 @@
<string>Cert Id</string> <string>Cert Id</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>Last used</string>
</property>
</column>
</widget> </widget>
</widget> </widget>
</item> </item>