summaryrefslogtreecommitdiff
authordrw <drw>2005-06-15 22:54:50 (UTC)
committer drw <drw>2005-06-15 22:54:50 (UTC)
commit7ff2e7bd4620a574f3ff22a951a5904310cfd920 (patch) (unidiff)
tree6d8ffd28aadf00901b3ab560464794aded3efc76
parente0205bac48b9d23af9feb48004c24fcf7a5e8200 (diff)
downloadopie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.zip
opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.tar.gz
opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.tar.bz2
Resource -> OResource
Diffstat (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
-rw-r--r--inputmethods/kjumpx/config.in2
-rw-r--r--inputmethods/kjumpx/keyboard.cpp60
-rw-r--r--inputmethods/kjumpx/kjumpx.pro2
-rw-r--r--inputmethods/kjumpx/opie-kjumpx.control2
-rw-r--r--inputmethods/multikey/config.in2
-rw-r--r--inputmethods/multikey/configdlg.cpp13
-rw-r--r--inputmethods/multikey/multikey.pro2
-rw-r--r--inputmethods/multikey/opie-multikey.control2
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 @@
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.
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 @@
1 config KJUMPX 1 config KJUMPX
2 boolean "opie-kjumpx (korean keyboard optimized for single finger/stylus input)" 2 boolean "opie-kjumpx (korean 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/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 @@
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
@@ -153,25 +153,25 @@ Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) :
153{ 153{
154 //setPalette(QPalette(QColor(240,240,230))); // Beige! 154 //setPalette(QPalette(QColor(240,240,230))); // Beige!
155 155
156 releasedPlain = releasedShift = releasedParen = Resource::loadPixmap("kjumpx/released"); 156 releasedPlain = releasedShift = releasedParen = Opie::Core::OResource::loadPixmap("kjumpx/released");
157 pressedPlain = pressedShift = pressedParen = Resource::loadPixmap("kjumpx/pressed"); 157 pressedPlain = pressedShift = pressedParen = Opie::Core::OResource::loadPixmap("kjumpx/pressed");
158 pressedDigit = Resource::loadPixmap("kjumpx/pressed"); 158 pressedDigit = Opie::Core::OResource::loadPixmap("kjumpx/pressed");
159 159
160 QPixmap tmp; 160 QPixmap tmp;
161 161
162 tmp = Resource::loadPixmap("kjumpx/releasedShift"); 162 tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedShift");
163 bitBlt(&releasedShift, letterx1, 0, &tmp); 163 bitBlt(&releasedShift, letterx1, 0, &tmp);
164 164
165 tmp = Resource::loadPixmap("kjumpx/releasedParen"); 165 tmp = Opie::Core::OResource::loadPixmap("kjumpx/releasedParen");
166 bitBlt(&releasedParen, specialx1, 0, &tmp); 166 bitBlt(&releasedParen, specialx1, 0, &tmp);
167 167
168 tmp = Resource::loadPixmap("kjumpx/pressedShift"); 168 tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedShift");
169 bitBlt(&pressedShift, letterx1, 0, &tmp); 169 bitBlt(&pressedShift, letterx1, 0, &tmp);
170 170
171 tmp = Resource::loadPixmap("kjumpx/pressedParen"); 171 tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedParen");
172 bitBlt(&pressedParen, specialx1, 0, &tmp); 172 bitBlt(&pressedParen, specialx1, 0, &tmp);
173 173
174 tmp = Resource::loadPixmap("kjumpx/pressedDigit"); 174 tmp = Opie::Core::OResource::loadPixmap("kjumpx/pressedDigit");
175 bitBlt(&pressedDigit, specialx1, 0, &tmp); 175 bitBlt(&pressedDigit, specialx1, 0, &tmp);
176 176
177 offscreen = QPixmap( releasedPlain ); 177 offscreen = QPixmap( releasedPlain );
@@ -564,9 +564,9 @@ void Keyboard::resetState()
564 * 564 *
565 * all following chars means unicode char value and are in hex 565 * all following chars means unicode char value and are in hex
566 * 566 *
567 * ÃÊÀ½ = schar (start char) 567 * �= = schar (start char)
568 * ÁßÀ½ = mchar (middle char) 568 * �= = mchar (middle char)
569 * ³¡À½ = echar (end char) 569 * = = echar (end char)
570 * 570 *
571 * there are 19 schars. unicode position is at 1100 - 1112 571 * there are 19 schars. unicode position is at 1100 - 1112
572 * there are 21 mchars. unicode position is at 1161 - 1175 572 * there are 21 mchars. unicode position is at 1161 - 1175
@@ -610,49 +610,49 @@ QChar Keyboard::parseKoreanInput (ushort c) {
610 } 610 }
611 else { // must figure out what the echar is 611 else { // must figure out what the echar is
612 612
613 if (echar == 0x11a8) { // ¤¡ 613 if (echar == 0x11a8) { //
614 614
615 if (c == 0x1100) echar = 0x11a9; // ¤¡ + ¤¡ 615 if (c == 0x1100) echar = 0x11a9; // +
616 else if (c == 0x1109) echar = 0x11aa; // ¤¡ + ¤µ 616 else if (c == 0x1109) echar = 0x11aa; // +
617 else { 617 else {
618 schar = c; mchar = 0; echar = 0; 618 schar = c; mchar = 0; echar = 0;
619 return QChar(c); 619 return QChar(c);
620 } 620 }
621 621
622 } else if (echar == 0x11ab) { // ¤¤ 622 } else if (echar == 0x11ab) { //
623 623
624 if (c == 0x110c) echar = 0x11ac; // ¤¤ + ¤¸ 624 if (c == 0x110c) echar = 0x11ac; // +
625 else if (c == 0x1112) echar = 0x11ad; // ¤¤ + ¤¾ 625 else if (c == 0x1112) echar = 0x11ad; // +
626 else { 626 else {
627 schar = c; mchar = 0; echar = 0; 627 schar = c; mchar = 0; echar = 0;
628 return QChar(c); 628 return QChar(c);
629 } 629 }
630 630
631 } else if (echar == 0x11af) { // ¤© 631 } else if (echar == 0x11af) { //
632 632
633 if (c == 0x1100) echar = 0x11b0; // ¤© + ¤¡ 633 if (c == 0x1100) echar = 0x11b0; // +
634 else if (c == 0x1106) echar = 0x11b1; // ¤© + ¤± 634 else if (c == 0x1106) echar = 0x11b1; // +
635 else if (c == 0x1107) echar = 0x11b2; // ¤© + ¤² 635 else if (c == 0x1107) echar = 0x11b2; // +
636 else if (c == 0x1109) echar = 0x11b3; // ¤© + ¤µ 636 else if (c == 0x1109) echar = 0x11b3; // +
637 else if (c == 0x1110) echar = 0x11b4; // ¤© + ¤¼ 637 else if (c == 0x1110) echar = 0x11b4; // +
638 else if (c == 0x1111) echar = 0x11b5; // ¤© + ¤½ 638 else if (c == 0x1111) echar = 0x11b5; // +
639 else if (c == 0x1112) echar = 0x11b6; // ¤© + ¤¾ 639 else if (c == 0x1112) echar = 0x11b6; // +
640 else { 640 else {
641 schar = c; mchar = 0; echar = 0; 641 schar = c; mchar = 0; echar = 0;
642 return QChar(c); 642 return QChar(c);
643 } 643 }
644 644
645 } else if (echar == 0x11b8) { // ¤² 645 } else if (echar == 0x11b8) { //
646 646
647 if (c == 0x1109) echar = 0x11b9; // ¤² + ¤µ 647 if (c == 0x1109) echar = 0x11b9; // +
648 else { 648 else {
649 schar = c; mchar = 0; echar = 0; 649 schar = c; mchar = 0; echar = 0;
650 return QChar(c); 650 return QChar(c);
651 } 651 }
652 652
653 } else if (echar == 0x11ba) { // ¤µ 653 } else if (echar == 0x11ba) { //
654 654
655 if (c == 0x1109) echar = 0x11bb; // ¤µ + ¤µ 655 if (c == 0x1109) echar = 0x11bb; // +
656 else { 656 else {
657 schar = c; mchar = 0; echar = 0; 657 schar = c; mchar = 0; echar = 0;
658 return QChar(c); 658 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
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/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
4Section: opie/inputmethods 4Section: opie/inputmethods
5Maintainer: Jake Richardson <jake@asdfnews.org> 5Maintainer: Jake Richardson <jake@asdfnews.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8License: GPL 8License: GPL
9Description: Koreanized JumpX input method 9Description: Koreanized JumpX input method
10 Keyboard-like input method for the Opie environment. 10 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 @@
1 config MULTIKEY 1 config MULTIKEY
2 boolean "opie-multikey (OnScreen keyboard for multiple languages)" 2 boolean "opie-multikey (OnScreen keyboard for multiple languages)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX && LIBOPIE2UI 4 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 @@
8 * 8 *
9 */ 9 */
10 10
11#include <opie2/ofiledialog.h>
12#include <opie2/qcolordialog.h>
13#include <opie2/oresource.h>
14
11#include <qpe/qpeapplication.h> 15#include <qpe/qpeapplication.h>
12#include <qpe/config.h> 16#include <qpe/config.h>
13#include <qpe/resource.h>
14 17
15#include <qlayout.h> 18#include <qlayout.h>
16#include <qwidget.h> 19#include <qwidget.h>
@@ -26,8 +29,6 @@
26#include <qlistbox.h> 29#include <qlistbox.h>
27#include <qstringlist.h> 30#include <qstringlist.h>
28#include <qtoolbutton.h> 31#include <qtoolbutton.h>
29#include <opie2/ofiledialog.h>
30#include <opie2/qcolordialog.h>
31#include <qdir.h> 32#include <qdir.h>
32#include <qfileinfo.h> 33#include <qfileinfo.h>
33#include "configdlg.h" 34#include "configdlg.h"
@@ -62,14 +63,16 @@ ConfigDlg::ConfigDlg () : QDialog ()
62 QVBox *vbox1 = new QVBox(hbox1); 63 QVBox *vbox1 = new QVBox(hbox1);
63 64
64 QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up")); 65 QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up"));
65 tb1->setPixmap(Resource::loadPixmap("up")); 66 tb1->setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
67 tb1->setPixmap(Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon));
66 tb1->setAutoRaise(TRUE); 68 tb1->setAutoRaise(TRUE);
67 tb1->setFocusPolicy(QWidget::NoFocus); 69 tb1->setFocusPolicy(QWidget::NoFocus);
68 tb1->setToggleButton(FALSE); 70 tb1->setToggleButton(FALSE);
69 connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp())); 71 connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp()));
70 72
71 QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down")); 73 QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down"));
72 tb2->setPixmap(Resource::loadPixmap("down")); 74 tb2->setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
75 tb2->setPixmap(Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon));
73 tb2->setAutoRaise(TRUE); 76 tb2->setAutoRaise(TRUE);
74 tb2->setFocusPolicy(QWidget::NoFocus); 77 tb2->setFocusPolicy(QWidget::NoFocus);
75 tb2->setToggleButton(FALSE); 78 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
10 DESTDIR = $(OPIEDIR)/plugins/inputmethods 10 DESTDIR = $(OPIEDIR)/plugins/inputmethods
11INCLUDEPATH += $(OPIEDIR)/include 11INCLUDEPATH += $(OPIEDIR)/include
12DEPENDPATH += ../../launcher 12DEPENDPATH += ../../launcher
13LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2 13LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2
14 QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods 14 QMAKE_LFLAGS+= -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
15 VERSION = 1.0.0 15 VERSION = 1.0.0
16 16
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
4Section: opie/inputmethods 4Section: opie/inputmethods
5Maintainer: Jake Richardson (jake@asdfnews.org) 5Maintainer: Jake Richardson (jake@asdfnews.org)
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal, opie-pickboard, libqtaux2 7Depends: task-opie-minimal, opie-pickboard, libqtaux2, libopiecore2, libopieui2
8Description: Multiple language keyboard 8Description: Multiple language keyboard
9 Keyboard for inputing multiple languages in the Opie environment. 9 Keyboard for inputing multiple languages in the Opie environment.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION