From ac580a6c07740bdd86d274eb2fa936dfc8f9c1ad Mon Sep 17 00:00:00 2001 From: joss17 Date: Mon, 18 Jan 2010 22:44:09 +0000 Subject: [PATCH] add location to account detail at startup, and improve the peersdialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2075 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/authssl.cc | 4 +- libretroshare/src/pqi/authssl.h | 4 +- libretroshare/src/rsserver/rsinit.cc | 18 +- retroshare-gui/src/gui/MainWindow.cpp | 17 - retroshare-gui/src/gui/PeersDialog.cpp | 113 +- retroshare-gui/src/gui/PeersDialog.h | 10 - retroshare-gui/src/gui/PeersDialog.ui | 71 +- retroshare-gui/src/gui/StartDialog.cpp | 6 +- .../src/gui/profile/ProfileWidget.cpp | 6 +- .../src/gui/profile/ProfileWidget.ui | 1107 ++++++++--------- 10 files changed, 548 insertions(+), 808 deletions(-) diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc index 379eeab94..01c339049 100644 --- a/libretroshare/src/pqi/authssl.cc +++ b/libretroshare/src/pqi/authssl.cc @@ -2239,7 +2239,7 @@ int AuthSSL::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx) // Not dependent on sslroot. load, and detroys the X509 memory. -int LoadCheckX509andGetName(const char *cert_file, std::string &userName, std::string &userId) +int LoadCheckX509andGetLocation(const char *cert_file, std::string &location, std::string &userId) { /* This function loads the X509 certificate from the file, * and checks the certificate @@ -2270,7 +2270,7 @@ int LoadCheckX509andGetName(const char *cert_file, std::string &userName, std::s if (valid) { // extract the name. - userName = getX509CNString(x509->cert_info->subject); + location = getX509LocString(x509->cert_info->subject); } std::cout << getX509Info(x509) << std::endl ; diff --git a/libretroshare/src/pqi/authssl.h b/libretroshare/src/pqi/authssl.h index 2688b5211..cc0a7eee5 100644 --- a/libretroshare/src/pqi/authssl.h +++ b/libretroshare/src/pqi/authssl.h @@ -236,7 +236,7 @@ bool getX509id(X509 *x509, std::string &xid); int LoadCheckX509andGetIssuerName(const char *cert_file, std::string &issuerName, std::string &userId); -int LoadCheckX509andGetName(const char *cert_file, - std::string &userName, std::string &userId); +int LoadCheckX509andGetLocation(const char *cert_file, + std::string &location, std::string &userId); #endif // MRK_AUTH_SSL_HEADER diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 4d42ff68d..e0c5ec9ac 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -57,7 +57,7 @@ class accountId std::string pgpEmail; std::string sslId; - std::string sslName; + std::string location; }; @@ -489,7 +489,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored) { std::cerr << " * Preferred * " << std::endl; userId = it->sslId; - userName = it->sslName; + userName = it->pgpName; existingUser = true; } } @@ -533,7 +533,7 @@ bool RsInit::getAccountIds(std::list &ids) std::cerr << "SSL Id: " << it->sslId << " PGP Id " << it->pgpId << std::cerr << " PGP Name: " << it->pgpName; std::cerr << " PGP Email: " << it->pgpEmail; - std::cerr << " SSL Name: " << it->sslName; + std::cerr << " Location: " << it->location; std::cerr << std::endl; ids.push_back(it->sslId); @@ -544,7 +544,7 @@ bool RsInit::getAccountIds(std::list &ids) bool RsInit::getAccountDetails(std::string id, std::string &gpgId, std::string &gpgName, - std::string &gpgEmail, std::string &sslName) + std::string &gpgEmail, std::string &location) { std::list::iterator it; for(it = RsInitConfig::accountIds.begin(); it != RsInitConfig::accountIds.end(); it++) @@ -554,7 +554,7 @@ bool RsInit::getAccountDetails(std::string id, gpgId = it->pgpId; gpgName = it->pgpName; gpgEmail = it->pgpEmail; - sslName = it->sslName; + location = it->location; return true; } } @@ -732,8 +732,8 @@ static bool checkAccount(std::string accountdir, accountId &id) bool ret = false; /* check against authmanagers private keys */ - LoadCheckX509andGetName(cert_name.c_str(), id.sslName, id.sslId); - std::cerr << "sslName: " << id.sslName << " id: " << id.sslId << std::endl; + LoadCheckX509andGetLocation(cert_name.c_str(), id.location, id.sslId); + std::cerr << "location: " << id.location << " id: " << id.sslId << std::endl; std::string tmpid; if (LoadCheckX509andGetIssuerName(cert_name.c_str(), id.pgpId, tmpid)) @@ -949,10 +949,10 @@ bool RsInit::GenerateSSLCertificate(std::string gpg_id, std::string org, std /* try to load it, and get Id */ - std::string sslName; + std::string location; int ret = 0; - ret = LoadCheckX509andGetName(cert_name.c_str(), sslName, sslId); + ret = LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId); /* Move directory to correct id */ std::string finalbase = RsInitConfig::basedir + RsInitConfig::dirSeperator + sslId + RsInitConfig::dirSeperator; diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index d07d11d76..cda686d9f 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -181,22 +181,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) LinksDialog *linksDialog = NULL; - -#ifdef RS_RELEASE_VERSION - - ChannelFeed *channelFeed = NULL; - ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), - createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); - - ForumsDialog *forumsDialog = NULL; - ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp)); - - ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), - createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp)); - -#else - ChannelFeed *channelFeed = NULL; ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); @@ -208,7 +192,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp)); -#endif NewsFeed *newsFeed = NULL; ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp index 15a46b9aa..d1ce4cb27 100644 --- a/retroshare-gui/src/gui/PeersDialog.cpp +++ b/retroshare-gui/src/gui/PeersDialog.cpp @@ -22,6 +22,7 @@ #include #include #include "common/vmessagebox.h" +#include #include "rshare.h" #include "PeersDialog.h" @@ -96,6 +97,7 @@ PeersDialog::PeersDialog(QWidget *parent) last_status_send_time = 0 ; + connect( ui.peertreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( peertreeWidgetCostumPopupMenu( QPoint ) ) ); connect( ui.peertreeWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int)), this, SLOT(chatfriend())); @@ -104,6 +106,7 @@ PeersDialog::PeersDialog(QWidget *parent) connect( ui.actionSet_your_Avatar, SIGNAL(triggered()), this, SLOT(getAvatar())); connect( ui.actionSet_your_Personal_Message, SIGNAL(triggered()), this, SLOT(statusmessage())); + ui.peertabWidget->setTabPosition(QTabWidget::West); ui.peertabWidget->addTab(new ProfileWidget(),QString(tr("Profile"))); ui.peertreeWidget->setColumnCount(4); @@ -127,7 +130,6 @@ PeersDialog::PeersDialog(QWidget *parent) headerItem->setTextAlignment(1, Qt::AlignLeft | Qt::AlignVCenter); headerItem->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter); - loadtabsettings(); loadEmoticonsgroupchat(); connect(ui.lineEdit, SIGNAL(textChanged ( ) ), this, SLOT(checkChat( ) )); @@ -175,9 +177,7 @@ PeersDialog::PeersDialog(QWidget *parent) timer->start(500); /* half a second */ QMenu *menu = new QMenu(); - menu->addAction(ui.actionAdd_Friend); - menu->addSeparator(); - menu->addAction(ui.actionCreate_new_Profile); + menu->addAction(ui.actionAdd_Friend); menu->addSeparator(); menu->addAction(ui.actionCreate_New_Forum); menu->addAction(ui.actionCreate_New_Channel); @@ -186,21 +186,6 @@ PeersDialog::PeersDialog(QWidget *parent) ui.menupushButton->setMenu(menu); - QMenu *lookmenu = new QMenu(); - lookmenu->addAction(ui.actionSort_Status_Descending_Order); - lookmenu->addAction(ui.actionSort_Status_Ascending_Order); - lookmenu->addSeparator(); - lookmenu->addAction(ui.actionSet_Tabs_Right); - lookmenu->addAction(ui.actionSet_Tabs_Left); - lookmenu->addAction(ui.actionSet_Tabs_North); - lookmenu->addAction(ui.actionSet_Tabs_South); - lookmenu->addSeparator(); - lookmenu->addAction(ui.actionSet_Tabs_Triangular); - lookmenu->addAction(ui.actionSet_Tabs_Rounded); - - ui.lookpushButton->setMenu(lookmenu); - - updateAvatar(); loadmypersonalstatus(); @@ -1417,15 +1402,9 @@ void PeersDialog::on_actionAdd_Friend_activated() connectwiz->show(); } -void PeersDialog::on_actionCreate_new_Profile_activated() -{ - static GenCertDialog *gencertdialog = new GenCertDialog(); - gencertdialog->show(); - -} - void PeersDialog::on_actionCreate_New_Forum_activated() { + ((MainPageStack*)this->parent())->setCurrentIndex(8); // swtich to forum view static CreateForum *cf = new CreateForum(this); cf->show(); @@ -1434,6 +1413,7 @@ void PeersDialog::on_actionCreate_New_Forum_activated() void PeersDialog::on_actionCreate_New_Channel_activated() { CreateForum *cf = new CreateForum(NULL, false); + ((MainPageStack*)this->parent())->setCurrentIndex(6); // swtich to forum view cf->setWindowTitle(tr("Create a new Channel")); cf->ui.labelicon->setPixmap(QPixmap(":/images/add_channel64.png")); @@ -1456,84 +1436,3 @@ void PeersDialog::statusmessage() static StatusMessage *statusmsgdialog = new StatusMessage(); statusmsgdialog->show(); } - -void PeersDialog::on_actionSet_Tabs_North_activated() -{ - _settings->beginGroup("PeersDialog"); - - ui.peertabWidget->setTabPosition(QTabWidget::North); - - _settings->setValue("TabWidget_Position",ui.peertabWidget->tabPosition()); - _settings->endGroup(); -} - -void PeersDialog::on_actionSet_Tabs_South_activated() -{ - _settings->beginGroup("PeersDialog"); - - ui.peertabWidget->setTabPosition(QTabWidget::South); - - _settings->setValue("TabWidget_Position",ui.peertabWidget->tabPosition()); - _settings->endGroup(); -} - -void PeersDialog::on_actionSet_Tabs_Left_activated() -{ - _settings->beginGroup("PeersDialog"); - - ui.peertabWidget->setTabPosition(QTabWidget::West); - - _settings->setValue("TabWidget_Position",ui.peertabWidget->tabPosition()); - _settings->endGroup(); -} - -void PeersDialog::on_actionSet_Tabs_Right_activated() -{ - _settings->beginGroup("PeersDialog"); - - ui.peertabWidget->setTabPosition(QTabWidget::East); - - _settings->setValue("TabWidget_Position",ui.peertabWidget->tabPosition()); - _settings->endGroup(); -} - -void PeersDialog::on_actionSet_Tabs_Triangular_activated() -{ - ui.peertabWidget->setTabShape(QTabWidget::Triangular); -} - -void PeersDialog::on_actionSet_Tabs_Rounded_activated() -{ - ui.peertabWidget->setTabShape(QTabWidget::Rounded); -} - -void PeersDialog::loadtabsettings() -{ - _settings->beginGroup("PeersDialog"); - - if(_settings->value("TabWidget_Position","0").toInt() == 0) - { - qDebug() << "Tab North"; - ui.peertabWidget->setTabPosition(QTabWidget::North); - } - - else if (_settings->value("TabWidget_Position","1").toInt() == 1) - { - qDebug() << "Tab South"; - ui.peertabWidget->setTabPosition(QTabWidget::South); - } - - else if (_settings->value("TabWidget_Position","2").toInt() ==2) - { - qDebug() << "Tab West"; - ui.peertabWidget->setTabPosition(QTabWidget::West); - } - - else if(_settings->value("TabWidget_Position","3").toInt() ==3) - { - qDebug() << "Tab East"; - ui.peertabWidget->setTabPosition(QTabWidget::East); - } - - _settings->endGroup(); - } diff --git a/retroshare-gui/src/gui/PeersDialog.h b/retroshare-gui/src/gui/PeersDialog.h index 56d06c84e..7d497cc14 100644 --- a/retroshare-gui/src/gui/PeersDialog.h +++ b/retroshare-gui/src/gui/PeersDialog.h @@ -124,20 +124,10 @@ class PeersDialog : public RsAutoUpdatePage void getAvatar(); void on_actionAdd_Friend_activated(); - void on_actionCreate_new_Profile_activated(); void on_actionCreate_New_Forum_activated(); void on_actionCreate_New_Channel_activated(); void loadmypersonalstatus(); - void loadtabsettings(); - - void on_actionSet_Tabs_Right_activated(); - void on_actionSet_Tabs_North_activated(); - void on_actionSet_Tabs_South_activated(); - void on_actionSet_Tabs_Left_activated(); - - void on_actionSet_Tabs_Triangular_activated(); - void on_actionSet_Tabs_Rounded_activated(); signals: void friendsUpdated() ; diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui index 53d11fac7..5d00ff40e 100644 --- a/retroshare-gui/src/gui/PeersDialog.ui +++ b/retroshare-gui/src/gui/PeersDialog.ui @@ -557,7 +557,7 @@ p, li { white-space: pre-wrap; } - + Add @@ -598,33 +598,6 @@ p, li { white-space: pre-wrap; } - - - - Display - - - QPushButton::menu-indicator { -subcontrol-origin: padding; -subcontrol-position: bottom right; -} - - QPushButton:hover { - border: 1px solid #CCCCCC; - } - - - - - - - :/images/looknfeel.png:/images/looknfeel.png - - - true - - - @@ -1225,47 +1198,7 @@ background: white;} Set your Personal Message - Set your Personal Message - - - - - Set Tabs Right - - - - - Set Tabs Left - - - - - Set Tabs North - - - - - Set Tabs South - - - - - Set Tabs Triangular - - - - - Set Tabs Rounded - - - - - Sort Status Descending Order - - - - - Sort Status Ascending Order + Edit your status Message diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index 5800a2a7d..674cd7186 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -75,9 +75,9 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags) for(it = accountIds.begin(), i = 0; it != accountIds.end(); it++, i++) { const QVariant & userData = QVariant(QString::fromStdString(*it)); - std::string gpgid, name, email, sslname; - RsInit::getAccountDetails(*it, gpgid, name, email, sslname); - QString accountName = QString::fromStdString(name); + std::string gpgid, name, email, location; + RsInit::getAccountDetails(*it, gpgid, name, email, location); + QString accountName = QString::fromStdString(name) + " - " + QString::fromStdString(location); ui.loadName->addItem(accountName, userData); if (preferedId == *it) diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp index e19af836f..b7e5423a4 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp +++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp @@ -65,8 +65,7 @@ void ProfileWidget::loadDialog() if (rsPeers->getPeerDetails(rsPeers->getOwnId(),detail)) { - ui.name->setText(QString::fromStdString(detail.name)); - ui.orgloc->setText(QString::fromStdString(detail.org)); + ui.name->setText(QString::fromStdString(detail.name)); ui.country->setText(QString::fromStdString(detail.location)); ui.peerid->setText(QString::fromStdString(detail.id)); @@ -74,7 +73,6 @@ void ProfileWidget::loadDialog() // Dont Show a timestamp in RS calculate the day QDateTime date = QDateTime::fromTime_t(detail.lastConnect); QString stime = date.toString(Qt::LocalDate); - ui.lastcontact-> setText(stime); /* set retroshare version */ std::map::iterator vit; @@ -94,7 +92,7 @@ void ProfileWidget::loadDialog() std::list ids; ids.clear(); - rsPeers->getFriendList(ids); + rsPeers->getGPGAcceptedList(ids); int friends = ids.size(); std::ostringstream out; diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.ui b/retroshare-gui/src/gui/profile/ProfileWidget.ui index 303071523..21b1b96c5 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.ui +++ b/retroshare-gui/src/gui/profile/ProfileWidget.ui @@ -1,585 +1,522 @@ - - - ProfileWidget - - - - 0 - 0 - 414 - 425 - - - - - 0 - 0 - - - - Form - - - - 0 - - - 0 - - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 1 - - - 1 - - - 1 - - - - - Edit Personal message - - - QPushButton:hover { -border: 1px solid #CCCCCC; -} - - - Edit Personal message - - - true - - - - - - - Qt::Horizontal - - - - 298 - 20 - - - - - - - - - - - true - - - - - 0 - 0 - 412 - 396 - - - - - - - QFrame#frame_2{ -background-color: white; - -border: 2px solid #CCCCCC;} - - - - - - - - - 16 - 16 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/info16.png" /><span style=" font-size:8pt;"> </span><span style=" font-size:12pt;">Public Information</span></p></body></html> - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; color:#808080;">Public Information</span></p></body></html> - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Name:</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 252 - 20 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Org / Loc:</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 252 - 20 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Country/State:</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 252 - 20 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Peer ID</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 252 - 20 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Last Contact</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 252 - 20 - - - - - - - - - - - QFrame#frame_3{ -background-color: white; - -border: 2px solid #CCCCCC;} - - - - - - - - - 16 - 16 - - - - - - - :/images/info16.png - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; color:#808080;">Other Information</span></p></body></html> - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Number of Friends:</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Version</span></p></body></html> - - - - - - - - 75 - true - - - - TextLabel - - - - - - - Qt::Horizontal - - - - 211 - 17 - - - - - - - - - - - QFrame#frame_4{ -background-color: white; - -border: 2px solid #CCCCCC;} - - - - - - - - - 16 - 16 - - - - - - - :/images/info16.png - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; color:#808080;">My Address</span></p></body></html> - - - - - - - - - true - - - - - - - true - - - 0 - - - 65535 - - - 7812 - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">External Address:</span></p></body></html> - - - - - - - true - - - - - - - true - - - 0 - - - 65535 - - - 7812 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Local Address</span></p></body></html> - - - - - - - - - - - - - - - - - - - + + + ProfileWidget + + + + 0 + 0 + 414 + 425 + + + + + 0 + 0 + + + + Form + + + + 0 + + + 0 + + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 1 + + + 1 + + + 1 + + + + + Edit Personal message + + + QPushButton:hover { +border: 1px solid #CCCCCC; +} + + + Edit Personal message + + + true + + + + + + + Qt::Horizontal + + + + 298 + 20 + + + + + + + + + + + true + + + + + 0 + 0 + 412 + 391 + + + + + + + QFrame#frame_2{ +background-color: white; + +border: 2px solid #CCCCCC;} + + + + + + + + + 16 + 16 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/images/info16.png" /><span style=" font-size:8pt;"> </span><span style=" font-size:12pt;">Public Information</span></p></body></html> + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; color:#808080;">Public Information</span></p></body></html> + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Name:</span></p></body></html> + + + + + + + + 75 + true + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 252 + 20 + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; color:#76746c;">Location:</span></p></body></html> + + + + + + + + 75 + true + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 252 + 20 + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Peer ID</span></p></body></html> + + + + + + + + 75 + true + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 252 + 20 + + + + + + + + + + + QFrame#frame_3{ +background-color: white; + +border: 2px solid #CCCCCC;} + + + + + + + + + 16 + 16 + + + + + + + :/images/info16.png + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; color:#808080;">Other Information</span></p></body></html> + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Number of Friends:</span></p></body></html> + + + + + + + + 75 + true + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Version</span></p></body></html> + + + + + + + + 75 + true + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 211 + 17 + + + + + + + + + + + QFrame#frame_4{ +background-color: white; + +border: 2px solid #CCCCCC;} + + + + + + + + + 16 + 16 + + + + + + + :/images/info16.png + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; color:#808080;">My Address</span></p></body></html> + + + + + + + + + true + + + + + + + true + + + 0 + + + 65535 + + + 7812 + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">External Address:</span></p></body></html> + + + + + + + true + + + + + + + true + + + 0 + + + 65535 + + + 7812 + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#76746c;">Local Address</span></p></body></html> + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + +