summaryrefslogtreecommitdiff
path: root/core/applets/multikeyapplet/multikey.cpp
Unidiff
Diffstat (limited to 'core/applets/multikeyapplet/multikey.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/applets/multikeyapplet/multikey.cpp12
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
@@ -28,12 +28,13 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("
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}
@@ -47,16 +48,23 @@ void Multikey::mousePressEvent(QMouseEvent *ev)
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]);
58 }
59 QWidget::mousePressEvent(ev);
55 } 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];
60 setText(labels[lang]); 68 setText(labels[lang]);
61} 69}
62 70