author | mickeyl <mickeyl> | 2004-03-01 14:44:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-01 14:44:21 (UTC) |
commit | 7a819ad4bc09aa88521044bfbb06ab37a4c2ef66 (patch) (unidiff) | |
tree | 30adbbdd3d1eedaadd3671a17d960d161ddbfbe0 /core/applets/multikeyapplet | |
parent | dbf8c3e1fc4416f2fd719b7d278984591a2366de (diff) | |
download | opie-7a819ad4bc09aa88521044bfbb06ab37a4c2ef66.zip opie-7a819ad4bc09aa88521044bfbb06ab37a4c2ef66.tar.gz opie-7a819ad4bc09aa88521044bfbb06ab37a4c2ef66.tar.bz2 |
libopie1-->libopie2
-rw-r--r-- | core/applets/multikeyapplet/config.in | 2 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 15 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikey.h | 1 | ||||
-rw-r--r-- | core/applets/multikeyapplet/multikeyapplet.pro | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/core/applets/multikeyapplet/config.in b/core/applets/multikeyapplet/config.in index fc7affe..2e1a9e2 100644 --- a/core/applets/multikeyapplet/config.in +++ b/core/applets/multikeyapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config MULTIKEYAPPLET | 1 | config MULTIKEYAPPLET |
2 | boolean "opie-multikeyapplet (Applet to switch OnScreen keyboard layout)" | 2 | boolean "opie-multikeyapplet (Applet to switch OnScreen keyboard layout)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MULTIKEY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && MULTIKEY |
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index d304f54..b36ee12 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp | |||
@@ -14,11 +14,14 @@ | |||
14 | 14 | ||
15 | #include "multikey.h" | 15 | #include "multikey.h" |
16 | 16 | ||
17 | /* OPIE */ | ||
18 | #include <opie2/otaskbarapplet.h> | ||
17 | #include <qpe/global.h> | 19 | #include <qpe/global.h> |
18 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 21 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
21 | 23 | ||
24 | /* QT */ | ||
22 | #include <qlabel.h> | 25 | #include <qlabel.h> |
23 | #include <qdir.h> | 26 | #include <qdir.h> |
24 | #include <qfileinfo.h> | 27 | #include <qfileinfo.h> |
@@ -112,7 +115,7 @@ void Multikey::message(const QCString &message, const QByteArray &data) | |||
112 | while (!map.atEnd()) { | 115 | while (!map.atEnd()) { |
113 | 116 | ||
114 | if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) { | 117 | if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) { |
115 | 118 | ||
116 | if (i != sw.count()-1) { | 119 | if (i != sw.count()-1) { |
117 | if (keymap_map == current_map) { | 120 | if (keymap_map == current_map) { |
118 | lang = i; | 121 | lang = i; |
@@ -134,3 +137,13 @@ void Multikey::message(const QCString &message, const QByteArray &data) | |||
134 | setText(current); | 137 | setText(current); |
135 | } | 138 | } |
136 | } | 139 | } |
140 | |||
141 | int Multikey::position() | ||
142 | { | ||
143 | return 10; | ||
144 | } | ||
145 | |||
146 | Q_EXPORT_INTERFACE() | ||
147 | { | ||
148 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> ); | ||
149 | } | ||
diff --git a/core/applets/multikeyapplet/multikey.h b/core/applets/multikeyapplet/multikey.h index 1c5aa0c..acddfc8 100644 --- a/core/applets/multikeyapplet/multikey.h +++ b/core/applets/multikeyapplet/multikey.h | |||
@@ -24,6 +24,7 @@ class Multikey: public QLabel | |||
24 | Q_OBJECT | 24 | Q_OBJECT |
25 | public: | 25 | public: |
26 | Multikey(QWidget *parent); | 26 | Multikey(QWidget *parent); |
27 | static int position(); | ||
27 | 28 | ||
28 | protected: | 29 | protected: |
29 | void mousePressEvent(QMouseEvent *ev); | 30 | void mousePressEvent(QMouseEvent *ev); |
diff --git a/core/applets/multikeyapplet/multikeyapplet.pro b/core/applets/multikeyapplet/multikeyapplet.pro index 4be1f74..86e41c0 100644 --- a/core/applets/multikeyapplet/multikeyapplet.pro +++ b/core/applets/multikeyapplet/multikeyapplet.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS= multikey.h multikeyappletimpl.h | 3 | HEADERS= multikey.h |
4 | SOURCES= multikey.cpp multikeyappletimpl.cpp | 4 | SOURCES= multikey.cpp |
5 | TARGET = multikeyapplet | 5 | TARGET = multikeyapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |