diff options
| author | Ken Moore <ken@ixsystems.com> | 2018-02-01 09:48:11 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2018-02-01 09:48:11 -0500 |
| commit | 9d3f929c27127bbc8f9d4b3d286c5d979f7203e4 (patch) | |
| tree | 273f7323c6b1acfa690c1e45bc3ee37ca52feb07 /src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h | |
| parent | Get a unified system clock setup within the RootDesktopObject. (diff) | |
| download | lumina-9d3f929c27127bbc8f9d4b3d286c5d979f7203e4.tar.gz lumina-9d3f929c27127bbc8f9d4b3d286c5d979f7203e4.tar.bz2 lumina-9d3f929c27127bbc8f9d4b3d286c5d979f7203e4.zip | |
Finish getting the session settings all loaded by the Desktop Manager.
Also ensure the desktop clock is a bit smarter about when it changes it's functionality (just in case the setting did not change).
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h index e7ce50e0..a6a4a236 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h @@ -21,6 +21,7 @@ class RootDesktopObject : public QObject{ Q_PROPERTY( QStringList trayWindows READ trayWindows NOTIFY trayWindowsChanged) Q_PROPERTY( bool hasTrayWindows READ hasTrayWindows NOTIFY trayWindowsChanged) Q_PROPERTY( QString currentTime READ currentTime NOTIFY currentTimeChanged); + Q_PROPERTY( QDateTime currentDateTime READ currentDateTime NOTIFY currentTimeChanged); public: //main contructor/destructor @@ -43,6 +44,7 @@ public: Q_INVOKABLE NativeWindowObject* trayWindow(QString id); Q_INVOKABLE bool hasTrayWindows(); Q_INVOKABLE QString currentTime(); + Q_INVOKABLE QDateTime currentDateTime(); //QML Globals Access Q_INVOKABLE OSInterface* os_interface(); @@ -61,6 +63,7 @@ private: QPointer<NativeWindowObject> last_window_up; QTimer *currentTimeTimer; QString currentTimeFormat, currentTimeString; + QDateTime currentDateTimeStruct; public slots: void updateScreens(); //rescan/update screen objects |