summaryrefslogtreecommitdiff
path: root/inputmethods
Side-by-side diff
Diffstat (limited to 'inputmethods') (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/dvorak/dvorakimpl.cpp3
-rw-r--r--inputmethods/handwriting/handwritingimpl.cpp3
-rw-r--r--inputmethods/handwriting/qimpenhelp.cpp41
-rw-r--r--inputmethods/handwriting/qimpeninput.cpp15
-rw-r--r--inputmethods/handwriting/qimpenprofile.cpp6
-rw-r--r--inputmethods/handwriting/qimpensetup.cpp10
-rw-r--r--inputmethods/jumpx/keyboardimpl.cpp3
-rw-r--r--inputmethods/keyboard/keyboardimpl.cpp3
-rw-r--r--inputmethods/kjumpx/keyboardimpl.cpp3
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp3
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.cpp3
11 files changed, 42 insertions, 51 deletions
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index d58b6b9..3c83464 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -99,10 +99,9 @@ QPixmap *KeyboardImpl::icon()
}
QString KeyboardImpl::name()
{
- // return qApp->translate( "InputMethods", "Dvorak" );
- return "Dvorak";
+ return qApp->translate( "InputMethods", "Dvorak" );
}
void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
{
diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp
index 0ea140c..c39e1aa 100644
--- a/inputmethods/handwriting/handwritingimpl.cpp
+++ b/inputmethods/handwriting/handwritingimpl.cpp
@@ -82,10 +82,9 @@ QPixmap *HandwritingImpl::icon()
}
QString HandwritingImpl::name()
{
- // return qApp->translate( "InputMethods", "Handwriting" );
- return "Handwriting";
+ return qApp->translate( "InputMethods", "Handwriting" );
}
void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot )
{
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,8 +1,8 @@
/**********************************************************************
-** 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
@@ -134,12 +134,11 @@ void HandwritingHelp::hideEvent( QHideEvent * )
HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const char *name )
: QWidget( parent, name ), profile(p)
{
- QGridLayout *gl = new QGridLayout( this, 5, 2, 0, 4 );
- gl->setRowStretch( 1, 1 );
- gl->setRowStretch( 2, 1 );
+ QGridLayout *gl = new QGridLayout( this, 4, 2, 0, 4 );
gl->setColStretch( 1, 1 );
+ gl->setRowStretch(3, 1);
charSetCombo = new QComboBox( this );
gl->addMultiCellWidget( charSetCombo, 0, 0, 0, 1 );
connect( charSetCombo, SIGNAL(activated(int)), SLOT(selectCharSet(int)));
@@ -151,29 +150,25 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
charList = new QListBox( this );
charList->setHScrollBarMode( QListBox::AlwaysOff );
charList->setFixedWidth( 80 );
connect( charList, SIGNAL(highlighted(int)), this, SLOT(selectChar(int)) );
- gl->addMultiCellWidget( charList, 1, 2, 0, 0 );
-
- QLabel *help = new QLabel( this );
- help->setAlignment( AlignLeft | AlignVCenter | WordBreak );
- gl->addWidget( help, 1, 1 );
- help->setText(
- tr( "Select a character from the list. The writing area on the left "
- "shows the reference character. Practice writing in the area on "
- "the right.") );
+ gl->addWidget(charList, 1, 0);
result = new QLabel( this );
- gl->addMultiCellWidget( result, 2, 3, 1, 1 );
+ result->setAlignment(AlignLeft | AlignVCenter | WordBreak);
+ result->setText(
+ tr( "Select a reference character from the list. Practice writing in "
+ "the area on the right."));
+ gl->addMultiCellWidget(result, 1, 2, 1, 1);
matcher = new QIMPenMatch( this );
matcher->setCharSet( currentSet );
connect( matcher, SIGNAL(noMatch()), this, SLOT(noMatch()) );
connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList &)),
this, SLOT(matched(const QIMPenCharMatchList &)) );
QHBoxLayout *hb = new QHBoxLayout();
- gl->addLayout( hb, 3, 0 );
+ gl->addLayout( hb, 2, 0 );
prevBtn = new QPushButton( this );
prevBtn->setPixmap( QPixmap( (const char **)left_xpm ) );
connect( prevBtn, SIGNAL(clicked()), SLOT(prevChar()));
hb->addWidget( prevBtn );
@@ -184,9 +179,9 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
hb->addWidget( nextBtn );
refPw = new QIMPenWidget( this );
refPw->setReadOnly( TRUE );
- gl->addWidget( refPw, 4, 0 );
+ gl->addWidget( refPw, 3, 0 );
pracPw = new QIMPenWidget( this );
connect( matcher, SIGNAL(removeStroke()), pracPw, SLOT(removeStroke()) );
connect( pracPw, SIGNAL(beginStroke()),
@@ -196,9 +191,9 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
connect( pracPw, SIGNAL(beginStroke()),
matcher, SLOT(beginStroke()) );
connect( pracPw, SIGNAL(stroke( QIMPenStroke * )),
matcher, SLOT(strokeEntered( QIMPenStroke * )) );
- gl->addWidget( pracPw, 4, 1 );
+ gl->addWidget( pracPw, 3, 1 );
redrawTimer = new QTimer( this );
connect( redrawTimer, SIGNAL(timeout()), this, SLOT(redrawChar()) );
redrawTimer->start( 5000 );
@@ -226,14 +221,19 @@ void HandwritingTrainer::setCurrentChar( QIMPenChar *c )
if ( currentChar ) {
prevBtn->setEnabled( findPrev() != 0 );
nextBtn->setEnabled( findNext() != 0 );
}
- result->setText( "" );
redrawTimer->start( 5000 );
}
void HandwritingTrainer::selectChar( int i )
{
+ static int last_char = 0;
+
+ if (last_char != i) {
+ result->setText("");
+ }
+
currentChar = 0;
currentCode = ((CharListItem *)charList->item(i))->code();
QIMPenCharIterator it(currentSet->characters() );
for ( ; it.current(); ++it ) {
@@ -251,8 +251,9 @@ void HandwritingTrainer::selectCharSet( int i )
{
if ( currentSet ) {
refPw->removeCharSet( 0 );
pracPw->removeCharSet( 0 );
+ result->setText("");
}
currentSet = profile->charSets().at( i );
fillCharList();
refPw->insertCharSet( currentSet );
@@ -265,9 +266,9 @@ void HandwritingTrainer::selectCharSet( int i )
}
void HandwritingTrainer::noMatch()
{
- result->setText( "No match" );
+ result->setText( tr("No match") );
}
void HandwritingTrainer::matched( const QIMPenCharMatchList &ml )
{
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,8 +1,8 @@
/**********************************************************************
-** 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
@@ -133,10 +133,10 @@ 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 );
@@ -237,9 +237,9 @@ 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;
@@ -253,9 +253,8 @@ void QIMPenInput::loadProfiles()
}
}
}
-
Config config( "handwriting" );
config.setGroup( "Settings" );
QString prof = config.readEntry( "Profile", "Default" );
selectProfile( prof );
@@ -270,12 +269,10 @@ void QIMPenInput::selectProfile( const QString &name )
break;
}
}
- if ( !it.current() ) {
- qWarning("No profile selected!\n");
+ if ( !it.current() )
return;
- }
pw->clearCharSets();
baseSets.clear();
diff --git a/inputmethods/handwriting/qimpenprofile.cpp b/inputmethods/handwriting/qimpenprofile.cpp
index 4b5bb83..3b1b5e9 100644
--- a/inputmethods/handwriting/qimpenprofile.cpp
+++ b/inputmethods/handwriting/qimpenprofile.cpp
@@ -1,8 +1,8 @@
/**********************************************************************
-** 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
@@ -93,9 +93,9 @@ QString QIMPenProfile::userConfig()
pos = un.find( '.' );
if ( pos > 0 )
un.truncate( pos );
- un = "handwriting-" + un;
+ un = "handwriting-" + un; // No tr
return un;
}
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,8 +1,8 @@
/**********************************************************************
-** 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
@@ -234,9 +234,9 @@ QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name,
QHBoxLayout *hb = new QHBoxLayout();
vb->addLayout( hb );
- QLabel *label = new QLabel( "Character:", this );
+ QLabel *label = new QLabel( tr("Character:"), this );
hb->addWidget( label );
QComboBox *cb = new QComboBox( TRUE, this );
connect( cb, SIGNAL(activated(int)), SLOT(setSpecial(int)) );
@@ -372,13 +372,13 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
//--
#if !defined(Q_WS_QWS)
hb = new QHBoxLayout( tvb );
- pb = new QPushButton( "OK", this );
+ pb = new QPushButton( tr("OK"), this );
connect( pb, SIGNAL(clicked()), SLOT(accept()) );
hb->addWidget( pb );
- pb = new QPushButton( "Cancel", this );
+ pb = new QPushButton( tr("Cancel"), this );
connect( pb, SIGNAL(clicked()), SLOT(reject()) );
hb->addWidget( pb );
#endif
selectCharSet( 0 );
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index 004f0b0..92abb09 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -66,10 +66,9 @@ QPixmap *KeyboardImpl::icon()
}
QString KeyboardImpl::name()
{
- // return qApp->translate( "InputMethods", "JumpX" );
- return "JumpX";
+ return qApp->translate( "InputMethods", "JumpX" );
}
void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
{
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index 56e6870..bc96402 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -99,10 +99,9 @@ QPixmap *KeyboardImpl::icon()
}
QString KeyboardImpl::name()
{
- // return qApp->translate( "InputMethods", "Keyboard" );
- return "Keyboard";
+ return qApp->translate( "InputMethods", "Keyboard" );
}
void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
{
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index dbae2b4..5d8e0d3 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -66,10 +66,9 @@ QPixmap *KeyboardImpl::icon()
}
QString KeyboardImpl::name()
{
- // return qApp->translate( "InputMethods", "KJumpX" );
- return "KJumpX";
+ return qApp->translate( "InputMethods", "KJumpX" );
}
void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
{
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index 617acff..a4e8f02 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -69,10 +69,9 @@ QPixmap *PickboardImpl::icon()
}
QString PickboardImpl::name()
{
- // return qApp->translate( "InputMethods", "Pickboard" );
- return "Pickboard";
+ return qApp->translate( "InputMethods", "Pickboard" );
}
void PickboardImpl::onKeyPress( QObject *receiver, const char *slot )
{
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.cpp b/inputmethods/unikeyboard/unikeyboardimpl.cpp
index aa05b31..fe601e0 100644
--- a/inputmethods/unikeyboard/unikeyboardimpl.cpp
+++ b/inputmethods/unikeyboard/unikeyboardimpl.cpp
@@ -74,10 +74,9 @@ QPixmap *UniKeyboardImpl::icon()
}
QString UniKeyboardImpl::name()
{
- // return qApp->translate( "InputMethods", "Unicode" );
- return "Unicode";
+ return qApp->translate( "InputMethods", "Unicode" );
}
void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
{