Index: sources/view/settings/VNetworkModel.h =================================================================== diff -u -r247f91d8ee35391abf611248ba8ae3d64de5341b -r5b46bc8e4724e4ddb648f901d76bb7ec24f8b6c7 --- sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision 247f91d8ee35391abf611248ba8ae3d64de5341b) +++ sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision 5b46bc8e4724e4ddb648f901d76bb7ec24f8b6c7) @@ -42,6 +42,9 @@ int _interval = 1000; + const char *_devEth = "eth0"; + const char *_devWlan = "wlan0"; + PROPERTY(bool , isIdle , true ) PROPERTY(bool , scanInProgress , false) PROPERTY(QString , status , "") @@ -52,20 +55,20 @@ PROPERTY(QString , ssid , "") PROPERTY(QString , macAddress , "") PROPERTY(QString , ethernetIP , "") + PROPERTY(QString , wirelessIP , "") public: // Note: VIEW_DEC_CLASS(VNetworkModel) requires QObject as the parent, so it's necessary to define it here // Otherwise a VIEW_DEC_CLASS macro could allow specifying the parent class with QObject as the default explicit VNetworkModel(QAbstractListModel *parent = nullptr); enum NetworkDataRole { - MacAddressRole = Qt::UserRole + 1, - SSIDRole, - SecurityTypesRole, - StatusRole, - SignalLevelRole, - NetworkSupportedRole, - + MacAddressRole = Qt::UserRole + 1 , + SSIDRole , + SecurityTypesRole , + StatusRole , + SignalLevelRole , + NetworkSupportedRole , }; void addNetwork (const WifiNetworkData &network); @@ -104,8 +107,11 @@ private: void initConnections(); void clearSelectedNetwork(); - void checkEthernet(); + QString checkDevNet(const char *vDevNet, const QString &vMessage); + void checkEthernet(); + void checkWireless(); + QList _networks; private slots: