settings: wired: add wired connections UI

The initial Wired UI only implements
unauthenticated access.

Bug-AGL: SPEC-2355

Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I5bac4378879e365bce544ae55d752c187acc3a48

diff --git a/app/Settings.qml b/app/Settings.qml
index bfcec3a..47d5eb2 100644 (file)
--- a/app/Settings.qml
+++ b/app/Settings.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.0
 import 'datetime'
 import 'bluetooth'
 import 'wifi'
+import 'wired'
 import 'version'
 
 ApplicationWindow {
@@ -69,6 +70,8 @@ ApplicationWindow {
 
         Wifi {}
 
+        Wired {}
+
         Version {}
     }
 }

diff --git a/app/app.pro b/app/app.pro
index 566d2b6..1d06003 100644 (file)
--- a/app/app.pro
+++ b/app/app.pro
@@ -6,11 +6,12 @@ SOURCES = main.cpp
 CONFIG += link_pkgconfig
 PKGCONFIG += libhomescreen qlibwindowmanager qtappfw
 
-RESOURCES += \ 
+RESOURCES += \
     settings.qrc \
     images/images.qrc \
     datetime/datetime.qrc \
     wifi/wifi.qrc \
+    wired/wired.qrc \
     bluetooth/bluetooth.qrc \
     version/version.qrc
 

diff --git a/app/main.cpp b/app/main.cpp
index 8d78b74..c610cef 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
 
     QGuiApplication app(argc, argv);
     app.setApplicationName(graphic_role);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
+    app.setApplicationVersion(QStringLiteral("0.1.1"));
     app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
     app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
 

diff --git a/app/wired/Wired.qml b/app/wired/Wired.qml
new file mode 100644 (file)
index 0000000..7632cc6
--- /dev/null
+++ b/app/wired/Wired.qml
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ * Copyright (C) 2019 Konsulko Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import QtQuick 2.6
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
+import AGL.Demo.Controls 1.0
+import ".."
+
+SettingPage {
+    id: root
+    icon: '/wired/images/HMI_Settings_WiredIcon.svg'
+    title: 'Wired'
+    readonly property bool isWired: true
+
+    Component {
+        id: wiredDevice
+        MouseArea {
+            height: 120
+            width: ListView.view.width
+            Column {
+                anchors.left: parent.left
+                anchors.leftMargin: 5
+                id: networkName
+                Label {
+                    id: networkNameText
+                    text: service
+                    color: '#66FF99'
+                    font.pixelSize: 48
+                    font.bold: sstate === "ready"
+                               || sstate === "online"
+                }
+                Label {
+                    visible: sstate === "ready"
+                             || sstate === "online"
+                    text: "connected, " + address
+                    font.pixelSize: 18
+                    color: "white"
+                }
+            }
+            onClicked: {
+                if ((sstate === "ready") || sstate === "online") {
+                    console.log("Disconnecting from ->", service)
+                    networkNameText.font.italic = 1
+                    network.disconnect(service)
+                } else {
+                    console.log("Connecting to ->", service)
+                    networkNameText.font.italic = 1
+                    password.text = ''
+                    network.connect(service)
+                }
+            }
+
+            Image {
+                source: '../images/HMI_Settings_DividingLine.svg'
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.top: parent.top
+                anchors.topMargin: -15
+                visible: model.index > 0
+            }
+        }
+    }
+
+    ListView {
+        id: view
+        anchors.fill: parent
+        anchors.margins: 100
+        model: WiredNetworkModel
+        delegate: wiredDevice
+        clip: true
+    }
+
+    Connections {
+        target: network
+        onInputRequest: {
+                console.log("Only unatheunticated access implemented for (", service, ")")
+        }
+
+    }
+}

diff --git a/app/wired/images/HMI_Settings_WiredIcon.svg b/app/wired/images/HMI_Settings_WiredIcon.svg
new file mode 100644 (file)
index 0000000..4314729
--- /dev/null
+++ b/app/wired/images/HMI_Settings_WiredIcon.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:i="&amp;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 100 100"
+   style="enable-background:new 0 0 100 100;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="HMI_Settings_WifiIcon.svg"><metadata
+     id="metadata20"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs18" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1464"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="2.36"
+     inkscape:cx="-191.52542"
+     inkscape:cy="50"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style3">
+       .st0{fill:#FFFFFF;}
+</style><switch
+     id="switch5"><g
+       i:extraneous="self"
+       id="g7"><g
+         id="Wifi_Icon"><path
+           class="st0"
+           d="M49.6,32.8c10.8-0.2,21.2,4.3,31,13.4l1.6-1.6C72,35,61,30.2,49.6,30.5c-15.2,0.4-26.9,9.4-31.8,13.9     l1.6,1.6C24.1,41.7,35.4,33.1,49.6,32.8z"
+           id="path10" /><path
+           class="st0"
+           d="M29,55.8l1.6,1.6c2.9-2.7,10.1-8.2,19.1-8.4c6.9-0.2,13.4,2.7,19.6,8.5L71,56c-6.7-6.3-13.9-9.4-21.3-9.2     C39.7,47,32.1,52.9,29,55.8z"
+           id="path12" /><path
+           class="st0"
+           d="M49.8,63.5c-4.7,0.1-8.2,3.3-9,4.2l1.6,1.6c0.7-0.7,3.6-3.4,7.5-3.5c2.6,0,5.3,1.2,7.7,3.7l1.6-1.6     C56.3,64.9,53.2,63.5,49.8,63.5z"
+           id="path14" /></g></g></switch></svg>
\ No newline at end of file

diff --git a/app/wired/wired.qrc b/app/wired/wired.qrc
new file mode 100644 (file)
index 0000000..71cc1b3
--- /dev/null
+++ b/app/wired/wired.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/wired">
+        <file>Wired.qml</file>
+        <file>images/HMI_Settings_WiredIcon.svg</file>
+    </qresource>
+</RCC>

diff --git a/package/config.xml b/package/config.xml
index 75b7891..f7f2c1b 100644 (file)
--- a/package/config.xml
+++ b/package/config.xml
@@ -3,7 +3,7 @@
   <name>Settings</name>
   <icon src="icon.svg"/>
   <content src="bin/settings" type="application/vnd.agl.native"/>
-  <description>This is the settings application for date &amp; time, wifi and bluetooth</description>
+  <description>This is the settings application for date &amp; time, wifi, wired and bluetooth</description>
   <author>Tasuku Suzuki &lt;tasuku.suzuki@qt.io&gt;</author>
   <license>APL 2.0</license>
   <feature name="urn:AGL:widget:required-api">