From d0350d3b30f53bbee53fcea6563b7f20505c1b2c Mon Sep 17 00:00:00 2001 From: Raquel Medina Date: Fri, 5 Jul 2019 12:44:07 +0200 Subject: settings: wired: add wired connections UI The initial Wired UI only implements unauthenticated access. Bug-AGL: SPEC-2355 Signed-off-by: Raquel Medina Change-Id: I5bac4378879e365bce544ae55d752c187acc3a48 --- app/Settings.qml | 3 + app/app.pro | 3 +- app/main.cpp | 2 +- app/wired/Wired.qml | 94 +++++++++++++++++++++++++++++ app/wired/images/HMI_Settings_WiredIcon.svg | 61 +++++++++++++++++++ app/wired/wired.qrc | 6 ++ package/config.xml | 2 +- 7 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 app/wired/Wired.qml create mode 100644 app/wired/images/HMI_Settings_WiredIcon.svg create mode 100644 app/wired/wired.qrc diff --git a/app/Settings.qml b/app/Settings.qml index bfcec3a..47d5eb2 100644 --- 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 --- 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 --- 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 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 index 0000000..4314729 --- /dev/null +++ b/app/wired/images/HMI_Settings_WiredIcon.svg @@ -0,0 +1,61 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/app/wired/wired.qrc b/app/wired/wired.qrc new file mode 100644 index 0000000..71cc1b3 --- /dev/null +++ b/app/wired/wired.qrc @@ -0,0 +1,6 @@ + + + Wired.qml + images/HMI_Settings_WiredIcon.svg + + diff --git a/package/config.xml b/package/config.xml index 75b7891..f7f2c1b 100644 --- a/package/config.xml +++ b/package/config.xml @@ -3,7 +3,7 @@ Settings - This is the settings application for date & time, wifi and bluetooth + This is the settings application for date & time, wifi, wired and bluetooth Tasuku Suzuki <tasuku.suzuki@qt.io> APL 2.0 -- cgit 1.2.3-korg