From 66972f70880021f1cc8f9091e09f58b04757dbf8 Mon Sep 17 00:00:00 2001 From: Daniel Teichmann Date: Thu, 24 Jun 2021 22:10:32 +0200 Subject: Complete new more responsive layout; introducing session_id --- src/session.h | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'src/session.h') diff --git a/src/session.h b/src/session.h index 07a85d9..ad1b140 100644 --- a/src/session.h +++ b/src/session.h @@ -39,31 +39,40 @@ class Session : public QObject { Q_OBJECT - Q_PROPERTY(QString status READ getStatus NOTIFY statusChanged) // this makes status available as a QML property - Q_PROPERTY(int id READ getId NOTIFY idChanged ) // this makes id available as a QML property - Q_PROPERTY(QString url READ getURL NOTIFY urlChanged ) // this makes url available as a QML property - Q_PROPERTY(QString pin READ getPin NOTIFY pinChanged ) // this makes pin available as a QML property + // this makes status available as a QML property + Q_PROPERTY(QString status READ getStatus NOTIFY statusChanged) + // this makes service id available as a QML property + Q_PROPERTY(QString id READ getId NOTIFY idChanged) + // this makes session_id available as a QML property + Q_PROPERTY(QString session_id READ getSessionID NOTIFY sessionIDChanged) + // this makes url available as a QML property + Q_PROPERTY(QString url READ getURL NOTIFY urlChanged) + // this makes pin available as a QML property + Q_PROPERTY(QString pin READ getPin NOTIFY pinChanged) + public: explicit Session(QObject *parent, MainQMLAdaptor *main_gui = nullptr); QString getStatus(); QString getURL(); - int getId(); + QString getId(); + QString getSessionID(); QString getPin(); void setStatus(QString status); void setURL(QString url); - void setId(int id); + void setId(QString id); + void setSessionID(QString session_id); void setPin(QString pin); // Starts a VNC Session void start_request_dbus(); // Refreshes a VNC Session's status - void refresh_status_request_dbus(int pid); + void refresh_status_request_dbus(QString id); // Stop the Session - void stop_request_dbus(int pid); + void stop_request_dbus(QString id); // Gets a VNC Session's status - void status_request_dbus(int pid); + void status_request_dbus(QString id); // Returns true if Session is somewhat usable (Running, Alive, etc..) bool isSessionAliveOrRunning(QString status); @@ -74,7 +83,8 @@ protected: private: MainQMLAdaptor* _main_gui; - int _id; + QString _id; + QString _session_id; QString _url; QString _pin; OrgArcticaProjectRWAInterface* _dbus_rwa; @@ -85,10 +95,11 @@ private: signals: void finished(); - void statusChanged(QString status); - void idChanged(int id); - void urlChanged(QString URL); - void pinChanged(QString pin); + void statusChanged(QString); + void idChanged(QString); + void sessionIDChanged(QString); + void urlChanged(QString); + void pinChanged(QString); public slots: void handleConnectButtonClick(bool checked); -- cgit v1.2.3