summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-15 02:30:08 (UTC)
committer zecke <zecke>2004-10-15 02:30:08 (UTC)
commit5c3759f02725c17ba0efc386193a83da55a9a5da (patch) (unidiff)
treeb03e604b282de315096b74b6f404851c2bba3ad6
parentfefeafe35f8dac30f4baab9e3bff8e2ffbd1afd0 (diff)
downloadopie-5c3759f02725c17ba0efc386193a83da55a9a5da.zip
opie-5c3759f02725c17ba0efc386193a83da55a9a5da.tar.gz
opie-5c3759f02725c17ba0efc386193a83da55a9a5da.tar.bz2
Apply patch from Qtopia1.7 to allow 'Umlaute' in the pickboard
and make 'strings' translatable. This also fixes #501
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/pickboard/pickboard.cpp25
-rw-r--r--inputmethods/pickboard/pickboardcfg.cpp69
-rw-r--r--inputmethods/pickboard/pickboardcfg.h19
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp6
-rw-r--r--inputmethods/pickboard/pickboardpicks.cpp31
5 files changed, 91 insertions, 59 deletions
diff --git a/inputmethods/pickboard/pickboard.cpp b/inputmethods/pickboard/pickboard.cpp
index 087144e..1611cb0 100644
--- a/inputmethods/pickboard/pickboard.cpp
+++ b/inputmethods/pickboard/pickboard.cpp
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -25,25 +25,43 @@
25 25
26#include <qpainter.h> 26#include <qpainter.h>
27#include <qlist.h> 27#include <qlist.h>
28#include <qbitmap.h> 28#include <qbitmap.h>
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qvbox.h> 30#include <qvbox.h>
31#include <qdialog.h> 31#include <qdialog.h>
32#include <qscrollview.h> 32#include <qscrollview.h>
33#include <qpopupmenu.h> 33#include <qpopupmenu.h>
34#include <qhbuttongroup.h> 34#include <qhbuttongroup.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qmessagebox.h> 36#include <qmessagebox.h>
37#ifdef QWS
37#include <qwindowsystem_qws.h> 38#include <qwindowsystem_qws.h>
39#endif
40
41/*! \class Pickboard
42 \brief The Pickboard class provides an input method
43 based on a virtual keyboard combined with word-completion.
44
45 This version of Pickboard is Dual Licensed Software. However, for you to be
46 able to license the technology to others, you may require a T9(R) Text
47 Input license from Tegic Communications Corporation. More information can
48 be found at http://www.t9.com/.
49
50 \legalese
51 This version of Pickboard is Dual Licensed Software. However, for you to be
52 able to license the technology to others, you may require a T9(R) Text
53 Input license from Tegic Communications Corporation. More information can
54 be found at http://www.t9.com/.
55*/
38 56
39/* XPM */ 57/* XPM */
40static const char * const menu_xpm[]={ 58static const char * const menu_xpm[]={
41"9 9 2 1", 59"9 9 2 1",
42"a c #000000", 60"a c #000000",
43". c None", 61". c None",
44".........", 62".........",
45".........", 63".........",
46".........", 64".........",
47"....a....", 65"....a....",
48"...aaa...", 66"...aaa...",
49"..aaaaa..", 67"..aaaaa..",
@@ -65,25 +83,28 @@ public:
65 parent,SIGNAL(key(ushort,ushort,ushort,bool,bool))); 83 parent,SIGNAL(key(ushort,ushort,ushort,bool,bool)));
66 } 84 }
67 85
68 PickboardPicks* picks; 86 PickboardPicks* picks;
69 QPushButton* menu; 87 QPushButton* menu;
70}; 88};
71 89
72Pickboard::Pickboard(QWidget* parent, const char* name, WFlags f) : 90Pickboard::Pickboard(QWidget* parent, const char* name, WFlags f) :
73 QFrame(parent,name,f) 91 QFrame(parent,name,f)
74{ 92{
75 (new QHBoxLayout(this))->setAutoAdd(TRUE); 93 (new QHBoxLayout(this))->setAutoAdd(TRUE);
76 d = new PickboardPrivate(this); 94 d = new PickboardPrivate(this);
95// under Win32 we may not have smallsmooth font
96#ifndef Q_OS_WIN32
77 setFont( QFont( "smallsmooth", 9 ) ); 97 setFont( QFont( "smallsmooth", 9 ) );
98#endif
78} 99}
79 100
80Pickboard::~Pickboard() 101Pickboard::~Pickboard()
81{ 102{
82 delete d; 103 delete d;
83} 104}
84 105
85void Pickboard::resetState() 106void Pickboard::resetState()
86{ 107{
87 d->picks->resetState(); 108 d->picks->resetState();
88} 109}
89 110
diff --git a/inputmethods/pickboard/pickboardcfg.cpp b/inputmethods/pickboard/pickboardcfg.cpp
index d500266..70a89cd 100644
--- a/inputmethods/pickboard/pickboardcfg.cpp
+++ b/inputmethods/pickboard/pickboardcfg.cpp
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -25,35 +25,37 @@
25 25
26#include <qpainter.h> 26#include <qpainter.h>
27#include <qlist.h> 27#include <qlist.h>
28#include <qbitmap.h> 28#include <qbitmap.h>
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qvbox.h> 30#include <qvbox.h>
31#include <qdialog.h> 31#include <qdialog.h>
32#include <qscrollview.h> 32#include <qscrollview.h>
33#include <qpopupmenu.h> 33#include <qpopupmenu.h>
34#include <qhbuttongroup.h> 34#include <qhbuttongroup.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
36#include <qmessagebox.h> 36#include <qmessagebox.h>
37#ifdef QWS
37#include <qwindowsystem_qws.h> 38#include <qwindowsystem_qws.h>
39#endif
38 40
39static const char * pickboard_help = 41static const char * pickboard_help =
40 "<h1>The Pickboard</h1>" 42 QT_TRANSLATE_NOOP("PickboardConfig", "<h1>The Pickboard</h1>"
41 "<i>The smallest and fastest way to type.</i>" 43 "<i>The smallest and fastest way to type.</i>"
42 "<p>" 44 "<p>"
43 "Enter a word by tapping letter-groups and picking the word." 45 "Enter a word by tapping letter-groups and picking the word."
44 "<br>Enter spaces with \"Space\", or other keys through \"KEY\"." 46 "<br>Enter spaces with \"Space\", or other keys through \"KEY\"."
45 "<br>Use \"Shift\" to capitalize words that are not normally capitalized." 47 "<br>Use \"Shift\" to capitalize words that are not normally capitalized."
46 "<br>Press \"Shift\" twice for an all-capitals word." 48 "<br>Press \"Shift\" twice for an all-capitals word."
47 "<br>Add custom words by picking them, then selecting \"Add...\" from the menu on the right." 49 "<br>Add custom words by picking them, then selecting \"Add...\" from the menu on the right." )
48 ; 50 ;
49 51
50const int intermatchmargin=5; 52const int intermatchmargin=5;
51 53
52 54
53PickboardConfig::~PickboardConfig() { } 55PickboardConfig::~PickboardConfig() { }
54 56
55void PickboardConfig::updateRows(int from, int to) 57void PickboardConfig::updateRows(int from, int to)
56{ 58{
57 if ( from != to ) { // (all) 59 if ( from != to ) { // (all)
58 parent->update(); 60 parent->update();
59 } else { 61 } else {
@@ -67,28 +69,32 @@ void PickboardConfig::updateItem(int r, int)
67{ 69{
68 updateRows(r,r); 70 updateRows(r,r);
69} 71}
70 72
71void PickboardConfig::changeMode(int m) 73void PickboardConfig::changeMode(int m)
72{ 74{
73 parent->setMode(m); 75 parent->setMode(m);
74} 76}
75void PickboardConfig::generateText(const QString& s) 77void PickboardConfig::generateText(const QString& s)
76{ 78{
77#if defined(Q_WS_QWS) || defined(_WS_QWS_) 79#if defined(Q_WS_QWS) || defined(_WS_QWS_)
78 for (int i=0; i<(int)s.length(); i++) { 80 for (int i=0; i<(int)s.length(); i++) {
79 parent->emitKey(s[i].unicode(), 0, 0, true, false); 81 uint code = 0;
80 parent->emitKey(s[i].unicode(), 0, 0, false, false); 82 if ( s[i].unicode() >= 'a' && s[i].unicode() <= 'z' ) {
83 code = s[i].unicode() - 'a' + Key_A;
84 }
85 parent->emitKey(s[i].unicode(), code, 0, true, false);
86 parent->emitKey(s[i].unicode(), code, 0, false, false);
81 } 87 }
82#endif 88#endif
83} 89}
84void PickboardConfig::generateKey( int k ) 90void PickboardConfig::generateKey( int k )
85{ 91{
86#if defined(Q_WS_QWS) || defined(_WS_QWS_) 92#if defined(Q_WS_QWS) || defined(_WS_QWS_)
87 parent->emitKey(0, k, 0, true, false); 93 parent->emitKey(0, k, 0, true, false);
88 parent->emitKey(0, k, 0, false, false); 94 parent->emitKey(0, k, 0, false, false);
89#endif 95#endif
90} 96}
91 97
92void PickboardConfig::pickPoint(const QPoint& p, bool press) 98void PickboardConfig::pickPoint(const QPoint& p, bool press)
93{ 99{
94 if ( press ) { 100 if ( press ) {
@@ -103,40 +109,40 @@ void PickboardConfig::pickPoint(const QPoint& p, bool press)
103 return; 109 return;
104 } 110 }
105 y += ls; 111 y += ls;
106 } 112 }
107 } else if ( pressx >= 0 ) { 113 } else if ( pressx >= 0 ) {
108 pickInRow( pressrow, pressx, FALSE ); 114 pickInRow( pressrow, pressx, FALSE );
109 pressx = -1; 115 pressx = -1;
110 } 116 }
111} 117}
112 118
113void PickboardConfig::fillMenu(QPopupMenu& menu) 119void PickboardConfig::fillMenu(QPopupMenu& menu)
114{ 120{
115 menu.insertItem("Reset",100); 121 menu.insertItem(tr("Reset"),100);
116 menu.insertSeparator(); 122 menu.insertSeparator();
117 menu.insertItem("Help",1); 123 menu.insertItem(tr("Help"),1);
118} 124}
119 125
120void PickboardConfig::doMenu(int i) 126void PickboardConfig::doMenu(int i)
121{ 127{
122 switch (i) { 128 switch (i) {
123 case 100: 129 case 100:
124 if ( parent->currentMode() ) { 130 if ( parent->currentMode() ) {
125 changeMode(0); 131 changeMode(0);
126 updateRows(0,1); 132 updateRows(0,1);
127 } 133 }
128 break; 134 break;
129 case 1: { 135 case 1: {
130 QMessageBox help("Pickboard Help", pickboard_help, 136 QMessageBox help(tr("Pickboard Help"), tr(pickboard_help),
131 QMessageBox::NoIcon, 1, 0, 0); 137 QMessageBox::NoIcon, 1, 0, 0);
132 help.showMaximized(); 138 help.showMaximized();
133 help.exec(); 139 help.exec();
134 } 140 }
135 } 141 }
136} 142}
137 143
138void StringConfig::draw(QPainter* p) 144void StringConfig::draw(QPainter* p)
139{ 145{
140 QFontMetrics fm = p->fontMetrics(); 146 QFontMetrics fm = p->fontMetrics();
141 147
142 for (int r=0; r<nrows; r++) { 148 for (int r=0; r<nrows; r++) {
@@ -149,28 +155,28 @@ void StringConfig::draw(QPainter* p)
149 for (; !(s=text(r,i)).isNull(); ++i) { 155 for (; !(s=text(r,i)).isNull(); ++i) {
150 int w = fm.width(s); 156 int w = fm.width(s);
151 tw += w; 157 tw += w;
152 } 158 }
153 bool spread = spreadRow(r);// && parent->width() > tw; 159 bool spread = spreadRow(r);// && parent->width() > tw;
154 int xw = spread ? (parent->width()-tw)/(i-1) : 3; 160 int xw = spread ? (parent->width()-tw)/(i-1) : 3;
155 int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; 161 int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2;
156 162
157 i=0; 163 i=0;
158 for (; !(s=text(r,i)).isNull(); ++i) { 164 for (; !(s=text(r,i)).isNull(); ++i) {
159 int w = fm.width(s)+xw; 165 int w = fm.width(s)+xw;
160 if ( highlight(r,i) ) { 166 if ( highlight(r,i) ) {
161 p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),::Qt::black); 167 p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),Qt::black);
162 p->setPen(::Qt::white); 168 p->setPen(Qt::white);
163 }else{ 169 }else{
164 p->setPen(::Qt::black); 170 p->setPen(Qt::black);
165 } 171 }
166 p->drawText(x,-fm.descent()-1,s); 172 p->drawText(x,-fm.descent()-1,s);
167 x += w; 173 x += w;
168 } 174 }
169 } 175 }
170} 176}
171 177
172void StringConfig::pickInRow(int r, int xpos, bool press) 178void StringConfig::pickInRow(int r, int xpos, bool press)
173{ 179{
174 QFontMetrics fm = parent->fontMetrics(); 180 QFontMetrics fm = parent->fontMetrics();
175 181
176 int tw=0; 182 int tw=0;
@@ -284,27 +290,27 @@ PickboardAdd::PickboardAdd(QWidget* owner, const QStringList& setlist) :
284 setMaximumHeight(200); // ### QDialog shouldn't allow us to be bigger than the screen 290 setMaximumHeight(200); // ### QDialog shouldn't allow us to be bigger than the screen
285 QVBox *letters = new QVBox(sv); 291 QVBox *letters = new QVBox(sv);
286 letters->setSpacing(0); 292 letters->setSpacing(0);
287 lc = new LetterChoice*[setlist.count()]; 293 lc = new LetterChoice*[setlist.count()];
288 nlc = (int)setlist.count(); 294 nlc = (int)setlist.count();
289 for (int i=0; i<nlc; i++) { 295 for (int i=0; i<nlc; i++) {
290 lc[i] = new LetterChoice(letters,setlist[i]); 296 lc[i] = new LetterChoice(letters,setlist[i]);
291 connect(lc[i],SIGNAL(changed()),this,SLOT(checkAllDone())); 297 connect(lc[i],SIGNAL(changed()),this,SLOT(checkAllDone()));
292 } 298 }
293 sv->addChild(letters); 299 sv->addChild(letters);
294 QHBox* hb = new QHBox(this); 300 QHBox* hb = new QHBox(this);
295 hb->setSpacing(0); 301 hb->setSpacing(0);
296 yes = new QPushButton("OK",hb); 302 yes = new QPushButton(tr("OK"),hb);
297 yes->setEnabled(FALSE); 303 yes->setEnabled(FALSE);
298 QPushButton *no = new QPushButton("Cancel",hb); 304 QPushButton *no = new QPushButton(tr("Cancel"),hb);
299 connect(yes, SIGNAL(clicked()), this, SLOT(accept())); 305 connect(yes, SIGNAL(clicked()), this, SLOT(accept()));
300 connect(no, SIGNAL(clicked()), this, SLOT(reject())); 306 connect(no, SIGNAL(clicked()), this, SLOT(reject()));
301} 307}
302 308
303PickboardAdd::~PickboardAdd() 309PickboardAdd::~PickboardAdd()
304{ 310{
305 delete [] lc; 311 delete [] lc;
306} 312}
307 313
308QString PickboardAdd::word() const 314QString PickboardAdd::word() const
309{ 315{
310 QString str; 316 QString str;
@@ -334,29 +340,29 @@ void PickboardAdd::checkAllDone()
334 return; 340 return;
335 } 341 }
336 yes->setEnabled(TRUE); 342 yes->setEnabled(TRUE);
337 } 343 }
338} 344}
339 345
340 346
341void DictFilterConfig::doMenu(int i) 347void DictFilterConfig::doMenu(int i)
342{ 348{
343 switch (i) { 349 switch (i) {
344 case 300: 350 case 300:
345 if ( input.count() == 0 ) { 351 if ( input.count() == 0 ) {
346 QMessageBox::information(0, "Adding Words", 352 QMessageBox::information(0, tr("Adding Words"),
347 "To add words, pick the letters,\nthen " 353 tr("To add words, pick the letters,\nthen "
348 "open the Add dialog. In that\ndialog, tap " 354 "open the Add dialog. In that\ndialog, tap "
349 "the correct letters\nfrom the list " 355 "the correct letters\nfrom the list "
350 "(tap twice for\ncapitals)."); 356 "(tap twice for\ncapitals)."));
351 } else { 357 } else {
352 PickboardAdd add(parent,capitalize(input)); 358 PickboardAdd add(parent,capitalize(input));
353 if ( add.exec() ) 359 if ( add.exec() )
354 generateText(add.word()); 360 generateText(add.word());
355 input.clear(); 361 input.clear();
356 matches.clear(); 362 matches.clear();
357 updateRows(0,0); 363 updateRows(0,0);
358 } 364 }
359 break; 365 break;
360 case 100: 366 case 100:
361 if ( !input.isEmpty() ) { 367 if ( !input.isEmpty() ) {
362 input.clear(); 368 input.clear();
@@ -365,25 +371,25 @@ void DictFilterConfig::doMenu(int i)
365 updateRows(0,1); 371 updateRows(0,1);
366 break; 372 break;
367 } // else fall through 373 } // else fall through
368 default: 374 default:
369 StringConfig::doMenu(i); 375 StringConfig::doMenu(i);
370 } 376 }
371 shift = 0; 377 shift = 0;
372 lit0 = -1; 378 lit0 = -1;
373} 379}
374 380
375QString DictFilterConfig::text(int r, int i) 381QString DictFilterConfig::text(int r, int i)
376{ 382{
377 QStringList l = r ? sets : input.isEmpty() ? othermodes : matches; 383 QStringList l = r ? sets_a : input.isEmpty() ? othermodes : matches;
378 return i < (int)l.count() ? 384 return i < (int)l.count() ?
379 (input.isEmpty() ? l[i] : capitalize(l[i])) 385 (input.isEmpty() ? l[i] : capitalize(l[i]))
380 : QString::null; 386 : QString::null;
381} 387}
382 388
383bool DictFilterConfig::spreadRow(int r) 389bool DictFilterConfig::spreadRow(int r)
384{ 390{
385 return r ? TRUE : input.isEmpty() ? TRUE : FALSE; 391 return r ? TRUE : input.isEmpty() ? TRUE : FALSE;
386} 392}
387 393
388QStringList DictFilterConfig::capitalize(const QStringList& l) 394QStringList DictFilterConfig::capitalize(const QStringList& l)
389{ 395{
@@ -417,68 +423,68 @@ QString DictFilterConfig::capitalize(const QString& s)
417 return s.upper(); 423 return s.upper();
418 break; 424 break;
419 } 425 }
420 return s; 426 return s;
421} 427}
422 428
423void DictFilterConfig::pick(bool press, int row, int item) 429void DictFilterConfig::pick(bool press, int row, int item)
424{ 430{
425 if ( row == 0 ) { 431 if ( row == 0 ) {
426 if ( press ) { 432 if ( press ) {
427 if ( input.isEmpty() ) { 433 if ( input.isEmpty() ) {
428 lit0 = item; 434 lit0 = item;
429 if ( othermodes[item] == "Space" ) { 435 if ( othermodes[item] == PickboardPicks::tr("Space") ) {
430 updateItem(row,item); 436 updateItem(row,item);
431 generateText(" "); 437 generateText(" ");
432 } else if ( othermodes[item] == "Back" ) { 438 } else if ( othermodes[item] == PickboardPicks::tr("Back") ) {
433 updateItem(row,item); 439 updateItem(row,item);
434 generateKey(::Qt::Key_Backspace); 440 generateKey(::Qt::Key_Backspace);
435 } else if ( othermodes[item] == "Enter" ) { 441 } else if ( othermodes[item] == PickboardPicks::tr("Enter") ) {
436 updateItem(row,item); 442 updateItem(row,item);
437 generateKey(::Qt::Key_Return); 443 generateKey(::Qt::Key_Return);
438 } else if ( othermodes[item] == "Shift" ) { 444 } else if ( othermodes[item] == PickboardPicks::tr("Shift") ) {
439 updateItem(row,item); 445 updateItem(row,item);
440 shift = (shift+1)%3; 446 shift = (shift+1)%3;
441 } 447 }
442 } 448 }
443 } else { 449 } else {
444 if ( !input.isEmpty() ) { 450 if ( !input.isEmpty() ) {
445 input.clear(); 451 input.clear();
446 if ( item>=0 ) { 452 if ( item>=0 ) {
447 generateText(capitalize(matches[item])); 453 generateText(capitalize(matches[item]));
448 } 454 }
449 shift = 0; 455 shift = 0;
450 matches.clear(); 456 matches.clear();
451 updateRows(0,0); 457 updateRows(0,0);
452 } else if ( item < 3 ) { 458 } else if ( item < 3 ) {
453 lit0 = -1; 459 lit0 = -1;
454 changeMode(item+1); // I'm mode 0! #### 460 changeMode(item+1); // I'm mode 0! ####
455 updateRows(0,1); 461 updateRows(0,1);
456 } 462 }
457 if ( lit0 >= 0 ) { 463 if ( lit0 >= 0 ) {
458 if ( !shift || othermodes[lit0] != "Shift" ) { 464 if ( !shift || othermodes[lit0] != PickboardPicks::tr("Shift") ) {
459 updateItem(0,lit0); 465 updateItem(0,lit0);
460 lit0 = -1; 466 lit0 = -1;
461 } 467 }
462 } 468 }
463 } 469 }
464 } else { 470 } else {
465 lit0 = -1; 471 lit0 = -1;
466 if ( press && item >= 0 ) { 472 if ( press && item >= 0 ) {
467 lit1 = item; 473 lit1 = item;
468 add(sets[item]); 474 add(sets[item]);
469 updateItem(1,item); 475 updateItem(1,item);
470 updateRows(0,0); 476 updateRows(0,0);
471 } else { 477 } else {
472 updateItem(1,lit1); 478 updateItem(1,lit1);
473 lit1 = -1; 479 lit1 = -1;
474 } 480 }
475 } 481 }
476} 482}
477 483
478bool DictFilterConfig::scanMatch(const QString& set, const QChar& l) const 484bool DictFilterConfig::scanMatch(const QString& set, const QChar& l) const
479{ 485{
480 return set == "?" || set == "*" || set.contains(l); 486 return set == "?" || set == "*" || set.contains(l);
481} 487}
482 488
483//static int visit=0; 489//static int visit=0;
484//static int lvisit=0; 490//static int lvisit=0;
@@ -559,37 +565,38 @@ void DictFilterConfig::add(const QString& set)
559 } 565 }
560 } 566 }
561 } 567 }
562//qDebug("%d+%d visits",lvisit,visit); 568//qDebug("%d+%d visits",lvisit,visit);
563} 569}
564 570
565bool DictFilterConfig::highlight(int r,int c) const 571bool DictFilterConfig::highlight(int r,int c) const
566{ 572{
567 return r == 0 ? c == lit0 : c == lit1; 573 return r == 0 ? c == lit0 : c == lit1;
568} 574}
569 575
570 576
571void DictFilterConfig::addSet(const QString& s) 577void DictFilterConfig::addSet(const QString& appearance, const QString& set)
572{ 578{
573 sets.append(s); 579 sets_a.append( appearance );
580 sets.append( set );
574} 581}
575 582
576void DictFilterConfig::addMode(const QString& s) 583void DictFilterConfig::addMode(const QString& s)
577{ 584{
578 othermodes.append(s); 585 othermodes.append(s);
579} 586}
580 587
581void DictFilterConfig::fillMenu(QPopupMenu& menu) 588void DictFilterConfig::fillMenu(QPopupMenu& menu)
582{ 589{
583 menu.insertItem("Add...",300); 590 menu.insertItem(tr("Add..."),300);
584 StringConfig::fillMenu(menu); 591 StringConfig::fillMenu(menu);
585} 592}
586 593
587QValueList<QPixmap> KeycodeConfig::row(int i) 594QValueList<QPixmap> KeycodeConfig::row(int i)
588{ 595{
589 return i ? keypm2 : keypm1; 596 return i ? keypm2 : keypm1;
590} 597}
591 598
592void KeycodeConfig::pickInRow(int r, int xpos, bool press) 599void KeycodeConfig::pickInRow(int r, int xpos, bool press)
593{ 600{
594 QValueList<QPixmap> pl = row(r); 601 QValueList<QPixmap> pl = row(r);
595 QValueList<QPixmap>::Iterator it; 602 QValueList<QPixmap>::Iterator it;
diff --git a/inputmethods/pickboard/pickboardcfg.h b/inputmethods/pickboard/pickboardcfg.h
index b1913df..92c6420 100644
--- a/inputmethods/pickboard/pickboardcfg.h
+++ b/inputmethods/pickboard/pickboardcfg.h
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -67,25 +67,26 @@ public:
67 QString word() const; 67 QString word() const;
68 bool exec(); 68 bool exec();
69 69
70private slots: 70private slots:
71 void checkAllDone(); 71 void checkAllDone();
72 72
73private: 73private:
74 QPushButton *yes; 74 QPushButton *yes;
75 LetterChoice **lc; 75 LetterChoice **lc;
76 int nlc; 76 int nlc;
77}; 77};
78 78
79class PickboardConfig : QObject { 79class PickboardConfig : public QObject {
80 Q_OBJECT
80public: 81public:
81 PickboardConfig(PickboardPicks* p) : parent(p), nrows(2), pressx(-1) { } 82 PickboardConfig(PickboardPicks* p) : parent(p), nrows(2), pressx(-1) { }
82 virtual ~PickboardConfig(); 83 virtual ~PickboardConfig();
83 virtual void pickPoint(const QPoint& p, bool press); 84 virtual void pickPoint(const QPoint& p, bool press);
84 virtual void draw(QPainter*)=0; 85 virtual void draw(QPainter*)=0;
85 virtual void fillMenu(QPopupMenu&); 86 virtual void fillMenu(QPopupMenu&);
86 virtual void doMenu(int); 87 virtual void doMenu(int);
87 88
88protected: 89protected:
89 void updateRows(int from, int to); 90 void updateRows(int from, int to);
90 virtual void updateItem(int r, int i); 91 virtual void updateItem(int r, int i);
91 virtual void pickInRow(int r, int xpos, bool press)=0; 92 virtual void pickInRow(int r, int xpos, bool press)=0;
@@ -95,114 +96,118 @@ protected:
95 void generateKey( int k ); 96 void generateKey( int k );
96 97
97 virtual void pick(bool press, int row, int item)=0; 98 virtual void pick(bool press, int row, int item)=0;
98 99
99protected: 100protected:
100 PickboardPicks* parent; 101 PickboardPicks* parent;
101 int nrows; 102 int nrows;
102private: 103private:
103 int pressrow, pressx; 104 int pressrow, pressx;
104}; 105};
105 106
106class StringConfig : public PickboardConfig { 107class StringConfig : public PickboardConfig {
108 Q_OBJECT
107public: 109public:
108 StringConfig(PickboardPicks* p) : PickboardConfig(p) { } 110 StringConfig(PickboardPicks* p) : PickboardConfig(p) { }
109 111
110 void draw(QPainter* p); 112 void draw(QPainter* p);
111 113
112protected: 114protected:
113 virtual QString text(int r, int i)=0; 115 virtual QString text(int r, int i)=0;
114 virtual bool spreadRow(int i)=0; 116 virtual bool spreadRow(int i)=0;
115 virtual QColor rowColor(int) { return ::Qt::black; } 117 virtual QColor rowColor(int) { return Qt::black; }
116 virtual void pickInRow(int r, int xpos, bool press); 118 virtual void pickInRow(int r, int xpos, bool press);
117 virtual void updateItem(int r, int i); 119 virtual void updateItem(int r, int i);
118 virtual bool highlight(int,int) const; 120 virtual bool highlight(int,int) const;
119}; 121};
120 122
121class CharStringConfig : public StringConfig { 123class CharStringConfig : public StringConfig {
124 Q_OBJECT
122 QString input; 125 QString input;
123 QStringList chars; 126 QStringList chars;
124public: 127public:
125 CharStringConfig(PickboardPicks* p) : StringConfig(p) { } 128 CharStringConfig(PickboardPicks* p) : StringConfig(p) { }
126 129
127 void addChar(const QString& s); 130 void addChar(const QString& s);
128 virtual void doMenu(int); 131 virtual void doMenu(int);
129 132
130protected: 133protected:
131 QString text(int r, int i); 134 QString text(int r, int i);
132 bool spreadRow(int i); 135 bool spreadRow(int i);
133 void pick(bool press, int row, int item); 136 void pick(bool press, int row, int item);
134}; 137};
135 138
136class DictFilterConfig : public StringConfig { 139class DictFilterConfig : public StringConfig {
140 Q_OBJECT
137 QStringList matches; 141 QStringList matches;
142 QStringList sets_a;
138 QStringList sets; 143 QStringList sets;
139 QStringList othermodes; 144 QStringList othermodes;
140 int lit0; 145 int lit0;
141 int lit1; 146 int lit1;
142 int shift; 147 int shift;
143 QString capitalize(const QString& s); 148 QString capitalize(const QString& s);
144 QStringList capitalize(const QStringList& s); 149 QStringList capitalize(const QStringList& s);
145 150
146public: 151public:
147 QStringList input; 152 QStringList input;
148 DictFilterConfig(PickboardPicks* p) : StringConfig(p) 153 DictFilterConfig(PickboardPicks* p) : StringConfig(p)
149 { 154 {
150 shift = 0; 155 shift = 0;
151 lit0 = -1; 156 lit0 = -1;
152 lit1 = -1; 157 lit1 = -1;
153 } 158 }
154 159
155 void addSet(const QString& s); 160 void addSet(const QString& apperance, const QString& set);
156 void addMode(const QString& s); 161 void addMode(const QString& s);
157 162
158 void fillMenu(QPopupMenu& menu); 163 void fillMenu(QPopupMenu& menu);
159 void doMenu(int i); 164 void doMenu(int i);
160 165
161 void add(const QString& set); 166 void add(const QString& set);
162 167
163protected: 168protected:
164 QString text(int r, int i); 169 QString text(int r, int i);
165 170
166 bool spreadRow(int i); 171 bool spreadRow(int i);
167 172
168 void pick(bool press, int row, int item); 173 void pick(bool press, int row, int item);
169 174
170 bool scanMatch(const QString& set, const QChar& l) const; 175 bool scanMatch(const QString& set, const QChar& l) const;
171 void scan(const QDawg::Node* n, int ipos, const QString& str, int length, bool extend); 176 void scan(const QDawg::Node* n, int ipos, const QString& str, int length, bool extend);
172 void scanLengths(const QDawg::Node* n, int ipos, int& bitarray); 177 void scanLengths(const QDawg::Node* n, int ipos, int& bitarray);
173 178
174 bool highlight(int r,int c) const; 179 bool highlight(int r,int c) const;
175}; 180};
176 181
177class CharConfig : public StringConfig { 182class CharConfig : public StringConfig {
183 Q_OBJECT
178 QStringList chars1; 184 QStringList chars1;
179 QStringList chars2; 185 QStringList chars2;
180public: 186public:
181 CharConfig(PickboardPicks* p) : StringConfig(p) { } 187 CharConfig(PickboardPicks* p) : StringConfig(p) { }
182 void addChar(int r, const QString& s); 188 void addChar(int r, const QString& s);
183 189
184protected: 190protected:
185 QString text(int r, int i); 191 QString text(int r, int i);
186 bool spreadRow(int); 192 bool spreadRow(int);
187 void pick(bool press, int row, int item); 193 void pick(bool press, int row, int item);
188}; 194};
189 195
190class KeycodeConfig : public PickboardConfig { 196class KeycodeConfig : public PickboardConfig {
191 QValueList<int> keys1; 197 QValueList<int> keys1;
192 QValueList<int> keys2; 198 QValueList<int> keys2;
193 QValueList<QPixmap> keypm1; 199 QValueList<QPixmap> keypm1;
194 QValueList<QPixmap> keypm2; 200 QValueList<QPixmap> keypm2;
195 static const int xw = 8; 201 enum { xw = 8, xmarg = 8 };
196 static const int xmarg = 8;
197 202
198public: 203public:
199 KeycodeConfig(PickboardPicks* p) : PickboardConfig(p) { } 204 KeycodeConfig(PickboardPicks* p) : PickboardConfig(p) { }
200 void addKey(int r, const QPixmap& pm, int code); 205 void addKey(int r, const QPixmap& pm, int code);
201 void addGap(int r, int w); 206 void addGap(int r, int w);
202 207
203 void draw(QPainter* p); 208 void draw(QPainter* p);
204 209
205protected: 210protected:
206 void pickInRow(int r, int xpos, bool press); 211 void pickInRow(int r, int xpos, bool press);
207 QValueList<QPixmap> row(int i); 212 QValueList<QPixmap> row(int i);
208 213
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index 9a21229..f839452 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -18,25 +18,25 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include <qapplication.h> 20#include <qapplication.h>
21#include <qobject.h> 21#include <qobject.h>
22#include <qpixmap.h> 22#include <qpixmap.h>
23#include "pickboard.h" 23#include "pickboard.h"
24#include "pickboardimpl.h" 24#include "pickboardimpl.h"
25 25
26/* XPM */ 26/* XPM */
27static const char * pb_xpm[]={ 27static const char * pb_xpm[]={
28"28 7 2 1", 28"28 7 2 1",
29"# c #303030", 29"# c #303030",
30" c None", 30" c None", // No tr
31" ########################## ", 31" ########################## ",
32" # # # # # # # ", 32" # # # # # # # ",
33" # # # # # # # ", 33" # # # # # # # ",
34" ########################## ", 34" ########################## ",
35" # # # # # # ", 35" # # # # # # ",
36" # # # # # # ", 36" # # # # # # ",
37" ########################## "}; 37" ########################## "};
38 38
39 39
40PickboardImpl::PickboardImpl() 40PickboardImpl::PickboardImpl()
41 : pickboard(0), icn(0) 41 : pickboard(0), icn(0)
42{ 42{
diff --git a/inputmethods/pickboard/pickboardpicks.cpp b/inputmethods/pickboard/pickboardpicks.cpp
index a80bbf8..b9d9928 100644
--- a/inputmethods/pickboard/pickboardpicks.cpp
+++ b/inputmethods/pickboard/pickboardpicks.cpp
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -24,25 +24,27 @@
24 24
25#include <qpainter.h> 25#include <qpainter.h>
26#include <qlist.h> 26#include <qlist.h>
27#include <qbitmap.h> 27#include <qbitmap.h>
28#include <qlayout.h> 28#include <qlayout.h>
29#include <qvbox.h> 29#include <qvbox.h>
30#include <qdialog.h> 30#include <qdialog.h>
31#include <qscrollview.h> 31#include <qscrollview.h>
32#include <qpopupmenu.h> 32#include <qpopupmenu.h>
33#include <qhbuttongroup.h> 33#include <qhbuttongroup.h>
34#include <qpushbutton.h> 34#include <qpushbutton.h>
35#include <qmessagebox.h> 35#include <qmessagebox.h>
36#ifdef QWS
36#include <qwindowsystem_qws.h> 37#include <qwindowsystem_qws.h>
38#endif
37 39
38void PickboardPicks::doMenu() 40void PickboardPicks::doMenu()
39{ 41{
40 QWidget* cause = (QWidget*)sender(); // evil 42 QWidget* cause = (QWidget*)sender(); // evil
41 43
42 QPopupMenu popup(this); 44 QPopupMenu popup(this);
43 config()->fillMenu(popup); 45 config()->fillMenu(popup);
44 46
45 QPoint pos = cause->mapToGlobal(cause->rect().topRight()); 47 QPoint pos = cause->mapToGlobal(cause->rect().topRight());
46 QSize sz = popup.sizeHint(); 48 QSize sz = popup.sizeHint();
47 pos.ry() -= sz.height(); 49 pos.ry() -= sz.height();
48 pos.rx() -= sz.width(); 50 pos.rx() -= sz.width();
@@ -239,48 +241,45 @@ static const char *Space_xpm[] = {
239"a.......a", 241"a.......a",
240"a.......a", 242"a.......a",
241"a.......a", 243"a.......a",
242"a.......a", 244"a.......a",
243"a.......a", 245"a.......a",
244"a.......a", 246"a.......a",
245"aaaaaaaaa" 247"aaaaaaaaa"
246}; 248};
247 249
248PickboardPicks::PickboardPicks(QWidget* parent, const char* name, WFlags f ) : 250PickboardPicks::PickboardPicks(QWidget* parent, const char* name, WFlags f ) :
249 QFrame(parent,name,f) 251 QFrame(parent,name,f)
250{ 252{
253 configs.setAutoDelete( TRUE );
251} 254}
252 255
253void PickboardPicks::initialise(void) 256void PickboardPicks::initialise(void)
254{ 257{
255 setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); 258 setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
256 mode = 0; 259 mode = 0;
257 260
258 DictFilterConfig* dc = new DictFilterConfig(this); 261 DictFilterConfig* dc = new DictFilterConfig(this);
259 dc->addSet("ABC"); 262 QStringList sets_a = QStringList::split(' ',tr("ABC DEF GHI JKL MNO PQR STU VWX YZ-'"));
260 dc->addSet("DEF"); 263 QStringList sets = QStringList::split(' ',
261 dc->addSet("GHI"); 264 tr("ABC%/1iso8859-15 DEF%/1iso8859-15 GHI%/1iso8859-15 JKL MNO%/1iso8859-15 PQR%/1iso8859-15 STU%/1iso8859-15 VWX YZ-'%/1iso8859-15"));
262 dc->addSet("JKL"); 265 for (QStringList::ConstIterator it = sets.begin(), it_a = sets_a.begin(); it!=sets.end(); ++it,++it_a)
263 dc->addSet("MNO"); 266 dc->addSet(*it_a,*it);
264 dc->addSet("PQR");
265 dc->addSet("STU");
266 dc->addSet("VWX");
267 dc->addSet("YZ-'");
268 dc->addMode("123"); 267 dc->addMode("123");
269 dc->addMode("@*!?"); 268 dc->addMode("@*!?");
270 dc->addMode("KEY"); 269 dc->addMode(tr("KEY"));
271 dc->addMode("Space"); 270 dc->addMode(tr("Space"));
272 dc->addMode("Back"); 271 dc->addMode(tr("Back"));
273 dc->addMode("Enter"); 272 dc->addMode(tr("Enter"));
274 dc->addMode("Shift"); 273 dc->addMode(tr("Shift"));
275 configs.append(dc); 274 configs.append(dc);
276 275
277 CharStringConfig* number = new CharStringConfig(this); 276 CharStringConfig* number = new CharStringConfig(this);
278 number->addChar("0"); 277 number->addChar("0");
279 number->addChar("1"); 278 number->addChar("1");
280 number->addChar("2"); 279 number->addChar("2");
281 number->addChar("3"); 280 number->addChar("3");
282 number->addChar("4"); 281 number->addChar("4");
283 number->addChar("5"); 282 number->addChar("5");
284 number->addChar("6"); 283 number->addChar("6");
285 number->addChar("7"); 284 number->addChar("7");
286 number->addChar("8"); 285 number->addChar("8");