12 files changed, 56 insertions, 53 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.
diff --git a/inputmethods/kjumpx/config.in b/inputmethods/kjumpx/config.in
index 8ccef5b..0c4e9d4 100644
--- a/inputmethods/kjumpx/config.in
+++ b/inputmethods/kjumpx/config.in
@@ -1,4 +1,4 @@
   config KJUMPX
     boolean "opie-kjumpx (korean keyboard optimized for single finger/stylus input)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/inputmethods/kjumpx/keyboard.cpp b/inputmethods/kjumpx/keyboard.cpp
index dc44805..4e99f40 100644
--- a/inputmethods/kjumpx/keyboard.cpp
+++ b/inputmethods/kjumpx/keyboard.cpp
@@ -11,7 +11,7 @@
 *********************************************************************************************/
 #include "keyboard.h"
 
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
 
 //#include <iostream.h>
 
@@ -153,25 +153,25 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
 {
     //setPalette(QPalette(QColor(240,240,230))); // Beige!
 
-    releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("kjumpx/released");
-    pressedPlain  = pressedShift  = pressedParen  = Resource::loadPixmap("kjumpx/pressed");
-    pressedDigit = Resource::loadPixmap("kjumpx/pressed");
+    releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("kjumpx/released");
+    pressedPlain  = pressedShift  = pressedParen  = Opie::Core::OResource::loadPixmap("kjumpx/pressed");
+    pressedDigit = Opie::Core::OResource::loadPixmap("kjumpx/pressed");
 
     QPixmap tmp;
 
-    tmp = Resource::loadPixmap("kjumpx/releasedShift");
+    tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedShift");
     bitBlt(&releasedShift, letterx1, 0, &tmp);
 
-    tmp = Resource::loadPixmap("kjumpx/releasedParen");
+    tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedParen");
     bitBlt(&releasedParen, specialx1, 0, &tmp);
 
-    tmp = Resource::loadPixmap("kjumpx/pressedShift");
+    tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedShift");
     bitBlt(&pressedShift, letterx1, 0, &tmp);
 
-    tmp = Resource::loadPixmap("kjumpx/pressedParen");
+    tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedParen");
     bitBlt(&pressedParen, specialx1, 0, &tmp);
 
-    tmp = Resource::loadPixmap("kjumpx/pressedDigit");
+    tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedDigit");
     bitBlt(&pressedDigit, specialx1, 0, &tmp);
 
     offscreen = QPixmap( releasedPlain );
@@ -564,9 +564,9 @@ void Keyboard::resetState()
  *
  * all following chars means unicode char value and are in hex
  *
- * ÃÊÀ½ = schar (start char)
- * ÁßÀ½ = mchar (middle char)
- * ³¡À½ = echar (end char)
+ * �= = schar (start char)
+ * �= = mchar (middle char)
+ * = = echar (end char)
  *
  * there are 19 schars. unicode position is at 1100 - 1112
  * there are 21 mchars. unicode position is at 1161 - 1175
@@ -610,49 +610,49 @@ QChar Keyboard::parseKoreanInput (ushort c) {
                         }
                         else { // must figure out what the echar is
 
-                                if (echar == 0x11a8) { // ¤¡
+                                if (echar == 0x11a8) { // 
 
-                                                if (c == 0x1100)        echar = 0x11a9; // ¤¡ + ¤¡
-                                                else if (c == 0x1109) echar = 0x11aa; // ¤¡ + ¤µ
+                                                if (c == 0x1100)        echar = 0x11a9; //  + 
+                                                else if (c == 0x1109) echar = 0x11aa; //  + 
                                         else { 
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return QChar(c);
                                         }
 
-                                } else if (echar == 0x11ab) { // ¤¤
+                                } else if (echar == 0x11ab) { // 
 
-                                                if (c == 0x110c)        echar = 0x11ac; // ¤¤ + ¤¸
-                                                else if (c == 0x1112)  echar = 0x11ad; // ¤¤ + ¤¾
+                                                if (c == 0x110c)        echar = 0x11ac; //  + 
+                                                else if (c == 0x1112)  echar = 0x11ad; //  + 
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return QChar(c);
                                         }
 
-                                } else if (echar == 0x11af) { // ¤©
+                                } else if (echar == 0x11af) { // 
 
-                                                if (c == 0x1100)        echar = 0x11b0; // ¤© + ¤¡
-                                                else if (c == 0x1106) echar = 0x11b1; // ¤© + ¤±
-                                                else if (c == 0x1107) echar = 0x11b2; // ¤© + ¤²
-                                                else if (c == 0x1109) echar = 0x11b3; // ¤© + ¤µ
-                                                else if (c == 0x1110) echar = 0x11b4; // ¤© + ¤¼
-                                                else if (c == 0x1111) echar = 0x11b5; // ¤© + ¤½
-                                                else if (c == 0x1112) echar = 0x11b6; // ¤© + ¤¾
+                                                if (c == 0x1100)        echar = 0x11b0; //  + 
+                                                else if (c == 0x1106) echar = 0x11b1; //  + 
+                                                else if (c == 0x1107) echar = 0x11b2; //  + 
+                                                else if (c == 0x1109) echar = 0x11b3; //  + 
+                                                else if (c == 0x1110) echar = 0x11b4; //  + 
+                                                else if (c == 0x1111) echar = 0x11b5; //  + 
+                                                else if (c == 0x1112) echar = 0x11b6; //  + 
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return QChar(c);
                                         }
 
-                                } else if (echar == 0x11b8) { // ¤²
+                                } else if (echar == 0x11b8) { // 
 
-                                                if (c == 0x1109)        echar = 0x11b9; // ¤² + ¤µ
+                                                if (c == 0x1109)        echar = 0x11b9; //  + 
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return QChar(c);
                                         }
 
-                                } else if (echar == 0x11ba) { // ¤µ 
+                                } else if (echar == 0x11ba) { //  
 
-                                                if (c == 0x1109)        echar = 0x11bb; // ¤µ + ¤µ 
+                                                if (c == 0x1109)        echar = 0x11bb; //  +  
                                         else {
                                                 schar = c; mchar = 0; echar = 0; 
                                                 return QChar(c);
diff --git a/inputmethods/kjumpx/kjumpx.pro b/inputmethods/kjumpx/kjumpx.pro
index 09e9bf1..0f708fd 100644
--- a/inputmethods/kjumpx/kjumpx.pro
+++ b/inputmethods/kjumpx/kjumpx.pro
@@ -8,7 +8,7 @@ TARGET          = qkjumpx
 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/kjumpx/opie-kjumpx.control b/inputmethods/kjumpx/opie-kjumpx.control
index 3650812..a9d004e 100644
--- a/inputmethods/kjumpx/opie-kjumpx.control
+++ b/inputmethods/kjumpx/opie-kjumpx.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson <jake@asdfnews.org>
 Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 License: GPL
 Description: Koreanized JumpX input method
  Keyboard-like input method for the Opie environment.
diff --git a/inputmethods/multikey/config.in b/inputmethods/multikey/config.in
index 4eeb326..dd3192b 100644
--- a/inputmethods/multikey/config.in
+++ b/inputmethods/multikey/config.in
@@ -1,4 +1,4 @@
   config MULTIKEY
     boolean "opie-multikey (OnScreen keyboard for multiple languages)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX && LIBOPIE2UI
+    depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index fe5051d..52c498b 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -8,9 +8,12 @@
  *
  */
 
+#include <opie2/ofiledialog.h>
+#include <opie2/qcolordialog.h>
+#include <opie2/oresource.h>
+
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
-#include <qpe/resource.h>
 
 #include <qlayout.h>
 #include <qwidget.h>
@@ -26,8 +29,6 @@
 #include <qlistbox.h>
 #include <qstringlist.h>
 #include <qtoolbutton.h>
-#include <opie2/ofiledialog.h>
-#include <opie2/qcolordialog.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include "configdlg.h"
@@ -62,14 +63,16 @@ ConfigDlg::ConfigDlg () : QDialog ()
     QVBox *vbox1 = new QVBox(hbox1);
     
     QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up"));
-    tb1->setPixmap(Resource::loadPixmap("up"));
+    tb1->setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
+    tb1->setPixmap(Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon));
     tb1->setAutoRaise(TRUE);
     tb1->setFocusPolicy(QWidget::NoFocus);
     tb1->setToggleButton(FALSE);
     connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp()));
 
     QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down"));
-    tb2->setPixmap(Resource::loadPixmap("down"));
+    tb2->setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
+    tb2->setPixmap(Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon));
     tb2->setAutoRaise(TRUE);
     tb2->setFocusPolicy(QWidget::NoFocus);
     tb2->setToggleButton(FALSE);
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 3fd621f..4ad1923 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -10,7 +10,7 @@ TARGET		= qmultikey
         DESTDIR         = $(OPIEDIR)/plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      +=  ../../launcher
-LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2
+LIBS            += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2
         QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
         VERSION         = 1.0.0
 
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control
index 5a5ce77..fc7d56c 100644
--- a/inputmethods/multikey/opie-multikey.control
+++ b/inputmethods/multikey/opie-multikey.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/inputmethods
 Maintainer: Jake Richardson (jake@asdfnews.org)
 Architecture: arm
-Depends: task-opie-minimal, opie-pickboard, libqtaux2
+Depends: task-opie-minimal, opie-pickboard, libqtaux2, libopiecore2, libopieui2
 Description: Multiple language keyboard
  Keyboard for inputing multiple languages in the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION