mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-15 02:44:20 -05:00
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
This commit is contained in:
joss17
parent
5f27d75dc4
commit
ac580a6c07
@ -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 ;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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<std::string> &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<std::string> &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<accountId>::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;
|
||||
|
||||
@ -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));
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include "common/vmessagebox.h"
|
||||
#include <gui/mainpagestack.h>
|
||||
|
||||
#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( ) ));
|
||||
@ -177,8 +179,6 @@ PeersDialog::PeersDialog(QWidget *parent)
|
||||
QMenu *menu = new QMenu();
|
||||
menu->addAction(ui.actionAdd_Friend);
|
||||
menu->addSeparator();
|
||||
menu->addAction(ui.actionCreate_new_Profile);
|
||||
menu->addSeparator();
|
||||
menu->addAction(ui.actionCreate_New_Forum);
|
||||
menu->addAction(ui.actionCreate_New_Channel);
|
||||
menu->addAction(ui.actionSet_your_Avatar);
|
||||
@ -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();
|
||||
}
|
||||
|
||||
@ -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() ;
|
||||
|
||||
@ -557,7 +557,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<item row="0" column="2">
|
||||
<widget class="QPushButton" name="menupushButton">
|
||||
<property name="toolTip">
|
||||
<string>Add</string>
|
||||
@ -598,33 +598,6 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QPushButton" name="lookpushButton">
|
||||
<property name="toolTip">
|
||||
<string>Display</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QPushButton::menu-indicator {
|
||||
subcontrol-origin: padding;
|
||||
subcontrol-position: bottom right;
|
||||
}
|
||||
|
||||
QPushButton:hover {
|
||||
border: 1px solid #CCCCCC;
|
||||
}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="images.qrc">
|
||||
<normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
|
||||
</property>
|
||||
<property name="flat">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1225,47 +1198,7 @@ background: white;}</string>
|
||||
<string>Set your Personal Message</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Set your Personal Message</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSet_Tabs_Right">
|
||||
<property name="text">
|
||||
<string>Set Tabs Right</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSet_Tabs_Left">
|
||||
<property name="text">
|
||||
<string>Set Tabs Left</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSet_Tabs_North">
|
||||
<property name="text">
|
||||
<string>Set Tabs North</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSet_Tabs_South">
|
||||
<property name="text">
|
||||
<string>Set Tabs South</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSet_Tabs_Triangular">
|
||||
<property name="text">
|
||||
<string>Set Tabs Triangular</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSet_Tabs_Rounded">
|
||||
<property name="text">
|
||||
<string>Set Tabs Rounded</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSort_Status_Descending_Order">
|
||||
<property name="text">
|
||||
<string>Sort Status Descending Order</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSort_Status_Ascending_Order">
|
||||
<property name="text">
|
||||
<string>Sort Status Ascending Order</string>
|
||||
<string>Edit your status Message</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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<std::string, std::string>::iterator vit;
|
||||
@ -94,7 +92,7 @@ void ProfileWidget::loadDialog()
|
||||
|
||||
std::list<std::string> ids;
|
||||
ids.clear();
|
||||
rsPeers->getFriendList(ids);
|
||||
rsPeers->getGPGAcceptedList(ids);
|
||||
int friends = ids.size();
|
||||
|
||||
std::ostringstream out;
|
||||
|
||||
@ -96,7 +96,7 @@ border: 1px solid #CCCCCC;
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>412</width>
|
||||
<height>396</height>
|
||||
<height>391</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
@ -179,54 +179,17 @@ p, li { white-space: pre-wrap; }
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_11">
|
||||
<property name="text">
|
||||
<string><!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></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLabel" name="orgloc">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>252</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="text">
|
||||
<string><!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></string>
|
||||
</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></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QLabel" name="country">
|
||||
<property name="font">
|
||||
<font>
|
||||
@ -239,7 +202,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<item row="2" column="2">
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
@ -252,7 +215,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
@ -263,7 +226,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<item row="3" column="1">
|
||||
<widget class="QLabel" name="peerid">
|
||||
<property name="font">
|
||||
<font>
|
||||
@ -276,7 +239,7 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<item row="3" column="2">
|
||||
<spacer name="horizontalSpacer_6">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
@ -289,43 +252,6 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="text">
|
||||
<string><!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></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLabel" name="lastcontact">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>TextLabel</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="2">
|
||||
<spacer name="horizontalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>252</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
@ -543,19 +469,6 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" colspan="3">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_14">
|
||||
<property name="text">
|
||||
@ -567,9 +480,35 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
@ -578,8 +517,6 @@ p, li { white-space: pre-wrap; }
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="../images.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user