summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-12-20 00:10:10 +0900
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2017-12-20 00:19:36 +0900
commitd946204ad1a4ba754131652e30d4cfacae89028b (patch)
treef2c5fe14ef96e58983d60e3f1520eee0f249d3c7 /app
parent88611724502425d3656ef0dcbfdcbdb519c0b41f (diff)
Revert "Merge "Check if dependencies are available and make it run without them" into eel"
NOTE: I18N features isn't supported in EEL/CES2018 yet. This reverts commit 88611724502425d3656ef0dcbfdcbdb519c0b41f, reversing changes made to 2f43c64c0b55dbfc7ffa1d87e952d840c7f940e1. Change-Id: I1195f929ac5c3b2e28bad0b4b52e4fe4469f1c3a Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'app')
-rw-r--r--app/app.pri15
-rw-r--r--app/app.pro3
-rw-r--r--app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp8
-rw-r--r--app/config.tests/qlibwindowmanager/qlibwindowmanager.pro5
-rw-r--r--app/main.cpp92
5 files changed, 41 insertions, 82 deletions
diff --git a/app/app.pri b/app/app.pri
index 590c154..e535cbc 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -2,19 +2,4 @@ TEMPLATE = app
load(configure)
-qtCompileTest(libhomescreen)
-qtCompileTest(qlibwindowmanager)
-
-config_libhomescreen {
- CONFIG += link_pkgconfig
- PKGCONFIG += libhomescreen
- DEFINES += HAVE_LIBHOMESCREEN
-}
-
-config_qlibwindowmanager {
- CONFIG += link_pkgconfig
- PKGCONFIG += qlibwindowmanager
- DEFINES += HAVE_QLIBWINDOWMANAGER
-}
-
DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
index 97d4f64..169258b 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -7,6 +7,9 @@ HEADERS += \
SOURCES = main.cpp \
translator.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libhomescreen qlibwindowmanager
+
RESOURCES += \
dashboard.qrc \
images/images.qrc
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
deleted file mode 100644
index bb95c93..0000000
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <qlibwindowmanager.h>
-
-int main(int argc,char **argv)
-{
- QLibWindowmanager qwm;
- return 0;
-}
-
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
deleted file mode 100644
index 96721e8..0000000
--- a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES = qlibwindowmanager.cpp
-
-CONFIG -= qt
-CONFIG += link_pkgconfig
-PKGCONFIG += qlibwindowmanager
diff --git a/app/main.cpp b/app/main.cpp
index a75e779..7adc1f0 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -24,13 +24,8 @@
#include "translator.h"
-#ifdef HAVE_LIBHOMESCREEN
#include <libhomescreen.hpp>
-#endif
-
-#ifdef HAVE_QLIBWINDOWMANAGER
#include <qlibwindowmanager.h>
-#endif
int main(int argc, char *argv[])
{
@@ -53,12 +48,10 @@ int main(int argc, char *argv[])
qmlRegisterType<Translator>("Translator", 1, 0, "Translator");
QQmlApplicationEngine engine;
- QQmlContext *context = engine.rootContext();
- QUrl bindingAddress;
- QString secret;
if (positionalArguments.length() == 2) {
int port = positionalArguments.takeFirst().toInt();
QString secret = positionalArguments.takeFirst();
+ QUrl bindingAddress;
bindingAddress.setScheme(QStringLiteral("ws"));
bindingAddress.setHost(QStringLiteral("localhost"));
bindingAddress.setPort(port);
@@ -66,58 +59,49 @@ int main(int argc, char *argv[])
QUrlQuery query;
query.addQueryItem(QStringLiteral("token"), secret);
bindingAddress.setQuery(query);
+ QQmlContext *context = engine.rootContext();
context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
- } else {
- context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
- }
-#ifdef HAVE_QLIBWINDOWMANAGER
- // WindowManager
- QLibWindowmanager* qwm = new QLibWindowmanager();
- if(qwm->init(port,secret) != 0){
- exit(EXIT_FAILURE);
- }
- // Request a surface as described in layers.json windowmanager’s file
- if (qwm->requestSurface(myname) != 0) {
- exit(EXIT_FAILURE);
- }
- // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
- qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
- fprintf(stderr, "Surface got syncDraw!\n");
- qwm->endDraw(myname);
- });
-#endif
+ std::string token = secret.toStdString();
+ LibHomeScreen* hs = new LibHomeScreen();
+ QLibWindowmanager* qwm = new QLibWindowmanager();
-#ifdef HAVE_LIBHOMESCREEN
- // HomeScreen
- LibHomeScreen* hs = new LibHomeScreen();
- std::string token = secret.toStdString();
- hs->init(port, secret.to);
- // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
- hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
- json_object *appnameJ = nullptr;
- if(json_object_object_get_ex(object, "application_name", &appnameJ))
- {
- const char *appname = json_object_get_string(appnameJ);
- if(myname == appname)
- {
- qDebug("Surface %s got tapShortcut\n", appname);
- qwm->activateSurface(myname);
- }
+ // WindowManager
+ if(qwm->init(port,secret) != 0){
+ exit(EXIT_FAILURE);
+ }
+ // Request a surface as described in layers.json windowmanager’s file
+ if (qwm->requestSurface(myname) != 0) {
+ exit(EXIT_FAILURE);
}
- });
-#endif
- engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
+ // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
+ qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
+ fprintf(stderr, "Surface got syncDraw!\n");
+ qwm->endDraw(myname);
+ });
- QObject *root = engine.rootObjects().first();
- QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_QLIBWINDOWMANAGER
- QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-#else
- window->resize(1080, 1920 - 218 - 215);
- window->setVisible(true);
-#endif
+ // HomeScreen
+ hs->init(port, token.c_str());
+ // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
+ hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
+ json_object *appnameJ = nullptr;
+ if(json_object_object_get_ex(object, "application_name", &appnameJ))
+ {
+ const char *appname = json_object_get_string(appnameJ);
+ if(myname == appname)
+ {
+ qDebug("Surface %s got tapShortcut\n", appname);
+ qwm->activateSurface(myname);
+ }
+ }
+ });
+ engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
+ QObject *root = engine.rootObjects().first();
+ QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+ QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
+ ));
+ }
return app.exec();
}