Merge pull request #329 from Gelmir/iface_hrNames

Show human readable interface names

src/preferences/advancedsettings.h

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

src/preferences/preferences.h

@@ -1043,6 +1043,14 @@ public:
     return value(QString::fromUtf8("Preferences/Connection/Interface"), QString()).toString();
   }
   
+  void setNetworkInterfaceName(const QString& iface) {
+    setValue(QString::fromUtf8("Preferences/Connection/InterfaceName"), iface);
+  }
+
+  QString getNetworkInterfaceName() const {
+    return value(QString::fromUtf8("Preferences/Connection/InterfaceName"), QString()).toString();
+  }
+
   void setNetworkAddress(const QString& addr) {
     setValue(QString::fromUtf8("Preferences/Connection/InetAddress"), addr);
   }