X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fmain.cpp;h=dcad4c6b22c670c9b9f1e72aa9556aad6332336b;hb=a4f5c7d97fcbb97ece05cfbca38fb1963ab11377;hp=99f98c9bdc3cd888082abe256e8b8b22f9b1dad1;hpb=79714c0aa8fc461d77b75d6c5dae6a1a7d726954;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index 99f98c9..dcad4c6 100644
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -14,26 +14,27 @@
  * limitations under the License.
  */
 
-#include "mainwindow.h"
-#include <QApplication>
+#include <QGuiApplication>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
+#include <QtQml/QQmlContext>
 #include <QtQml/qqml.h>
 
+#include "layouthandler.h"
+#include "homescreencontrolinterface.h"
 #include "../src2/applicationlauncher.h"
 #include "../src2/statusbarmodel.h"
-#include "layouthandler.h"
-
+#include "../src2/applicationmodel.h"
 
 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());
 
@@ -41,11 +42,22 @@ int main(int argc, char *argv[])
     qDBusRegisterMetaType<QList<AppInfo> >();
 
     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();