added popup menu

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

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
@@ -22,47 +22,55 @@
 #include <qlabel.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qcopchannel_qws.h>
 
 Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
 {
     QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
     connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)),
              this, SLOT(message(const QCString &, const QByteArray &)));
 
     setFont( QFont( "Helvetica", 10, QFont::Normal ) );
+    QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
     lang = 0;
     QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
     setText("EN");
     popupMenu.insertItem("EN", -1);
     show();
 }
 
 void Multikey::mousePressEvent(QMouseEvent *ev)
 {
     if (ev->button() == RightButton) {
 
         QPoint p = mapToGlobal(QPoint(0, 0));
         QSize s = popupMenu.sizeHint();
         int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2),
                                         p.y() - s.height()), 0);
 
         if (opt == -1)
             return;
         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)");
     //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii());
     e << sw_maps[lang];
     setText(labels[lang]);
 }
 
 void Multikey::message(const QCString &message, const QByteArray &data)
 {
     if ( message == "setsw(QString,QString)" ) {
 
         QDataStream stream(data, IO_ReadOnly);
         QString maps, current_map;
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
@@ -10,31 +10,34 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #ifndef __MULTIKEY_H__
 #define __MULTIKEY_H__
 
 #include <qlabel.h>
 #include <qstringlist.h>
 #include <qpopupmenu.h>
 #include <qcopchannel_qws.h>
 
-class Multikey : public QLabel
+class Multikey: public QLabel
 {
     Q_OBJECT
 public:
-    Multikey( QWidget *parent );
+    Multikey(QWidget *parent);
+
+protected:
+    void mousePressEvent(QMouseEvent *ev);
+    void mouseReleaseEvent(QMouseEvent *ev);
 
 public slots:
     void message(const QCString &message, const QByteArray &data);
 
 protected:
-    void mousePressEvent( QMouseEvent * );
     QStringList sw_maps;
     QStringList labels;
     QPopupMenu popupMenu;
     QString current;
     uint lang;
 };
 
 #endif /* __MULTIKEY_H__ */