Changeset View
Changeset View
Standalone View
Standalone View
shell/shellcorona.h
Show All 23 Lines | |||||
24 | #define SHELLCORONA_H | 24 | #define SHELLCORONA_H | ||
25 | 25 | | |||
26 | #include "plasma/corona.h" | 26 | #include "plasma/corona.h" | ||
27 | 27 | | |||
28 | #include <QSet> | 28 | #include <QSet> | ||
29 | #include <QTimer> | 29 | #include <QTimer> | ||
30 | #include <QDBusVariant> | 30 | #include <QDBusVariant> | ||
31 | #include <QDBusContext> | 31 | #include <QDBusContext> | ||
32 | #include <QAbstractNativeEventFilter> | ||||
32 | 33 | | |||
33 | #include <KPackage/Package> | 34 | #include <KPackage/Package> | ||
34 | 35 | | |||
35 | class DesktopView; | 36 | class DesktopView; | ||
36 | class PanelView; | 37 | class PanelView; | ||
37 | class QMenu; | 38 | class QMenu; | ||
38 | class QScreen; | 39 | class QScreen; | ||
39 | class ScreenPool; | 40 | class ScreenPool; | ||
Show All 20 Lines | |||||
60 | namespace KWayland | 61 | namespace KWayland | ||
61 | { | 62 | { | ||
62 | namespace Client | 63 | namespace Client | ||
63 | { | 64 | { | ||
64 | class PlasmaShell; | 65 | class PlasmaShell; | ||
65 | } | 66 | } | ||
66 | } | 67 | } | ||
67 | 68 | | |||
68 | class ShellCorona : public Plasma::Corona, QDBusContext | 69 | class ShellCorona : public Plasma::Corona, QDBusContext, public QAbstractNativeEventFilter | ||
69 | { | 70 | { | ||
70 | Q_OBJECT | 71 | Q_OBJECT | ||
71 | Q_PROPERTY(QString shell READ shell WRITE setShell) | 72 | Q_PROPERTY(QString shell READ shell WRITE setShell) | ||
72 | Q_PROPERTY(int numScreens READ numScreens) | 73 | Q_PROPERTY(int numScreens READ numScreens) | ||
73 | Q_CLASSINFO("D-Bus Interface", "org.kde.PlasmaShell") | 74 | Q_CLASSINFO("D-Bus Interface", "org.kde.PlasmaShell") | ||
74 | 75 | | |||
75 | public: | 76 | public: | ||
76 | explicit ShellCorona(QObject *parent = 0); | 77 | explicit ShellCorona(QObject *parent = 0); | ||
Show All 31 Lines | |||||
108 | 109 | | |||
109 | 110 | | |||
110 | ScreenPool *screenPool() const; | 111 | ScreenPool *screenPool() const; | ||
111 | 112 | | |||
112 | QList<int> screenIds() const; | 113 | QList<int> screenIds() const; | ||
113 | 114 | | |||
114 | QString defaultContainmentPlugin() const; | 115 | QString defaultContainmentPlugin() const; | ||
115 | 116 | | |||
117 | protected: | ||||
118 | bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) Q_DECL_OVERRIDE; | ||||
sebas: whitespace between * and var name | |||||
119 | | ||||
116 | public Q_SLOTS: | 120 | public Q_SLOTS: | ||
117 | /** | 121 | /** | ||
118 | * Request saving applicationConfig on disk, it's event compressed, not immediate | 122 | * Request saving applicationConfig on disk, it's event compressed, not immediate | ||
119 | */ | 123 | */ | ||
120 | void requestApplicationConfigSync(); | 124 | void requestApplicationConfigSync(); | ||
121 | 125 | | |||
122 | /** | 126 | /** | ||
123 | * Sets the shell that the corona should display | 127 | * Sets the shell that the corona should display | ||
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Line(s) | 226 | #endif | |||
235 | QHash<QString, QString> m_activityContainmentPlugins; | 239 | QHash<QString, QString> m_activityContainmentPlugins; | ||
236 | QHash<QString, QSet<Plasma::Containment *> > m_desktopContainments; | 240 | QHash<QString, QSet<Plasma::Containment *> > m_desktopContainments; | ||
237 | QAction *m_addPanelAction; | 241 | QAction *m_addPanelAction; | ||
238 | QMenu *m_addPanelsMenu; | 242 | QMenu *m_addPanelsMenu; | ||
239 | KPackage::Package m_lookAndFeelPackage; | 243 | KPackage::Package m_lookAndFeelPackage; | ||
240 | QSet<QScreen*> m_redundantOutputs; | 244 | QSet<QScreen*> m_redundantOutputs; | ||
241 | QList<KDeclarative::QmlObject *> m_alternativesObjects; | 245 | QList<KDeclarative::QmlObject *> m_alternativesObjects; | ||
242 | KDeclarative::QmlObject *m_interactiveConsole; | 246 | KDeclarative::QmlObject *m_interactiveConsole; | ||
247 | int m_eventBase; | ||||
243 | 248 | | |||
244 | QTimer m_waitingPanelsTimer; | 249 | QTimer m_waitingPanelsTimer; | ||
245 | QTimer m_appConfigSyncTimer; | 250 | QTimer m_appConfigSyncTimer; | ||
246 | QTimer m_reconsiderOutputsTimer; | 251 | QTimer m_reconsiderOutputsTimer; | ||
247 | 252 | | |||
248 | KWayland::Client::PlasmaShell *m_waylandPlasmaShell; | 253 | KWayland::Client::PlasmaShell *m_waylandPlasmaShell; | ||
249 | }; | 254 | }; | ||
250 | 255 | | |||
251 | #endif // SHELLCORONA_H | 256 | #endif // SHELLCORONA_H | ||
252 | 257 | | |||
253 | 258 | |
whitespace between * and var name