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

diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index 4d626d9..dcad4c6 100644
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -14,51 +14,51 @@
  * limitations under the License.
  */
 
-#include "mainwindow.h"
-#include <QApplication>
-#include <QSysInfo>
-//#include <QSharedMemory>
+#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 "../src2/applicationmodel.h"
 
 int main(int argc, char *argv[])
 {
-    // allow only one instance of this application
-    /*QSharedMemory appInstance;
-    appInstance.setKey("HomeScreen");
-    if (!appInstance.create(1))
-    {
-        qDebug("Only one instance of the Home Screen App allowed!");
-        exit(-1);
-    }*/
-
-    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.4.0");
+    QCoreApplication::setApplicationVersion("0.7.0");
 
     qDebug("%s, v%s", QCoreApplication::applicationName().toStdString().c_str(), QCoreApplication::applicationVersion().toStdString().c_str());
 
     qDBusRegisterMetaType<AppInfo>();
     qDBusRegisterMetaType<QList<AppInfo> >();
 
-    MainWindow w;
-    w.show();
-#ifdef __arm__
-    // the WindowManager positions the surface correctly
-#endif
-#ifdef __i386__
-    w.move(0, 0);
-#endif
+    qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
+    qmlRegisterType<ApplicationModel>("Home", 1, 0, "ApplicationModel");
+    qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
+
+    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);
 
-#ifdef __arm__
-    qDebug("Running on ARM architecture");
-#endif
-#ifdef __i386__
-    qDebug("Running on x86 architecture");
-#endif
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
     return a.exec();
 }