summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/homeapplet/home.cpp11
-rw-r--r--core/applets/homeapplet/home.h2
-rw-r--r--core/applets/logoutapplet/logout.cpp29
-rw-r--r--core/applets/logoutapplet/logout.h6
-rw-r--r--core/applets/suspendapplet/suspend.cpp11
-rw-r--r--core/applets/suspendapplet/suspend.h2
6 files changed, 49 insertions, 12 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,7 +1,8 @@
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"
@@ -30,8 +31,18 @@ QString HomeApplet::text ( ) const
30{ 31{
31 return tr( "Desktop" ); 32 return tr( "Desktop" );
32} 33}
33 34
35QString HomeApplet::tr( const char* s ) const
36{
37 return qApp->translate( "HomeApplet", s, 0 );
38}
39
40QString HomeApplet::tr( const char* s, const char* p ) const
41{
42 return qApp->translate( "HomeApplet", s, p );
43}
44
34QIconSet HomeApplet::icon ( ) const 45QIconSet HomeApplet::icon ( ) const
35{ 46{
36 QPixmap pix; 47 QPixmap pix;
37 QImage img = Resource::loadImage ( "home" ); 48 QImage img = Resource::loadImage ( "home" );
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
@@ -35,8 +35,10 @@ public:
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
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
@@ -34,13 +34,23 @@ QString LogoutApplet::text ( ) const
34{ 34{
35 return tr( "Logout" ); 35 return tr( "Logout" );
36} 36}
37 37
38QString LogoutApplet::tr( const char* s ) const
39{
40 return qApp->translate( "LogoutApplet", s, 0 );
41}
42
43QString LogoutApplet::tr( const char* s, const char* p ) const
44{
45 return qApp->translate( "LogoutApplet", s, p );
46}
47
38QIconSet LogoutApplet::icon ( ) const 48QIconSet 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}
@@ -55,26 +65,26 @@ QPopupMenu *LogoutApplet::popup ( QWidget * ) const
55// will hang on quit() right before it emits aboutToQuit() 65// will hang on quit() right before it emits aboutToQuit()
56 66
57class HackApplication : public QApplication { 67class HackApplication : public QApplication {
58public: 68public:
59 HackApplication ( ) : QApplication ( dummy, 0 ) 69 HackApplication ( ) : QApplication ( dummy, 0 )
60 { 70 {
61 } 71 }
62 72
63 void emit_about_to_quit ( ) 73 void emit_about_to_quit ( )
64 { 74 {
65 emit aboutToQuit ( ); 75 emit aboutToQuit ( );
66 } 76 }
67 77
68 int dummy; 78 int dummy;
69}; 79};
70 80
71 81
72void LogoutApplet::activated ( ) 82void LogoutApplet::activated ( )
73{ 83{
74 QMessageBox mb ( tr( "Logout" ), 84 QMessageBox mb ( tr( "Logout" ),
75 tr( "Do you really want to\nend this session ?" ), 85 tr( "Do you really want to\nend this session ?" ),
76 QMessageBox::NoIcon, 86 QMessageBox::NoIcon,
77 QMessageBox::Yes | QMessageBox::Default, 87 QMessageBox::Yes | QMessageBox::Default,
78 QMessageBox::No | QMessageBox::Escape, 88 QMessageBox::No | QMessageBox::Escape,
79 QMessageBox::NoButton ); 89 QMessageBox::NoButton );
80 90
@@ -86,9 +96,9 @@ void LogoutApplet::activated ( )
86 { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); } 96 { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); }
87 97
88 qApp-> processEvents ( ); // ensure the message goes out. 98 qApp-> processEvents ( ); // ensure the message goes out.
89 sleep ( 1 ); // You have 1 second to comply. 99 sleep ( 1 ); // You have 1 second to comply.
90 100
91 ((HackApplication *) qApp )-> emit_about_to_quit ( ); 101 ((HackApplication *) qApp )-> emit_about_to_quit ( );
92 qApp-> quit(); 102 qApp-> quit();
93 } 103 }
94} 104}
@@ -111,5 +121,4 @@ 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
@@ -31,14 +31,16 @@ public:
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
43private: 45private:
44 ulong ref; 46 ulong ref;
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,7 +1,8 @@
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"
@@ -30,8 +31,18 @@ QString SuspendApplet::text ( ) const
30{ 31{
31 return tr( "Suspend" ); 32 return tr( "Suspend" );
32} 33}
33 34
35QString SuspendApplet::tr( const char* s ) const
36{
37 return qApp->translate( "SuspendApplet", s, 0 );
38}
39
40QString SuspendApplet::tr( const char* s, const char* p ) const
41{
42 return qApp->translate( "SuspendApplet", s, p );
43}
44
34QIconSet SuspendApplet::icon ( ) const 45QIconSet SuspendApplet::icon ( ) const
35{ 46{
36 QPixmap pix; 47 QPixmap pix;
37 QImage img = Resource::loadImage ( "suspend" ); 48 QImage img = Resource::loadImage ( "suspend" );
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
@@ -35,8 +35,10 @@ public:
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