Index: sources/view/VNetworkModel.h =================================================================== diff -u -rf35b360054e1e2fa81bf107427fe2d50d78e9e8a -r13ac42cf8bdc5038dedd3302ba79dc387e5704b4 --- sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision f35b360054e1e2fa81bf107427fe2d50d78e9e8a) +++ sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision 13ac42cf8bdc5038dedd3302ba79dc387e5704b4) @@ -41,20 +41,27 @@ enum NetworkDataRole { MacAddressRole = Qt::UserRole + 1, SSIDRole, - SecurityLevelRole, + SecurityTypesRole, StatusRole, SignalLevelRole, }; void addNetwork (const Network &network); int rowCount (const QModelIndex &parent = QModelIndex()) const; QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const; + void removeAllRows(); signals: void didScan(); void didJoinNetwork(const Network, const QString); void didDisconnectNetwork(const Network); void didRequestIPSettings(); + // set IP addresses + void didRequestSetIPAddress(const QString); + void didRequestSetGateway(const QString); + void didRequestSetSubnetMask(const QString); + void didRequestSetDNS(const QString); + public slots: void doScan(); void doAddNetwork(const Network &vNetwork); @@ -63,6 +70,12 @@ void doDisconnectNetwork(const QString &vMacAddress); void doRequestIPSettings(); + // static IP address assignment + void doSetIPAddress(const QString &vIPAddress); + void doSetGateway(const QString &vGateway); + void doSetSubnetMask(const QString &vSubnetMask); + void doSetDNS(const QString &vDNS); + protected: QHash roleNames() const; private: @@ -72,9 +85,9 @@ private slots: void onScanStatusChanged(const bool &vScanning); + void onStatusChanged(const QString &vNewStatus); void onConnectedToNetwork(const Network &vNetwork); void onDisconnectedNetwork(const Network &vNetwork); - void onError(const QString &vMessage); }; }