Code Review
/
apps
/
homescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
modify homescreen seq
[apps/homescreen.git]
/
homescreen
/
src
/
homescreenhandler.h
diff --git
a/homescreen/src/homescreenhandler.h
b/homescreen/src/homescreenhandler.h
index
99367d5
..
df3dfc7
100644
(file)
--- a/
homescreen/src/homescreenhandler.h
+++ b/
homescreen/src/homescreenhandler.h
@@
-18,21
+18,32
@@
#define HOMESCREENHANDLER_H
#include <QObject>
#define HOMESCREENHANDLER_H
#include <QObject>
-#include <libhomescreen.hpp>
+#include <qlibhomescreen.h>
+#include <libwindowmanager.h>
#include <string>
using namespace std;
#include <string>
using namespace std;
+class QQmlApplicationEngine;
+
class HomescreenHandler : public QObject
{
Q_OBJECT
public:
class HomescreenHandler : public QObject
{
Q_OBJECT
public:
+ enum CHANGE_LAYOUT_PATTERN {
+ P_LEFT_METER_RIGHT_MAP = 0,
+ P_LEFT_MAP_RIGHT_METER
+ };
+ Q_ENUMS(CHANGE_LAYOUT_PATTERN)
explicit HomescreenHandler(QObject *parent = 0);
~HomescreenHandler();
explicit HomescreenHandler(QObject *parent = 0);
~HomescreenHandler();
- void init(int port, const char* token);
+ void init(const char* role, int port, const char* token);
+ void attach(QQmlApplicationEngine* engine);
+ void setWMHandler(WMHandler &handler);
Q_INVOKABLE void tapShortcut(QString application_name);
Q_INVOKABLE void tapShortcut(QString application_name);
+ Q_INVOKABLE void changeLayout(int pattern);
void onRep(struct json_object* reply_contents);
void onEv(const string& event, struct json_object* event_contents);
void onRep(struct json_object* reply_contents);
void onEv(const string& event, struct json_object* event_contents);
@@
-45,8
+56,14
@@
signals:
void notification(QString id, QString icon, QString text);
void information(QString text);
void notification(QString id, QString icon, QString text);
void information(QString text);
+private Q_SLOTS:
+ void disconnect_frame_swapped(void);
+
private:
private:
- LibHomeScreen *mp_hs;
+ QLibHomeScreen *mp_qhs;
+ LibWindowmanager *mp_wm;
+ std::string m_role;
+ QMetaObject::Connection loading;
};
#endif // HOMESCREENHANDLER_H
};
#endif // HOMESCREENHANDLER_H