-rw-r--r-- | core/applets/logoutapplet/logout.cpp | 11 | ||||
-rw-r--r-- | core/applets/logoutapplet/logout.h | 2 |
2 files changed, 12 insertions, 1 deletions
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 |