-rw-r--r-- | core/applets/homeapplet/home.cpp | 2 | ||||
-rw-r--r-- | core/applets/suspendapplet/suspend.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp index 3670e6d..0d4ad66 100644 --- a/core/applets/homeapplet/home.cpp +++ b/core/applets/homeapplet/home.cpp | |||
@@ -1,74 +1,74 @@ | |||
1 | #include <qpe/resource.h> | 1 | #include <qpe/resource.h> |
2 | #include <qpe/qcopenvelope_qws.h> | 2 | #include <qpe/qcopenvelope_qws.h> |
3 | 3 | ||
4 | #include <qiconset.h> | 4 | #include <qiconset.h> |
5 | #include <qpopupmenu.h> | 5 | #include <qpopupmenu.h> |
6 | 6 | ||
7 | #include "home.h" | 7 | #include "home.h" |
8 | 8 | ||
9 | 9 | ||
10 | HomeApplet::HomeApplet ( ) | 10 | HomeApplet::HomeApplet ( ) |
11 | : QObject ( 0, "HomeApplet" ), ref ( 0 ) | 11 | : QObject ( 0, "HomeApplet" ), ref ( 0 ) |
12 | { | 12 | { |
13 | } | 13 | } |
14 | 14 | ||
15 | HomeApplet::~HomeApplet ( ) | 15 | HomeApplet::~HomeApplet ( ) |
16 | { | 16 | { |
17 | } | 17 | } |
18 | 18 | ||
19 | int HomeApplet::position ( ) const | 19 | int HomeApplet::position ( ) const |
20 | { | 20 | { |
21 | return 4; | 21 | return 4; |
22 | } | 22 | } |
23 | 23 | ||
24 | QString HomeApplet::name ( ) const | 24 | QString HomeApplet::name ( ) const |
25 | { | 25 | { |
26 | return tr( "Home shortcut" ); | 26 | return tr( "Home shortcut" ); |
27 | } | 27 | } |
28 | 28 | ||
29 | QString HomeApplet::text ( ) const | 29 | QString HomeApplet::text ( ) const |
30 | { | 30 | { |
31 | return tr( "Home" ); | 31 | return tr( "Home" ); |
32 | } | 32 | } |
33 | 33 | ||
34 | QIconSet HomeApplet::icon ( ) const | 34 | QIconSet HomeApplet::icon ( ) const |
35 | { | 35 | { |
36 | QPixmap pix; | 36 | QPixmap pix; |
37 | QImage img = Resource::loadImage ( "home" ); | 37 | QImage img = Resource::loadImage ( "home" ); |
38 | 38 | ||
39 | if ( !img. isNull ( )) | 39 | if ( !img. isNull ( )) |
40 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 40 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
41 | return pix; | 41 | return pix; |
42 | } | 42 | } |
43 | 43 | ||
44 | QPopupMenu *HomeApplet::popup ( QWidget * ) const | 44 | QPopupMenu *HomeApplet::popup ( QWidget * ) const |
45 | { | 45 | { |
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | void HomeApplet::activated ( ) | 49 | void HomeApplet::activated ( ) |
50 | { | 50 | { |
51 | // to desktop (home) | 51 | // to desktop (home) |
52 | QCopEnvelope ( "QPE/Desktop", "home()" ); | 52 | QCopEnvelope ( "QPE/Application/qpe", "raise()" ); |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 56 | QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
57 | { | 57 | { |
58 | *iface = 0; | 58 | *iface = 0; |
59 | if ( uuid == IID_QUnknown ) | 59 | if ( uuid == IID_QUnknown ) |
60 | *iface = this; | 60 | *iface = this; |
61 | else if ( uuid == IID_MenuApplet ) | 61 | else if ( uuid == IID_MenuApplet ) |
62 | *iface = this; | 62 | *iface = this; |
63 | 63 | ||
64 | if ( *iface ) | 64 | if ( *iface ) |
65 | (*iface)-> addRef ( ); | 65 | (*iface)-> addRef ( ); |
66 | return QS_OK; | 66 | return QS_OK; |
67 | } | 67 | } |
68 | 68 | ||
69 | Q_EXPORT_INTERFACE( ) | 69 | Q_EXPORT_INTERFACE( ) |
70 | { | 70 | { |
71 | Q_CREATE_INSTANCE( HomeApplet ) | 71 | Q_CREATE_INSTANCE( HomeApplet ) |
72 | } | 72 | } |
73 | 73 | ||
74 | 74 | ||
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp index e9861e8..b502e87 100644 --- a/core/applets/suspendapplet/suspend.cpp +++ b/core/applets/suspendapplet/suspend.cpp | |||
@@ -1,74 +1,74 @@ | |||
1 | #include <qpe/resource.h> | 1 | #include <qpe/resource.h> |
2 | #include <qpe/qcopenvelope_qws.h> | 2 | #include <qpe/qcopenvelope_qws.h> |
3 | 3 | ||
4 | #include <qiconset.h> | 4 | #include <qiconset.h> |
5 | #include <qpopupmenu.h> | 5 | #include <qpopupmenu.h> |
6 | 6 | ||
7 | #include "suspend.h" | 7 | #include "suspend.h" |
8 | 8 | ||
9 | 9 | ||
10 | SuspendApplet::SuspendApplet ( ) | 10 | SuspendApplet::SuspendApplet ( ) |
11 | : QObject ( 0, "SuspendApplet" ), ref ( 0 ) | 11 | : QObject ( 0, "SuspendApplet" ), ref ( 0 ) |
12 | { | 12 | { |
13 | } | 13 | } |
14 | 14 | ||
15 | SuspendApplet::~SuspendApplet ( ) | 15 | SuspendApplet::~SuspendApplet ( ) |
16 | { | 16 | { |
17 | } | 17 | } |
18 | 18 | ||
19 | int SuspendApplet::position ( ) const | 19 | int SuspendApplet::position ( ) const |
20 | { | 20 | { |
21 | return 2; | 21 | return 2; |
22 | } | 22 | } |
23 | 23 | ||
24 | QString SuspendApplet::name ( ) const | 24 | QString SuspendApplet::name ( ) const |
25 | { | 25 | { |
26 | return tr( "Suspend shortcut" ); | 26 | return tr( "Suspend shortcut" ); |
27 | } | 27 | } |
28 | 28 | ||
29 | QString SuspendApplet::text ( ) const | 29 | QString SuspendApplet::text ( ) const |
30 | { | 30 | { |
31 | return tr( "Suspend" ); | 31 | return tr( "Suspend" ); |
32 | } | 32 | } |
33 | 33 | ||
34 | QIconSet SuspendApplet::icon ( ) const | 34 | QIconSet SuspendApplet::icon ( ) const |
35 | { | 35 | { |
36 | QPixmap pix; | 36 | QPixmap pix; |
37 | QImage img = Resource::loadImage ( "suspend" ); | 37 | QImage img = Resource::loadImage ( "suspend" ); |
38 | 38 | ||
39 | if ( !img. isNull ( )) | 39 | if ( !img. isNull ( )) |
40 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 40 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
41 | return pix; | 41 | return pix; |
42 | } | 42 | } |
43 | 43 | ||
44 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const | 44 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const |
45 | { | 45 | { |
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | void SuspendApplet::activated ( ) | 49 | void SuspendApplet::activated ( ) |
50 | { | 50 | { |
51 | // suspend | 51 | // suspend |
52 | QCopEnvelope ( "QPE/Desktop", "suspend()" ); | 52 | QCopEnvelope ( "QPE/System", "suspend()" ); |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 56 | QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
57 | { | 57 | { |
58 | *iface = 0; | 58 | *iface = 0; |
59 | if ( uuid == IID_QUnknown ) | 59 | if ( uuid == IID_QUnknown ) |
60 | *iface = this; | 60 | *iface = this; |
61 | else if ( uuid == IID_MenuApplet ) | 61 | else if ( uuid == IID_MenuApplet ) |
62 | *iface = this; | 62 | *iface = this; |
63 | 63 | ||
64 | if ( *iface ) | 64 | if ( *iface ) |
65 | (*iface)-> addRef ( ); | 65 | (*iface)-> addRef ( ); |
66 | return QS_OK; | 66 | return QS_OK; |
67 | } | 67 | } |
68 | 68 | ||
69 | Q_EXPORT_INTERFACE( ) | 69 | Q_EXPORT_INTERFACE( ) |
70 | { | 70 | { |
71 | Q_CREATE_INSTANCE( SuspendApplet ) | 71 | Q_CREATE_INSTANCE( SuspendApplet ) |
72 | } | 72 | } |
73 | 73 | ||
74 | 74 | ||