github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 05:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixup! Show human readable interface names (mostly affects Windows)

Browse source
This commit is contained in:
Nick Tiskov 2013-01-26 21:24:38 +04:00
commit 104b2aecdc
2 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/preferences/advancedsettings.h
View file

@ -89,16 +89,10 @@ public slots:
if (combo_iface.currentIndex() == 0) { if (combo_iface.currentIndex() == 0) {
// All interfaces (default) // All interfaces (default)
pref.setNetworkInterface(QString::null); pref.setNetworkInterface(QString::null);
#if QT_VERSION >= QT_VERSION_CHECK(4,5,0)
pref.setNetworkInterfaceName(QString::null); pref.setNetworkInterfaceName(QString::null);
#endif
} else { } else {
#if QT_VERSION < QT_VERSION_CHECK(4,5,0)
pref.setNetworkInterface(combo_iface.currentText());
#else
pref.setNetworkInterface(combo_iface.itemData(combo_iface.currentIndex()).toString()); pref.setNetworkInterface(combo_iface.itemData(combo_iface.currentIndex()).toString());
pref.setNetworkInterfaceName(combo_iface.currentText()); pref.setNetworkInterfaceName(combo_iface.currentText());
#endif
} }
// Network address // Network address
QHostAddress addr(txt_network_address.text().trimmed()); QHostAddress addr(txt_network_address.text().trimmed());
@ -221,11 +215,7 @@ private slots:
int i = 1; int i = 1;
foreach (const QNetworkInterface& iface, QNetworkInterface::allInterfaces()) { foreach (const QNetworkInterface& iface, QNetworkInterface::allInterfaces()) {
if (iface.flags() & QNetworkInterface::IsLoopBack) continue; if (iface.flags() & QNetworkInterface::IsLoopBack) continue;
#if QT_VERSION >= QT_VERSION_CHECK(4,5,0)
combo_iface.addItem(iface.humanReadableName(),iface.name()); combo_iface.addItem(iface.humanReadableName(),iface.name());
#else
combo_iface.addItem(iface.name());
#endif
if (!current_iface.isEmpty() && iface.name() == current_iface) { if (!current_iface.isEmpty() && iface.name() == current_iface) {
combo_iface.setCurrentIndex(i); combo_iface.setCurrentIndex(i);
interface_exists = true; interface_exists = true;
@ -234,11 +224,7 @@ private slots:
} }
// Saved interface does not exist, show it anyway // Saved interface does not exist, show it anyway
if (!interface_exists) { if (!interface_exists) {
#if QT_VERSION >= QT_VERSION_CHECK(4,5,0)
combo_iface.addItem(pref.getNetworkInterfaceName(),current_iface); combo_iface.addItem(pref.getNetworkInterfaceName(),current_iface);
#else
combo_iface.addItem(current_iface);
#endif
combo_iface.setCurrentIndex(i); combo_iface.setCurrentIndex(i);
} }
setRow(NETWORK_IFACE, tr("Network Interface (requires restart)"), &combo_iface); setRow(NETWORK_IFACE, tr("Network Interface (requires restart)"), &combo_iface);

2
src/preferences/preferences.h
View file

@ -1043,7 +1043,6 @@ public:
return value(QString::fromUtf8("Preferences/Connection/Interface"), QString()).toString(); return value(QString::fromUtf8("Preferences/Connection/Interface"), QString()).toString();
} }
#if QT_VERSION >= QT_VERSION_CHECK(4,5,0)
void setNetworkInterfaceName(const QString& iface) { void setNetworkInterfaceName(const QString& iface) {
setValue(QString::fromUtf8("Preferences/Connection/InterfaceName"), iface); setValue(QString::fromUtf8("Preferences/Connection/InterfaceName"), iface);
} }
@ -1051,7 +1050,6 @@ public:
QString getNetworkInterfaceName() const { QString getNetworkInterfaceName() const {
return value(QString::fromUtf8("Preferences/Connection/InterfaceName"), QString()).toString(); return value(QString::fromUtf8("Preferences/Connection/InterfaceName"), QString()).toString();
} }
#endif
void setNetworkAddress(const QString& addr) { void setNetworkAddress(const QString& addr) {
setValue(QString::fromUtf8("Preferences/Connection/InetAddress"), addr); setValue(QString::fromUtf8("Preferences/Connection/InetAddress"), addr);