Index: sources/view/settings/VNetworkModel.cpp =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -r87ca1f6fca153e2ac05425d2dc5937d5a46ba206 --- sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 87ca1f6fca153e2ac05425d2dc5937d5a46ba206) @@ -38,18 +38,21 @@ connect(&_WifiInterface, SIGNAL(didStatusChanged (const QString &)), this, SLOT( onStatusChanged (const QString &))); + connect(&_WifiInterface, SIGNAL(didInternetConnectionChange (const bool &)), + this, SLOT( onInternetConnectionChanged(const bool &))); + // incoming - static IP address assignment - connect(&_WifiInterface, SIGNAL(didSetStaticIPAddress ()), - this, SLOT( onSetStaticIPAddressSuccess())); + connect(&_WifiInterface, SIGNAL(didSetStaticIPAddress (const QString &)), + this, SLOT( onSetStaticIPAddressSuccess(const QString &))); - connect(&_WifiInterface, SIGNAL(didSetGateway ()), - this, SLOT( onSetGatewaySuccess())); + connect(&_WifiInterface, SIGNAL(didSetGateway (const QString &)), + this, SLOT( onSetGatewaySuccess(const QString &))); - connect(&_WifiInterface, SIGNAL(didSetSubnetMask ()), - this, SLOT( onSetSubnetMaskSuccess())); + connect(&_WifiInterface, SIGNAL(didSetSubnetMask (const QString &)), + this, SLOT( onSetSubnetMaskSuccess(const QString &))); - connect(&_WifiInterface, SIGNAL(didSetDNS ()), - this, SLOT( onSetDNSSuccess())); + connect(&_WifiInterface, SIGNAL(didSetDNS (const QString &)), + this, SLOT( onSetDNSSuccess(const QString &))); // outgoing connect(this, SIGNAL(didScan()), @@ -367,34 +370,48 @@ * \brief VNetworkModel::onSetIPAddressSuccess * Called when the IP address has been set */ -void VNetworkModel::onSetStaticIPAddressSuccess() +void VNetworkModel::onSetStaticIPAddressSuccess(const QString &vStaticIP) { + ipAddress(vStaticIP); status(tr("Successfully set the IP address.")); } /*! * \brief VNetworkModel::onSetGatewaySuccess * Called when the gateway has been set */ -void VNetworkModel::onSetGatewaySuccess() +void VNetworkModel::onSetGatewaySuccess(const QString &vGateway) { + gateway(vGateway); status(tr("Successfully set the gateway.")); } /*! * \brief VNetworkModel::onSetSubnetMaskSuccess * Called when the subnet mask has been set */ -void VNetworkModel::onSetSubnetMaskSuccess() +void VNetworkModel::onSetSubnetMaskSuccess(const QString &vSubnetMask) { + subnetMask(vSubnetMask); status(tr("Successfully set the subnet mask.")); } /*! * \brief VNetworkModel::onSetDNSSuccess * Called when the DNS has been set */ -void VNetworkModel::onSetDNSSuccess() +void VNetworkModel::onSetDNSSuccess(const QString &vDNS) { + dns(vDNS); status(tr("Successfully set the DNS.")); } + +/*! + * \brief VNetworkModel::onInternetConnectionChanged + * Called when the internet connection changes + * \param vConnected - if true, we're connected to the internet, false otherwise + */ +void VNetworkModel::onInternetConnectionChanged(const bool &vConnected) +{ + connectedToInternet(vConnected); +}