Apply patch from Qtopia1.7 to allow 'Umlaute' in the pickboard

and make 'strings' translatable.

This also fixes #501

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,5 +1,5 @@
 /**********************************************************************
-** 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.
 **
@@ -36,6 +36,8 @@
 #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>"
@@ -46,3 +48,3 @@ static const char * pickboard_help =
     "<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." )
     ;
@@ -78,6 +80,10 @@ void PickboardConfig::generateText(const QString& s)
     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
 }
@@ -114,5 +120,5 @@ 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);
 }
@@ -129,3 +135,3 @@ void PickboardConfig::doMenu(int i)
 	case 1: {
-	    QMessageBox help("Pickboard Help", pickboard_help,
+            QMessageBox help(tr("Pickboard Help"), tr(pickboard_help),
 		QMessageBox::NoIcon, 1, 0, 0);
@@ -160,6 +166,6 @@ void StringConfig::draw(QPainter* p)
 	    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);
 	    }
@@ -295,5 +301,5 @@ PickboardAdd::PickboardAdd(QWidget* owner, const QStringList& setlist) :
     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()));
@@ -345,7 +351,7 @@ void DictFilterConfig::doMenu(int i)
 	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 {
@@ -376,3 +382,3 @@ 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() ?
@@ -428,12 +434,12 @@ void DictFilterConfig::pick(bool press, int row, int item)
 		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);
@@ -457,4 +463,4 @@ void DictFilterConfig::pick(bool press, int row, int item)
 	    if ( lit0 >= 0 ) {
-		if ( !shift || othermodes[lit0] != "Shift" ) {
-		    updateItem(0,lit0); 
+                if ( !shift || othermodes[lit0] != PickboardPicks::tr("Shift") ) {
+                    updateItem(0,lit0);
 		    lit0 = -1;
@@ -468,6 +474,6 @@ void DictFilterConfig::pick(bool press, int row, int item)
 	    add(sets[item]);
-	    updateItem(1,item); 
+	    updateItem(1,item);
 	    updateRows(0,0);
 	} else {
-	    updateItem(1,lit1); 
+	    updateItem(1,lit1);
 	    lit1 = -1;
@@ -570,5 +576,6 @@ bool DictFilterConfig::highlight(int r,int c) const
 
-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 );
 }
@@ -582,3 +589,3 @@ void DictFilterConfig::fillMenu(QPopupMenu& menu)
 {
-    menu.insertItem("Add...",300);
+    menu.insertItem(tr("Add..."),300);
     StringConfig::fillMenu(menu);