author | mouse <mouse> | 2004-01-05 15:23:15 (UTC) |
---|---|---|
committer | mouse <mouse> | 2004-01-05 15:23:15 (UTC) |
commit | 969831e80dd285e8c95e8a91333a626717d5543e (patch) (unidiff) | |
tree | f5976ce77f9381f8e4f4d871d74e520f0d76ba85 /core | |
parent | c127e5d582b1ae4033eca1c8454bee75d510b9e8 (diff) | |
download | opie-969831e80dd285e8c95e8a91333a626717d5543e.zip opie-969831e80dd285e8c95e8a91333a626717d5543e.tar.gz opie-969831e80dd285e8c95e8a91333a626717d5543e.tar.bz2 |
added popup menu
fixed reaction by one touch and hold-touch (RightButton)
-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 | |||
@@ -32,4 +32,5 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current(" | |||
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()"); |
@@ -51,8 +52,15 @@ void Multikey::mousePressEvent(QMouseEvent *ev) | |||
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 | ||
62 | void 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()); |
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 | |||
@@ -20,9 +20,13 @@ | |||
20 | #include <qcopchannel_qws.h> | 20 | #include <qcopchannel_qws.h> |
21 | 21 | ||
22 | class Multikey : public QLabel | 22 | class Multikey: public QLabel |
23 | { | 23 | { |
24 | Q_OBJECT | 24 | Q_OBJECT |
25 | public: | 25 | public: |
26 | Multikey( QWidget *parent ); | 26 | Multikey(QWidget *parent); |
27 | |||
28 | protected: | ||
29 | void mousePressEvent(QMouseEvent *ev); | ||
30 | void mouseReleaseEvent(QMouseEvent *ev); | ||
27 | 31 | ||
28 | public slots: | 32 | public slots: |
@@ -30,5 +34,4 @@ public slots: | |||
30 | 34 | ||
31 | protected: | 35 | protected: |
32 | void mousePressEvent( QMouseEvent * ); | ||
33 | QStringList sw_maps; | 36 | QStringList sw_maps; |
34 | QStringList labels; | 37 | QStringList labels; |