Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use fixed header size for Avatar Item and display autoconnect attempt after location.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-04-20 16:37:53 +00:00
parent 7e4eaa4ae3
commit aefd492b86
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroshare-gui/src/gui/MessengerWindow.cpp
View File

@ -126,12 +126,12 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
QHeaderView * _header = ui.messengertreeWidget->header () ; QHeaderView * _header = ui.messengertreeWidget->header () ;
_header->setResizeMode (0, QHeaderView::Stretch); _header->setResizeMode (0, QHeaderView::Stretch);
_header->setResizeMode (1, QHeaderView::Interactive); _header->setResizeMode (1, QHeaderView::Custom);
_header->setStretchLastSection(false); _header->setStretchLastSection(false);
_header->resizeSection ( 0, 200 ); _header->resizeSection ( 0, 200 );
_header->resizeSection ( 1, 100 ); _header->resizeSection ( 1, 42 );
//LogoBar //LogoBar
_rsLogoBarmessenger = NULL; _rsLogoBarmessenger = NULL;
@ -389,19 +389,19 @@ void MessengerWindow::insertPeers()
sslItem -> setText(3, QString::fromStdString(sslDetail.id)); sslItem -> setText(3, QString::fromStdString(sslDetail.id));
if (rsMsgs->getCustomStateString(sslDetail.id) != "") { if (rsMsgs->getCustomStateString(sslDetail.id) != "") {
sslItem -> setText( 0, tr("location : ") + QString::fromStdString(sslDetail.location) ); sslItem -> setText( 0, tr("location : ") + QString::fromStdString(sslDetail.location) + " " + QString::fromStdString(sslDetail.autoconnect) );
sslItem -> setToolTip( 0, tr("location : ") + QString::fromStdString(sslDetail.location) + tr(" - ") + QString::fromStdString(rsMsgs->getCustomStateString(sslDetail.id))); sslItem -> setToolTip( 0, tr("location : ") + QString::fromStdString(sslDetail.location) + tr(" - ") + QString::fromStdString(rsMsgs->getCustomStateString(sslDetail.id)));
gpg_item -> setText(0, QString::fromStdString(detail.name) + tr("\n") + QString::fromStdString(rsMsgs->getCustomStateString(sslDetail.id))); gpg_item -> setText(0, QString::fromStdString(detail.name) + tr("\n") + QString::fromStdString(rsMsgs->getCustomStateString(sslDetail.id)));
} else { } else {
sslItem -> setText( 0, tr("location : ") + QString::fromStdString(sslDetail.location)); sslItem -> setText( 0, tr("location : ") + QString::fromStdString(sslDetail.location) + " " + QString::fromStdString(sslDetail.autoconnect));
sslItem -> setToolTip( 0, tr("location : ") + QString::fromStdString(sslDetail.location)); sslItem -> setToolTip( 0, tr("location : ") + QString::fromStdString(sslDetail.location));
gpg_item -> setText(0, QString::fromStdString(detail.name) + tr("\n") + QString::fromStdString(sslDetail.location)); gpg_item -> setText(0, QString::fromStdString(detail.name) + tr("\n") + QString::fromStdString(sslDetail.location));
} }
/* not displayed, used to find back the item */ /* not displayed, used to find back the item */
sslItem -> setText(1, QString::fromStdString(sslDetail.autoconnect)); //sslItem -> setText(1, QString::fromStdString(sslDetail.autoconnect));
int i; int i;
if (sslDetail.state & RS_PEER_STATE_CONNECTED) { if (sslDetail.state & RS_PEER_STATE_CONNECTED) {
@ -410,7 +410,6 @@ void MessengerWindow::insertPeers()
/* change color and icon */ /* change color and icon */
sslItem -> setIcon(0,(QIcon(":/images/connect_established.png"))); sslItem -> setIcon(0,(QIcon(":/images/connect_established.png")));
sslItem -> setIcon(1,(QIcon(":/images/encrypted32.png")));
QFont font; QFont font;
font.setBold(true); font.setBold(true);
for(i = 0; i < 3; i++) { for(i = 0; i < 3; i++) {
@ -457,7 +456,7 @@ void MessengerWindow::insertPeers()
int i = 0; int i = 0;
if (gpg_connected) { if (gpg_connected) {
gpg_item->setHidden(false); gpg_item->setHidden(false);
gpg_item -> setText(1, tr("Online")); // set to online regardless on update //gpg_item -> setText(1, tr("Online")); // set to online regardless on update
std::list<StatusInfo>::iterator it = statusInfo.begin(); std::list<StatusInfo>::iterator it = statusInfo.begin();
@ -515,7 +514,7 @@ void MessengerWindow::insertPeers()
} else if (gpg_online) { } else if (gpg_online) {
gpg_item->setHidden(ui.actionHide_Offline_Friends->isChecked()); gpg_item->setHidden(ui.actionHide_Offline_Friends->isChecked());
gpg_item -> setIcon(0,(QIcon(IMAGE_AVAIBLE))); gpg_item -> setIcon(0,(QIcon(IMAGE_AVAIBLE)));
gpg_item -> setText(1, tr("Available")); //gpg_item -> setText(1, tr("Available"));
QFont font; QFont font;
font.setBold(true); font.setBold(true);
for(i = 0; i < 3; i++) { for(i = 0; i < 3; i++) {
@ -525,7 +524,7 @@ void MessengerWindow::insertPeers()
} else { } else {
gpg_item->setHidden(ui.actionHide_Offline_Friends->isChecked()); gpg_item->setHidden(ui.actionHide_Offline_Friends->isChecked());
gpg_item -> setIcon(0,(QIcon(IMAGE_OFFLINE))); gpg_item -> setIcon(0,(QIcon(IMAGE_OFFLINE)));
gpg_item -> setText(1, tr("Offline")); //gpg_item -> setText(1, tr("Offline"));
QFont font; QFont font;
font.setBold(false); font.setBold(false);
for(i = 0; i < 3; i++) { for(i = 0; i < 3; i++) {