Add 2017 to copyright

[staging/HomeScreen.git] / HomeScreen / src / main.cpp

diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index ac798a9..47d4f16 100644 (file)
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,45 @@
  * limitations under the License.
  */
 
-#include "mainwindow.h"
-#include <QApplication>
+#include <QGuiApplication>
+#include <QCommandLineParser>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
+#include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 
-#include "../src2/applicationlauncher.h"
-#include "../src2/statusbarmodel.h"
 #include "layouthandler.h"
-#include "../src2/applicationmodel.h"
+#include "homescreencontrolinterface.h"
+#include "applicationlauncher.h"
+#include "statusbarmodel.h"
+#include "applicationmodel.h"
+
+void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
+{
+}
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
+    QGuiApplication a(argc, argv);
 
-    // used for application settings (QSettings)
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
     QCoreApplication::setApplicationName("HomeScreen");
-    QCoreApplication::setApplicationVersion("0.6.0");
+    QCoreApplication::setApplicationVersion("0.7.0");
 
-    qDebug("%s, v%s", QCoreApplication::applicationName().toStdString().c_str(), QCoreApplication::applicationVersion().toStdString().c_str());
+    QCommandLineParser parser;
+    parser.setApplicationDescription("AGL HomeScreen - see wwww... for more details");
+    parser.addHelpOption();
+    parser.addVersionOption();
+    QCommandLineOption quietOption(QStringList() << "q" << "quiet",
+        QCoreApplication::translate("main", "Be quiet. No outputs."));
+    parser.addOption(quietOption);
+    parser.process(a);
+
+    if (parser.isSet(quietOption))
+    {
+        qInstallMessageHandler(noOutput);
+    }
 
     qDBusRegisterMetaType<AppInfo>();
     qDBusRegisterMetaType<QList<AppInfo> >();
@@ -43,10 +60,20 @@ int main(int argc, char *argv[])
     qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
     qmlRegisterType<ApplicationModel>("Home", 1, 0, "ApplicationModel");
     qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
-    qmlRegisterType<LayoutHandler>("HomeScreen", 1, 0, "LayoutHandler");
-
 
     QQmlApplicationEngine engine;
+
+    LayoutHandler* layoutHandler = new LayoutHandler();
+
+    HomeScreenControlInterface* hsci = new HomeScreenControlInterface();
+    QObject::connect(hsci, SIGNAL(newRequestGetSurfaceStatus(int)), layoutHandler, SLOT(requestGetSurfaceStatus(int)));
+    QObject::connect(hsci, SIGNAL(newRequestsToBeVisibleApp(int)), layoutHandler, SLOT(makeMeVisible(int)));
+    QObject::connect(hsci, SIGNAL(newRequestRenderSurfaceToArea(int, int)), layoutHandler, SLOT(requestRenderSurfaceToArea(int,int)));
+    QObject::connect(hsci, SIGNAL(newRequestRenderSurfaceToAreaAllowed(int, int)), layoutHandler, SLOT(requestRenderSurfaceToAreaAllowed(int,int)));
+    QObject::connect(hsci, SIGNAL(newRequestSurfaceIdToFullScreen(int)), layoutHandler, SLOT(requestSurfaceIdToFullScreen(int)));
+
+    engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
+
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
     return a.exec();