From d1fcfe58025603ae28e8fda31d96519a92cdb7dd Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Tue, 31 Oct 2017 13:46:40 +0200
Subject: Add Wi-Fi enable button to network settings

Task-number: QTBUG-64230
Change-Id: I2aad07fb98a45997b116fc9a06924ba8be3dff2a
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/imports/networksettings/plugin.cpp       | 10 ++++++++++
 src/imports/networksettings/plugins.qmltypes | 20 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'src/imports')

diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index 665cb6a..431a099 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -32,6 +32,7 @@
 #include <qnetworksettingsservice.h>
 #include <qnetworksettingsuseragent.h>
 #include <qnetworksettingsservicemodel.h>
+#include <qnetworksettingsinterface.h>
 #include <qnetworksettingsinterfacemodel.h>
 
 #include <qqml.h>
@@ -121,6 +122,14 @@
     \sa services
 */
 
+/*!
+    \qmlmethod NetworkInterface NetworkSettingsManager::interface(int type, int instance)
+
+    Returns the interface with type \a type and order number of \a instance
+
+    \sa NetworkInterface
+*/
+
 /*!
     \qmlmethod NetworkSettingsManager::userAgent.setPassphrase(string passphrase)
 
@@ -162,6 +171,7 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.NetworkSettings"));
     qmlRegisterUncreatableType<QNetworkSettingsService>(uri, 1, 0, "NetworkService", "Cannot be instantiated directly.");
+    qmlRegisterUncreatableType<QNetworkSettingsInterface>(uri, 1, 0, "NetworkInterface", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsIPv4>(uri, 1, 0, "NetworkSettingsIPv4", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsIPv6>(uri, 1, 0, "NetworkSettingsIPv6", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsProxy>(uri, 1, 0, "NetworkSettingsProxy", "Cannot be instantiated directly.");
diff --git a/src/imports/networksettings/plugins.qmltypes b/src/imports/networksettings/plugins.qmltypes
index 5022d6f..ac0d3fc 100644
--- a/src/imports/networksettings/plugins.qmltypes
+++ b/src/imports/networksettings/plugins.qmltypes
@@ -7,7 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtDeviceUtilities.NetworkSettings 1.0'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QNetworkSettingsIPv4"
         prototype: "QObject"
@@ -55,6 +55,18 @@ Module {
         Property { name: "privacy"; type: "PrivacyType" }
         Property { name: "prefixLength"; type: "int" }
     }
+    Component {
+        name: "QNetworkSettingsInterface"
+        prototype: "QObject"
+        exports: ["QtDeviceUtilities.NetworkSettings/NetworkInterface 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "name"; type: "string"; isReadonly: true }
+        Property { name: "state"; type: "QNetworkSettingsState::States"; isReadonly: true }
+        Property { name: "type"; type: "QNetworkSettingsType::Types"; isReadonly: true }
+        Property { name: "powered"; type: "bool" }
+        Method { name: "scanServices" }
+    }
     Component {
         name: "QNetworkSettingsManager"
         prototype: "QObject"
@@ -88,6 +100,12 @@ Module {
             Parameter { name: "name"; type: "string" }
             Parameter { name: "type"; type: "int" }
         }
+        Method {
+            name: "interface"
+            type: "QNetworkSettingsInterface*"
+            Parameter { name: "type"; type: "int" }
+            Parameter { name: "instance"; type: "int" }
+        }
     }
     Component {
         name: "QNetworkSettingsProxy"
-- 
cgit v1.2.3