I have made the following changes intended for : CE:MW:Shared / connman-qt
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5196 Thank You, rojkov [This message was auto-generated] --- Request # 5196: Messages from BOSS: State: review at 2012-07-11T16:59:32 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rojkov:branches:CE:MW:Shared / connman-qt -> CE:MW:Shared / connman-qt changes files: -------------- --- connman-qt.changes +++ connman-qt.changes @@ -0,0 +1,4 @@ +* Wed Jul 11 2012 Dmitry Rozhkov <[email protected]> - 0.2.1 +- Added setters for advanced settings of NetworkService +- register NetworkService as declarative uncreatable type + old: ---- connman-qt-0.2.0.tar.bz2 new: ---- connman-qt-0.2.1.tar.bz2 spec files: ----------- --- connman-qt.spec +++ connman-qt.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.24.1 +# Generated by: spectacle version 0.24 # Name: connman-qt @@ -9,7 +9,7 @@ # << macros Summary: qt bindings for connman -Version: 0.2.0 +Version: 0.2.1 Release: 1 Group: System/GUI/Other License: Apache License other changes: -------------- ++++++ connman-qt-0.2.0.tar.bz2 -> connman-qt-0.2.1.tar.bz2 --- libconnman-qt/networkservice.cpp +++ libconnman-qt/networkservice.cpp @@ -18,9 +18,13 @@ const QString NetworkService::Error("Error"); const QString NetworkService::Favorite("Favorite"); const QString NetworkService::IPv4("IPv4"); +const QString NetworkService::IPv4Config("IPv4.Configuration"); const QString NetworkService::Nameservers("Nameservers"); +const QString NetworkService::NameserversConfig("Nameservers.Configuration"); const QString NetworkService::Domains("Domains"); +const QString NetworkService::DomainsConfig("Domains.Configuration"); const QString NetworkService::Proxy("Proxy"); +const QString NetworkService::ProxyConfig("Proxy.Configuration"); NetworkService::NetworkService(const QString &path, const QVariantMap &properties, QObject* parent) : QObject(parent), @@ -72,18 +76,34 @@ return qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv4)); } +const QVariantMap NetworkService::ipv4Config() const { + return qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv4Config)); +} + const QStringList NetworkService::nameservers() const { return m_propertiesCache.value(Nameservers).toStringList(); } +const QStringList NetworkService::nameserversConfig() const { + return m_propertiesCache.value(NameserversConfig).toStringList(); +} + const QStringList NetworkService::domains() const { return m_propertiesCache.value(Domains).toStringList(); } +const QStringList NetworkService::domainsConfig() const { + return m_propertiesCache.value(DomainsConfig).toStringList(); +} + const QVariantMap NetworkService::proxy() const { return qdbus_cast<QVariantMap>(m_propertiesCache.value(Proxy)); } +const QVariantMap NetworkService::proxyConfig() const { + return qdbus_cast<QVariantMap>(m_propertiesCache.value(ProxyConfig)); +} + void NetworkService::requestConnect() { // increase reply timeout when connecting @@ -108,6 +128,30 @@ m_service->Disconnect(); } +void NetworkService::setIpv4Config(const QVariantMap &ipv4) +{ + // QDBusPendingReply<void> reply = + m_service->SetProperty(IPv4Config, QDBusVariant(QVariant(ipv4))); +} + +void NetworkService::setNameserversConfig(const QStringList &nameservers) +{ + // QDBusPendingReply<void> reply = + m_service->SetProperty(NameserversConfig, QDBusVariant(QVariant(nameservers))); +} + +void NetworkService::setDomainsConfig(const QStringList &domains) +{ + // QDBusPendingReply<void> reply = + m_service->SetProperty(DomainsConfig, QDBusVariant(QVariant(domains))); +} + +void NetworkService::setProxyConfig(const QVariantMap &proxy) +{ + // QDBusPendingReply<void> reply = + m_service->SetProperty(ProxyConfig, QDBusVariant(QVariant(proxy))); +} + /* this slot is used for debugging */ void NetworkService::dbg_connectReply(QDBusPendingCallWatcher *call){ qDebug() << "Got something from service.connect()"; @@ -138,11 +182,19 @@ emit favoriteChanged(m_propertiesCache[name].toBool()); } else if (name == IPv4) { emit ipv4Changed(qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv4))); + } else if (name == IPv4Config) { + emit ipv4ConfigChanged(qdbus_cast<QVariantMap>(m_propertiesCache.value(IPv4Config))); } else if (name == Nameservers) { emit nameserversChanged(m_propertiesCache[name].toStringList()); + } else if (name == NameserversConfig) { + emit nameserversConfigChanged(m_propertiesCache[name].toStringList()); } else if (name == Domains) { emit domainsChanged(m_propertiesCache[name].toStringList()); + } else if (name == DomainsConfig) { + emit domainsConfigChanged(m_propertiesCache[name].toStringList()); } else if (name == Proxy) { emit proxyChanged(qdbus_cast<QVariantMap>(m_propertiesCache.value(Proxy))); + } else if (name == ProxyConfig) { + emit proxyConfigChanged(qdbus_cast<QVariantMap>(m_propertiesCache.value(ProxyConfig))); } } --- libconnman-qt/networkservice.h +++ libconnman-qt/networkservice.h @@ -28,9 +28,13 @@ Q_PROPERTY(uint strength READ strength NOTIFY strengthChanged); Q_PROPERTY(bool favorite READ favorite NOTIFY favoriteChanged); Q_PROPERTY(QVariantMap ipv4 READ ipv4 NOTIFY ipv4Changed); + Q_PROPERTY(QVariantMap ipv4Config READ ipv4Config WRITE setIpv4Config NOTIFY ipv4ConfigChanged); Q_PROPERTY(QStringList nameservers READ nameservers NOTIFY nameserversChanged); + Q_PROPERTY(QStringList nameserversConfig READ nameserversConfig WRITE setNameserversConfig NOTIFY nameserversConfigChanged); Q_PROPERTY(QStringList domains READ domains NOTIFY domainsChanged); + Q_PROPERTY(QStringList domainsConfig READ domainsConfig WRITE setDomainsConfig NOTIFY domainsConfigChanged); Q_PROPERTY(QVariantMap proxy READ proxy NOTIFY proxyChanged); + Q_PROPERTY(QVariantMap proxyConfig READ proxyConfig WRITE setProxyConfig NOTIFY proxyConfigChanged); public: NetworkService(const QString &path, const QVariantMap &properties, QObject* parent); @@ -44,9 +48,13 @@ const uint strength() const; const bool favorite() const; const QVariantMap ipv4() const; + const QVariantMap ipv4Config() const; const QStringList nameservers() const; + const QStringList nameserversConfig() const; const QStringList domains() const; + const QStringList domainsConfig() const; const QVariantMap proxy() const; + const QVariantMap proxyConfig() const; signals: void nameChanged(const QString &name); @@ -55,14 +63,23 @@ void strengthChanged(const uint strength); void favoriteChanged(const bool &favorite); void ipv4Changed(const QVariantMap &ipv4); + void ipv4ConfigChanged(const QVariantMap &ipv4); void nameserversChanged(const QStringList &nameservers); + void nameserversConfigChanged(const QStringList &nameservers); void domainsChanged(const QStringList &domains); + void domainsConfigChanged(const QStringList &domains); void proxyChanged(const QVariantMap &proxy); + void proxyConfigChanged(const QVariantMap &proxy); public slots: void requestConnect(); void requestDisconnect(); + void setIpv4Config(const QVariantMap &ipv4); + void setNameserversConfig(const QStringList &nameservers); + void setDomainsConfig(const QStringList &domains); + void setProxyConfig(const QVariantMap &proxy); + private: Service *m_service; QVariantMap m_propertiesCache; @@ -77,9 +94,13 @@ static const QString Error; static const QString Favorite; static const QString IPv4; + static const QString IPv4Config; static const QString Nameservers; + static const QString NameserversConfig; static const QString Domains; + static const QString DomainsConfig; static const QString Proxy; + static const QString ProxyConfig; private slots: void propertyChanged(const QString &name, const QDBusVariant &value); --- plugin/components.cpp +++ plugin/components.cpp @@ -16,7 +16,8 @@ void Components::registerTypes(const char *uri) { - qmlRegisterType<NetworkService>(uri,0,2,"NetworkService"); + qmlRegisterUncreatableType<NetworkService>(uri,0,2,"NetworkService", + "Please don't create \"NetworkService\" objects manually."); qmlRegisterType<NetworkingModel>(uri,0,2,"NetworkingModel"); qmlRegisterType<ClockModel>(uri,0,2,"ClockModel"); } ++++++ connman-qt.yaml --- connman-qt.yaml +++ connman-qt.yaml @@ -1,6 +1,6 @@ Name: connman-qt Summary: qt bindings for connman -Version: 0.2.0 +Version: 0.2.1 Release: 1 Group: System/GUI/Other License: Apache License
