summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-16 19:07:50 (UTC)
committer mickeyl <mickeyl>2003-03-16 19:07:50 (UTC)
commitae6b3de789726af3928664ef03eac81950e716e4 (patch) (unidiff)
tree687455725b5dafcfc7851563bf8203c25060e102
parent917fb7d2dca76f5c2c5c86553be0fcc2832c3435 (diff)
downloadopie-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.
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,15 +1,16 @@
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
7#include "home.h" 8#include "home.h"
8 9
9 10
10HomeApplet::HomeApplet ( ) 11HomeApplet::HomeApplet ( )
11 : QObject ( 0, "HomeApplet" ), ref ( 0 ) 12 : QObject ( 0, "HomeApplet" ), ref ( 0 )
12{ 13{
13} 14}
14 15
15HomeApplet::~HomeApplet ( ) 16HomeApplet::~HomeApplet ( )
@@ -22,24 +23,34 @@ int HomeApplet::position ( ) const
22} 23}
23 24
24QString HomeApplet::name ( ) const 25QString HomeApplet::name ( ) const
25{ 26{
26 return tr( "Home shortcut" ); 27 return tr( "Home shortcut" );
27} 28}
28 29
29QString HomeApplet::text ( ) const 30QString HomeApplet::text ( ) const
30{ 31{
31 return tr( "Desktop" ); 32 return tr( "Desktop" );
32} 33}
33 34
35QString HomeApplet::tr( const char* s ) const
36{
37 return qApp->translate( "HomeApplet", s, 0 );
38}
39
40QString HomeApplet::tr( const char* s, const char* p ) const
41{
42 return qApp->translate( "HomeApplet", s, p );
43}
44
34QIconSet HomeApplet::icon ( ) const 45QIconSet HomeApplet::icon ( ) const
35{ 46{
36 QPixmap pix; 47 QPixmap pix;
37 QImage img = Resource::loadImage ( "home" ); 48 QImage img = Resource::loadImage ( "home" );
38 49
39 if ( !img. isNull ( )) 50 if ( !img. isNull ( ))
40 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 51 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
41 return pix; 52 return pix;
42} 53}
43 54
44QPopupMenu *HomeApplet::popup ( QWidget * ) const 55QPopupMenu *HomeApplet::popup ( QWidget * ) const
45{ 56{
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
@@ -27,21 +27,23 @@ class HomeApplet : public QObject, public MenuAppletInterface
27public: 27public:
28 HomeApplet ( ); 28 HomeApplet ( );
29 virtual ~HomeApplet ( ); 29 virtual ~HomeApplet ( );
30 30
31 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 31 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
32 Q_REFCOUNT 32 Q_REFCOUNT
33 33
34 virtual int position() const; 34 virtual int position() const;
35 35
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 ( );
42 44
43private: 45private:
44 ulong ref; 46 ulong ref;
45}; 47};
46 48
47#endif 49#endif
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
@@ -26,90 +26,99 @@ int LogoutApplet::position ( ) const
26} 26}
27 27
28QString LogoutApplet::name ( ) const 28QString LogoutApplet::name ( ) const
29{ 29{
30 return tr( "Logout shortcut" ); 30 return tr( "Logout shortcut" );
31} 31}
32 32
33QString LogoutApplet::text ( ) const 33QString LogoutApplet::text ( ) const
34{ 34{
35 return tr( "Logout" ); 35 return tr( "Logout" );
36} 36}
37 37
38QString LogoutApplet::tr( const char* s ) const
39{
40 return qApp->translate( "LogoutApplet", s, 0 );
41}
42
43QString LogoutApplet::tr( const char* s, const char* p ) const
44{
45 return qApp->translate( "LogoutApplet", s, p );
46}
47
38QIconSet LogoutApplet::icon ( ) const 48QIconSet LogoutApplet::icon ( ) const
39{ 49{
40 QPixmap pix; 50 QPixmap pix;
41 QImage img = Resource::loadImage ( "logout" ); 51 QImage img = Resource::loadImage ( "logout" );
42 52
43 if ( !img. isNull ( )) 53 if ( !img. isNull ( ))
44 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 54 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
45 return pix; 55 return pix;
46} 56}
47 57
48QPopupMenu *LogoutApplet::popup ( QWidget * ) const 58QPopupMenu *LogoutApplet::popup ( QWidget * ) const
49{ 59{
50 return 0; 60 return 0;
51} 61}
52 62
53// This is a workaround for a Qt bug 63// This is a workaround for a Qt bug
54// clipboard applet has to stop its poll timer, or Qt/E 64// clipboard applet has to stop its poll timer, or Qt/E
55// will hang on quit() right before it emits aboutToQuit() 65// will hang on quit() right before it emits aboutToQuit()
56 66
57class HackApplication : public QApplication { 67class HackApplication : public QApplication {
58public: 68public:
59 HackApplication ( ) : QApplication ( dummy, 0 ) 69 HackApplication ( ) : QApplication ( dummy, 0 )
60 { 70 {
61 } 71 }
62 72
63 void emit_about_to_quit ( ) 73 void emit_about_to_quit ( )
64 { 74 {
65 emit aboutToQuit ( ); 75 emit aboutToQuit ( );
66 } 76 }
67 77
68 int dummy; 78 int dummy;
69}; 79};
70 80
71 81
72void LogoutApplet::activated ( ) 82void LogoutApplet::activated ( )
73{ 83{
74 QMessageBox mb ( tr( "Logout" ), 84 QMessageBox mb ( tr( "Logout" ),
75 tr( "Do you really want to\nend this session ?" ), 85 tr( "Do you really want to\nend this session ?" ),
76 QMessageBox::NoIcon, 86 QMessageBox::NoIcon,
77 QMessageBox::Yes | QMessageBox::Default, 87 QMessageBox::Yes | QMessageBox::Default,
78 QMessageBox::No | QMessageBox::Escape, 88 QMessageBox::No | QMessageBox::Escape,
79 QMessageBox::NoButton ); 89 QMessageBox::NoButton );
80 90
81 mb. setButtonText ( QMessageBox::Yes, "Yes" ); 91 mb. setButtonText ( QMessageBox::Yes, "Yes" );
82 mb. setButtonText ( QMessageBox::No, "No" ); 92 mb. setButtonText ( QMessageBox::No, "No" );
83 mb. setIconPixmap ( icon ( ). pixmap ( )); 93 mb. setIconPixmap ( icon ( ). pixmap ( ));
84 94
85 if ( mb. exec ( ) == QMessageBox::Yes ) { 95 if ( mb. exec ( ) == QMessageBox::Yes ) {
86 { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); } 96 { QCopEnvelope envelope( "QPE/System", "forceQuit()" ); }
87 97
88 qApp-> processEvents ( ); // ensure the message goes out. 98 qApp-> processEvents ( ); // ensure the message goes out.
89 sleep ( 1 ); // You have 1 second to comply. 99 sleep ( 1 ); // You have 1 second to comply.
90 100
91 ((HackApplication *) qApp )-> emit_about_to_quit ( ); 101 ((HackApplication *) qApp )-> emit_about_to_quit ( );
92 qApp-> quit(); 102 qApp-> quit();
93 } 103 }
94} 104}
95 105
96 106
97QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 107QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
98{ 108{
99 *iface = 0; 109 *iface = 0;
100 if ( uuid == IID_QUnknown ) 110 if ( uuid == IID_QUnknown )
101 *iface = this; 111 *iface = this;
102 else if ( uuid == IID_MenuApplet ) 112 else if ( uuid == IID_MenuApplet )
103 *iface = this; 113 *iface = this;
104 114
105 if ( *iface ) 115 if ( *iface )
106 (*iface)-> addRef ( ); 116 (*iface)-> addRef ( );
107 return QS_OK; 117 return QS_OK;
108} 118}
109 119
110Q_EXPORT_INTERFACE( ) 120Q_EXPORT_INTERFACE( )
111{ 121{
112 Q_CREATE_INSTANCE( LogoutApplet ) 122 Q_CREATE_INSTANCE( LogoutApplet )
113} 123}
114 124
115
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
@@ -23,25 +23,27 @@
23#include <qpe/menuappletinterface.h> 23#include <qpe/menuappletinterface.h>
24 24
25class LogoutApplet : public QObject, public MenuAppletInterface 25class LogoutApplet : public QObject, public MenuAppletInterface
26{ 26{
27public: 27public:
28 LogoutApplet ( ); 28 LogoutApplet ( );
29 virtual ~LogoutApplet ( ); 29 virtual ~LogoutApplet ( );
30 30
31 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 31 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
32 Q_REFCOUNT 32 Q_REFCOUNT
33 33
34 virtual int position() const; 34 virtual int position() const;
35 35
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 ( );
42 44
43private: 45private:
44 ulong ref; 46 ulong ref;
45}; 47};
46 48
47#endif 49#endif
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,15 +1,16 @@
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
7#include "suspend.h" 8#include "suspend.h"
8 9
9 10
10SuspendApplet::SuspendApplet ( ) 11SuspendApplet::SuspendApplet ( )
11 : QObject ( 0, "SuspendApplet" ), ref ( 0 ) 12 : QObject ( 0, "SuspendApplet" ), ref ( 0 )
12{ 13{
13} 14}
14 15
15SuspendApplet::~SuspendApplet ( ) 16SuspendApplet::~SuspendApplet ( )
@@ -22,24 +23,34 @@ int SuspendApplet::position ( ) const
22} 23}
23 24
24QString SuspendApplet::name ( ) const 25QString SuspendApplet::name ( ) const
25{ 26{
26 return tr( "Suspend shortcut" ); 27 return tr( "Suspend shortcut" );
27} 28}
28 29
29QString SuspendApplet::text ( ) const 30QString SuspendApplet::text ( ) const
30{ 31{
31 return tr( "Suspend" ); 32 return tr( "Suspend" );
32} 33}
33 34
35QString SuspendApplet::tr( const char* s ) const
36{
37 return qApp->translate( "SuspendApplet", s, 0 );
38}
39
40QString SuspendApplet::tr( const char* s, const char* p ) const
41{
42 return qApp->translate( "SuspendApplet", s, p );
43}
44
34QIconSet SuspendApplet::icon ( ) const 45QIconSet SuspendApplet::icon ( ) const
35{ 46{
36 QPixmap pix; 47 QPixmap pix;
37 QImage img = Resource::loadImage ( "suspend" ); 48 QImage img = Resource::loadImage ( "suspend" );
38 49
39 if ( !img. isNull ( )) 50 if ( !img. isNull ( ))
40 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 51 pix. convertFromImage ( img. smoothScale ( 14, 14 ));
41 return pix; 52 return pix;
42} 53}
43 54
44QPopupMenu *SuspendApplet::popup ( QWidget * ) const 55QPopupMenu *SuspendApplet::popup ( QWidget * ) const
45{ 56{
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
@@ -27,21 +27,23 @@ class SuspendApplet : public QObject, public MenuAppletInterface
27public: 27public:
28 SuspendApplet ( ); 28 SuspendApplet ( );
29 virtual ~SuspendApplet ( ); 29 virtual ~SuspendApplet ( );
30 30
31 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 31 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
32 Q_REFCOUNT 32 Q_REFCOUNT
33 33
34 virtual int position() const; 34 virtual int position() const;
35 35
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 ( );
42 44
43private: 45private:
44 ulong ref; 46 ulong ref;
45}; 47};
46 48
47#endif 49#endif