Add 2017 to copyright

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

diff --git a/WindowManager/src/main.cpp b/WindowManager/src/main.cpp
index 9c6e791..5526c92 100644 (file)
--- a/WindowManager/src/main.cpp
+++ b/WindowManager/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.
@@ -15,26 +15,56 @@
  */
 
 #include <QCoreApplication>
+#include <QCommandLineParser>
 #include "windowmanager.hpp"
 
+
+void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
+{
+}
+
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 
-    // used for application settings (QSettings)
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
     QCoreApplication::setApplicationName("WindowManager");
-    QCoreApplication::setApplicationVersion("0.3.0");
+    QCoreApplication::setApplicationVersion("0.7.0");
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("AGL WindowManager - see wwww... for more details");
+    parser.addHelpOption();
+    parser.addVersionOption();
+    QCommandLineOption quietOption(QStringList() << "q" << "quiet",
+        QCoreApplication::translate("main", "Be quiet. No outputs."));
+    parser.addOption(quietOption);
+    QCommandLineOption displayOption(QStringList() << "d" << "display-id",
+        QCoreApplication::translate("main", "The display with this <id> to manage. Default=0"),
+        QCoreApplication::translate("main", "id"));
+    parser.addOption(displayOption);
+    parser.process(a);
+
+    if (parser.isSet(quietOption))
+    {
+        qInstallMessageHandler(noOutput);
+    }
 
-    qDebug("%s, v%s", QCoreApplication::applicationName().toStdString().c_str(), QCoreApplication::applicationVersion().toStdString().c_str());
+    int displayId = 0;
+    if (parser.isSet(displayOption))
+    {
+        displayId = parser.value(displayOption).toInt();
+    }
+    qDebug() << "Using display" << displayId;
 
     qDBusRegisterMetaType<SimplePoint>();
     qDBusRegisterMetaType<QList<SimplePoint> >();
-    qDBusRegisterMetaType<SimpleRect>();
-    qDBusRegisterMetaType<QList<SimpleRect> >();
+    qDBusRegisterMetaType<LayoutArea>();
+    qDBusRegisterMetaType<QList<LayoutArea> >();
+    qDBusRegisterMetaType<Layout>();
+    qDBusRegisterMetaType<QList<Layout> >();
 
-    WindowManager *windowManager = new WindowManager();
+    WindowManager *windowManager = new WindowManager(displayId);
     windowManager->start();
 
 #ifdef __arm__