author | drw <drw> | 2005-06-15 22:54:50 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 22:54:50 (UTC) |
commit | 7ff2e7bd4620a574f3ff22a951a5904310cfd920 (patch) (unidiff) | |
tree | 6d8ffd28aadf00901b3ab560464794aded3efc76 | |
parent | e0205bac48b9d23af9feb48004c24fcf7a5e8200 (diff) | |
download | opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.zip opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.tar.gz opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.tar.bz2 |
Resource -> OResource
-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 | ||||
-rw-r--r-- | inputmethods/kjumpx/config.in | 2 | ||||
-rw-r--r-- | inputmethods/kjumpx/keyboard.cpp | 60 | ||||
-rw-r--r-- | inputmethods/kjumpx/kjumpx.pro | 2 | ||||
-rw-r--r-- | inputmethods/kjumpx/opie-kjumpx.control | 2 | ||||
-rw-r--r-- | inputmethods/multikey/config.in | 2 | ||||
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 13 | ||||
-rw-r--r-- | inputmethods/multikey/multikey.pro | 2 | ||||
-rw-r--r-- | inputmethods/multikey/opie-multikey.control | 2 |
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 | |||
@@ -1,15 +1,15 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = keyboard.h \ | 3 | HEADERS = keyboard.h \ |
4 | keyboardimpl.h | 4 | keyboardimpl.h |
5 | SOURCES = keyboard.cpp \ | 5 | SOURCES = keyboard.cpp \ |
6 | keyboardimpl.cpp | 6 | keyboardimpl.cpp |
7 | TARGET = qjumpx | 7 | TARGET = qjumpx |
8 | DESTDIR = ../../plugins/inputmethods | 8 | DESTDIR = ../../plugins/inputmethods |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += -lqpe | 11 | LIBS += -lqpe -lopiecore2 |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
13 | 13 | ||
14 | include( $(OPIEDIR)/include.pro ) | 14 | include( $(OPIEDIR)/include.pro ) |
15 | target.path = $$prefix/plugins/inputmethods | 15 | target.path = $$prefix/plugins/inputmethods |
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 | |||
@@ -2,25 +2,25 @@ | |||
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
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 | ||
18 | 18 | ||
19 | static const int autorepeatDelaytime = 500; // ms | 19 | static const int autorepeatDelaytime = 500; // ms |
20 | static const int autorepeatRate = 20; // chars per second | 20 | static const int autorepeatRate = 20; // chars per second |
21 | 21 | ||
22 | static const int mod1x1 = 0; | 22 | static const int mod1x1 = 0; |
23 | static const int mod1x2 = 23; | 23 | static const int mod1x2 = 23; |
24 | static const int mod1w = mod1x2 - mod1x1; | 24 | static const int mod1w = mod1x2 - mod1x1; |
25 | 25 | ||
26 | static const int letterx1 = 27; | 26 | static const int letterx1 = 27; |
@@ -128,43 +128,43 @@ using namespace JumpX; | |||
128 | 128 | ||
129 | Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : | 129 | Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : |
130 | QFrame(parent, name, f), | 130 | QFrame(parent, name, f), |
131 | shift(0), paren(0), ctrl(0), alt(0), | 131 | shift(0), paren(0), ctrl(0), alt(0), |
132 | pressedKeyUnicode(0), pressedKeyQcode(0), pressedMod(0), | 132 | pressedKeyUnicode(0), pressedKeyQcode(0), pressedMod(0), |
133 | isnoncont(false), | 133 | isnoncont(false), |
134 | slideKeyUnicodeH(0), slideKeyQcodeH(0), slideKeyUnicodeV(0), slideKeyQcodeV(0), | 134 | slideKeyUnicodeH(0), slideKeyQcodeH(0), slideKeyUnicodeV(0), slideKeyQcodeV(0), |
135 | enableMouseTracking(false), slidePix(NULL), slidePixH(NULL), slidePixV(NULL), | 135 | enableMouseTracking(false), slidePix(NULL), slidePixH(NULL), slidePixV(NULL), |
136 | releasedPix(NULL), pressedPix(NULL) | 136 | releasedPix(NULL), pressedPix(NULL) |
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 ); |
162 | 162 | ||
163 | releasedPix = &releasedPlain; | 163 | releasedPix = &releasedPlain; |
164 | pressedPix = &pressedPlain; | 164 | pressedPix = &pressedPlain; |
165 | slidePix = &pressedPlain; | 165 | slidePix = &pressedPlain; |
166 | 166 | ||
167 | delayTimer = new QTimer(this); | 167 | delayTimer = new QTimer(this); |
168 | rateTimer = new QTimer(this); | 168 | rateTimer = new QTimer(this); |
169 | connect( delayTimer, SIGNAL( timeout() ), this, SLOT( delayTimerDone() ) ); | 169 | connect( delayTimer, SIGNAL( timeout() ), this, SLOT( delayTimerDone() ) ); |
170 | connect( rateTimer, SIGNAL( timeout() ), this, SLOT( rateTimerDone() ) ); | 170 | connect( rateTimer, SIGNAL( timeout() ), this, SLOT( rateTimerDone() ) ); |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-jumpx | 1 | Package: opie-jumpx |
2 | Files: plugins/inputmethods/libqjumpx.so* pics/jumpx | 2 | Files: plugins/inputmethods/libqjumpx.so* pics/jumpx |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/inputmethods | 4 | Section: opie/inputmethods |
5 | Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at> | 5 | Maintainer: Markus Gritsch <gritsch@iue.tuwien.ac.at> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | License: GPL | 8 | License: GPL |
9 | Description: JumpX input method | 9 | Description: JumpX input method |
10 | Keyboard-like input method for the Opie environment. | 10 | Keyboard-like input method for the Opie environment. |
11 | Version: $QPE_VERSION$EXTRAVERSION | 11 | Version: $QPE_VERSION$EXTRAVERSION |
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 | |||
@@ -2,25 +2,25 @@ | |||
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
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 | ||
18 | 18 | ||
19 | static const int autorepeatDelaytime = 500; // ms | 19 | static const int autorepeatDelaytime = 500; // ms |
20 | static const int autorepeatRate = 20; // chars per second | 20 | static const int autorepeatRate = 20; // chars per second |
21 | 21 | ||
22 | static const int mod1x1 = 0; | 22 | static const int mod1x1 = 0; |
23 | static const int mod1x2 = 23; | 23 | static const int mod1x2 = 23; |
24 | static const int mod1w = mod1x2 - mod1x1; | 24 | static const int mod1w = mod1x2 - mod1x1; |
25 | 25 | ||
26 | static const int letterx1 = 27; | 26 | static const int letterx1 = 27; |
@@ -144,43 +144,43 @@ using namespace KJumpX; | |||
144 | 144 | ||
145 | Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : | 145 | Keyboard::Keyboard(QWidget* parent, const char* name, WFlags f) : |
146 | QFrame(parent, name, f), | 146 | QFrame(parent, name, f), |
147 | shift(0), paren(0), ctrl(0), alt(0), lang(1), lastKey(0), | 147 | shift(0), paren(0), ctrl(0), alt(0), lang(1), lastKey(0), |
148 | pressedKeyUnicode(0), pressedKeyQcode(0), pressedMod(0), | 148 | pressedKeyUnicode(0), pressedKeyQcode(0), pressedMod(0), |
149 | isnoncont(false), | 149 | isnoncont(false), |
150 | slideKeyUnicodeH(0), slideKeyQcodeH(0), slideKeyUnicodeV(0), slideKeyQcodeV(0), | 150 | slideKeyUnicodeH(0), slideKeyQcodeH(0), slideKeyUnicodeV(0), slideKeyQcodeV(0), |
151 | enableMouseTracking(false), slidePix(NULL), slidePixH(NULL), slidePixV(NULL), | 151 | enableMouseTracking(false), slidePix(NULL), slidePixH(NULL), slidePixV(NULL), |
152 | releasedPix(NULL), pressedPix(NULL) | 152 | releasedPix(NULL), pressedPix(NULL) |
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 ); |
178 | 178 | ||
179 | releasedPix = &releasedPlain; | 179 | releasedPix = &releasedPlain; |
180 | pressedPix = &pressedPlain; | 180 | pressedPix = &pressedPlain; |
181 | slidePix = &pressedPlain; | 181 | slidePix = &pressedPlain; |
182 | 182 | ||
183 | delayTimer = new QTimer(this); | 183 | delayTimer = new QTimer(this); |
184 | rateTimer = new QTimer(this); | 184 | rateTimer = new QTimer(this); |
185 | connect( delayTimer, SIGNAL( timeout() ), this, SLOT( delayTimerDone() ) ); | 185 | connect( delayTimer, SIGNAL( timeout() ), this, SLOT( delayTimerDone() ) ); |
186 | connect( rateTimer, SIGNAL( timeout() ), this, SLOT( rateTimerDone() ) ); | 186 | connect( rateTimer, SIGNAL( timeout() ), this, SLOT( rateTimerDone() ) ); |
@@ -555,27 +555,27 @@ void Keyboard::resetState() | |||
555 | * one major problem with this implementation is that you can't move the | 555 | * one major problem with this implementation is that you can't move the |
556 | * cursor after inputing korean chars, otherwise it will eat up and replace | 556 | * cursor after inputing korean chars, otherwise it will eat up and replace |
557 | * the char before the cursor you move to. fix that | 557 | * the char before the cursor you move to. fix that |
558 | * | 558 | * |
559 | * make a kor/eng swaping key | 559 | * make a kor/eng swaping key |
560 | * | 560 | * |
561 | * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 561 | * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
562 | * | 562 | * |
563 | * how korean input works | 563 | * how korean input works |
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 |
573 | * there are 27 echars. unicode position is at 11a8 - 11c2 | 573 | * there are 27 echars. unicode position is at 11a8 - 11c2 |
574 | * | 574 | * |
575 | * the map with everything combined is at ac00 - d7a3 | 575 | * the map with everything combined is at ac00 - d7a3 |
576 | * | 576 | * |
577 | * to find a combination of schar + mchar in the map, lookup | 577 | * to find a combination of schar + mchar in the map, lookup |
578 | * ((schar - 0x1100) * 587) + ((mchar - 0x1161) * 27) + (echar - 0x11a8) + 0xac00) | 578 | * ((schar - 0x1100) * 587) + ((mchar - 0x1161) * 27) + (echar - 0x11a8) + 0xac00) |
579 | * | 579 | * |
580 | */ | 580 | */ |
581 | 581 | ||
@@ -601,67 +601,67 @@ QChar Keyboard::parseKoreanInput (ushort c) { | |||
601 | 601 | ||
602 | if (echar == 0) { | 602 | if (echar == 0) { |
603 | 603 | ||
604 | if (!(echar = constoe(c))) { | 604 | if (!(echar = constoe(c))) { |
605 | 605 | ||
606 | schar = c; mchar = 0; echar = 0; | 606 | schar = c; mchar = 0; echar = 0; |
607 | return QChar(c); | 607 | return QChar(c); |
608 | } | 608 | } |
609 | 609 | ||
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); |
659 | } | 659 | } |
660 | 660 | ||
661 | } else { // if any other char, cannot combine chars | 661 | } else { // if any other char, cannot combine chars |
662 | 662 | ||
663 | schar = c; mchar = 0; echar = 0; | 663 | schar = c; mchar = 0; echar = 0; |
664 | return QChar(c); | 664 | return QChar(c); |
665 | } | 665 | } |
666 | 666 | ||
667 | lastKey = echar; | 667 | lastKey = echar; |
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 | |||
@@ -1,15 +1,15 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = keyboard.h \ | 3 | HEADERS = keyboard.h \ |
4 | keyboardimpl.h | 4 | keyboardimpl.h |
5 | SOURCES = keyboard.cpp \ | 5 | SOURCES = keyboard.cpp \ |
6 | keyboardimpl.cpp | 6 | keyboardimpl.cpp |
7 | TARGET = qkjumpx | 7 | TARGET = qkjumpx |
8 | DESTDIR = ../../plugins/inputmethods | 8 | DESTDIR = ../../plugins/inputmethods |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += -lqpe | 11 | LIBS += -lqpe -lopiecore2 |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
13 | 13 | ||
14 | include( $(OPIEDIR)/include.pro ) | 14 | include( $(OPIEDIR)/include.pro ) |
15 | target.path = $$prefix/plugins/inputmethods | 15 | target.path = $$prefix/plugins/inputmethods |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-kjumpx | 1 | Package: opie-kjumpx |
2 | Files: plugins/inputmethods/libqkjumpx.so* pics/kjumpx/* | 2 | Files: plugins/inputmethods/libqkjumpx.so* pics/kjumpx/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/inputmethods | 4 | Section: opie/inputmethods |
5 | Maintainer: Jake Richardson <jake@asdfnews.org> | 5 | Maintainer: Jake Richardson <jake@asdfnews.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | License: GPL | 8 | License: GPL |
9 | Description: Koreanized JumpX input method | 9 | Description: Koreanized JumpX input method |
10 | Keyboard-like input method for the Opie environment. | 10 | Keyboard-like input method for the Opie environment. |
11 | Version: $QPE_VERSION$EXTRAVERSION | 11 | Version: $QPE_VERSION$EXTRAVERSION |
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 | |||
@@ -1,42 +1,43 @@ | |||
1 | /* | 1 | /* |
2 | * TODO | 2 | * TODO |
3 | * make a font selection thing (size too) | 3 | * make a font selection thing (size too) |
4 | * make a keymap editor | 4 | * make a keymap editor |
5 | * make keys translucent | 5 | * make keys translucent |
6 | * make vertical keys possible | 6 | * make vertical keys possible |
7 | * | 7 | * |
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> |
17 | #include <qdialog.h> | 20 | #include <qdialog.h> |
18 | #include <qtabwidget.h> | 21 | #include <qtabwidget.h> |
19 | #include <qvbox.h> | 22 | #include <qvbox.h> |
20 | #include <qgrid.h> | 23 | #include <qgrid.h> |
21 | #include <qgroupbox.h> | 24 | #include <qgroupbox.h> |
22 | #include <qlabel.h> | 25 | #include <qlabel.h> |
23 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
24 | #include <qsizepolicy.h> | 27 | #include <qsizepolicy.h> |
25 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
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" |
34 | #include "keyboard.h" | 35 | #include "keyboard.h" |
35 | 36 | ||
36 | using namespace Opie; | 37 | using namespace Opie; |
37 | using namespace Opie::Ui; | 38 | using namespace Opie::Ui; |
38 | // ConfigDlg::ConfigDlg() {{{1 | 39 | // ConfigDlg::ConfigDlg() {{{1 |
39 | ConfigDlg::ConfigDlg () : QDialog () | 40 | ConfigDlg::ConfigDlg () : QDialog () |
40 | { | 41 | { |
41 | setCaption( tr("Multikey Configuration") ); | 42 | setCaption( tr("Multikey Configuration") ); |
42 | Config config ("multikey"); | 43 | Config config ("multikey"); |
@@ -53,32 +54,34 @@ ConfigDlg::ConfigDlg () : QDialog () | |||
53 | 54 | ||
54 | QWidget *gen_box = new QWidget(tabs, "gen_tab"); | 55 | QWidget *gen_box = new QWidget(tabs, "gen_tab"); |
55 | QVBoxLayout *gen_lay = new QVBoxLayout(gen_box); | 56 | QVBoxLayout *gen_lay = new QVBoxLayout(gen_box); |
56 | gen_lay->setMargin(3); | 57 | gen_lay->setMargin(3); |
57 | QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); | 58 | QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); |
58 | 59 | ||
59 | QHBox *hbox1 = new QHBox(map_group); | 60 | QHBox *hbox1 = new QHBox(map_group); |
60 | keymaps = new QListBox(hbox1); | 61 | keymaps = new QListBox(hbox1); |
61 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); | 62 | keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); |
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); |
76 | connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown())); | 79 | connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown())); |
77 | 80 | ||
78 | QString cur(tr("Current Language")); | 81 | QString cur(tr("Current Language")); |
79 | keymaps->insertItem(cur); | 82 | keymaps->insertItem(cur); |
80 | keymaps->setSelected(0, true); | 83 | keymaps->setSelected(0, true); |
81 | 84 | ||
82 | QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap"); | 85 | QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap"); |
83 | default_maps = map_dir.entryList(); // so i can access it in other places | 86 | default_maps = map_dir.entryList(); // so i can access it in other places |
84 | custom_maps = config.readListEntry("maps", QChar('|')); | 87 | custom_maps = config.readListEntry("maps", QChar('|')); |
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 | |||
@@ -1,18 +1,18 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS= keyboard.h \ | 3 | HEADERS= keyboard.h \ |
4 | configdlg.h \ | 4 | configdlg.h \ |
5 | keyboardimpl.h | 5 | keyboardimpl.h |
6 | SOURCES= keyboard.cpp \ | 6 | SOURCES= keyboard.cpp \ |
7 | configdlg.cpp \ | 7 | configdlg.cpp \ |
8 | keyboardimpl.cpp | 8 | keyboardimpl.cpp |
9 | TARGET = qmultikey | 9 | TARGET = qmultikey |
10 | DESTDIR = $(OPIEDIR)/plugins/inputmethods | 10 | DESTDIR = $(OPIEDIR)/plugins/inputmethods |
11 | INCLUDEPATH += $(OPIEDIR)/include | 11 | INCLUDEPATH += $(OPIEDIR)/include |
12 | DEPENDPATH += ../../launcher | 12 | DEPENDPATH += ../../launcher |
13 | LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2 | 13 | LIBS += -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 | ||
17 | include( $(OPIEDIR)/include.pro ) | 17 | include( $(OPIEDIR)/include.pro ) |
18 | target.path = $$prefix/plugins/inputmethods | 18 | target.path = $$prefix/plugins/inputmethods |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-multikey | 1 | Package: opie-multikey |
2 | Files: plugins/inputmethods/libqmultikey.so* share/multikey/* | 2 | Files: plugins/inputmethods/libqmultikey.so* share/multikey/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/inputmethods | 4 | Section: opie/inputmethods |
5 | Maintainer: Jake Richardson (jake@asdfnews.org) | 5 | Maintainer: Jake Richardson (jake@asdfnews.org) |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal, opie-pickboard, libqtaux2 | 7 | Depends: task-opie-minimal, opie-pickboard, libqtaux2, libopiecore2, libopieui2 |
8 | Description: Multiple language keyboard | 8 | Description: Multiple language keyboard |
9 | Keyboard for inputing multiple languages in the Opie environment. | 9 | Keyboard for inputing multiple languages in the Opie environment. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |