aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/src-cpp/framework-OSInterface.h
diff options
context:
space:
mode:
authorZackaryWelch <welch.zackary@gmail.com>2018-01-30 13:25:00 -0500
committerZackaryWelch <welch.zackary@gmail.com>2018-01-30 13:25:00 -0500
commit79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78 (patch)
treea3df677962ce5eeeef5ac3b9056119987b701c8b /src-qt5/src-cpp/framework-OSInterface.h
parentFixed the find/bookmark widgets and rotation for lumina-pdf (diff)
parentMerge branch 'master' of github.com:trueos/lumina (diff)
downloadlumina-79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78.tar.gz
lumina-79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78.tar.bz2
lumina-79cc1484c38e0dbd27aa03a97eaab2bb6b6d5c78.zip
Merge branch 'master' of https://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/src-cpp/framework-OSInterface.h')
-rw-r--r--src-qt5/src-cpp/framework-OSInterface.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src-qt5/src-cpp/framework-OSInterface.h b/src-qt5/src-cpp/framework-OSInterface.h
index 95b1b441..c12561de 100644
--- a/src-qt5/src-cpp/framework-OSInterface.h
+++ b/src-qt5/src-cpp/framework-OSInterface.h
@@ -50,7 +50,9 @@ class OSInterface : public QObject{
Q_PROPERTY( QString networkType READ networkType NOTIFY networkStatusChanged)
Q_PROPERTY( float networkStrength READ networkStrength NOTIFY networkStatusChanged)
Q_PROPERTY( QString networkHostname READ networkHostname NOTIFY networkStatusChanged)
- Q_PROPERTY( QHostAddress networkAddress READ networkAddress NOTIFY networkStatusChanged)
+ Q_PROPERTY( QStringList networkAddress READ networkAddress NOTIFY networkStatusChanged)
+ Q_PROPERTY( QString networkIcon READ networkIcon NOTIFY networkStatusChanged);
+ Q_PROPERTY( QString networkStatus READ networkStatus NOTIFY networkStatusChanged);
//Media
Q_PROPERTY( QStringList mediaShortcuts READ mediaShortcuts NOTIFY mediaShortcutsChanged)
//Updates
@@ -91,7 +93,8 @@ public:
Q_INVOKABLE float networkStrength(); //percentage. ("wired" type should always be 100%)
Q_INVOKABLE QString networkIcon();
Q_INVOKABLE QString networkHostname();
- Q_INVOKABLE QHostAddress networkAddress();
+ Q_INVOKABLE QStringList networkAddress();
+ Q_INVOKABLE QString networkStatus(); //combines a bunch of the above info into a single string
// = Network Modification =
Q_INVOKABLE bool hasNetworkManager();
bgstack15