summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/multikeyapplet/multikey.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index 9ef162f..d304f54 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -14,74 +14,80 @@
14 14
15#include "multikey.h" 15#include "multikey.h"
16 16
17#include <qpe/global.h> 17#include <qpe/global.h>
18#include <qpe/config.h> 18#include <qpe/config.h>
19#include <qpe/qcopenvelope_qws.h> 19#include <qpe/qcopenvelope_qws.h>
20#include <qpe/qpeapplication.h> 20#include <qpe/qpeapplication.h>
21 21
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
27Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") 27Multikey::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 QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
35 lang = 0; 35 lang = 0;
36 QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); 36 QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
37 setText("EN"); 37 setText("EN");
38 popupMenu.insertItem("EN", -1); 38 popupMenu.insertItem("EN", 0);
39 show(); 39 show();
40} 40}
41 41
42void Multikey::mousePressEvent(QMouseEvent *ev) 42void Multikey::mousePressEvent(QMouseEvent *ev)
43{ 43{
44 if (!sw_maps.count())
45 return;
46
44 if (ev->button() == RightButton) { 47 if (ev->button() == RightButton) {
45 48
46 QPoint p = mapToGlobal(QPoint(0, 0)); 49 QPoint p = mapToGlobal(QPoint(0, 0));
47 QSize s = popupMenu.sizeHint(); 50 QSize s = popupMenu.sizeHint();
48 int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2), 51 int opt = popupMenu.exec(QPoint(p.x() + (width() / 2) - (s.width() / 2),
49 p.y() - s.height()), 0); 52 p.y() - s.height()), 0);
50 53
51 if (opt == -1) 54 if (opt == -1)
52 return; 55 return;
53 lang = opt; 56 lang = opt;
54 57
55 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); 58 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
56 e << sw_maps[lang]; 59 e << sw_maps[lang];
57 setText(labels[lang]); 60 setText(labels[lang]);
58 } 61 }
59 QWidget::mousePressEvent(ev); 62 QWidget::mousePressEvent(ev);
60} 63}
61 64
62void Multikey::mouseReleaseEvent(QMouseEvent *ev) 65void Multikey::mouseReleaseEvent(QMouseEvent *ev)
63{ 66{
67 if (!sw_maps.count())
68 return;
69
64 lang = lang < sw_maps.count()-1 ? lang+1 : 0; 70 lang = lang < sw_maps.count()-1 ? lang+1 : 0;
65 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); 71 QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
66 //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii()); 72 //qDebug("Lang=%d, count=%d, lab=%s", lang, sw_maps.count(), labels[lang].ascii());
67 e << sw_maps[lang]; 73 e << sw_maps[lang];
68 setText(labels[lang]); 74 setText(labels[lang]);
69} 75}
70 76
71void Multikey::message(const QCString &message, const QByteArray &data) 77void Multikey::message(const QCString &message, const QByteArray &data)
72{ 78{
73 if ( message == "setsw(QString,QString)" ) { 79 if ( message == "setsw(QString,QString)" ) {
74 80
75 QDataStream stream(data, IO_ReadOnly); 81 QDataStream stream(data, IO_ReadOnly);
76 QString maps, current_map; 82 QString maps, current_map;
77 stream >> maps >> current_map; 83 stream >> maps >> current_map;
78 QStringList sw = QStringList::split(QChar('|'), maps); 84 QStringList sw = QStringList::split(QChar('|'), maps);
79 sw.append(current_map); 85 sw.append(current_map);
80 86
81 QDir map_dir(QPEApplication::qpeDir() + "/share/multikey/", "*.keymap"); 87 QDir map_dir(QPEApplication::qpeDir() + "/share/multikey/", "*.keymap");
82 lang = 0; 88 lang = 0;
83 labels.clear(); 89 labels.clear();
84 sw_maps.clear(); 90 sw_maps.clear();
85 popupMenu.clear(); 91 popupMenu.clear();
86 92
87 for (uint i = 0; i < sw.count(); ++i) { 93 for (uint i = 0; i < sw.count(); ++i) {