author | mickeyl <mickeyl> | 2004-10-29 12:38:37 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-10-29 12:38:37 (UTC) |
commit | dca4423e3b0966fe26ba4183e5b6ad4666c61e86 (patch) (unidiff) | |
tree | 8a06619edc609164f45b6a2d92ec3fe264fc3fb1 | |
parent | e1ab37a7bc09619958037be7ecddc67fd334227d (diff) | |
download | opie-dca4423e3b0966fe26ba4183e5b6ad4666c61e86.zip opie-dca4423e3b0966fe26ba4183e5b6ad4666c61e86.tar.gz opie-dca4423e3b0966fe26ba4183e5b6ad4666c61e86.tar.bz2 |
- no longer hardcode the font size
- add fixme for initial keyboard setting
-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index 8cb9083..f3d8375 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp | |||
@@ -17,20 +17,20 @@ | |||
17 | /* OPIE */ | 17 | /* OPIE */ |
18 | #include <opie2/otaskbarapplet.h> | 18 | #include <opie2/otaskbarapplet.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | using namespace Opie::Ui; | ||
21 | 22 | ||
22 | /* QT */ | 23 | /* QT */ |
23 | #include <qdir.h> | 24 | #include <qdir.h> |
24 | 25 | ||
25 | using namespace Opie::Ui; | 26 | //FIXME: Better read appropriate initial setting from LOCALE, not hardcode it "EN" |
26 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") | 27 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") |
27 | { | 28 | { |
28 | QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); | 29 | QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); |
29 | connect( swChannel, SIGNAL(received(const QCString&,const QByteArray&)), | 30 | connect( swChannel, SIGNAL(received(const QCString&,const QByteArray&)), |
30 | this, SLOT(message(const QCString&,const QByteArray&))); | 31 | this, SLOT(message(const QCString&,const QByteArray&))); |
31 | 32 | ||
32 | setFont( QFont( "Helvetica", 10, QFont::Normal ) ); | ||
33 | QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold); | 33 | QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold); |
34 | lang = 0; | 34 | lang = 0; |
35 | QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); | 35 | QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); |
36 | setText("EN"); | 36 | setText("EN"); |
@@ -67,9 +67,9 @@ void Multikey::mouseReleaseEvent(QMouseEvent *ev) | |||
67 | return; | 67 | return; |
68 | 68 | ||
69 | lang = lang < sw_maps.count()-1 ? lang+1 : 0; | 69 | lang = lang < sw_maps.count()-1 ? lang+1 : 0; |
70 | QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); | 70 | QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)"); |
71 | //odebug << "Lang=" << lang << ", count=" << sw_maps.count() << ", lab=" << labels[lang].ascii() << "" << oendl; | 71 | //odebug << "Lang=" << lang << ", count=" << sw_maps.count() << ", lab=" << labels[lang].ascii() << "" << oendl; |
72 | e << sw_maps[lang]; | 72 | e << sw_maps[lang]; |
73 | setText(labels[lang]); | 73 | setText(labels[lang]); |
74 | } | 74 | } |
75 | 75 | ||