summaryrefslogtreecommitdiff
path: root/inputmethods/jumpx
Unidiff
Diffstat (limited to 'inputmethods/jumpx') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/jumpx/config.in2
-rw-r--r--inputmethods/jumpx/jumpx.pro2
-rw-r--r--inputmethods/jumpx/keyboard.cpp18
-rw-r--r--inputmethods/jumpx/opie-jumpx.control2
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 @@
1 config JUMPX 1 config JUMPX
2 boolean "opie-jumpx (keyboard optimized for single finger/stylus input)" 2 boolean "opie-jumpx (keyboard optimized for single finger/stylus input)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) 4 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
8DESTDIR = ../../plugins/inputmethods 8DESTDIR = ../../plugins/inputmethods
9INCLUDEPATH += $(OPIEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10DEPENDPATH += $(OPIEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11LIBS += -lqpe 11LIBS += -lqpe -lopiecore2
12VERSION = 1.0.0 12VERSION = 1.0.0
13 13
14include( $(OPIEDIR)/include.pro ) 14include( $(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 @@
11*********************************************************************************************/ 11*********************************************************************************************/
12#include "keyboard.h" 12#include "keyboard.h"
13 13
14#include <qpe/resource.h> 14#include <opie2/oresource.h>
15 15
16//#include <iostream.h> 16//#include <iostream.h>
17 17
@@ -137,25 +137,25 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
137{ 137{
138 //setPalette(QPalette(QColor(240,240,230))); // Beige! 138 //setPalette(QPalette(QColor(240,240,230))); // Beige!
139 139
140 releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("jumpx/released"); 140 releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("jumpx/released");
141 pressedPlain = pressedShift = pressedParen = Resource::loadPixmap("jumpx/pressed"); 141 pressedPlain = pressedShift = pressedParen = Opie::Core::OResource::loadPixmap("jumpx/pressed");
142 pressedDigit = Resource::loadPixmap("jumpx/pressed"); 142 pressedDigit = Opie::Core::OResource::loadPixmap("jumpx/pressed");
143 143
144 QPixmap tmp; 144 QPixmap tmp;
145 145
146 tmp = Resource::loadPixmap("jumpx/releasedShift"); 146 tmp = Opie::Core::OResource::loadPixmap("jumpx/releasedShift");
147 bitBlt(&releasedShift, letterx1, 0, &tmp); 147 bitBlt(&releasedShift, letterx1, 0, &tmp);
148 148
149 tmp = Resource::loadPixmap("jumpx/releasedParen"); 149 tmp = Opie::Core::OResource::loadPixmap("jumpx/releasedParen");
150 bitBlt(&releasedParen, specialx1, 0, &tmp); 150 bitBlt(&releasedParen, specialx1, 0, &tmp);
151 151
152 tmp = Resource::loadPixmap("jumpx/pressedShift"); 152 tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedShift");
153 bitBlt(&pressedShift, letterx1, 0, &tmp); 153 bitBlt(&pressedShift, letterx1, 0, &tmp);
154 154
155 tmp = Resource::loadPixmap("jumpx/pressedParen"); 155 tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedParen");
156 bitBlt(&pressedParen, specialx1, 0, &tmp); 156 bitBlt(&pressedParen, specialx1, 0, &tmp);
157 157
158 tmp = Resource::loadPixmap("jumpx/pressedDigit"); 158 tmp = Opie::Core::OResource::loadPixmap("jumpx/pressedDigit");
159 bitBlt(&pressedDigit, specialx1, 0, &tmp); 159 bitBlt(&pressedDigit, specialx1, 0, &tmp);
160 160
161 offscreen = QPixmap( releasedPlain ); 161 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
4Section: opie/inputmethods 4Section: opie/inputmethods
5Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at> 5Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8License: GPL 8License: GPL
9Description: JumpX input method 9Description: JumpX input method
10 Keyboard-like input method for the Opie environment. 10 Keyboard-like input method for the Opie environment.