author | mickeyl <mickeyl> | 2003-03-16 19:07:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-16 19:07:50 (UTC) |
commit | ae6b3de789726af3928664ef03eac81950e716e4 (patch) (unidiff) | |
tree | 687455725b5dafcfc7851563bf8203c25060e102 /core/applets/homeapplet | |
parent | 917fb7d2dca76f5c2c5c86553be0fcc2832c3435 (diff) | |
download | opie-ae6b3de789726af3928664ef03eac81950e716e4.zip opie-ae6b3de789726af3928664ef03eac81950e716e4.tar.gz opie-ae6b3de789726af3928664ef03eac81950e716e4.tar.bz2 |
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.
-rw-r--r-- | core/applets/homeapplet/home.cpp | 11 | ||||
-rw-r--r-- | core/applets/homeapplet/home.h | 2 |
2 files changed, 13 insertions, 0 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,6 +1,7 @@ | |||
1 | #include <qpe/resource.h> | 1 | #include <qpe/resource.h> |
2 | #include <qpe/qcopenvelope_qws.h> | 2 | #include <qpe/qcopenvelope_qws.h> |
3 | 3 | ||
4 | #include <qapplication.h> | ||
4 | #include <qiconset.h> | 5 | #include <qiconset.h> |
5 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
6 | 7 | ||
@@ -31,6 +32,16 @@ QString HomeApplet::text ( ) const | |||
31 | return tr( "Desktop" ); | 32 | return tr( "Desktop" ); |
32 | } | 33 | } |
33 | 34 | ||
35 | QString HomeApplet::tr( const char* s ) const | ||
36 | { | ||
37 | return qApp->translate( "HomeApplet", s, 0 ); | ||
38 | } | ||
39 | |||
40 | QString HomeApplet::tr( const char* s, const char* p ) const | ||
41 | { | ||
42 | return qApp->translate( "HomeApplet", s, p ); | ||
43 | } | ||
44 | |||
34 | QIconSet HomeApplet::icon ( ) const | 45 | QIconSet HomeApplet::icon ( ) const |
35 | { | 46 | { |
36 | QPixmap pix; | 47 | QPixmap pix; |
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 | |||
@@ -36,6 +36,8 @@ public: | |||
36 | virtual QString name ( ) const; | 36 | virtual QString name ( ) const; |
37 | virtual QIconSet icon ( ) const; | 37 | virtual QIconSet icon ( ) const; |
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 ( ); |