summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/multikeyapplet/multikey.cpp12
-rw-r--r--core/applets/multikeyapplet/multikey.h9
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
@@ -31,6 +31,7 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("
31 this, SLOT(message(const QCString &, const QByteArray &))); 31 this, SLOT(message(const QCString &, const QByteArray &)));
32 32
33 setFont( QFont( "Helvetica", 10, QFont::Normal ) ); 33 setFont( QFont( "Helvetica", 10, QFont::Normal ) );
34 QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
34 lang = 0; 35 lang = 0;
35 QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); 36 QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
36 setText("EN"); 37 setText("EN");
@@ -50,10 +51,17 @@ void Multikey::mousePressEvent(QMouseEvent *ev)
50 if (opt == -1) 51 if (opt == -1)
51 return; 52 return;
52 lang = opt; 53 lang = opt;
53 } else { 54
54 lang = lang < sw_maps.count()-1 ? lang+1 : 0; 55 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
56 e << sw_maps[lang];
57 setText(labels[lang]);
55 } 58 }
59 QWidget::mousePressEvent(ev);
60}
56 61
62void Multikey::mouseReleaseEvent(QMouseEvent *ev)
63{
64 lang = lang < sw_maps.count()-1 ? lang+1 : 0;
57 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); 65 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
58 //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); 66 //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii());
59 e << sw_maps[lang]; 67 e << sw_maps[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
@@ -19,17 +19,20 @@
19#include <qpopupmenu.h> 19#include <qpopupmenu.h>
20#include <qcopchannel_qws.h> 20#include <qcopchannel_qws.h>
21 21
22class Multikey : public QLabel 22class Multikey: public QLabel
23{ 23{
24 Q_OBJECT 24 Q_OBJECT
25public: 25public:
26 Multikey( QWidget *parent ); 26 Multikey(QWidget *parent);
27
28protected:
29 void mousePressEvent(QMouseEvent *ev);
30 void mouseReleaseEvent(QMouseEvent *ev);
27 31
28public slots: 32public slots:
29 void message(const QCString &message, const QByteArray &data); 33 void message(const QCString &message, const QByteArray &data);
30 34
31protected: 35protected:
32 void mousePressEvent( QMouseEvent * );
33 QStringList sw_maps; 36 QStringList sw_maps;
34 QStringList labels; 37 QStringList labels;
35 QPopupMenu popupMenu; 38 QPopupMenu popupMenu;