Diffstat (limited to 'inputmethods/handwriting/qimpenhelp.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpenhelp.cpp | 41 |
1 files changed, 21 insertions, 20 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,6 +1,6 @@ | |||
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 |
@@ -136,8 +136,7 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
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 ); |
@@ -153,16 +152,12 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
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 ); |
@@ -173,5 +168,5 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
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 ) ); |
@@ -186,5 +181,5 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
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 ); |
@@ -198,5 +193,5 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const | |||
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 ); |
@@ -228,5 +223,4 @@ void HandwritingTrainer::setCurrentChar( QIMPenChar *c ) | |||
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 | } |
@@ -234,4 +228,10 @@ void HandwritingTrainer::setCurrentChar( QIMPenChar *c ) | |||
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(); |
@@ -253,4 +253,5 @@ void HandwritingTrainer::selectCharSet( int i ) | |||
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 ); |
@@ -267,5 +268,5 @@ void HandwritingTrainer::selectCharSet( int i ) | |||
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 | ||