1 files changed, 23 insertions, 109 deletions

diff --git a/app/main.cpp b/app/main.cpp
index 489c72b..bd136c0 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,115 +1,29 @@
-#include <QQmlApplicationEngine>
-
-#include <QtCore/QDebug>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QUrlQuery>
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlContext>
-#include <QtQuick/QQuickWindow>
-#include <QtDBus/QDBusConnection>
-
-#include "qcheapruler.hpp"
-#include "file_operation.h"
-
-#ifdef HAVE_QLIBHOMESCREEN
-#include <qlibhomescreen.h>
-#endif
-#ifdef HAVE_QLIBWINDOWMANAGER
-#include <qlibwindowmanager.h>
-#endif
+/*
+ * 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.
+ */
+
+#include <QtAGLExtras/AGLApplication>
+#include <QtQml/QQmlApplicationEngine>
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("tbtnavi");
-
-    QGuiApplication app(argc, argv);
-    app.setApplicationName(myname);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
-    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();
-
-    //make the bindingAddress for websocket
-    QQmlApplicationEngine engine;
-    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);
-        engine.rootContext()->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-    }else {
-        engine.rootContext()->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);
-    }
-#endif
-
-#ifdef HAVE_QLIBHOMESCREEN
-    // HomeScreen
-    QLibHomeScreen* qhs = new QLibHomeScreen();
-    std::string token = secret.toStdString();
-    qhs->init(port, token.c_str());
-    // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
-    qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow, [qwm, myname](json_object *object){
-        qDebug("Surface %s got tapShortcut\n", qPrintable(myname));
-        qwm->activateWindow(myname, "master.split.sub");
-    });
-#endif
-    qmlRegisterType<QCheapRuler>("com.mapbox.cheap_ruler", 1, 0, "CheapRuler");
-
-    //read the config info from /etc/naviconfig.ini
-    File_Operation file;
-    engine.rootContext()->setContextProperty("fileOperation", &file);
-
-    //load the qml file
-    engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
-
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_QLIBHOMESCREEN
-    qhs->setQuickWindow(window);
-#endif
-
-#ifdef HAVE_QLIBWINDOWMANAGER
-//    QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-    // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-    qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [root, qwm, myname](json_object *object) {
-        fprintf(stderr, "Surface got syncDraw!\n");
-        qwm->endDraw(myname);
-    });
-    // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-    qwm->set_event_handler(QLibWindowmanager::Event_Active, [root](json_object *object) {
-        fprintf(stderr, "Surface got Event_Active!\n");
-    });
-#else
-    window->resize(1024, 768);
-    window->setVisible(true);
-#endif
+    AGLApplication app(argc, argv);
+    app.setApplicationName("Hudtbt");
+    app.setupApplicationRole("hudtbt");
 
+    app.load(QUrl(QStringLiteral("qrc:/Hudtbt.qml")));
     return app.exec();
 }
+