author | alwin <alwin> | 2004-08-01 10:34:14 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-08-01 10:34:14 (UTC) |
commit | 724f12e7a37e977b70bb0002d14ee36b9358ae99 (patch) (unidiff) | |
tree | 273711aa81ed69aaf24201ed51e98509241e19b5 | |
parent | ecd0e7c523c9f190eb2b8765ef2d629aa399d635 (diff) | |
download | opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.zip opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.tar.gz opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.tar.bz2 |
switched to OKeyFilter handler.
-rw-r--r-- | development/keyview/keyview.cpp | 17 | ||||
-rw-r--r-- | development/keyview/keyview.h | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/development/keyview/keyview.cpp b/development/keyview/keyview.cpp index 8e24efc..8187744 100644 --- a/development/keyview/keyview.cpp +++ b/development/keyview/keyview.cpp | |||
@@ -2,8 +2,10 @@ | |||
2 | #include <qgrid.h> | 2 | #include <qgrid.h> |
3 | //#include <iostream.h> | 3 | //#include <iostream.h> |
4 | #include <qlineedit.h> | 4 | #include <qlineedit.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | #include <opie2/okeyfilter.h> | ||
7 | #include <opie2/odebug.h> | ||
6 | 8 | ||
7 | Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) | 9 | Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) |
8 | : QGrid ( 2, parent, name, fl ) | 10 | : QGrid ( 2, parent, name, fl ) |
9 | { | 11 | { |
@@ -27,9 +29,9 @@ Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) | |||
27 | 29 | ||
28 | l = new QLabel(QString("isPress:"), this); | 30 | l = new QLabel(QString("isPress:"), this); |
29 | isPress = new QLineEdit(this); | 31 | isPress = new QLineEdit(this); |
30 | isPress->setReadOnly(1); | 32 | isPress->setReadOnly(1); |
31 | 33 | ||
32 | l = new QLabel(QString("autoRepeat:"), this); | 34 | l = new QLabel(QString("autoRepeat:"), this); |
33 | autoRepeat = new QLineEdit(this); | 35 | autoRepeat = new QLineEdit(this); |
34 | autoRepeat->setReadOnly(1); | 36 | autoRepeat->setReadOnly(1); |
35 | 37 | ||
@@ -38,15 +40,18 @@ Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) | |||
38 | l->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); | 40 | l->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); |
39 | 41 | ||
40 | 42 | ||
41 | KeyFilter *filter = new KeyFilter(this); | 43 | KeyFilter *filter = new KeyFilter(this); |
42 | QWSServer::setKeyboardFilter(filter); | 44 | Opie::Core::OKeyFilter::inst()->addHandler(filter); |
45 | odebug << "Creating keyview filter " << oendl; | ||
43 | 46 | ||
44 | connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)), | 47 | connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)), |
45 | this, SLOT(updateItems(int,int,int,bool,bool))); | 48 | this, SLOT(updateItems(int,int,int,bool,bool))); |
46 | } | 49 | } |
47 | 50 | ||
48 | Keyview::~Keyview() { } | 51 | Keyview::~Keyview() |
52 | { | ||
53 | } | ||
49 | 54 | ||
50 | void Keyview::updateItems(int u, int k, int m, bool p, bool a) { | 55 | void Keyview::updateItems(int u, int k, int m, bool p, bool a) { |
51 | 56 | ||
52 | unicode->setText("0x" + QString::number(u, 16)); | 57 | unicode->setText("0x" + QString::number(u, 16)); |
@@ -55,10 +60,10 @@ void Keyview::updateItems(int u, int k, int m, bool p, bool a) { | |||
55 | isPress->setText("0x" + QString::number(p, 16)); | 60 | isPress->setText("0x" + QString::number(p, 16)); |
56 | autoRepeat->setText("0x" + QString::number(a, 16)); | 61 | autoRepeat->setText("0x" + QString::number(a, 16)); |
57 | } | 62 | } |
58 | 63 | ||
59 | KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name ) { | 64 | KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name ) |
60 | 65 | { | |
61 | } | 66 | } |
62 | 67 | ||
63 | bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress, | 68 | bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress, |
64 | bool autoRepeat) { | 69 | bool autoRepeat) { |
diff --git a/development/keyview/keyview.h b/development/keyview/keyview.h index ab4ae60..5f1e943 100644 --- a/development/keyview/keyview.h +++ b/development/keyview/keyview.h | |||
@@ -5,9 +5,9 @@ | |||
5 | #include <qwindowsystem_qws.h> | 5 | #include <qwindowsystem_qws.h> |
6 | 6 | ||
7 | 7 | ||
8 | class Keyview : public QGrid | 8 | class Keyview : public QGrid |
9 | { | 9 | { |
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | 11 | ||
12 | public: | 12 | public: |
13 | Keyview( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 13 | Keyview( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |