-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 12 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.h | 9 |
2 files changed, 16 insertions, 5 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index f1227ef..9ef162f 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp @@ -30,8 +30,9 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current(" connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(message(const QCString &, const QByteArray &))); setFont( QFont( "Helvetica", 10, QFont::Normal ) ); + QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold); lang = 0; QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); setText("EN"); popupMenu.insertItem("EN", -1); @@ -49,12 +50,19 @@ void Multikey::mousePressEvent(QMouseEvent *ev) if (opt == -1) return; lang = opt; - } else { - lang = lang < sw_maps.count()-1 ? lang+1 : 0; + + QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); + e << sw_maps[lang]; + setText(labels[lang]); } + QWidget::mousePressEvent(ev); +} +void Multikey::mouseReleaseEvent(QMouseEvent *ev) +{ + lang = lang < sw_maps.count()-1 ? lang+1 : 0; QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); e << sw_maps[lang]; setText(labels[lang]); diff --git a/core/applets/multikeyapplet/multikey.h b/core/applets/multikeyapplet/multikey.h index b525074..1c5aa0c 100644 --- a/core/applets/multikeyapplet/multikey.h +++ b/core/applets/multikeyapplet/multikey.h @@ -18,19 +18,22 @@ #include <qstringlist.h> #include <qpopupmenu.h> #include <qcopchannel_qws.h> -class Multikey : public QLabel +class Multikey: public QLabel { Q_OBJECT public: - Multikey( QWidget *parent ); + Multikey(QWidget *parent); + +protected: + void mousePressEvent(QMouseEvent *ev); + void mouseReleaseEvent(QMouseEvent *ev); public slots: void message(const QCString &message, const QByteArray &data); protected: - void mousePressEvent( QMouseEvent * ); QStringList sw_maps; QStringList labels; QPopupMenu popupMenu; QString current; |