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.

5 files changed, 38 insertions, 41 deletions

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
@@ -85,4 +85,3 @@ QString HandwritingImpl::name()
 {
-    // return qApp->translate( "InputMethods", "Handwriting" );
-    return "Handwriting";
+    return qApp->translate( "InputMethods", "Handwriting" );
 }
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,5 +1,5 @@
 /**********************************************************************
-** 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.
 **
@@ -137,6 +137,5 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
 {
-    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);
 
@@ -152,16 +151,12 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
     charList->setHScrollBarMode( QListBox::AlwaysOff );
-    charList->setFixedWidth( 80 );
+    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);
 
@@ -174,3 +169,3 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
     QHBoxLayout *hb = new QHBoxLayout();
-    gl->addLayout( hb, 3, 0 );
+    gl->addLayout( hb, 2, 0 );
     prevBtn = new QPushButton( this );
@@ -187,3 +182,3 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
     refPw->setReadOnly( TRUE );
-    gl->addWidget( refPw, 4, 0 );
+    gl->addWidget( refPw, 3, 0 );
 
@@ -199,3 +194,3 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
              matcher, SLOT(strokeEntered( QIMPenStroke * )) );
-    gl->addWidget( pracPw, 4, 1 );
+    gl->addWidget( pracPw, 3, 1 );
 
@@ -229,3 +224,2 @@ void HandwritingTrainer::setCurrentChar( QIMPenChar *c )
     }
-    result->setText( "" );
     redrawTimer->start( 5000 );
@@ -235,2 +229,8 @@ void HandwritingTrainer::selectChar( int i )
 {
+    static int last_char = 0;
+
+    if (last_char != i) {
+        result->setText("");
+    }
+
     currentChar = 0;
@@ -254,2 +254,3 @@ void HandwritingTrainer::selectCharSet( int i )
         pracPw->removeCharSet( 0 );
+        result->setText("");
     }
@@ -268,3 +269,3 @@ void HandwritingTrainer::noMatch()
 {
-    result->setText( "No match" );
+    result->setText( tr("No match") );
 }
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,5 +1,5 @@
 /**********************************************************************
-** 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.
 **
@@ -136,4 +136,4 @@ static char * help_xpm[] = {
 */
-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)
 {
@@ -240,3 +240,3 @@ void QIMPenInput::loadProfiles()
     shortcutCharSet = new QIMPenCharSet();
-    shortcutCharSet->setTitle( "Shortcut" );
+    shortcutCharSet->setTitle( tr("Shortcut") );
     QString path = QPEApplication::qpeDir() + "etc/qimpen";
@@ -256,3 +256,2 @@ void QIMPenInput::loadProfiles()
 
-
     Config config( "handwriting" );
@@ -273,6 +272,4 @@ void QIMPenInput::selectProfile( const QString &name )
 
-    if ( !it.current() ) {
-        qWarning("No profile selected!\n");
-            return;
-    }
+    if ( !it.current() )
+        return;
 
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,5 +1,5 @@
 /**********************************************************************
-** 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.
 **
@@ -96,3 +96,3 @@ QString QIMPenProfile::userConfig()
 
-    un = "handwriting-" + un;
+    un = "handwriting-" + un; // No tr
 
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,5 +1,5 @@
 /**********************************************************************
-** 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.
 **
@@ -237,3 +237,3 @@ QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name,
 
-    QLabel *label = new QLabel( "Character:", this );
+    QLabel *label = new QLabel( tr("Character:"), this );
     hb->addWidget( label );
@@ -375,3 +375,3 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
     hb = new QHBoxLayout( tvb );
-    pb = new QPushButton( "OK", this );
+    pb = new QPushButton( tr("OK"), this );
     connect( pb, SIGNAL(clicked()), SLOT(accept()) );
@@ -379,3 +379,3 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
 
-    pb = new QPushButton( "Cancel", this );
+    pb = new QPushButton( tr("Cancel"), this );
     connect( pb, SIGNAL(clicked()), SLOT(reject()) );