mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

mejorado el heur?stico de selecci?n de ip

Browse Source
This commit is contained in:
Luis Ángel San Martín 2013-04-16 23:09:15 +02:00
parent daa778fd2b
commit 475faf7472
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
YACReaderLibrary/server_config_dialog.cpp
View File

@ -96,7 +96,8 @@ ServerConfigDialog::ServerConfigDialog(QWidget * parent)
ip = new QComboBox(this); ip = new QComboBox(this);
connect(ip,SIGNAL(activated(const QString &)),this,SLOT(regenerateQR(const QString &))); connect(ip,SIGNAL(activated(const QString &)),this,SLOT(regenerateQR(const QString &)));
ip->move(520,71); ip->move(520,71);
//ip->setSizeAdjustPolicy(QComboBox::AdjustToContents); ip->setSizeAdjustPolicy(QComboBox::AdjustToContents);
ip->setMinimumWidth(110);
port = new QLineEdit("8080",this); port = new QLineEdit("8080",this);
port->setReadOnly(true); port->setReadOnly(true);
@ -195,15 +196,16 @@ void ServerConfigDialog::generateQR()
foreach(QHostAddress add, list) foreach(QHostAddress add, list)
{ {
QString tmp = add.toString(); QString tmp = add.toString();
if(tmp.contains(".") && tmp != "127.0.0.1") if(tmp.contains(".") && !tmp.startsWith("127"))
{ {
if(dir.isEmpty()) if(dir.isEmpty() && tmp.startsWith("192.168"))
dir = tmp; dir = tmp;
else else
otherAddresses.push_back(tmp); otherAddresses.push_back(tmp);
} }
} }
#else #else
QList<QString> list = addresses(); QList<QString> list = addresses();
@ -211,9 +213,9 @@ void ServerConfigDialog::generateQR()
foreach(QString add, list) foreach(QString add, list)
{ {
QString tmp = add; QString tmp = add;
if(tmp.contains(".") && tmp != "127.0.0.1") if(tmp.contains(".") && !tmp.startsWith("127"))
{ {
if(dir.isEmpty()) if(dir.isEmpty() && tmp.startsWith("192.168"))
dir = tmp; dir = tmp;
else else
otherAddresses.push_back(tmp); otherAddresses.push_back(tmp);
@ -221,10 +223,11 @@ void ServerConfigDialog::generateQR()
} }
} }
#endif #endif
if(!dir.isEmpty()) if(otherAddresses.length()>0)
{ {
generateQR(dir+":"+s->getPort()); generateQR(dir+":"+s->getPort());
ip->addItem(dir); if(!dir.isEmpty())
ip->addItem(dir);
ip->addItems(otherAddresses); ip->addItems(otherAddresses);
port->setText(s->getPort()); port->setText(s->getPort());
} }
@ -233,9 +236,9 @@ void ServerConfigDialog::generateQR()
} }
//qrCode->setText(dir+":8080"); //qrCode->setText(dir+":8080");
#ifdef Q_WS_MAC
ip->setFixedWidth(130); ip->setFixedWidth(130);
#endif
} }
void ServerConfigDialog::generateQR(const QString & serverAddress) void ServerConfigDialog::generateQR(const QString & serverAddress)