Index: denali.pro.user =================================================================== diff -u -ra1fdb6d955a07f87e0352c41cee61106eb97e59f -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 --- denali.pro.user (.../denali.pro.user) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) +++ denali.pro.user (.../denali.pro.user) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 --- en_US.udic (.../en_US.udic) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ en_US.udic (.../en_US.udic) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) @@ -159,3 +159,5 @@ VHDSyringe HDVersions Bak +IPAddress +Wifi Index: sources/gui/qml/main.qml =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 --- sources/gui/qml/main.qml (.../main.qml) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ sources/gui/qml/main.qml (.../main.qml) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) @@ -255,6 +255,20 @@ Text { // TEST : Current Date/Time color : Colors.textMain anchors { + top : parent.top + horizontalCenter: parent.horizontalCenter + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom + + height : 15 + text : vDateTime.current + font.pixelSize: 14 + } + + Text { // TEST : Ethernet IP + color : Colors.textMain + anchors { top : parent.top left : parent.left leftMargin : 1000 @@ -263,7 +277,7 @@ verticalAlignment : Text.AlignBottom height : 15 - text : vDateTime.current + text : vNetwork.ethernetIP font.pixelSize: 14 } Index: sources/view/settings/VNetworkModel.cpp =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 --- sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) @@ -1,5 +1,6 @@ // Qt +#include // Project #include "VNetworkModel.h" @@ -9,6 +10,7 @@ using namespace View; VNetworkModel::VNetworkModel(QAbstractListModel *parent) : QAbstractListModel(parent) { + startTimer(_interval); initConnections(); } @@ -348,6 +350,11 @@ emit didRequestSetDNS(vDNS.trimmed()); } +void VNetworkModel::timerEvent(QTimerEvent *) +{ + checkEthernet(); +} + /*! * \brief VNetworkModel::clearWifiSettings * Clears the selected network settings @@ -362,6 +369,20 @@ macAddress(""); } +void VNetworkModel::checkEthernet() +{ + const QNetworkInterface eth0 = QNetworkInterface::interfaceFromName("eth0"); + if ( eth0.isValid() ) { + auto addresses = eth0.allAddresses(); + if ( addresses.count() > 2 ) { + ethernetIP(addresses[2].toString()); + } + else { + ethernetIP("No Ethernet"); + } + } +} + /*! * \brief VNetworkModel::onSetIPAddressSuccess * Called when the IP address has been set Index: sources/view/settings/VNetworkModel.h =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -ra302861c33cdda0f0a95ade9b7c6a02b5593a9f2 --- sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision a302861c33cdda0f0a95ade9b7c6a02b5593a9f2) @@ -26,6 +26,8 @@ { Q_OBJECT + int _interval = 1000; + PROPERTY(bool , isIdle , true ) PROPERTY(bool , scanInProgress , false) PROPERTY(QString , status , "") @@ -35,6 +37,7 @@ PROPERTY(QString , dns , "") PROPERTY(QString , ssid , "") PROPERTY(QString , macAddress , "") + PROPERTY(QString , ethernetIP , "") public: // Note: VIEW_DEC_CLASS(VNetworkModel) requires QObject as the parent, so it's necessary to define it here @@ -80,10 +83,12 @@ void doSetDNS(const QString &vDNS); protected: + void timerEvent(QTimerEvent *event) override; QHash roleNames() const; private: void initConnections(); void clearSelectedNetwork(); + void checkEthernet(); QList _networks;