-rw-r--r-- | core/applets/homeapplet/home.cpp | 11 | ||||
-rw-r--r-- | core/applets/homeapplet/home.h | 2 | ||||
-rw-r--r-- | core/applets/logoutapplet/logout.cpp | 11 | ||||
-rw-r--r-- | core/applets/logoutapplet/logout.h | 2 | ||||
-rw-r--r-- | core/applets/suspendapplet/suspend.cpp | 11 | ||||
-rw-r--r-- | core/applets/suspendapplet/suspend.h | 2 |
6 files changed, 38 insertions, 1 deletions
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp index f94bc14..017de27 100644 --- a/core/applets/homeapplet/home.cpp +++ b/core/applets/homeapplet/home.cpp | |||
@@ -1,15 +1,16 @@ | |||
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 <qapplication.h> | ||
4 | #include <qiconset.h> | 5 | #include <qiconset.h> |
5 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
6 | 7 | ||
7 | #include "home.h" | 8 | #include "home.h" |
8 | 9 | ||
9 | 10 | ||
10 | HomeApplet::HomeApplet ( ) | 11 | HomeApplet::HomeApplet ( ) |
11 | : QObject ( 0, "HomeApplet" ), ref ( 0 ) | 12 | : QObject ( 0, "HomeApplet" ), ref ( 0 ) |
12 | { | 13 | { |
13 | } | 14 | } |
14 | 15 | ||
15 | HomeApplet::~HomeApplet ( ) | 16 | HomeApplet::~HomeApplet ( ) |
@@ -22,24 +23,34 @@ int HomeApplet::position ( ) const | |||
22 | } | 23 | } |
23 | 24 | ||
24 | QString HomeApplet::name ( ) const | 25 | QString HomeApplet::name ( ) const |
25 | { | 26 | { |
26 | return tr( "Home shortcut" ); | 27 | return tr( "Home shortcut" ); |
27 | } | 28 | } |
28 | 29 | ||
29 | QString HomeApplet::text ( ) const | 30 | QString HomeApplet::text ( ) const |
30 | { | 31 | { |
31 | return tr( "Desktop" ); | 32 | return tr( "Desktop" ); |
32 | } | 33 | } |
33 | 34 | ||
35 | QString HomeApplet::tr( const char* s ) const | ||
36 | { | ||
37 | return qApp->translate( "HomeApplet", s, 0 ); | ||
38 | } | ||
39 | |||
40 | QString HomeApplet::tr( const char* s, const char* p ) const | ||
41 | { | ||
42 | return qApp->translate( "HomeApplet", s, p ); | ||
43 | } | ||
44 | |||
34 | QIconSet HomeApplet::icon ( ) const | 45 | QIconSet HomeApplet::icon ( ) const |
35 | { | 46 | { |
36 | QPixmap pix; | 47 | QPixmap pix; |
37 | QImage img = Resource::loadImage ( "home" ); | 48 | QImage img = Resource::loadImage ( "home" ); |
38 | 49 | ||
39 | if ( !img. isNull ( )) | 50 | if ( !img. isNull ( )) |
40 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 51 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
41 | return pix; | 52 | return pix; |
42 | } | 53 | } |
43 | 54 | ||
44 | QPopupMenu *HomeApplet::popup ( QWidget * ) const | 55 | QPopupMenu *HomeApplet::popup ( QWidget * ) const |
45 | { | 56 | { |
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h index 7f4b630..64af97d 100644 --- a/core/applets/homeapplet/home.h +++ b/core/applets/homeapplet/home.h | |||
@@ -27,21 +27,23 @@ class HomeApplet : public QObject, public MenuAppletInterface | |||
27 | public: | 27 | public: |
28 | HomeApplet ( ); | 28 | HomeApplet ( ); |
29 | virtual ~HomeApplet ( ); | 29 | virtual ~HomeApplet ( ); |
30 | 30 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
32 | Q_REFCOUNT | 32 | Q_REFCOUNT |
33 | 33 | ||
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
38 | virtual QString text ( ) const; | 38 | virtual QString text ( ) const; |
39 | virtual QString tr( const char* ) const; | ||
40 | virtual QString tr( const char*, const char* ) const; | ||
39 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 41 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
40 | 42 | ||
41 | virtual void activated ( ); | 43 | virtual void activated ( ); |
42 | 44 | ||
43 | private: | 45 | private: |
44 | ulong ref; | 46 | ulong ref; |
45 | }; | 47 | }; |
46 | 48 | ||
47 | #endif | 49 | #endif |
diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp index 9470401..1769ae6 100644 --- a/core/applets/logoutapplet/logout.cpp +++ b/core/applets/logoutapplet/logout.cpp | |||
@@ -26,24 +26,34 @@ int LogoutApplet::position ( ) const | |||
26 | } | 26 | } |
27 | 27 | ||
28 | QString LogoutApplet::name ( ) const | 28 | QString LogoutApplet::name ( ) const |
29 | { | 29 | { |
30 | return tr( "Logout shortcut" ); | 30 | return tr( "Logout shortcut" ); |
31 | } | 31 | } |
32 | 32 | ||
33 | QString LogoutApplet::text ( ) const | 33 | QString LogoutApplet::text ( ) const |
34 | { | 34 | { |
35 | return tr( "Logout" ); | 35 | return tr( "Logout" ); |
36 | } | 36 | } |
37 | 37 | ||
38 | QString LogoutApplet::tr( const char* s ) const | ||
39 | { | ||
40 | return qApp->translate( "LogoutApplet", s, 0 ); | ||
41 | } | ||
42 | |||
43 | QString LogoutApplet::tr( const char* s, const char* p ) const | ||
44 | { | ||
45 | return qApp->translate( "LogoutApplet", s, p ); | ||
46 | } | ||
47 | |||
38 | QIconSet LogoutApplet::icon ( ) const | 48 | QIconSet LogoutApplet::icon ( ) const |
39 | { | 49 | { |
40 | QPixmap pix; | 50 | QPixmap pix; |
41 | QImage img = Resource::loadImage ( "logout" ); | 51 | QImage img = Resource::loadImage ( "logout" ); |
42 | 52 | ||
43 | if ( !img. isNull ( )) | 53 | if ( !img. isNull ( )) |
44 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 54 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
45 | return pix; | 55 | return pix; |
46 | } | 56 | } |
47 | 57 | ||
48 | QPopupMenu *LogoutApplet::popup ( QWidget * ) const | 58 | QPopupMenu *LogoutApplet::popup ( QWidget * ) const |
49 | { | 59 | { |
@@ -103,13 +113,12 @@ QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **if | |||
103 | *iface = this; | 113 | *iface = this; |
104 | 114 | ||
105 | if ( *iface ) | 115 | if ( *iface ) |
106 | (*iface)-> addRef ( ); | 116 | (*iface)-> addRef ( ); |
107 | return QS_OK; | 117 | return QS_OK; |
108 | } | 118 | } |
109 | 119 | ||
110 | Q_EXPORT_INTERFACE( ) | 120 | Q_EXPORT_INTERFACE( ) |
111 | { | 121 | { |
112 | Q_CREATE_INSTANCE( LogoutApplet ) | 122 | Q_CREATE_INSTANCE( LogoutApplet ) |
113 | } | 123 | } |
114 | 124 | ||
115 | |||
diff --git a/core/applets/logoutapplet/logout.h b/core/applets/logoutapplet/logout.h index e45f3ba..3fcb295 100644 --- a/core/applets/logoutapplet/logout.h +++ b/core/applets/logoutapplet/logout.h | |||
@@ -27,21 +27,23 @@ class LogoutApplet : public QObject, public MenuAppletInterface | |||
27 | public: | 27 | public: |
28 | LogoutApplet ( ); | 28 | LogoutApplet ( ); |
29 | virtual ~LogoutApplet ( ); | 29 | virtual ~LogoutApplet ( ); |
30 | 30 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
32 | Q_REFCOUNT | 32 | Q_REFCOUNT |
33 | 33 | ||
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
38 | virtual QString text ( ) const; | 38 | virtual QString text ( ) const; |
39 | virtual QString tr( const char* ) const; | ||
40 | virtual QString tr( const char*, const char* ) const; | ||
39 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 41 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
40 | 42 | ||
41 | virtual void activated ( ); | 43 | virtual void activated ( ); |
42 | 44 | ||
43 | private: | 45 | private: |
44 | ulong ref; | 46 | ulong ref; |
45 | }; | 47 | }; |
46 | 48 | ||
47 | #endif | 49 | #endif |
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp index b502e87..4bdc8fb 100644 --- a/core/applets/suspendapplet/suspend.cpp +++ b/core/applets/suspendapplet/suspend.cpp | |||
@@ -1,15 +1,16 @@ | |||
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 <qapplication.h> | ||
4 | #include <qiconset.h> | 5 | #include <qiconset.h> |
5 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
6 | 7 | ||
7 | #include "suspend.h" | 8 | #include "suspend.h" |
8 | 9 | ||
9 | 10 | ||
10 | SuspendApplet::SuspendApplet ( ) | 11 | SuspendApplet::SuspendApplet ( ) |
11 | : QObject ( 0, "SuspendApplet" ), ref ( 0 ) | 12 | : QObject ( 0, "SuspendApplet" ), ref ( 0 ) |
12 | { | 13 | { |
13 | } | 14 | } |
14 | 15 | ||
15 | SuspendApplet::~SuspendApplet ( ) | 16 | SuspendApplet::~SuspendApplet ( ) |
@@ -22,24 +23,34 @@ int SuspendApplet::position ( ) const | |||
22 | } | 23 | } |
23 | 24 | ||
24 | QString SuspendApplet::name ( ) const | 25 | QString SuspendApplet::name ( ) const |
25 | { | 26 | { |
26 | return tr( "Suspend shortcut" ); | 27 | return tr( "Suspend shortcut" ); |
27 | } | 28 | } |
28 | 29 | ||
29 | QString SuspendApplet::text ( ) const | 30 | QString SuspendApplet::text ( ) const |
30 | { | 31 | { |
31 | return tr( "Suspend" ); | 32 | return tr( "Suspend" ); |
32 | } | 33 | } |
33 | 34 | ||
35 | QString SuspendApplet::tr( const char* s ) const | ||
36 | { | ||
37 | return qApp->translate( "SuspendApplet", s, 0 ); | ||
38 | } | ||
39 | |||
40 | QString SuspendApplet::tr( const char* s, const char* p ) const | ||
41 | { | ||
42 | return qApp->translate( "SuspendApplet", s, p ); | ||
43 | } | ||
44 | |||
34 | QIconSet SuspendApplet::icon ( ) const | 45 | QIconSet SuspendApplet::icon ( ) const |
35 | { | 46 | { |
36 | QPixmap pix; | 47 | QPixmap pix; |
37 | QImage img = Resource::loadImage ( "suspend" ); | 48 | QImage img = Resource::loadImage ( "suspend" ); |
38 | 49 | ||
39 | if ( !img. isNull ( )) | 50 | if ( !img. isNull ( )) |
40 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 51 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
41 | return pix; | 52 | return pix; |
42 | } | 53 | } |
43 | 54 | ||
44 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const | 55 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const |
45 | { | 56 | { |
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h index 629430d..0c92bcb 100644 --- a/core/applets/suspendapplet/suspend.h +++ b/core/applets/suspendapplet/suspend.h | |||
@@ -27,21 +27,23 @@ class SuspendApplet : public QObject, public MenuAppletInterface | |||
27 | public: | 27 | public: |
28 | SuspendApplet ( ); | 28 | SuspendApplet ( ); |
29 | virtual ~SuspendApplet ( ); | 29 | virtual ~SuspendApplet ( ); |
30 | 30 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
32 | Q_REFCOUNT | 32 | Q_REFCOUNT |
33 | 33 | ||
34 | virtual int position() const; | 34 | virtual int position() const; |
35 | 35 | ||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
38 | virtual QString text ( ) const; | 38 | virtual QString text ( ) const; |
39 | virtual QString tr( const char* ) const; | ||
40 | virtual QString tr( const char*, const char* ) const; | ||
39 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 41 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
40 | 42 | ||
41 | virtual void activated ( ); | 43 | virtual void activated ( ); |
42 | 44 | ||
43 | private: | 45 | private: |
44 | ulong ref; | 46 | ulong ref; |
45 | }; | 47 | }; |
46 | 48 | ||
47 | #endif | 49 | #endif |