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/qimpensetup.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/qimpensetup.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpensetup.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp index 2c06fbc..5d49e03 100644 --- a/inputmethods/handwriting/qimpensetup.cpp +++ b/inputmethods/handwriting/qimpensetup.cpp | |||
@@ -1,28 +1,28 @@ | |||
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 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "qimpenwidget.h" | 21 | #include "qimpenwidget.h" |
22 | #include "qimpenprefbase.h" | 22 | #include "qimpenprefbase.h" |
23 | #include "qimpensetup.h" | 23 | #include "qimpensetup.h" |
24 | 24 | ||
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | 27 | ||
28 | #include <qcombobox.h> | 28 | #include <qcombobox.h> |
@@ -214,49 +214,49 @@ void QIMPenSetup::accept() | |||
214 | QMessageBox::Yes|QMessageBox::Escape, | 214 | QMessageBox::Yes|QMessageBox::Escape, |
215 | QMessageBox::No|QMessageBox::Default ) | 215 | QMessageBox::No|QMessageBox::Default ) |
216 | != QMessageBox::No ) { | 216 | != QMessageBox::No ) { |
217 | QDialog::accept(); | 217 | QDialog::accept(); |
218 | } | 218 | } |
219 | } else { | 219 | } else { |
220 | QDialog::accept(); | 220 | QDialog::accept(); |
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | //--------------------------------------------------------------------------- | 224 | //--------------------------------------------------------------------------- |
225 | 225 | ||
226 | QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name, | 226 | QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name, |
227 | bool modal, int WFlags) | 227 | bool modal, int WFlags) |
228 | : QDialog( parent, name, modal, WFlags ) | 228 | : QDialog( parent, name, modal, WFlags ) |
229 | { | 229 | { |
230 | setCaption( tr("Enter new character") ); | 230 | setCaption( tr("Enter new character") ); |
231 | uni = 0; | 231 | uni = 0; |
232 | 232 | ||
233 | QVBoxLayout *vb = new QVBoxLayout( this, 10 ); | 233 | QVBoxLayout *vb = new QVBoxLayout( this, 10 ); |
234 | 234 | ||
235 | QHBoxLayout *hb = new QHBoxLayout(); | 235 | QHBoxLayout *hb = new QHBoxLayout(); |
236 | vb->addLayout( hb ); | 236 | vb->addLayout( hb ); |
237 | 237 | ||
238 | QLabel *label = new QLabel( "Character:", this ); | 238 | QLabel *label = new QLabel( tr("Character:"), this ); |
239 | hb->addWidget( label ); | 239 | hb->addWidget( label ); |
240 | 240 | ||
241 | QComboBox *cb = new QComboBox( TRUE, this ); | 241 | QComboBox *cb = new QComboBox( TRUE, this ); |
242 | connect( cb, SIGNAL(activated(int)), SLOT(setSpecial(int)) ); | 242 | connect( cb, SIGNAL(activated(int)), SLOT(setSpecial(int)) ); |
243 | connect( cb, SIGNAL(textChanged(const QString &)), | 243 | connect( cb, SIGNAL(textChanged(const QString &)), |
244 | SLOT(setCharacter(const QString &)) ); | 244 | SLOT(setCharacter(const QString &)) ); |
245 | addSpecial( cb ); | 245 | addSpecial( cb ); |
246 | cb->setEditText( "" ); | 246 | cb->setEditText( "" ); |
247 | hb->addWidget( cb ); | 247 | hb->addWidget( cb ); |
248 | 248 | ||
249 | hb = new QHBoxLayout(); | 249 | hb = new QHBoxLayout(); |
250 | vb->addLayout( hb ); | 250 | vb->addLayout( hb ); |
251 | 251 | ||
252 | QPushButton *pb = new QPushButton( "OK", this ); | 252 | QPushButton *pb = new QPushButton( "OK", this ); |
253 | connect( pb, SIGNAL(clicked()), SLOT(accept())); | 253 | connect( pb, SIGNAL(clicked()), SLOT(accept())); |
254 | hb->addWidget( pb ); | 254 | hb->addWidget( pb ); |
255 | pb = new QPushButton( "Cancel", this ); | 255 | pb = new QPushButton( "Cancel", this ); |
256 | connect( pb, SIGNAL(clicked()), SLOT(reject())); | 256 | connect( pb, SIGNAL(clicked()), SLOT(reject())); |
257 | hb->addWidget( pb ); | 257 | hb->addWidget( pb ); |
258 | 258 | ||
259 | cb->setFocus(); | 259 | cb->setFocus(); |
260 | } | 260 | } |
261 | 261 | ||
262 | void QIMPenInputCharDlg::addSpecial( QComboBox *cb ) | 262 | void QIMPenInputCharDlg::addSpecial( QComboBox *cb ) |
@@ -352,53 +352,53 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent, | |||
352 | 352 | ||
353 | QPushButton *pb = new QPushButton( tr("Default"), this ); | 353 | QPushButton *pb = new QPushButton( tr("Default"), this ); |
354 | connect( pb, SIGNAL(clicked()), SLOT(defaultChars()) ); | 354 | connect( pb, SIGNAL(clicked()), SLOT(defaultChars()) ); |
355 | vb->addWidget( pb ); | 355 | vb->addWidget( pb ); |
356 | 356 | ||
357 | QHBoxLayout *hb = new QHBoxLayout(); | 357 | QHBoxLayout *hb = new QHBoxLayout(); |
358 | gl->addLayout( hb, 2, 1 ); | 358 | gl->addLayout( hb, 2, 1 ); |
359 | prevBtn = new QPushButton( this ); | 359 | prevBtn = new QPushButton( this ); |
360 | prevBtn->setPixmap( QPixmap( (const char **)left_xpm ) ); | 360 | prevBtn->setPixmap( QPixmap( (const char **)left_xpm ) ); |
361 | connect( prevBtn, SIGNAL(clicked()), SLOT(prevChar())); | 361 | connect( prevBtn, SIGNAL(clicked()), SLOT(prevChar())); |
362 | hb->addWidget( prevBtn ); | 362 | hb->addWidget( prevBtn ); |
363 | 363 | ||
364 | nextBtn = new QPushButton( this ); | 364 | nextBtn = new QPushButton( this ); |
365 | nextBtn->setPixmap( QPixmap( (const char **)right_xpm ) ); | 365 | nextBtn->setPixmap( QPixmap( (const char **)right_xpm ) ); |
366 | connect( nextBtn, SIGNAL(clicked()), SLOT(nextChar())); | 366 | connect( nextBtn, SIGNAL(clicked()), SLOT(nextChar())); |
367 | hb->addWidget( nextBtn ); | 367 | hb->addWidget( nextBtn ); |
368 | 368 | ||
369 | pb = new QPushButton( tr("Clear"), this ); | 369 | pb = new QPushButton( tr("Clear"), this ); |
370 | connect( pb, SIGNAL(clicked()), SLOT(clearChar()) ); | 370 | connect( pb, SIGNAL(clicked()), SLOT(clearChar()) ); |
371 | gl->addWidget( pb, 3, 1 ); | 371 | gl->addWidget( pb, 3, 1 ); |
372 | 372 | ||
373 | //-- | 373 | //-- |
374 | #if !defined(Q_WS_QWS) | 374 | #if !defined(Q_WS_QWS) |
375 | hb = new QHBoxLayout( tvb ); | 375 | hb = new QHBoxLayout( tvb ); |
376 | pb = new QPushButton( "OK", this ); | 376 | pb = new QPushButton( tr("OK"), this ); |
377 | connect( pb, SIGNAL(clicked()), SLOT(accept()) ); | 377 | connect( pb, SIGNAL(clicked()), SLOT(accept()) ); |
378 | hb->addWidget( pb ); | 378 | hb->addWidget( pb ); |
379 | 379 | ||
380 | pb = new QPushButton( "Cancel", this ); | 380 | pb = new QPushButton( tr("Cancel"), this ); |
381 | connect( pb, SIGNAL(clicked()), SLOT(reject()) ); | 381 | connect( pb, SIGNAL(clicked()), SLOT(reject()) ); |
382 | hb->addWidget( pb ); | 382 | hb->addWidget( pb ); |
383 | #endif | 383 | #endif |
384 | selectCharSet( 0 ); | 384 | selectCharSet( 0 ); |
385 | charList->setFocus(); | 385 | charList->setFocus(); |
386 | 386 | ||
387 | resize( minimumSize() ); | 387 | resize( minimumSize() ); |
388 | enableButtons(); | 388 | enableButtons(); |
389 | } | 389 | } |
390 | 390 | ||
391 | void QIMPenEdit::setProfile( QIMPenProfile *p ) | 391 | void QIMPenEdit::setProfile( QIMPenProfile *p ) |
392 | { | 392 | { |
393 | profile = p; | 393 | profile = p; |
394 | charSetCombo->clear(); | 394 | charSetCombo->clear(); |
395 | QIMPenCharSetIterator it( profile->charSets() ); | 395 | QIMPenCharSetIterator it( profile->charSets() ); |
396 | for ( ; it.current(); ++it ) { | 396 | for ( ; it.current(); ++it ) { |
397 | charSetCombo->insertItem( it.current()->description() ); | 397 | charSetCombo->insertItem( it.current()->description() ); |
398 | } | 398 | } |
399 | selectCharSet( 0 ); | 399 | selectCharSet( 0 ); |
400 | charList->setFocus(); | 400 | charList->setFocus(); |
401 | enableButtons(); | 401 | enableButtons(); |
402 | } | 402 | } |
403 | 403 | ||
404 | void QIMPenEdit::selectCharSet( QIMPenCharSet *c ) | 404 | void QIMPenEdit::selectCharSet( QIMPenCharSet *c ) |