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
@@ -3,2 +3,3 @@
3 3
4#include <qapplication.h>
4#include <qiconset.h> 5#include <qiconset.h>
@@ -33,2 +34,12 @@ QString HomeApplet::text ( ) const
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
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
@@ -38,2 +38,4 @@ public:
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;
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
@@ -37,2 +37,12 @@ QString LogoutApplet::text ( ) const
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
@@ -41,3 +51,3 @@ QIconSet LogoutApplet::icon ( ) const
41 QImage img = Resource::loadImage ( "logout" ); 51 QImage img = Resource::loadImage ( "logout" );
42 52
43 if ( !img. isNull ( )) 53 if ( !img. isNull ( ))
@@ -58,4 +68,4 @@ class HackApplication : public QApplication {
58public: 68public:
59 HackApplication ( ) : QApplication ( dummy, 0 ) 69 HackApplication ( ) : QApplication ( dummy, 0 )
60 { 70 {
61 } 71 }
@@ -64,5 +74,5 @@ public:
64 { 74 {
65 emit aboutToQuit ( ); 75 emit aboutToQuit ( );
66 } 76 }
67 77
68 int dummy; 78 int dummy;
@@ -73,5 +83,5 @@ void 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,
@@ -89,3 +99,3 @@ void LogoutApplet::activated ( )
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 ( );
@@ -114,2 +124 @@ Q_EXPORT_INTERFACE( )
114
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
@@ -34,3 +34,3 @@ public:
34 virtual int position() const; 34 virtual int position() const;
35 35
36 virtual QString name ( ) const; 36 virtual QString name ( ) const;
@@ -38,4 +38,6 @@ public:
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 ( );
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
@@ -3,2 +3,3 @@
3 3
4#include <qapplication.h>
4#include <qiconset.h> 5#include <qiconset.h>
@@ -33,2 +34,12 @@ QString SuspendApplet::text ( ) const
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
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
@@ -38,2 +38,4 @@ public:
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;