diff options
| -rw-r--r-- | app/SettingPage.qml | 4 | ||||
| -rw-r--r-- | app/app.pro | 3 | ||||
| -rw-r--r-- | app/example/Example.qml | 114 | ||||
| -rw-r--r-- | app/example/example.qrc | 6 | ||||
| -rw-r--r-- | app/example/images/HMI_Settings_Example.svg | 72 | ||||
| -rw-r--r-- | app/main.cpp | 23 |
6 files changed, 1 insertions, 221 deletions
diff --git a/app/SettingPage.qml b/app/SettingPage.qml index 104cb51..d5858e8 100644 --- a/app/SettingPage.qml +++ b/app/SettingPage.qml @@ -29,10 +29,6 @@ Page { parent.pop() } - function setStatusIcon(index, icon) { - dbus.setStatusIcon(index, icon) - } - Connections { target: root onCheckedChanged: { diff --git a/app/app.pro b/app/app.pro index 23dce89..566d2b6 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,5 +1,5 @@ TARGET = settings -QT = quickcontrols2 websockets dbus +QT = quickcontrols2 websockets SOURCES = main.cpp @@ -12,7 +12,6 @@ RESOURCES += \ datetime/datetime.qrc \ wifi/wifi.qrc \ bluetooth/bluetooth.qrc \ - example/example.qrc \ version/version.qrc diff --git a/app/example/Example.qml b/app/example/Example.qml deleted file mode 100644 index 283b76b..0000000 --- a/app/example/Example.qml +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2016 The Qt Company Ltd. - * - * 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: '/example/images/HMI_Settings_Example.svg' - title: 'Example' - checkable: true - - ColumnLayout { - anchors.fill: parent - anchors.margins: 100 - RowLayout { - spacing: 20 - Button { - text: 'Wifi' - highlighted: true - property int index: 0 - property var icons: ['HMI_Status_Wifi_NoBars-01', 'HMI_Status_Wifi_1Bar-01', 'HMI_Status_Wifi_2Bars-01', 'HMI_Status_Wifi_3Bars-01', 'HMI_Status_Wifi_Full-01'] - onClicked: { - index = (index + 1) % icons.length - setStatusIcon(0, 'qrc:/images/Status/%1.png'.arg(icons[index])) - } - } - Button { - text: 'Bluetooth' - property int index: 0 - property var icons: ['HMI_Status_Bluetooth_Inactive-01', 'HMI_Status_Bluetooth_On-01'] - onClicked: { - index = (index + 1) % icons.length - setStatusIcon(1, 'qrc:/images/Status/%1.png'.arg(icons[index])) - } - } - Button { - text: 'Signal' - property int index: 0 - property var icons: ['HMI_Status_Signal_NoBars-01', 'HMI_Status_Signal_1Bars-01', 'HMI_Status_Signal_2Bars-01', 'HMI_Status_Signal_3Bars-01', 'HMI_Status_Signal_4Bars-01', 'HMI_Status_Signal_Full-01'] - onClicked: { - index = (index + 1) % icons.length - setStatusIcon(2, 'qrc:/images/Status/%1.png'.arg(icons[index])) - } - } - } - - Image { - source: '../images/HMI_Settings_DividingLine.svg' - } - - ListView { - Layout.fillWidth: true - Layout.fillHeight: true - clip: true - model: 10 - delegate: MouseArea { - width: ListView.view.width - height: 110 - RowLayout { - anchors.fill: parent - anchors.margins: 5 - spacing: 30 - Image { - source: './images/HMI_Settings_Example.svg' - } - - ColumnLayout { - Label { - id: title - Layout.fillWidth: true - text: 'Title' - font.pixelSize: 48 - } - Label { - id: subtitle - Layout.fillWidth: true - text: 'Subtitle' - color: '#66FF99' - font.pixelSize: 24 - } - } - - Button { - text: 'Go' - } - } - - Image { - source: '../images/HMI_Settings_DividingLine.svg' - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - visible: model.index > 0 - } - } - } - } -} diff --git a/app/example/example.qrc b/app/example/example.qrc deleted file mode 100644 index 5739f8e..0000000 --- a/app/example/example.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/example"> - <file>Example.qml</file> - <file>images/HMI_Settings_Example.svg</file> - </qresource> -</RCC> diff --git a/app/example/images/HMI_Settings_Example.svg b/app/example/images/HMI_Settings_Example.svg deleted file mode 100644 index 5ad9479..0000000 --- a/app/example/images/HMI_Settings_Example.svg +++ /dev/null @@ -1,72 +0,0 @@ -<?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="&#38;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" - x="0px" - y="0px" - viewBox="0 0 45 45" - style="enable-background:new 0 0 45 45;" - xml:space="preserve" - id="svg2" - inkscape:version="0.91 r13725" - sodipodi:docname="HMI_ContactScreen_X-01.svg"><metadata - id="metadata66"><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="defs64" /><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="namedview62" - showgrid="false" - inkscape:zoom="5.2444444" - inkscape:cx="-132.61653" - inkscape:cy="22.5" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="svg2" /><style - type="text/css" - id="style4"> - .st0{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;} - .st1{display:none;} - .st2{display:inline;opacity:0.15;fill:url(#SVGID_1_);} - .st3{display:inline;opacity:0.35;fill:url(#SVGID_2_);} - .st4{display:inline;} - .st5{opacity:0.15;fill:url(#SVGID_3_);} - .st6{opacity:0.15;fill:url(#SVGID_4_);stroke:url(#SVGID_5_);stroke-miterlimit:10;} - .st7{fill:url(#SVGID_6_);} -</style><switch - id="switch6"><g - i:extraneous="self" - id="g8"><g - id="Inactive"><g - id="g11"><line - class="st0" - x1="44.8" - y1="44.8" - x2="0.2" - y2="0.2" - id="line13" /><line - class="st0" - x1="45" - y1="0" - x2="0" - y2="45" - id="line15" /></g></g></g></switch></svg>
\ No newline at end of file diff --git a/app/main.cpp b/app/main.cpp index 2c8c01b..3b39810 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -19,8 +19,6 @@ #include <QtCore/QCommandLineParser> #include <QtCore/QUrlQuery> #include <QtCore/QFile> -#include <QtDBus/QDBusInterface> -#include <QtDBus/QDBusReply> #include <QtGui/QGuiApplication> #include <QtQml/QQmlApplicationEngine> #include <QtQml/QQmlContext> @@ -31,23 +29,6 @@ #include <network.h> #include <qlibwindowmanager.h> -class DBus : public QObject -{ - Q_OBJECT -public: - DBus(QObject *parent = nullptr) - : QObject(parent) - , interface("org.agl.homescreen", "/StatusBar", "org.agl.statusbar", QDBusConnection::sessionBus()) - {} - - Q_INVOKABLE void setStatusIcon(int index, const QString &url) { - interface.call("setStatusIcon", index, url); - } - -private: - QDBusInterface interface; -}; - int main(int argc, char *argv[]) { QString graphic_role = QString("settings"); // defined in layers.json in window manager @@ -133,8 +114,6 @@ int main(int argc, char *argv[]) qWarning() << aglversion.errorString(); } - DBus dbus; - engine.rootContext()->setContextProperty("dbus", &dbus); engine.rootContext()->setContextProperty("bluetooth", new Bluetooth(bindingAddressWS)); engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo); engine.load(QUrl(QStringLiteral("qrc:/Settings.qml"))); @@ -144,5 +123,3 @@ int main(int argc, char *argv[]) return app.exec(); } - -#include "main.moc" |
