summaryrefslogtreecommitdiff
Side-by-side diff
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 @@
+#include <qapplication.h>
#include <qiconset.h>
@@ -33,2 +34,12 @@ QString HomeApplet::text ( ) const
+QString HomeApplet::tr( const char* s ) const
+{
+ return qApp->translate( "HomeApplet", s, 0 );
+}
+
+QString HomeApplet::tr( const char* s, const char* p ) const
+{
+ return qApp->translate( "HomeApplet", s, p );
+}
+
QIconSet 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:
virtual QString text ( ) const;
+ virtual QString tr( const char* ) const;
+ virtual QString tr( const char*, const char* ) const;
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
+QString LogoutApplet::tr( const char* s ) const
+{
+ return qApp->translate( "LogoutApplet", s, 0 );
+}
+
+QString LogoutApplet::tr( const char* s, const char* p ) const
+{
+ return qApp->translate( "LogoutApplet", s, p );
+}
+
QIconSet LogoutApplet::icon ( ) const
@@ -41,3 +51,3 @@ QIconSet LogoutApplet::icon ( ) const
QImage img = Resource::loadImage ( "logout" );
-
+
if ( !img. isNull ( ))
@@ -58,4 +68,4 @@ class HackApplication : public QApplication {
public:
- HackApplication ( ) : QApplication ( dummy, 0 )
- {
+ HackApplication ( ) : QApplication ( dummy, 0 )
+ {
}
@@ -64,5 +74,5 @@ public:
{
- emit aboutToQuit ( );
+ emit aboutToQuit ( );
}
-
+
int dummy;
@@ -73,5 +83,5 @@ void LogoutApplet::activated ( )
{
- QMessageBox mb ( tr( "Logout" ),
- tr( "Do you really want to\nend this session ?" ),
- QMessageBox::NoIcon,
+ QMessageBox mb ( tr( "Logout" ),
+ tr( "Do you really want to\nend this session ?" ),
+ QMessageBox::NoIcon,
QMessageBox::Yes | QMessageBox::Default,
@@ -89,3 +99,3 @@ void LogoutApplet::activated ( )
sleep ( 1 ); // You have 1 second to comply.
-
+
((HackApplication *) qApp )-> emit_about_to_quit ( );
@@ -114,2 +124 @@ Q_EXPORT_INTERFACE( )
-
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:
virtual int position() const;
-
+
virtual QString name ( ) const;
@@ -38,4 +38,6 @@ public:
virtual QString text ( ) const;
+ virtual QString tr( const char* ) const;
+ virtual QString tr( const char*, const char* ) const;
virtual QPopupMenu *popup ( QWidget *parent ) const;
-
+
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 @@
+#include <qapplication.h>
#include <qiconset.h>
@@ -33,2 +34,12 @@ QString SuspendApplet::text ( ) const
+QString SuspendApplet::tr( const char* s ) const
+{
+ return qApp->translate( "SuspendApplet", s, 0 );
+}
+
+QString SuspendApplet::tr( const char* s, const char* p ) const
+{
+ return qApp->translate( "SuspendApplet", s, p );
+}
+
QIconSet 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:
virtual QString text ( ) const;
+ virtual QString tr( const char* ) const;
+ virtual QString tr( const char*, const char* ) const;
virtual QPopupMenu *popup ( QWidget *parent ) const;