| -rw-r--r-- | inputmethods/jumpx/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/jumpx/jumpx.pro | 2 | ||||
| -rw-r--r-- | inputmethods/jumpx/keyboard.cpp | 18 | ||||
| -rw-r--r-- | inputmethods/jumpx/opie-jumpx.control | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/inputmethods/jumpx/config.in b/inputmethods/jumpx/config.in index f2779f8..33645d9 100644 --- a/inputmethods/jumpx/config.in +++ b/inputmethods/jumpx/config.in @@ -1,4 +1,4 @@ config JUMPX boolean "opie-jumpx (keyboard optimized for single finger/stylus input)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/inputmethods/jumpx/jumpx.pro b/inputmethods/jumpx/jumpx.pro index c8b2185..e13deb9 100644 --- a/inputmethods/jumpx/jumpx.pro +++ b/inputmethods/jumpx/jumpx.pro @@ -8,7 +8,7 @@ TARGET = qjumpx DESTDIR = ../../plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) diff --git a/inputmethods/jumpx/keyboard.cpp b/inputmethods/jumpx/keyboard.cpp index 0cfb4be..79f0d5d 100644 --- a/inputmethods/jumpx/keyboard.cpp +++ b/inputmethods/jumpx/keyboard.cpp @@ -11,7 +11,7 @@ *********************************************************************************************/ #include "keyboard.h" -#include <qpe/resource.h> +#include <opie2/oresource.h> //#include <iostream.h> @@ -137,25 +137,25 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : { //setPalette(QPalette(QColor(240,240,230))); // Beige! - releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("jumpx/released"); - pressedPlain = pressedShift = pressedParen = Resource::loadPixmap("jumpx/pressed"); - pressedDigit = Resource::loadPixmap("jumpx/pressed"); + releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("jumpx/released"); + pressedPlain = pressedShift = pressedParen = Opie::Core::OResource::loadPixmap("jumpx/pressed"); + pressedDigit = Opie::Core::OResource::loadPixmap("jumpx/pressed"); QPixmap tmp; - tmp = Resource::loadPixmap("jumpx/releasedShift"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/releasedShift"); bitBlt(&releasedShift, letterx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/releasedParen"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/releasedParen"); bitBlt(&releasedParen, specialx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/pressedShift"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedShift"); bitBlt(&pressedShift, letterx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/pressedParen"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedParen"); bitBlt(&pressedParen, specialx1, 0, &tmp); - tmp = Resource::loadPixmap("jumpx/pressedDigit"); + tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedDigit"); bitBlt(&pressedDigit, specialx1, 0, &tmp); offscreen = QPixmap( releasedPlain ); diff --git a/inputmethods/jumpx/opie-jumpx.control b/inputmethods/jumpx/opie-jumpx.control index b8664cc..30771b1 100644 --- a/inputmethods/jumpx/opie-jumpx.control +++ b/inputmethods/jumpx/opie-jumpx.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/inputmethods Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 License: GPL Description: JumpX input method Keyboard-like input method for the Opie environment. |