diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 16:21:37 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-12-16 16:25:10 -0500 |
commit | 3570c2b580508b1cf01a602ec99bbf5836bafb85 (patch) | |
tree | ebf71a0fd0770246549ba1bdfbaa1ddb9902623c /app/main.cpp | |
parent | 70972c6093898b2d56152ca0fdc8297c70a7ec21 (diff) |
Update for app framework removal
Changes:
- Remove the autobuild scripts and config.xml used by the app
framework widget build.
- Update the qmake files to just build a "dashboard" binary and
install it into /usr/bin by default.
- Remove the code in main.cpp that handled reading the WebSocket
command-line arguments and passing them to binding related
code.
- Add setenv of QT_QUICK_CONTROLS_STYLE to "AGL" to get the AGL
styling used. This replaces a global environment variable
definition tied to the old app framework, and makes it more
obvious that the style is required for the app to properly
work.
- Comment out signal-composer code in Dashboard.qml for now,
keeping it as an indicator of how the values are updated may
be useful. Also remove some leftover screen scaling tweaks
as minor cleanup.
Bug-AGL: SPEC-4182
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I0ea604cb72aee86990e9584b0cab9577b2cd41e3
Diffstat (limited to 'app/main.cpp')
-rw-r--r-- | app/main.cpp | 46 |
1 files changed, 10 insertions, 36 deletions
diff --git a/app/main.cpp b/app/main.cpp index 6fe44d3..ec7b4a1 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. - * Copyright (C) 2019 Konsulko Group + * Copyright (C) 2019,2021 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,47 +16,21 @@ */ #include <QGuiApplication> -#include <QtQml/QQmlApplicationEngine> -#include <QtQml/QQmlContext> -#include <QtGui/QGuiApplication> -#include <QtCore/QCommandLineParser> -#include <QtCore/QUrlQuery> -#include <signalcomposer.h> +#include <QQmlApplicationEngine> + #include "translator.h" int main(int argc, char *argv[]) { - QGuiApplication app(argc, argv); - app.setDesktopFileName("dashboard"); - - QCommandLineParser parser; - parser.addPositionalArgument("port", app.translate("main", "port for binding")); - parser.addPositionalArgument("secret", app.translate("main", "secret for binding")); - parser.addHelpOption(); - parser.addVersionOption(); - parser.process(app); - QStringList positionalArguments = parser.positionalArguments(); - if (positionalArguments.length() != 2) { - exit(EXIT_FAILURE); - } + setenv("QT_QUICK_CONTROLS_STYLE", "AGL", 1); - int port = positionalArguments.takeFirst().toInt(); - QString secret = positionalArguments.takeFirst(); - QUrlQuery query; - query.addQueryItem(QStringLiteral("token"), secret); + QGuiApplication app(argc, argv); + app.setDesktopFileName("dashboard"); - QUrl bindingAddress; - bindingAddress.setScheme(QStringLiteral("ws")); - bindingAddress.setHost(QStringLiteral("localhost")); - bindingAddress.setPort(port); - bindingAddress.setPath(QStringLiteral("/api")); - bindingAddress.setQuery(query); + QQmlApplicationEngine engine; + qmlRegisterType<Translator>("Translator", 1, 0, "Translator"); + engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml"))); - QQmlApplicationEngine engine; - QQmlContext *context = engine.rootContext(); - context->setContextProperty("SignalComposer", new SignalComposer(bindingAddress, context)); - qmlRegisterType<Translator>("Translator", 1, 0, "Translator"); - engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml"))); - return app.exec(); + return app.exec(); } |