From 3beee2d1bdaea25a9ecd52a1a52ed2663ecf0c76 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Fri, 13 Jul 2018 10:24:33 +0900 Subject: Modify Dashboard to use qtaglextras Modify Dashboard to use qtaglextras. [Patch Set 2] Change role from "Dashboard" to "dashboard". Change-Id: I3bdd3796bee1366a35f48661acbe1d306e0bbe8d Signed-off-by: zheng_wenlong --- app/app.pri | 17 ---- app/app.pro | 2 +- app/config.tests/libhomescreen/libhomescreen.cpp | 8 -- app/config.tests/libhomescreen/libhomescreen.pro | 5 - .../qlibwindowmanager/qlibwindowmanager.cpp | 8 -- .../qlibwindowmanager/qlibwindowmanager.pro | 5 - app/main.cpp | 103 +-------------------- 7 files changed, 6 insertions(+), 142 deletions(-) delete mode 100644 app/config.tests/libhomescreen/libhomescreen.cpp delete mode 100644 app/config.tests/libhomescreen/libhomescreen.pro delete mode 100644 app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp delete mode 100644 app/config.tests/qlibwindowmanager/qlibwindowmanager.pro diff --git a/app/app.pri b/app/app.pri index 590c154..f22f540 100644 --- a/app/app.pri +++ b/app/app.pri @@ -1,20 +1,3 @@ TEMPLATE = app -load(configure) - -qtCompileTest(libhomescreen) -qtCompileTest(qlibwindowmanager) - -config_libhomescreen { - CONFIG += link_pkgconfig - PKGCONFIG += libhomescreen - DEFINES += HAVE_LIBHOMESCREEN -} - -config_qlibwindowmanager { - CONFIG += link_pkgconfig - PKGCONFIG += qlibwindowmanager - DEFINES += HAVE_QLIBWINDOWMANAGER -} - DESTDIR = $${OUT_PWD}/../package/root/bin diff --git a/app/app.pro b/app/app.pro index 97d4f64..197675e 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,5 +1,5 @@ TARGET = dashboard -QT = quick +QT = quick aglextras HEADERS += \ translator.h diff --git a/app/config.tests/libhomescreen/libhomescreen.cpp b/app/config.tests/libhomescreen/libhomescreen.cpp deleted file mode 100644 index d698b05..0000000 --- a/app/config.tests/libhomescreen/libhomescreen.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include - -int main(int argc,char **argv) -{ - LibHomeScreen libHomeScreen; - return 0; -} - diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro deleted file mode 100644 index 7d43112..0000000 --- a/app/config.tests/libhomescreen/libhomescreen.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = libhomescreen.cpp - -CONFIG -= qt -CONFIG += link_pkgconfig -PKGCONFIG += libhomescreen diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp deleted file mode 100644 index bb95c93..0000000 --- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include - -int main(int argc,char **argv) -{ - QLibWindowmanager qwm; - return 0; -} - diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro deleted file mode 100644 index cb51d98..0000000 --- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES = qlibwindowmanager.cpp - -CONFIG += qt -CONFIG += link_pkgconfig -PKGCONFIG += qlibwindowmanager diff --git a/app/main.cpp b/app/main.cpp index 856acfc..3520605 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -14,111 +14,18 @@ * limitations under the License. */ -#include -#include -#include -#include -#include +#include #include -#include - #include "translator.h" -#ifdef HAVE_LIBHOMESCREEN -#include -#endif - -#ifdef HAVE_QLIBWINDOWMANAGER -#include -#endif - int main(int argc, char *argv[]) { - QString myname = QString("Dashboard"); - - QGuiApplication app(argc, argv); - app.setApplicationName(myname); - app.setApplicationVersion(QStringLiteral("3.99.3")); - app.setOrganizationDomain(QStringLiteral("automotivelinux.org")); - app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux")); - - 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(); + AGLApplication app(argc, argv); + app.setApplicationName("Dashboard"); + app.setupApplicationRole("dashboard"); qmlRegisterType("Translator", 1, 0, "Translator"); - - QQmlApplicationEngine engine; - QQmlContext *context = engine.rootContext(); - QUrl bindingAddress; - int port = 0; - QString secret; - if (positionalArguments.length() == 2) { - port = positionalArguments.takeFirst().toInt(); - secret = positionalArguments.takeFirst(); - bindingAddress.setScheme(QStringLiteral("ws")); - bindingAddress.setHost(QStringLiteral("localhost")); - bindingAddress.setPort(port); - bindingAddress.setPath(QStringLiteral("/api")); - QUrlQuery query; - query.addQueryItem(QStringLiteral("token"), secret); - bindingAddress.setQuery(query); - context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); - } else { - context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); - } - -#ifdef HAVE_QLIBWINDOWMANAGER - // WindowManager - QLibWindowmanager* qwm = new QLibWindowmanager(); - if(qwm->init(port,secret) != 0){ - exit(EXIT_FAILURE); - } - // Request a surface as described in layers.json windowmanager’s file - if (qwm->requestSurface(myname) != 0) { - exit(EXIT_FAILURE); - } - // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs - qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) { - fprintf(stderr, "Surface got syncDraw!\n"); - qwm->endDraw(myname); - }); -#endif - -#ifdef HAVE_LIBHOMESCREEN - // HomeScreen - LibHomeScreen* hs = new LibHomeScreen(); - std::string token = secret.toStdString(); - hs->init(port, token.c_str()); - // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager - hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){ - json_object *appnameJ = nullptr; - if(json_object_object_get_ex(object, "application_name", &appnameJ)) - { - const char *appname = json_object_get_string(appnameJ); - if(myname == appname) - { - qDebug("Surface %s got tapShortcut\n", appname); - qwm->activateSurface(myname); - } - } - }); -#endif - engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml"))); - - QObject *root = engine.rootObjects().first(); - QQuickWindow *window = qobject_cast(root); -#ifdef HAVE_QLIBWINDOWMANAGER - QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface())); -#else - window->resize(1080, 1920 - 218 - 215); - window->setVisible(true); -#endif - + app.load(QUrl(QStringLiteral("qrc:/Dashboard.qml"))); return app.exec(); } -- cgit 1.2.3-korg