Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-07 22:46:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve the peers display update

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-02 21:45:46 +00:00
parent b83e894640
commit 32420790cb
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -84,7 +84,7 @@
/** Constructor */ /** Constructor */
PeersDialog::PeersDialog(QWidget *parent) PeersDialog::PeersDialog(QWidget *parent)
: RsAutoUpdatePage(1000,parent), : RsAutoUpdatePage(1500,parent),
historyKeeper(Rshare::dataDirectory() + "/his1.xml") historyKeeper(Rshare::dataDirectory() + "/his1.xml")
{ {
/* Invoke the Qt Designer generated object setup routine */ /* Invoke the Qt Designer generated object setup routine */
@ -106,17 +106,24 @@ PeersDialog::PeersDialog(QWidget *parent)
ui.peertabWidget->addTab(new ProfileWidget(),QString(tr("Profile"))); ui.peertabWidget->addTab(new ProfileWidget(),QString(tr("Profile")));
ui.peertreeWidget->setColumnCount(8);
ui.peertreeWidget->setColumnHidden ( 3, true);
ui.peertreeWidget->setColumnHidden ( 4, true);
ui.peertreeWidget->setColumnHidden ( 5, true);
ui.peertreeWidget->setColumnHidden ( 6, true);
ui.peertreeWidget->setColumnHidden ( 7, true);
ui.peertreeWidget->sortItems( 2, Qt::AscendingOrder );
/* Set header resize modes and initial section sizes */ /* Set header resize modes and initial section sizes */
QHeaderView * _header = ui.peertreeWidget->header () ; QHeaderView * _header = ui.peertreeWidget->header () ;
_header->setResizeMode (0, QHeaderView::Custom); _header->setResizeMode (0, QHeaderView::Custom);
_header->setResizeMode (1, QHeaderView::Interactive); _header->setResizeMode (1, QHeaderView::Interactive);
_header->setResizeMode (2, QHeaderView::Interactive); _header->setResizeMode (2, QHeaderView::Interactive);
_header->resizeSection ( 0, 25 ); _header->resizeSection ( 0, 25 );
_header->resizeSection ( 1, 100 ); _header->resizeSection ( 1, 150 );
_header->resizeSection ( 2, 100 ); _header->resizeSection ( 2, 150 );
// set header text aligment // set header text aligment
@ -173,8 +180,6 @@ PeersDialog::PeersDialog(QWidget *parent)
QTimer *timer = new QTimer(this); QTimer *timer = new QTimer(this);
timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat())); timer->connect(timer, SIGNAL(timeout()), this, SLOT(insertChat()));
timer->start(500); /* half a second */ timer->start(500); /* half a second */
ui.peertreeWidget->sortItems( 2, Qt::AscendingOrder );
QMenu *menu = new QMenu(); QMenu *menu = new QMenu();
menu->addAction(ui.actionAdd_Friend); menu->addAction(ui.actionAdd_Friend);
@ -185,7 +190,6 @@ PeersDialog::PeersDialog(QWidget *parent)
updateAvatar(); updateAvatar();
loadmypersonalstatus(); loadmypersonalstatus();
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -268,7 +272,7 @@ void PeersDialog::updateDisplay()
/* get the list of peers from the RsIface. */ /* get the list of peers from the RsIface. */
void PeersDialog::insertPeers() void PeersDialog::insertPeers()
{ {
std::list<std::string> peers; std::list<std::string> peers;
std::list<std::string>::iterator it; std::list<std::string>::iterator it;
if (!rsPeers) if (!rsPeers)
@ -281,6 +285,7 @@ void PeersDialog::insertPeers()
/* get a link to the table */ /* get a link to the table */
QTreeWidget *peerWidget = ui.peertreeWidget; QTreeWidget *peerWidget = ui.peertreeWidget;
QTreeWidgetItem *oldSelect = getCurrentPeer(); QTreeWidgetItem *oldSelect = getCurrentPeer();
QTreeWidgetItem *newSelect = NULL; QTreeWidgetItem *newSelect = NULL;
time_t now = time(NULL); time_t now = time(NULL);
@ -291,23 +296,17 @@ void PeersDialog::insertPeers()
oldId = (oldSelect -> text(7)).toStdString(); oldId = (oldSelect -> text(7)).toStdString();
} }
/* remove old items ??? */
peerWidget->clear();
peerWidget->setColumnCount(3);
// add self nick and Avatar to Friends. // add self nick and Avatar to Friends.
RsPeerDetails pd ; RsPeerDetails pd ;
if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd))
{ {
QString titleStr("<span style=\"font-size:16pt; font-weight:500;" QString titleStr("<span style=\"font-size:16pt; font-weight:500;"
"color:#32cd32;\">%1</span>"); "color:#32cd32;\">%1</span>");
ui.nicklabel->setText(titleStr.arg(QString::fromStdString(pd.name) + tr(" (me)"))) ; ui.nicklabel->setText(titleStr.arg(QString::fromStdString(pd.name) + tr(" (me)"))) ;
}
}
QList<QTreeWidgetItem *> items;
for(it = peers.begin(); it != peers.end(); it++) for(it = peers.begin(); it != peers.end(); it++)
{ {
RsPeerDetails detail; RsPeerDetails detail;
@ -317,7 +316,13 @@ void PeersDialog::insertPeers()
} }
/* make a widget per friend */ /* make a widget per friend */
QTreeWidgetItem *item = new QTreeWidgetItem((QTreeWidget*)0); QTreeWidgetItem *item;
QList<QTreeWidgetItem *> list = peerWidget->findItems (QString::fromStdString(detail.id), Qt::MatchExactly, 7);
if (list.size() == 1) {
item = list.front();
} else {
item = new QTreeWidgetItem((QTreeWidget*)0);
}
/* add all the labels */ /* add all the labels */
/* First 5 (1-5) Key Items */ /* First 5 (1-5) Key Items */
@ -339,14 +344,17 @@ void PeersDialog::insertPeers()
item -> setTextAlignment(1, Qt::AlignCenter | Qt::AlignVCenter ); item -> setTextAlignment(1, Qt::AlignCenter | Qt::AlignVCenter );
/* (1) Person */ /* (1) Person */
item -> setText( 2, QString::fromStdString(detail.name) + tr(" - ") + if (rsMsgs->getCustomStateString(detail.id) != "") {
QString::fromStdString(rsMsgs->getCustomStateString(detail.id))); item -> setText( 2, QString::fromStdString(detail.name) + tr(" - ") +
item -> setToolTip( 2, QString::fromStdString(detail.name) + tr(" - ") + QString::fromStdString(rsMsgs->getCustomStateString(detail.id)));
QString::fromStdString(rsMsgs->getCustomStateString(detail.id))); item -> setToolTip( 2, QString::fromStdString(detail.name) + tr(" - ") +
QString::fromStdString(rsMsgs->getCustomStateString(detail.id)));
} else {
item -> setText( 2, QString::fromStdString(detail.name));
item -> setToolTip( 2, QString::fromStdString(detail.name));
}
/* (2) Auto Connect */ item -> setText(3, status);
//item -> setText(3, QString::fromStdString(detail.autoconnect));
item -> setText(3, status);
/* (3) Trust Level */ /* (3) Trust Level */
item -> setText(4,QString::fromStdString( item -> setText(4,QString::fromStdString(
@ -379,7 +387,7 @@ void PeersDialog::insertPeers()
item -> setText(7, QString::fromStdString(detail.id)); item -> setText(7, QString::fromStdString(detail.id));
if ((oldSelect) && (oldId == detail.id)) if ((oldSelect) && (oldId == detail.id))
{ {
newSelect = item; peerWidget->setCurrentItem(item);
} }
} }
@ -424,7 +432,7 @@ void PeersDialog::insertPeers()
//item -> setBackground(i,QBrush(Qt::cyan)); //item -> setBackground(i,QBrush(Qt::cyan));
item -> setTextColor(i,(Qt::darkCyan)); item -> setTextColor(i,(Qt::darkCyan));
QFont font ; QFont font ;
font.setBold(true); font.setBold(true);
item -> setFont(i,font); item -> setFont(i,font);
item -> setIcon(0,(QIcon(IMAGE_AVAIBLE))); item -> setIcon(0,(QIcon(IMAGE_AVAIBLE)));
} }
@ -450,17 +458,8 @@ void PeersDialog::insertPeers()
} }
/* add to the list */ /* add to the list */
items.append(item); peerWidget->addTopLevelItem(item);
} }
/* add the items in! */
peerWidget->insertTopLevelItems(0, items);
if (newSelect)
{
peerWidget->setCurrentItem(newSelect);
}
peerWidget->update(); /* update display */
} }
/* Utility Fns */ /* Utility Fns */