Toast: Add a variety of new toast colors; Session complete rewrite; A lot of bugfixing;

New available toast colors/types:
ToastType.Standard, ToastType.Info, ToastType.Warning ToastType.Success, ToastType.Error

1 files changed, 34 insertions, 29 deletions

diff --git a/src/main_qmladaptor.h b/src/main_qmladaptor.h
index 9a2f7c3..70c075b 100644
--- a/src/main_qmladaptor.h
+++ b/src/main_qmladaptor.h
@@ -39,17 +39,34 @@
 #include "RWAHost.h"
 #include "DBusAPI.h"
 
-class MainQMLAdaptor : public QObject
+namespace Toast {
+    Q_NAMESPACE
+    enum ToastType {
+        ToastStandard,
+        ToastInfo,
+        ToastSuccess,
+        ToastWarning,
+        ToastError
+    };
+    Q_ENUM_NS(ToastType)
+}
+
+/*#include <QObject>
+namespace MyNamespace
 {
+    Q_NAMESPACE         // required for meta object creation
+    enum EnStyle {
+        STYLE_RADIAL,
+        STYLE_ENVELOPE,
+        STYLE_FILLED
+    };
+    Q_ENUM_NS(EnStyle)  // register the enum in meta object data
+}*/
+
+class MainQMLAdaptor : public QObject {
     Q_OBJECT
-    // this makes url available as a QML property
+    // this makes rwaHostModel available as a QML property
     Q_PROPERTY(QList<QObject*> rwaHostModel READ getRWAHostModel NOTIFY rwaHostModelChanged)
-    // this makes url available as a QML property
-    Q_PROPERTY(QString url READ getURL WRITE setURL NOTIFY urlChanged)
-    // this makes pin available as a QML property
-    Q_PROPERTY(QString pin READ getPin WRITE setPin NOTIFY pinChanged)
-    // this makes session_id available as a QML property
-    Q_PROPERTY(QString session_id READ getSessionID WRITE setSessionID NOTIFY sessionIDChanged)
     // this makes showMessageDialog available as a QML property
     Q_PROPERTY(bool showMessageDialog READ getShowMessageDialog NOTIFY showMessageDialogChanged)
     // this makes showMessageDialogTitle available as a QML property
@@ -85,27 +102,19 @@ signals:
     void minimizeWindow();
     void showWindow();
 
-    void onConnectButtonClick(bool checked);
-
-    void pinChanged(QString pin);
-    void urlChanged(QString URL);
-    void sessionIDChanged(QString session_id);
-
     void rwaHostModelChanged(QList<QObject*>);
 
     void onCloseSignal();
 
-    void showToastSignal(QString text, QString durationMs);
+    void showToastSignal(QString text, QString durationMs, int type);
 
 protected:
-    QString _url;
-    QString _pin;
-    QString _session_id;
     DBusAPI *_dbus_api;
     QList<QObject*> *_rwaHostModel;
 
 private:
-    QQmlApplicationEngine* _engine;
+    QQmlApplicationEngine *_engine;
+    RWAHost *_selected_rwa_host;
 
     bool _showMessageDialog;
     QString _messageDialogTitle;
@@ -113,27 +122,23 @@ private:
     QMessageBox::Icon _messageDialogIcon;
 
 public slots:
-    void handleCopyToClipboardButtonClick(QString copy_data);
-    void handleConnectButtonClick(bool checked);
-
     void get_web_app_hosts_response(QJsonDocument *doc);
 
-    void setPin(QString pin);
-    void setURL(QString URL);
-    void setSessionID(QString session_id);
     void addRWAHost(RWAHost *rwa_host);
     void removeRWAHost(RWAHost *rwa_host);
     void setRWAHostSelected(bool value);
-    QString getURL();
-    QString getPin();
-    QString getSessionID();
 
     // No pointer because QML doesn't
     // like this type much with pointer
     QList<QObject*> getRWAHostModel();
 
+    RWAHost *getSelectedRWAHost();
+
     void onRwaHostSelected(QString host_uuid);
     void onCloseHandler();
 
-    void showToast(QString text, uint durationMs = 3000);
+    // arg type is actually Toast::ToastType
+    void showToast(QString text,
+                   uint durationMs = 3000,
+                   uint type = 0);
 };