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.

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,9 +1,10 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
+#include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 
 #include "home.h"
 
 
@@ -28,12 +29,22 @@ QString HomeApplet::name ( ) const
 
 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" );
         
         if ( !img. isNull ( ))
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
@@ -33,12 +33,14 @@ public:
 
     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/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
@@ -32,17 +32,27 @@ QString LogoutApplet::name ( ) const
 
 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;
 }
 
 QPopupMenu *LogoutApplet::popup ( QWidget * ) const
@@ -53,30 +63,30 @@ QPopupMenu *LogoutApplet::popup ( QWidget * ) const
 // This is a workaround for a Qt bug
 // clipboard applet has to stop its poll timer, or Qt/E
 // 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 );
 
         mb. setButtonText ( QMessageBox::Yes, "Yes" );
         mb. setButtonText ( QMessageBox::No, "No" );
@@ -84,13 +94,13 @@ void LogoutApplet::activated ( )
 
         if ( mb. exec ( ) == QMessageBox::Yes ) {
                 { 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();
         }
 }
 
 
@@ -109,7 +119,6 @@ QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **if
 
 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
@@ -29,18 +29,20 @@ public:
     virtual ~LogoutApplet ( );
 
     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,9 +1,10 @@
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
+#include <qapplication.h>
 #include <qiconset.h>
 #include <qpopupmenu.h>
 
 #include "suspend.h"
 
 
@@ -28,12 +29,22 @@ QString SuspendApplet::name ( ) const
 
 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" );
         
         if ( !img. isNull ( ))
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
@@ -33,12 +33,14 @@ public:
 
     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;