diff options
| author | ZackaryWelch <welch.zackary@gmail.com> | 2018-01-03 12:44:13 -0500 |
|---|---|---|
| committer | ZackaryWelch <welch.zackary@gmail.com> | 2018-01-03 12:44:13 -0500 |
| commit | d0553003b9a1b73b164c8ee9348cc11ee8fb8304 (patch) | |
| tree | 3a68b4973be42d2859a5dc06709261eff2a1bd60 /src-qt5/core/lumina-desktop-unified/global-objects.h | |
| parent | Added some specific data for desktop plugins into the JSON reader (diff) | |
| parent | Get the DesktopSettings class automatically providing notifications about fil... (diff) | |
| download | lumina-d0553003b9a1b73b164c8ee9348cc11ee8fb8304.tar.gz lumina-d0553003b9a1b73b164c8ee9348cc11ee8fb8304.tar.bz2 lumina-d0553003b9a1b73b164c8ee9348cc11ee8fb8304.zip | |
Merge branch 'master' of https://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/global-objects.h')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/global-objects.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/global-objects.h b/src-qt5/core/lumina-desktop-unified/global-objects.h index c204587f..4cea60c2 100644 --- a/src-qt5/core/lumina-desktop-unified/global-objects.h +++ b/src-qt5/core/lumina-desktop-unified/global-objects.h @@ -22,9 +22,10 @@ //#include "src-events/LXcbEventFilter.h" //#endif #include "src-events/LShortcutEvents.h" - +#include "src-desktop/DesktopManager.h" #include "src-screensaver/LScreenSaver.h" //#include "src-WM/LWindowManager.h" + #include <RootWindow.h> #include "LSession.h" @@ -43,13 +44,13 @@ namespace Lumina{ //extern EventFilter *EFILTER; //Native Event Watcher extern LShortcutEvents *SHORTCUTS; //Keyboard/mouse shortcut events - //extern DesktopSettings *SETTINGS; //All Settings files + //ScreenSaver extern LScreenSaver *SS; //Root Window extern RootWindow *ROOTWIN; - //Window Manager - //LWindowManager *WM; + //Desktop Manager + extern DesktopManager *DESKMAN; //Application List extern XDGDesktopList *APPLIST; |