X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fsrc%2Fmain.cpp;h=4e928c6900b34334634067c40b747f87f0ca3b4a;hb=15e7b5003a6590f780cb115fb2bdb526ce68defc;hp=3cf8e8c2e67458820857c4647a09bf697bf881f7;hpb=3b66010c1f381f397e827209727742daf642e7fd;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index 3cf8e8c..4e928c6 100644
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -14,30 +14,46 @@
  * 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 "layouthandler.h"
+#include "homescreencontrolinterface.h"
 #include "../src2/applicationlauncher.h"
 #include "../src2/statusbarmodel.h"
-#include "layouthandler.h"
 #include "../src2/applicationmodel.h"
-#include "homescreencontrolinterface.h"
+#include "../src2/usermanagement.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");
+
+    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);
 
-    qDebug("%s, v%s", QCoreApplication::applicationName().toStdString().c_str(), QCoreApplication::applicationVersion().toStdString().c_str());
+    if (parser.isSet(quietOption))
+    {
+        qInstallMessageHandler(noOutput);
+    }
 
     qDBusRegisterMetaType<AppInfo>();
     qDBusRegisterMetaType<QList<AppInfo> >();
@@ -47,11 +63,9 @@ int main(int argc, char *argv[])
     qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
 
     QQmlApplicationEngine engine;
-
     LayoutHandler* layoutHandler = new LayoutHandler();
 
     HomeScreenControlInterface* hsci = new HomeScreenControlInterface();
-    QObject::connect(hsci, SIGNAL(newRequestGetAllSurfacesOfProcess(int)), layoutHandler, SLOT(requestGetAllSurfacesOfProcess(int)));
     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)));
@@ -61,6 +75,10 @@ int main(int argc, char *argv[])
     engine.rootContext()->setContextProperty("layoutHandler", layoutHandler);
 
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
-
+    QObject *home = engine.rootObjects().first()->findChild<QObject *>("Home");
+    QObject *shortcutArea = engine.rootObjects().first()->findChild<QObject *>("ShortcutArea");
+    QObject *statusArea = engine.rootObjects().first()->findChild<QObject *>("StatusArea");
+    UserManagement userManagement(home, shortcutArea, statusArea);
+    Q_UNUSED(userManagement);
     return a.exec();
 }