author | sandman <sandman> | 2002-10-22 11:58:33 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-22 11:58:33 (UTC) |
commit | 486280adc2ab5dc383a56d8516c36727eb382812 (patch) (side-by-side diff) | |
tree | 583cf961ec5c62c46137be36fcd9789d7d01158e /inputmethods/handwriting/qimpeninput.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/qimpeninput.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpeninput.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp index 6a21931..3f7a347 100644 --- a/inputmethods/handwriting/qimpeninput.cpp +++ b/inputmethods/handwriting/qimpeninput.cpp @@ -1,10 +1,10 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** @@ -131,14 +131,14 @@ static char * help_xpm[] = { /*! \class QIMPenInput qimpeninput.h Pen input widget. */ -QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags flags ) - : QFrame( parent, name, flags ), helpDlg(0), profile(0) +QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags f ) + : QFrame( parent, name, f ), helpDlg(0), profile(0) { setFrameStyle( Box | Plain ); profileList.setAutoDelete( true ); matcher = new QIMPenMatch( this ); @@ -235,13 +235,13 @@ QSize QIMPenInput::sizeHint() const void QIMPenInput::loadProfiles() { profileList.clear(); profile = 0; delete shortcutCharSet; shortcutCharSet = new QIMPenCharSet(); - shortcutCharSet->setTitle( "Shortcut" ); + shortcutCharSet->setTitle( tr("Shortcut") ); QString path = QPEApplication::qpeDir() + "etc/qimpen"; QDir dir( path, "*.conf" ); QStringList list = dir.entryList(); QStringList::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { QIMPenProfile *p = new QIMPenProfile( path + "/" + *it ); @@ -251,13 +251,12 @@ void QIMPenInput::loadProfiles() for ( ; it.current(); ++it ) { shortcutCharSet->addChar( new QIMPenChar(*it.current()) ); } } } - Config config( "handwriting" ); config.setGroup( "Settings" ); QString prof = config.readEntry( "Profile", "Default" ); selectProfile( prof ); } @@ -268,16 +267,14 @@ void QIMPenInput::selectProfile( const QString &name ) if ( it.current()->name() == name ) { profile = it.current(); break; } } - if ( !it.current() ) { - qWarning("No profile selected!\n"); + if ( !it.current() ) return; - } pw->clearCharSets(); baseSets.clear(); matcher->setMultiStrokeTimeout( profile->multiStrokeTimeout() ); matcher->setWordMatchingEnabled( profile->matchWords() ); |