author | sandman <sandman> | 2002-10-22 11:58:33 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-22 11:58:33 (UTC) |
commit | 486280adc2ab5dc383a56d8516c36727eb382812 (patch) (unidiff) | |
tree | 583cf961ec5c62c46137be36fcd9789d7d01158e /inputmethods/handwriting/qimpenhelp.cpp | |
parent | 1ee836bd1bb777dded54810909e508dc0470ada3 (diff) | |
download | opie-486280adc2ab5dc383a56d8516c36727eb382812.zip opie-486280adc2ab5dc383a56d8516c36727eb382812.tar.gz opie-486280adc2ab5dc383a56d8516c36727eb382812.tar.bz2 |
handwriting: qtopia 1.6 merge
all: someone made all inputmethod name()s untranslateable. This cured a
symptom (opie crashing), but it was not real a bug-fix. I have marked them
as translateable again and found no problems doing so.
Diffstat (limited to 'inputmethods/handwriting/qimpenhelp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpenhelp.cpp | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/inputmethods/handwriting/qimpenhelp.cpp b/inputmethods/handwriting/qimpenhelp.cpp index 5ee46a2..a294301 100644 --- a/inputmethods/handwriting/qimpenhelp.cpp +++ b/inputmethods/handwriting/qimpenhelp.cpp | |||
@@ -1,7 +1,7 @@ | |||
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 |
@@ -135,10 +135,9 @@ void HandwritingHelp::hideEvent( QHideEvent * ) | |||
135 | HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const char *name ) | 135 | HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const char *name ) |
136 | : QWidget( parent, name ), profile(p) | 136 | : QWidget( parent, name ), profile(p) |
137 | { | 137 | { |
138 | QGridLayout *gl = new QGridLayout( this, 5, 2, 0, 4 ); | 138 | QGridLayout *gl = new QGridLayout( this, 4, 2, 0, 4 ); |
139 | gl->setRowStretch( 1, 1 ); | ||
140 | gl->setRowStretch( 2, 1 ); | ||
141 | gl->setColStretch( 1, 1 ); | 139 | gl->setColStretch( 1, 1 ); |
140 | gl->setRowStretch(3, 1); | ||
142 | 141 | ||
143 | charSetCombo = new QComboBox( this ); | 142 | charSetCombo = new QComboBox( this ); |
144 | gl->addMultiCellWidget( charSetCombo, 0, 0, 0, 1 ); | 143 | gl->addMultiCellWidget( charSetCombo, 0, 0, 0, 1 ); |
@@ -150,20 +149,16 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
150 | 149 | ||
151 | charList = new QListBox( this ); | 150 | charList = new QListBox( this ); |
152 | charList->setHScrollBarMode( QListBox::AlwaysOff ); | 151 | charList->setHScrollBarMode( QListBox::AlwaysOff ); |
153 | charList->setFixedWidth( 80 ); | 152 | charList->setFixedWidth(80); |
154 | connect( charList, SIGNAL(highlighted(int)), this, SLOT(selectChar(int)) ); | 153 | connect( charList, SIGNAL(highlighted(int)), this, SLOT(selectChar(int)) ); |
155 | gl->addMultiCellWidget( charList, 1, 2, 0, 0 ); | 154 | gl->addWidget(charList, 1, 0); |
156 | |||
157 | QLabel *help = new QLabel( this ); | ||
158 | help->setAlignment( AlignLeft | AlignVCenter | WordBreak ); | ||
159 | gl->addWidget( help, 1, 1 ); | ||
160 | help->setText( | ||
161 | tr( "Select a character from the list. The writing area on the left " | ||
162 | "shows the reference character. Practice writing in the area on " | ||
163 | "the right.") ); | ||
164 | 155 | ||
165 | result = new QLabel( this ); | 156 | result = new QLabel( this ); |
166 | gl->addMultiCellWidget( result, 2, 3, 1, 1 ); | 157 | result->setAlignment(AlignLeft | AlignVCenter | WordBreak); |
158 | result->setText( | ||
159 | tr( "Select a reference character from the list. Practice writing in " | ||
160 | "the area on the right.")); | ||
161 | gl->addMultiCellWidget(result, 1, 2, 1, 1); | ||
167 | 162 | ||
168 | matcher = new QIMPenMatch( this ); | 163 | matcher = new QIMPenMatch( this ); |
169 | matcher->setCharSet( currentSet ); | 164 | matcher->setCharSet( currentSet ); |
@@ -172,7 +167,7 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
172 | this, SLOT(matched(const QIMPenCharMatchList &)) ); | 167 | this, SLOT(matched(const QIMPenCharMatchList &)) ); |
173 | 168 | ||
174 | QHBoxLayout *hb = new QHBoxLayout(); | 169 | QHBoxLayout *hb = new QHBoxLayout(); |
175 | gl->addLayout( hb, 3, 0 ); | 170 | gl->addLayout( hb, 2, 0 ); |
176 | prevBtn = new QPushButton( this ); | 171 | prevBtn = new QPushButton( this ); |
177 | prevBtn->setPixmap( QPixmap( (const char **)left_xpm ) ); | 172 | prevBtn->setPixmap( QPixmap( (const char **)left_xpm ) ); |
178 | connect( prevBtn, SIGNAL(clicked()), SLOT(prevChar())); | 173 | connect( prevBtn, SIGNAL(clicked()), SLOT(prevChar())); |
@@ -185,7 +180,7 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
185 | 180 | ||
186 | refPw = new QIMPenWidget( this ); | 181 | refPw = new QIMPenWidget( this ); |
187 | refPw->setReadOnly( TRUE ); | 182 | refPw->setReadOnly( TRUE ); |
188 | gl->addWidget( refPw, 4, 0 ); | 183 | gl->addWidget( refPw, 3, 0 ); |
189 | 184 | ||
190 | pracPw = new QIMPenWidget( this ); | 185 | pracPw = new QIMPenWidget( this ); |
191 | connect( matcher, SIGNAL(removeStroke()), pracPw, SLOT(removeStroke()) ); | 186 | connect( matcher, SIGNAL(removeStroke()), pracPw, SLOT(removeStroke()) ); |
@@ -197,7 +192,7 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
197 | matcher, SLOT(beginStroke()) ); | 192 | matcher, SLOT(beginStroke()) ); |
198 | connect( pracPw, SIGNAL(stroke( QIMPenStroke * )), | 193 | connect( pracPw, SIGNAL(stroke( QIMPenStroke * )), |
199 | matcher, SLOT(strokeEntered( QIMPenStroke * )) ); | 194 | matcher, SLOT(strokeEntered( QIMPenStroke * )) ); |
200 | gl->addWidget( pracPw, 4, 1 ); | 195 | gl->addWidget( pracPw, 3, 1 ); |
201 | 196 | ||
202 | redrawTimer = new QTimer( this ); | 197 | redrawTimer = new QTimer( this ); |
203 | connect( redrawTimer, SIGNAL(timeout()), this, SLOT(redrawChar()) ); | 198 | connect( redrawTimer, SIGNAL(timeout()), this, SLOT(redrawChar()) ); |
@@ -227,12 +222,17 @@ void HandwritingTrainer::setCurrentChar( QIMPenChar *c ) | |||
227 | prevBtn->setEnabled( findPrev() != 0 ); | 222 | prevBtn->setEnabled( findPrev() != 0 ); |
228 | nextBtn->setEnabled( findNext() != 0 ); | 223 | nextBtn->setEnabled( findNext() != 0 ); |
229 | } | 224 | } |
230 | result->setText( "" ); | ||
231 | redrawTimer->start( 5000 ); | 225 | redrawTimer->start( 5000 ); |
232 | } | 226 | } |
233 | 227 | ||
234 | void HandwritingTrainer::selectChar( int i ) | 228 | void HandwritingTrainer::selectChar( int i ) |
235 | { | 229 | { |
230 | static int last_char = 0; | ||
231 | |||
232 | if (last_char != i) { | ||
233 | result->setText(""); | ||
234 | } | ||
235 | |||
236 | currentChar = 0; | 236 | currentChar = 0; |
237 | currentCode = ((CharListItem *)charList->item(i))->code(); | 237 | currentCode = ((CharListItem *)charList->item(i))->code(); |
238 | QIMPenCharIterator it(currentSet->characters() ); | 238 | QIMPenCharIterator it(currentSet->characters() ); |
@@ -252,6 +252,7 @@ void HandwritingTrainer::selectCharSet( int i ) | |||
252 | if ( currentSet ) { | 252 | if ( currentSet ) { |
253 | refPw->removeCharSet( 0 ); | 253 | refPw->removeCharSet( 0 ); |
254 | pracPw->removeCharSet( 0 ); | 254 | pracPw->removeCharSet( 0 ); |
255 | result->setText(""); | ||
255 | } | 256 | } |
256 | currentSet = profile->charSets().at( i ); | 257 | currentSet = profile->charSets().at( i ); |
257 | fillCharList(); | 258 | fillCharList(); |
@@ -266,7 +267,7 @@ void HandwritingTrainer::selectCharSet( int i ) | |||
266 | 267 | ||
267 | void HandwritingTrainer::noMatch() | 268 | void HandwritingTrainer::noMatch() |
268 | { | 269 | { |
269 | result->setText( "No match" ); | 270 | result->setText( tr("No match") ); |
270 | } | 271 | } |
271 | 272 | ||
272 | void HandwritingTrainer::matched( const QIMPenCharMatchList &ml ) | 273 | void HandwritingTrainer::matched( const QIMPenCharMatchList &ml ) |