1 files changed, 38 insertions, 31 deletions

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 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
@@ -25,35 +25,37 @@
 
 #include <qpainter.h>
 #include <qlist.h>
 #include <qbitmap.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qdialog.h>
 #include <qscrollview.h>
 #include <qpopupmenu.h>
 #include <qhbuttongroup.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
+#ifdef QWS
 #include <qwindowsystem_qws.h>
+#endif
 
 static const char * pickboard_help =
-    "<h1>The Pickboard</h1>"
+    QT_TRANSLATE_NOOP("PickboardConfig", "<h1>The Pickboard</h1>"
     "<i>The smallest and fastest way to type.</i>"
     "<p>"
     "Enter a word by tapping letter-groups and picking the word."
     "<br>Enter spaces with \"Space\", or other keys through \"KEY\"."
     "<br>Use \"Shift\" to capitalize words that are not normally capitalized."
     "<br>Press \"Shift\" twice for an all-capitals word."
-    "<br>Add custom words by picking them, then selecting \"Add...\" from the menu on the right."
+    "<br>Add custom words by picking them, then selecting \"Add...\" from the menu on the right." )
     ;
 
 const int intermatchmargin=5;
 
 
 PickboardConfig::~PickboardConfig() { }
 
 void PickboardConfig::updateRows(int from, int to)
 {
     if ( from != to ) { // (all)
         parent->update();
     } else {
@@ -67,28 +69,32 @@ void PickboardConfig::updateItem(int r, int)
 {
     updateRows(r,r);
 }
 
 void PickboardConfig::changeMode(int m)
 {
     parent->setMode(m);
 }
 void PickboardConfig::generateText(const QString& s)
 {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     for (int i=0; i<(int)s.length(); i++) {
-        parent->emitKey(s[i].unicode(), 0, 0, true, false);
-        parent->emitKey(s[i].unicode(), 0, 0, false, false);
+        uint code = 0;
+        if ( s[i].unicode() >= 'a' && s[i].unicode() <= 'z' ) {
+            code = s[i].unicode() - 'a' + Key_A;
+        }
+        parent->emitKey(s[i].unicode(), code, 0, true, false);
+        parent->emitKey(s[i].unicode(), code, 0, false, false);
     }
-#endif   
+#endif
 }
 void PickboardConfig::generateKey( int k )
 {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     parent->emitKey(0, k, 0, true, false);
     parent->emitKey(0, k, 0, false, false);
 #endif
 }
 
 void PickboardConfig::pickPoint(const QPoint& p, bool press)
 {
     if ( press ) {
@@ -103,40 +109,40 @@ void PickboardConfig::pickPoint(const QPoint& p, bool press)
                 return;
             }
             y += ls;
         }
     } else if ( pressx >= 0 ) {
         pickInRow( pressrow, pressx, FALSE );
         pressx = -1;
     }
 }
 
 void PickboardConfig::fillMenu(QPopupMenu& menu)
 {
-    menu.insertItem("Reset",100);
+    menu.insertItem(tr("Reset"),100);
     menu.insertSeparator();
-    menu.insertItem("Help",1);
+    menu.insertItem(tr("Help"),1);
 }
 
 void PickboardConfig::doMenu(int i)
 {
     switch (i) {
         case 100:
             if ( parent->currentMode() ) {
                 changeMode(0);
                 updateRows(0,1);
             }
             break;
         case 1: {
-            QMessageBox help("Pickboard Help", pickboard_help,
+            QMessageBox help(tr("Pickboard Help"), tr(pickboard_help),
                 QMessageBox::NoIcon, 1, 0, 0);
             help.showMaximized();
             help.exec();
         }
     }
 }
 
 void StringConfig::draw(QPainter* p)
 {
     QFontMetrics fm = p->fontMetrics();
 
     for (int r=0; r<nrows; r++) {
@@ -149,28 +155,28 @@ void StringConfig::draw(QPainter* p)
         for (; !(s=text(r,i)).isNull(); ++i) {
             int w = fm.width(s);
             tw += w;
         }
         bool spread = spreadRow(r);// && parent->width() > tw;
         int xw = spread ? (parent->width()-tw)/(i-1) : 3;
         int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2;
 
         i=0;
         for (; !(s=text(r,i)).isNull(); ++i) {
             int w = fm.width(s)+xw;
             if ( highlight(r,i) ) {
-                p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),::Qt::black);
-                p->setPen(::Qt::white);
+                p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),Qt::black);
+                p->setPen(Qt::white);
             }else{
-                p->setPen(::Qt::black);
+                p->setPen(Qt::black);
             }
             p->drawText(x,-fm.descent()-1,s);
             x += w;
         }
     }
 }
 
 void StringConfig::pickInRow(int r, int xpos, bool press)
 {
     QFontMetrics fm = parent->fontMetrics();
 
     int tw=0;
@@ -284,27 +290,27 @@ PickboardAdd::PickboardAdd(QWidget* owner, const QStringList& setlist) :
     setMaximumHeight(200); // ### QDialog shouldn't allow us to be bigger than the screen
     QVBox *letters = new QVBox(sv);
     letters->setSpacing(0);
     lc = new LetterChoice*[setlist.count()];
     nlc = (int)setlist.count();
     for (int i=0; i<nlc; i++) {
         lc[i] = new LetterChoice(letters,setlist[i]);
         connect(lc[i],SIGNAL(changed()),this,SLOT(checkAllDone()));
     }
     sv->addChild(letters);
     QHBox* hb = new QHBox(this);
     hb->setSpacing(0);
-    yes = new QPushButton("OK",hb);
+    yes = new QPushButton(tr("OK"),hb);
     yes->setEnabled(FALSE);
-    QPushButton *no = new QPushButton("Cancel",hb);
+    QPushButton *no = new QPushButton(tr("Cancel"),hb);
     connect(yes, SIGNAL(clicked()), this, SLOT(accept()));
     connect(no, SIGNAL(clicked()), this, SLOT(reject()));
 }
 
 PickboardAdd::~PickboardAdd()
 {
     delete [] lc;
 }
 
 QString PickboardAdd::word() const
 {
     QString str;
@@ -334,29 +340,29 @@ void PickboardAdd::checkAllDone()
                 return;
         }
         yes->setEnabled(TRUE);
     }
 }
 
 
 void DictFilterConfig::doMenu(int i)
 {
     switch (i) {
       case 300:
         if ( input.count() == 0 ) {
-            QMessageBox::information(0, "Adding Words",
-                "To add words, pick the letters,\nthen "
+            QMessageBox::information(0, tr("Adding Words"),
+                tr("To add words, pick the letters,\nthen "
                 "open the Add dialog. In that\ndialog, tap "
                 "the correct letters\nfrom the list "
-                "(tap twice for\ncapitals).");
+                "(tap twice for\ncapitals)."));
         } else {
             PickboardAdd add(parent,capitalize(input));
             if ( add.exec() )
                 generateText(add.word());
             input.clear();
             matches.clear();
             updateRows(0,0);
         }
         break;
       case 100:
         if ( !input.isEmpty() ) {
             input.clear();
@@ -365,25 +371,25 @@ void DictFilterConfig::doMenu(int i)
             updateRows(0,1);
             break;
         } // else fall through
       default:
         StringConfig::doMenu(i);
     }
     shift = 0;
     lit0 = -1;
 }
 
 QString DictFilterConfig::text(int r, int i)
 {
-    QStringList l = r ? sets : input.isEmpty() ? othermodes : matches;
+    QStringList l = r ? sets_a : input.isEmpty() ? othermodes : matches;
     return i < (int)l.count() ?
         (input.isEmpty() ? l[i] : capitalize(l[i]))
         : QString::null;
 }
 
 bool DictFilterConfig::spreadRow(int r)
 {
     return r ? TRUE : input.isEmpty() ? TRUE : FALSE;
 }
 
 QStringList DictFilterConfig::capitalize(const QStringList& l)
 {
@@ -417,68 +423,68 @@ QString DictFilterConfig::capitalize(const QString& s)
             return s.upper();
             break;
     }
     return s;
 }
 
 void DictFilterConfig::pick(bool press, int row, int item)
 {
     if ( row == 0 ) {
         if ( press ) {
             if ( input.isEmpty() ) {
                 lit0 = item;
-                if ( othermodes[item] == "Space" ) {
+                if ( othermodes[item] == PickboardPicks::tr("Space") ) {
                     updateItem(row,item);
                     generateText(" ");
-                } else if ( othermodes[item] == "Back" ) {
+                } else if ( othermodes[item] == PickboardPicks::tr("Back") ) {
                     updateItem(row,item);
                     generateKey(::Qt::Key_Backspace);
-                } else if ( othermodes[item] == "Enter" ) {
-                    updateItem(row,item);
+                } else if ( othermodes[item] == PickboardPicks::tr("Enter") ) {
+                    updateItem(row,item);
                     generateKey(::Qt::Key_Return);
-                } else if ( othermodes[item] == "Shift" ) {
+                } else if ( othermodes[item] == PickboardPicks::tr("Shift") ) {
                     updateItem(row,item);
                     shift = (shift+1)%3;
                 }
             }
         } else {
             if ( !input.isEmpty() ) {
                 input.clear();
                 if ( item>=0 ) {
                     generateText(capitalize(matches[item]));
                 }
                 shift = 0;
                 matches.clear();
                 updateRows(0,0);
             } else if ( item < 3 ) {
                 lit0 = -1;
                 changeMode(item+1); // I'm mode 0! ####
                 updateRows(0,1);
             }
             if ( lit0 >= 0 ) {
-                if ( !shift || othermodes[lit0] != "Shift" ) {
-                    updateItem(0,lit0); 
+                if ( !shift || othermodes[lit0] != PickboardPicks::tr("Shift") ) {
+                    updateItem(0,lit0);
                     lit0 = -1;
                 }
             }
         }
     } else {
         lit0 = -1;
         if ( press && item >= 0 ) {
             lit1 = item;
             add(sets[item]);
-            updateItem(1,item); 
+            updateItem(1,item);
             updateRows(0,0);
         } else {
-            updateItem(1,lit1); 
+            updateItem(1,lit1);
             lit1 = -1;
         }
     }
 }
 
 bool DictFilterConfig::scanMatch(const QString& set, const QChar& l) const
 {
     return set == "?" || set == "*" || set.contains(l);
 }
 
 //static int visit=0;
 //static int lvisit=0;
@@ -559,37 +565,38 @@ void DictFilterConfig::add(const QString& set)
             }
         }
     }
 //qDebug("%d+%d visits",lvisit,visit);
 }
 
 bool DictFilterConfig::highlight(int r,int c) const
 {
     return r == 0 ? c == lit0 : c == lit1;
 }
 
 
-void DictFilterConfig::addSet(const QString& s)
+void DictFilterConfig::addSet(const QString& appearance, const QString& set)
 {
-    sets.append(s);
+    sets_a.append( appearance );
+    sets.append( set );
 }
 
 void DictFilterConfig::addMode(const QString& s)
 {
     othermodes.append(s);
 }
 
 void DictFilterConfig::fillMenu(QPopupMenu& menu)
 {
-    menu.insertItem("Add...",300);
+    menu.insertItem(tr("Add..."),300);
     StringConfig::fillMenu(menu);
 }
 
 QValueList<QPixmap> KeycodeConfig::row(int i)
 {
     return i ? keypm2 : keypm1;
 }
 
 void KeycodeConfig::pickInRow(int r, int xpos, bool press)
 {
     QValueList<QPixmap> pl = row(r);
     QValueList<QPixmap>::Iterator it;