diff options
author | Marius Vlad <marius.vlad@collabora.com> | 2020-04-13 14:48:20 +0300 |
---|---|---|
committer | Marius Vlad <marius.vlad@collabora.com> | 2020-04-21 22:53:13 +0300 |
commit | 98dab0eebc3dc0f567be3f80ab129cbcc71738db (patch) | |
tree | a4dad9bda9fd6d3d9819ba920013bf0cf835496c /app/main.cpp | |
parent | 9e76cf1b66b40a0e502c667dbbf53164261956b5 (diff) |
app: Fixes and some monior tweaks to the qml filesandbox/mvlad/agl-compositor
- app.pro: Remove depends on windowmanager and homescreen when building
- app: Fake an event
- adjust the window size
- add the app state events
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Diffstat (limited to 'app/main.cpp')
-rw-r--r-- | app/main.cpp | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/app/main.cpp b/app/main.cpp index 381b9a2..7b6dc62 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -22,10 +22,54 @@ #include <QtQml/qqml.h> #include <QQuickWindow> #include <QtQuickControls2/QQuickStyle> +#include <QVariant> +#include <QTimer> + +#include <json-c/json.h> #include "eventhandler.h" #include "onscreenmodel.h" +/* +{ + "application_id": "onscreenapp", + "title": "onscreen title", + "type": "information", + "contents": "message contents", + "buttons": ["button_name1"], + "replyto":"onstestapp" +} +*/ +static struct json_object * +build_fake_json(void) +{ + struct json_object *tmp; + struct json_object *obj = json_object_new_object(); + struct json_object *array = json_object_new_array(); + + tmp = json_object_new_string("Big Title"); + json_object_object_add(obj, "title", tmp); + + tmp = json_object_new_string("Informatin"); + json_object_object_add(obj, "type", tmp); + + tmp = json_object_new_string("Our message contents"); + json_object_object_add(obj, "contents", tmp); + + tmp = json_object_new_string("onstestapp"); + json_object_object_add(obj, "replyto", tmp); + + /* array */ + tmp = json_object_new_string("Button"); + json_object_array_add(array, tmp); + json_object_object_add(obj, "buttons", array); + + tmp = json_object_new_string(APP_ID); + json_object_object_add(obj, "application_id", tmp); + + /* adds the entire object */ + return obj; +} int main(int argc, char *argv[]) { @@ -80,7 +124,22 @@ int main(int argc, char *argv[]) QObject::connect(eventHandler, SIGNAL(showOnScreen()), window, SLOT(showOnScreen())); QObject::connect(eventHandler, SIGNAL(hideOnScreen()), window, SLOT(hideOnScreen())); + HMI_DEBUG(APP_ID, "onscreenapp started!"); + +#if 0 + /* fake(s) an event */ + + /* this was used before to fake an event before onscreenapp was hooked-up */ + QTimer::singleShot(1000, [eventHandler](){ + struct json_object *json = build_fake_json(); + const char *json_str = json_object_to_json_string_ext(json, + JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY); + emit eventHandler->updateModel(QVariant(json_str)); + emit eventHandler->showOnScreen(); + }); +#endif + return app.exec(); } |