Code Review
/
apps
/
onscreenapp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
change onscreenapp
[apps/onscreenapp.git]
/
app
/
eventhandler.h
diff --git
a/app/eventhandler.h
b/app/eventhandler.h
index
612e3de
..
40e3672
100644
(file)
--- a/
app/eventhandler.h
+++ b/
app/eventhandler.h
@@
-21,12
+21,11
@@
#include <string>
#include <QVariant>
#include <QPair>
#include <string>
#include <QVariant>
#include <QPair>
-#include <QMap>
+
//
#include <QMap>
#include <libhomescreen.hpp>
#include <qlibwindowmanager.h>
#include "hmi-debug.h"
#include <libhomescreen.hpp>
#include <qlibwindowmanager.h>
#include "hmi-debug.h"
-#define ROLE_NAME "on_screen"
#define APP_ID "onscreenapp"
class QQmlApplicationEngine;
#define APP_ID "onscreenapp"
class QQmlApplicationEngine;
@@
-46,20
+45,28
@@
public:
static void* myThis;
static void onRep_static(struct json_object* reply_contents);
static void* myThis;
static void onRep_static(struct json_object* reply_contents);
- void activateWindow(const char *role, const char *area = "normal");
Q_INVOKABLE void deactivateWindow();
Q_INVOKABLE void deactivateWindow();
- Q_INVOKABLE void onScreenReply(const QString &btn_name,
- const QString &press_mode = QString("shortPress"),
- const QString &press_state = QString("release"));
+ Q_INVOKABLE void onScreenReply(const QString &btn_name);
signals:
signals:
- void signalLoader(QVariant url);
- void signalOnScreenParameter(QVariant text);
+ void updateModel(QVariant data);
+ void showOnScreen();
+ void hideOnScreen();
private:
private:
+ enum {
+ HIDING = 0,
+ SHOWING,
+ SWAPPING
+ };
+
+ int getDisplayStatus() {return m_dsp_sts;}
+ void setDisplayStatus(int sts) {m_dsp_sts = sts;}
+ void activateWindow(const char *role, const char *area = "normal.full");
+
LibHomeScreen *mp_hs;
QLibWindowmanager* mp_wm;
LibHomeScreen *mp_hs;
QLibWindowmanager* mp_wm;
- Q
Map<QString, QPair<QString, QString>> m_req
;
-
QString m_dspreq
;
+ Q
Pair<QString, QString> m_req, m_dsp
;
+
int m_dsp_sts = HIDING
;
};
#endif // HOMESCREENHANDLER_H
};
#endif // HOMESCREENHANDLER_H