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
@@ -1,7 +1,8 @@
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qapplication.h>
#include <qiconset.h>
#include <qpopupmenu.h>
#include "home.h"
@@ -30,8 +31,18 @@ QString HomeApplet::text ( ) const
{
return tr( "Desktop" );
}
+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
{
QPixmap pix;
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:
virtual QString name ( ) const;
virtual QIconSet icon ( ) const;
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/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
{
return tr( "Logout" );
}
+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
{
QPixmap pix;
QImage img = Resource::loadImage ( "logout" );
-
+
if ( !img. isNull ( ))
pix. convertFromImage ( img. smoothScale ( 14, 14 ));
return pix;
}
@@ -55,26 +65,26 @@ QPopupMenu *LogoutApplet::popup ( QWidget * ) const
// will hang on quit() right before it emits aboutToQuit()
class HackApplication : public QApplication {
public:
- HackApplication ( ) : QApplication ( dummy, 0 )
- {
+ HackApplication ( ) : QApplication ( dummy, 0 )
+ {
}
void emit_about_to_quit ( )
{
- emit aboutToQuit ( );
+ emit aboutToQuit ( );
}
-
+
int dummy;
};
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,
QMessageBox::No | QMessageBox::Escape,
QMessageBox::NoButton );
@@ -86,9 +96,9 @@ void LogoutApplet::activated ( )
{ QCopEnvelope envelope( "QPE/System", "forceQuit()" ); }
qApp-> processEvents ( ); // ensure the message goes out.
sleep ( 1 ); // You have 1 second to comply.
-
+
((HackApplication *) qApp )-> emit_about_to_quit ( );
qApp-> quit();
}
}
@@ -111,5 +121,4 @@ Q_EXPORT_INTERFACE( )
{
Q_CREATE_INSTANCE( LogoutApplet )
}
-
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:
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
virtual int position() const;
-
+
virtual QString name ( ) const;
virtual QIconSet icon ( ) const;
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 ( );
private:
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 @@
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qapplication.h>
#include <qiconset.h>
#include <qpopupmenu.h>
#include "suspend.h"
@@ -30,8 +31,18 @@ QString SuspendApplet::text ( ) const
{
return tr( "Suspend" );
}
+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
{
QPixmap pix;
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:
virtual QString name ( ) const;
virtual QIconSet icon ( ) const;
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 ( );