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) (ignore 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,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 | ** |
@@ -232,13 +232,13 @@ QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name, | |||
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 &)) ); |
@@ -370,17 +370,17 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent, | |||
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 | ||