various changes in user language settings

[staging/HomeScreen.git] / HomeScreen / src2 / usermanagement.h

diff --git a/HomeScreen/src2/usermanagement.h b/HomeScreen/src2/usermanagement.h
index 382d1ac..085549d 100644 (file)
--- a/HomeScreen/src2/usermanagement.h
+++ b/HomeScreen/src2/usermanagement.h
@@ -1,7 +1,7 @@
 #ifndef USERMANAGEMENT_H
 #define USERMANAGEMENT_H
 
-#define REAL_SERVER "ws://your_server.com:1234"
+#define REAL_SERVER "ws://localhost:1212/api?token=hello"
 
 #include <QObject>
 #include "applicationmodel.h"
@@ -21,8 +21,8 @@ struct User {
     QString graphPreferredLanguage;
     QString ccNumberMasked;
     QString ccExpYear;
-    QString ccExpMonth;
     QString description;
+    QString ccExpMonth;
     QStringList groups;
     QString last_name;
     QString ccNumber;
@@ -30,11 +30,12 @@ struct User {
     QString phone;
     QString name;
     QString state;
-    QString common_name;
     QString fax;
+    QString common_name;
     QString postal_code;
     QString first_name;
     QString keytoken;
+    QStringList graphActions;
 };
 
 class UserManagement : public QObject
@@ -60,6 +61,7 @@ public slots:
     void serverSocketDisconnected();
     void slot_timerTest();
 #endif
+    void slot_turnOffRed();
 private:
     QObject *home;
     QObject *shortcutArea;
@@ -68,6 +70,8 @@ private:
     QByteArray data;
     ApplicationModel *appModel;
     QWebSocket webSocket;
+    QTimer timerRed;
+    bool isRed;
     int sequence;
     bool jsonToMap(const QByteArray &buf, QVariantMap *map) const;
     bool mapToJson(const QVariantMap &map, QByteArray *json) const;