| -rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 22 | ||||
| -rw-r--r-- | core/applets/multikeyapplet/multikey.h | 2 |
2 files changed, 21 insertions, 3 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index 0a056b0..f1227ef 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp @@ -26,3 +26,3 @@ -Multikey::Multikey( QWidget *parent ) : QLabel( parent ), current("EN") +Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") { @@ -36,2 +36,3 @@ Multikey::Multikey( QWidget *parent ) : QLabel( parent ), current("EN") setText("EN"); + popupMenu.insertItem("EN", -1); show(); @@ -39,6 +40,19 @@ Multikey::Multikey( QWidget *parent ) : QLabel( parent ), current("EN") -void Multikey::mousePressEvent( QMouseEvent * ) +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)"); - lang = lang < sw_maps.count()-1 ? lang+1 : 0; //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); @@ -62,2 +76,3 @@ void Multikey::message(const QCString &message, const QByteArray &data) sw_maps.clear(); + popupMenu.clear(); @@ -92,2 +107,3 @@ void Multikey::message(const QCString &message, const QByteArray &data) labels.append(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); + popupMenu.insertItem(labels[labels.count()-1], labels.count()-1); } else { diff --git a/core/applets/multikeyapplet/multikey.h b/core/applets/multikeyapplet/multikey.h index 2cb7b29..b525074 100644 --- a/core/applets/multikeyapplet/multikey.h +++ b/core/applets/multikeyapplet/multikey.h @@ -18,2 +18,3 @@ #include <qstringlist.h> +#include <qpopupmenu.h> #include <qcopchannel_qws.h> @@ -33,2 +34,3 @@ protected: QStringList labels; + QPopupMenu popupMenu; QString current; |