author | zecke <zecke> | 2004-10-15 02:30:08 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-15 02:30:08 (UTC) |
commit | 5c3759f02725c17ba0efc386193a83da55a9a5da (patch) (unidiff) | |
tree | b03e604b282de315096b74b6f404851c2bba3ad6 /inputmethods/pickboard/pickboardcfg.h | |
parent | fefeafe35f8dac30f4baab9e3bff8e2ffbd1afd0 (diff) | |
download | opie-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 (limited to 'inputmethods/pickboard/pickboardcfg.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/pickboard/pickboardcfg.h | 19 |
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,10 +1,10 @@ | |||
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 | ** |
@@ -73,13 +73,14 @@ private slots: | |||
73 | private: | 73 | private: |
74 | QPushButton *yes; | 74 | QPushButton *yes; |
75 | LetterChoice **lc; | 75 | LetterChoice **lc; |
76 | int nlc; | 76 | int nlc; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | class PickboardConfig : QObject { | 79 | class PickboardConfig : public QObject { |
80 | Q_OBJECT | ||
80 | public: | 81 | public: |
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&); |
@@ -101,27 +102,29 @@ protected: | |||
101 | int nrows; | 102 | int nrows; |
102 | private: | 103 | private: |
103 | int pressrow, pressx; | 104 | int pressrow, pressx; |
104 | }; | 105 | }; |
105 | 106 | ||
106 | class StringConfig : public PickboardConfig { | 107 | class StringConfig : public PickboardConfig { |
108 | Q_OBJECT | ||
107 | public: | 109 | public: |
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 | ||
112 | protected: | 114 | protected: |
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 | ||
121 | class CharStringConfig : public StringConfig { | 123 | class CharStringConfig : public StringConfig { |
124 | Q_OBJECT | ||
122 | QString input; | 125 | QString input; |
123 | QStringList chars; | 126 | QStringList chars; |
124 | public: | 127 | public: |
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); |
@@ -131,13 +134,15 @@ protected: | |||
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 | ||
136 | class DictFilterConfig : public StringConfig { | 139 | class 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); |
@@ -149,13 +154,13 @@ public: | |||
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); |
@@ -172,12 +177,13 @@ protected: | |||
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 | ||
177 | class CharConfig : public StringConfig { | 182 | class CharConfig : public StringConfig { |
183 | Q_OBJECT | ||
178 | QStringList chars1; | 184 | QStringList chars1; |
179 | QStringList chars2; | 185 | QStringList chars2; |
180 | public: | 186 | public: |
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 | ||
@@ -189,14 +195,13 @@ protected: | |||
189 | 195 | ||
190 | class KeycodeConfig : public PickboardConfig { | 196 | class 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 | ||
198 | public: | 203 | public: |
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 | ||