From ae6b3de789726af3928664ef03eac81950e716e4 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sun, 16 Mar 2003 19:07:50 +0000 Subject: Enable translations of startmenu-applets. Problem is, in Qt2, moc generates the necessary tr() functions which adds the context (aka class name) and then calls translate(). The startmenu applets don't use moc and therefore don't get the appropriate tr() functions. --- (limited to 'core/applets/logoutapplet') 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 @@ -35,11 +35,21 @@ 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; @@ -56,24 +66,24 @@ QPopupMenu *LogoutApplet::popup ( QWidget * ) const 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 ); @@ -87,7 +97,7 @@ void LogoutApplet::activated ( ) qApp-> processEvents ( ); // ensure the message goes out. sleep ( 1 ); // You have 1 second to comply. - + ((HackApplication *) qApp )-> emit_about_to_quit ( ); qApp-> quit(); } @@ -112,4 +122,3 @@ 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 @@ -32,12 +32,14 @@ public: 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: -- cgit v0.9.0.2