summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/multikeyapplet/config.in2
-rw-r--r--core/applets/multikeyapplet/multikey.cpp15
-rw-r--r--core/applets/multikeyapplet/multikey.h1
-rw-r--r--core/applets/multikeyapplet/multikeyapplet.pro6
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 @@
config MULTIKEYAPPLET
boolean "opie-multikeyapplet (Applet to switch OnScreen keyboard layout)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MULTIKEY
+ 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
@@ -13,13 +13,16 @@
**********************************************************************/
#include "multikey.h"
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
#include <qpe/global.h>
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
+/* QT */
#include <qlabel.h>
#include <qdir.h>
#include <qfileinfo.h>
#include <qcopchannel_qws.h>
@@ -111,9 +114,9 @@ void Multikey::message(const QCString &message, const QByteArray &data)
map.readLine(line, 1024);
while (!map.atEnd()) {
if (line.find(QRegExp("^sw\\s*=\\s*")) != -1) {
-
+
if (i != sw.count()-1) {
if (keymap_map == current_map) {
lang = i;
}
@@ -133,4 +136,14 @@ void Multikey::message(const QCString &message, const QByteArray &data)
setText(current);
}
}
+
+int Multikey::position()
+{
+ return 10;
+}
+
+Q_EXPORT_INTERFACE()
+{
+ Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> );
+}
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
@@ -23,8 +23,9 @@ class Multikey: public QLabel
{
Q_OBJECT
public:
Multikey(QWidget *parent);
+ static int position();
protected:
void mousePressEvent(QMouseEvent *ev);
void mouseReleaseEvent(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,13 +1,13 @@
TEMPLATE = lib
CONFIG += qt plugin warn_on release
-HEADERS = multikey.h multikeyappletimpl.h
-SOURCES = multikey.cpp multikeyappletimpl.cpp
+HEADERS = multikey.h
+SOURCES = multikey.cpp
TARGET = multikeyapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ..
-LIBS += -lqpe -lopie
+LIBS += -lqpe
VERSION = 1.0.0
include ( $(OPIEDIR)/include.pro )
target.path = $$prefix/plugins/applets