summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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.cpp11
-rw-r--r--core/applets/logoutapplet/logout.h2
-rw-r--r--core/applets/suspendapplet/suspend.cpp11
-rw-r--r--core/applets/suspendapplet/suspend.h2
6 files changed, 38 insertions, 1 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,57 +1,68 @@
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qapplication.h>
#include <qiconset.h>
#include <qpopupmenu.h>
#include "home.h"
HomeApplet::HomeApplet ( )
: QObject ( 0, "HomeApplet" ), ref ( 0 )
{
}
HomeApplet::~HomeApplet ( )
{
}
int HomeApplet::position ( ) const
{
return 4;
}
QString HomeApplet::name ( ) const
{
return tr( "Home shortcut" );
}
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 ( ))
pix. convertFromImage ( img. smoothScale ( 14, 14 ));
return pix;
}
QPopupMenu *HomeApplet::popup ( QWidget * ) const
{
return 0;
}
void HomeApplet::activated ( )
{
// to desktop (home)
QCopEnvelope ( "QPE/Application/qpe", "raise()" );
}
QRESULT HomeApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
{
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
@@ -15,33 +15,35 @@
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef __OPIE_HOME_APPLET_H__
#define __OPIE_HOME_APPLET_H__
#include <qpe/menuappletinterface.h>
class HomeApplet : public QObject, public MenuAppletInterface
{
public:
HomeApplet ( );
virtual ~HomeApplet ( );
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;
};
#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
@@ -14,48 +14,58 @@
LogoutApplet::LogoutApplet ( )
: QObject ( 0, "LogoutApplet" ), ref ( 0 )
{
}
LogoutApplet::~LogoutApplet ( )
{
}
int LogoutApplet::position ( ) const
{
return 0;
}
QString LogoutApplet::name ( ) const
{
return tr( "Logout shortcut" );
}
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
{
return 0;
}
// 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 )
{
}
@@ -91,25 +101,24 @@ void LogoutApplet::activated ( )
((HackApplication *) qApp )-> emit_about_to_quit ( );
qApp-> quit();
}
}
QRESULT LogoutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_MenuApplet )
*iface = this;
if ( *iface )
(*iface)-> addRef ( );
return QS_OK;
}
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
@@ -15,33 +15,35 @@
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef __OPIE_LOGOUT_APPLET_H__
#define __OPIE_LOGOUT_APPLET_H__
#include <qpe/menuappletinterface.h>
class LogoutApplet : public QObject, public MenuAppletInterface
{
public:
LogoutApplet ( );
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;
};
#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,57 +1,68 @@
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qapplication.h>
#include <qiconset.h>
#include <qpopupmenu.h>
#include "suspend.h"
SuspendApplet::SuspendApplet ( )
: QObject ( 0, "SuspendApplet" ), ref ( 0 )
{
}
SuspendApplet::~SuspendApplet ( )
{
}
int SuspendApplet::position ( ) const
{
return 2;
}
QString SuspendApplet::name ( ) const
{
return tr( "Suspend shortcut" );
}
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 ( ))
pix. convertFromImage ( img. smoothScale ( 14, 14 ));
return pix;
}
QPopupMenu *SuspendApplet::popup ( QWidget * ) const
{
return 0;
}
void SuspendApplet::activated ( )
{
// suspend
QCopEnvelope ( "QPE/System", "suspend()" );
}
QRESULT SuspendApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
{
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
@@ -15,33 +15,35 @@
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef __OPIE_SUSPEND_APPLET_H__
#define __OPIE_SUSPEND_APPLET_H__
#include <qpe/menuappletinterface.h>
class SuspendApplet : public QObject, public MenuAppletInterface
{
public:
SuspendApplet ( );
virtual ~SuspendApplet ( );
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;
};
#endif