Diffstat (limited to 'core/applets/multikeyapplet/multikey.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 12 |
1 files changed, 10 insertions, 2 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 | |||
@@ -22,47 +22,55 @@ | |||
22 | #include <qlabel.h> | 22 | #include <qlabel.h> |
23 | #include <qdir.h> | 23 | #include <qdir.h> |
24 | #include <qfileinfo.h> | 24 | #include <qfileinfo.h> |
25 | #include <qcopchannel_qws.h> | 25 | #include <qcopchannel_qws.h> |
26 | 26 | ||
27 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") | 27 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") |
28 | { | 28 | { |
29 | QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); | 29 | QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); |
30 | connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)), | 30 | connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)), |
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"); |
37 | popupMenu.insertItem("EN", -1); | 38 | popupMenu.insertItem("EN", -1); |
38 | show(); | 39 | show(); |
39 | } | 40 | } |
40 | 41 | ||
41 | void Multikey::mousePressEvent(QMouseEvent *ev) | 42 | void Multikey::mousePressEvent(QMouseEvent *ev) |
42 | { | 43 | { |
43 | if (ev->button() == RightButton) { | 44 | if (ev->button() == RightButton) { |
44 | 45 | ||
45 | QPoint p = mapToGlobal(QPoint(0, 0)); | 46 | QPoint p = mapToGlobal(QPoint(0, 0)); |
46 | QSize s = popupMenu.sizeHint(); | 47 | QSize s = popupMenu.sizeHint(); |
47 | int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2), | 48 | int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2), |
48 | p.y() - s.height()), 0); | 49 | p.y() - s.height()), 0); |
49 | 50 | ||
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 | ||
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()); |
59 | e << sw_maps[lang]; | 67 | e << sw_maps[lang]; |
60 | setText(labels[lang]); | 68 | setText(labels[lang]); |
61 | } | 69 | } |
62 | 70 | ||
63 | void Multikey::message(const QCString &message, const QByteArray &data) | 71 | void Multikey::message(const QCString &message, const QByteArray &data) |
64 | { | 72 | { |
65 | if ( message == "setsw(QString,QString)" ) { | 73 | if ( message == "setsw(QString,QString)" ) { |
66 | 74 | ||
67 | QDataStream stream(data, IO_ReadOnly); | 75 | QDataStream stream(data, IO_ReadOnly); |
68 | QString maps, current_map; | 76 | QString maps, current_map; |