added popup menu

fixed reaction by one touch and hold-touch (RightButton)

2 files changed, 14 insertions, 3 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
@@ -33,2 +33,3 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("
     setFont( QFont( "Helvetica", 10, QFont::Normal ) );
+    QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
     lang = 0;
@@ -52,6 +53,13 @@ void Multikey::mousePressEvent(QMouseEvent *ev)
 	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)");
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
@@ -27,2 +27,6 @@ public:
 
+protected:
+    void mousePressEvent(QMouseEvent *ev);
+    void mouseReleaseEvent(QMouseEvent *ev);
+
 public slots:
@@ -31,3 +35,2 @@ public slots:
 protected:
-    void mousePressEvent( QMouseEvent * );
     QStringList sw_maps;