author | zecke <zecke> | 2003-08-28 14:48:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-28 14:48:13 (UTC) |
commit | 6ae5aaad2dec2470940f83f1e8629aec48f284a7 (patch) (unidiff) | |
tree | 4b8c3c19351966849c591a855473043448cd5d48 /core/launcher/systray.h | |
parent | e284d63306cd3b00baff8e464a8eaf2eb64ea49a (diff) | |
download | opie-6ae5aaad2dec2470940f83f1e8629aec48f284a7.zip opie-6ae5aaad2dec2470940f83f1e8629aec48f284a7.tar.gz opie-6ae5aaad2dec2470940f83f1e8629aec48f284a7.tar.bz2 |
Plugin loading changes
-rw-r--r-- | core/launcher/systray.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/launcher/systray.h b/core/launcher/systray.h index 5a6849a..77c581f 100644 --- a/core/launcher/systray.h +++ b/core/launcher/systray.h | |||
@@ -12,50 +12,50 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef __SYSTRAY_H__ | 21 | #ifndef __SYSTRAY_H__ |
22 | #define __SYSTRAY_H__ | 22 | #define __SYSTRAY_H__ |
23 | 23 | ||
24 | #include <qpe/taskbarappletinterface.h> | 24 | #ifndef QT_NO_COMPONENT |
25 | #include <qtopia/taskbarappletinterface.h> | ||
26 | #endif | ||
25 | 27 | ||
26 | #include <qframe.h> | 28 | #include <qframe.h> |
27 | #include <qvaluelist.h> | 29 | #include <qvaluelist.h> |
28 | 30 | ||
29 | class QHBoxLayout; | 31 | class QHBoxLayout; |
30 | class QLibrary; | 32 | class QLibrary; |
31 | 33 | ||
32 | struct TaskbarApplet | 34 | struct TaskbarApplet |
33 | { | 35 | { |
34 | #ifndef QT_NO_COMPONENT | 36 | #ifndef QT_NO_COMPONENT |
35 | QLibrary *library; | 37 | QLibrary *library; |
36 | #endif | ||
37 | TaskbarAppletInterface *iface; | 38 | TaskbarAppletInterface *iface; |
39 | #endif | ||
38 | QWidget *applet; | 40 | QWidget *applet; |
41 | QString name; | ||
39 | }; | 42 | }; |
40 | 43 | ||
41 | class SysTray : public QFrame { | 44 | class SysTray : public QFrame { |
42 | Q_OBJECT | 45 | Q_OBJECT |
43 | public: | 46 | public: |
44 | SysTray( QWidget *parent ); | 47 | SysTray( QWidget *parent ); |
48 | ~SysTray(); | ||
45 | 49 | ||
46 | void clearApplets(); | 50 | void clearApplets(); |
47 | void addApplets(); | 51 | void addApplets(); |
48 | 52 | ||
49 | protected: | ||
50 | void timerEvent(QTimerEvent* e); | ||
51 | |||
52 | private: | 53 | private: |
53 | void loadApplets(); | 54 | void loadApplets(); |
54 | int safety_tid; | ||
55 | QHBoxLayout *layout; | 55 | QHBoxLayout *layout; |
56 | QValueList<TaskbarApplet> appletList; | 56 | QValueList<TaskbarApplet> appletList; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | 59 | ||
60 | #endif // __SYSTRAY_H__ | 60 | #endif // __SYSTRAY_H__ |
61 | 61 | ||