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

merged

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-03-18 16:08:35 +01:00
parent f3db490b23
commit 1db8d270e0
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
YACReaderLibrary/server_config_dialog.cpp
View File

@ -13,6 +13,22 @@
#include "startup.h" #include "startup.h"
#include "yacreader_global.h" #include "yacreader_global.h"
#include <algorithm>
bool ipComparator(const QString & ip1, const QString & ip2)
{
if(ip1.startsWith("192.168") && ip2.startsWith("192.168"))
return ip1 < ip2;
if(ip1.startsWith("192.168"))
return true;
if(ip2.startsWith("192.168"))
return false;
return ip1 < ip2;
}
#ifndef Q_OS_WIN32 #ifndef Q_OS_WIN32
#include <sys/types.h> #include <sys/types.h>
@ -166,7 +182,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget * parent)
settings->endGroup(); settings->endGroup();
connect(check,SIGNAL(stateChanged(int)),this,SLOT(enableServer(int))); connect(check,SIGNAL(stateChanged(int)),this,SLOT(enableServer(int)));
} }
void ServerConfigDialog::enableServer(int status) void ServerConfigDialog::enableServer(int status)
@ -205,6 +221,7 @@ void ServerConfigDialog::generateQR()
//} //}
ip->clear(); ip->clear();
QString dir; QString dir;
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
QList<QHostAddress> list = QHostInfo::fromName( QHostInfo::localHostName() ).addresses(); QList<QHostAddress> list = QHostInfo::fromName( QHostInfo::localHostName() ).addresses();
@ -214,11 +231,7 @@ void ServerConfigDialog::generateQR()
QString tmp = add.toString(); QString tmp = add.toString();
if(tmp.contains(".") && !tmp.startsWith("127")) if(tmp.contains(".") && !tmp.startsWith("127"))
{ {
if(dir.isEmpty() && tmp.startsWith("192.168.2.")) otherAddresses.push_back(tmp);
dir = tmp;
else
otherAddresses.push_back(tmp);
} }
} }
@ -231,14 +244,16 @@ void ServerConfigDialog::generateQR()
QString tmp = add; QString tmp = add;
if(tmp.contains(".") && !tmp.startsWith("127")) if(tmp.contains(".") && !tmp.startsWith("127"))
{ {
if(dir.isEmpty() && tmp.startsWith("192.168.2.")) otherAddresses.push_back(tmp);
dir = tmp;
else
otherAddresses.push_back(tmp);
} }
} }
#endif #endif
stl::sort(otherAddresses.begin(),otherAddresses.end(),ipComparator);
if(otherAddresses.length()>0)
dir = otherAddresses.pop_front();
if(otherAddresses.length()>0 || !dir.isEmpty()) if(otherAddresses.length()>0 || !dir.isEmpty())
{ {
if(!dir.isEmpty()) if(!dir.isEmpty())

3
YACReaderLibrary/server_config_dialog.h
View File

@ -28,6 +28,7 @@ Q_OBJECT
QPixmap * qrCodeImage; QPixmap * qrCodeImage;
QProcess * qrGenerator; QProcess * qrGenerator;
public slots: public slots:
void generateQR(); void generateQR();
void generateQR(const QString & serverAddress); void generateQR(const QString & serverAddress);
@ -41,4 +42,4 @@ signals:
}; };
#endif #endif