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

and make 'strings' translatable.

This also fixes #501

1 files changed, 12 insertions, 7 deletions

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,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.
 **
@@ -78,3 +78,4 @@ private:
 
-class PickboardConfig : QObject {
+class PickboardConfig : public QObject {
+    Q_OBJECT
 public:
@@ -106,2 +107,3 @@ private:
 class StringConfig : public PickboardConfig {
+    Q_OBJECT
 public:
@@ -114,3 +116,3 @@ protected:
     virtual bool spreadRow(int i)=0;
-    virtual QColor rowColor(int) { return ::Qt::black; }
+    virtual QColor rowColor(int) { return Qt::black; }
     virtual void pickInRow(int r, int xpos, bool press);
@@ -121,2 +123,3 @@ protected:
 class CharStringConfig : public StringConfig {
+    Q_OBJECT
     QString input;
@@ -136,3 +139,5 @@ protected:
 class DictFilterConfig : public StringConfig {
+    Q_OBJECT
     QStringList matches;
+    QStringList sets_a;
     QStringList sets;
@@ -154,3 +159,3 @@ public:
 
-    void addSet(const QString& s);
+    void addSet(const QString& apperance, const QString& set);
     void addMode(const QString& s);
@@ -177,2 +182,3 @@ protected:
 class CharConfig : public StringConfig {
+    Q_OBJECT
     QStringList chars1;
@@ -194,4 +200,3 @@ class KeycodeConfig : public PickboardConfig {
     QValueList<QPixmap> keypm2;
-    static const int xw = 8;
-    static const int xmarg = 8;
+    enum { xw = 8, xmarg = 8 };