summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-15 02:30:08 (UTC)
committer zecke <zecke>2004-10-15 02:30:08 (UTC)
commit5c3759f02725c17ba0efc386193a83da55a9a5da (patch) (side-by-side diff)
treeb03e604b282de315096b74b6f404851c2bba3ad6
parentfefeafe35f8dac30f4baab9e3bff8e2ffbd1afd0 (diff)
downloadopie-5c3759f02725c17ba0efc386193a83da55a9a5da.zip
opie-5c3759f02725c17ba0efc386193a83da55a9a5da.tar.gz
opie-5c3759f02725c17ba0efc386193a83da55a9a5da.tar.bz2
Apply patch from Qtopia1.7 to allow 'Umlaute' in the pickboard
and make 'strings' translatable. This also fixes #501
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/pickboard/pickboard.cpp25
-rw-r--r--inputmethods/pickboard/pickboardcfg.cpp69
-rw-r--r--inputmethods/pickboard/pickboardcfg.h19
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp6
-rw-r--r--inputmethods/pickboard/pickboardpicks.cpp31
5 files changed, 91 insertions, 59 deletions
diff --git a/inputmethods/pickboard/pickboard.cpp b/inputmethods/pickboard/pickboard.cpp
index 087144e..1611cb0 100644
--- a/inputmethods/pickboard/pickboard.cpp
+++ b/inputmethods/pickboard/pickboard.cpp
@@ -1,6 +1,6 @@
/**********************************************************************
-** 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
@@ -35,5 +35,23 @@
#include <qpushbutton.h>
#include <qmessagebox.h>
+#ifdef QWS
#include <qwindowsystem_qws.h>
+#endif
+
+/*! \class Pickboard
+ \brief The Pickboard class provides an input method
+ based on a virtual keyboard combined with word-completion.
+
+ This version of Pickboard is Dual Licensed Software. However, for you to be
+ able to license the technology to others, you may require a T9(R) Text
+ Input license from Tegic Communications Corporation. More information can
+ be found at http://www.t9.com/.
+
+ \legalese
+ This version of Pickboard is Dual Licensed Software. However, for you to be
+ able to license the technology to others, you may require a T9(R) Text
+ Input license from Tegic Communications Corporation. More information can
+ be found at http://www.t9.com/.
+*/
/* XPM */
@@ -75,5 +93,8 @@ Pickboard::Pickboard(QWidget* parent, const char* name, WFlags f) :
(new QHBoxLayout(this))->setAutoAdd(TRUE);
d = new PickboardPrivate(this);
+// under Win32 we may not have smallsmooth font
+#ifndef Q_OS_WIN32
setFont( QFont( "smallsmooth", 9 ) );
+#endif
}
diff --git a/inputmethods/pickboard/pickboardcfg.cpp b/inputmethods/pickboard/pickboardcfg.cpp
index d500266..70a89cd 100644
--- a/inputmethods/pickboard/pickboardcfg.cpp
+++ b/inputmethods/pickboard/pickboardcfg.cpp
@@ -1,6 +1,6 @@
/**********************************************************************
-** 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
@@ -35,8 +35,10 @@
#include <qpushbutton.h>
#include <qmessagebox.h>
+#ifdef QWS
#include <qwindowsystem_qws.h>
+#endif
static const char * pickboard_help =
- "<h1>The Pickboard</h1>"
+ QT_TRANSLATE_NOOP("PickboardConfig", "<h1>The Pickboard</h1>"
"<i>The smallest and fastest way to type.</i>"
"<p>"
@@ -45,5 +47,5 @@ static const char * pickboard_help =
"<br>Use \"Shift\" to capitalize words that are not normally capitalized."
"<br>Press \"Shift\" twice for an all-capitals word."
- "<br>Add custom words by picking them, then selecting \"Add...\" from the menu on the right."
+ "<br>Add custom words by picking them, then selecting \"Add...\" from the menu on the right." )
;
@@ -77,8 +79,12 @@ void PickboardConfig::generateText(const QString& s)
#if defined(Q_WS_QWS) || defined(_WS_QWS_)
for (int i=0; i<(int)s.length(); i++) {
- parent->emitKey(s[i].unicode(), 0, 0, true, false);
- parent->emitKey(s[i].unicode(), 0, 0, false, false);
+ uint code = 0;
+ if ( s[i].unicode() >= 'a' && s[i].unicode() <= 'z' ) {
+ code = s[i].unicode() - 'a' + Key_A;
+ }
+ parent->emitKey(s[i].unicode(), code, 0, true, false);
+ parent->emitKey(s[i].unicode(), code, 0, false, false);
}
-#endif
+#endif
}
void PickboardConfig::generateKey( int k )
@@ -113,7 +119,7 @@ void PickboardConfig::pickPoint(const QPoint& p, bool press)
void PickboardConfig::fillMenu(QPopupMenu& menu)
{
- menu.insertItem("Reset",100);
+ menu.insertItem(tr("Reset"),100);
menu.insertSeparator();
- menu.insertItem("Help",1);
+ menu.insertItem(tr("Help"),1);
}
@@ -128,5 +134,5 @@ void PickboardConfig::doMenu(int i)
break;
case 1: {
- QMessageBox help("Pickboard Help", pickboard_help,
+ QMessageBox help(tr("Pickboard Help"), tr(pickboard_help),
QMessageBox::NoIcon, 1, 0, 0);
help.showMaximized();
@@ -159,8 +165,8 @@ void StringConfig::draw(QPainter* p)
int w = fm.width(s)+xw;
if ( highlight(r,i) ) {
- p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),::Qt::black);
- p->setPen(::Qt::white);
+ p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),Qt::black);
+ p->setPen(Qt::white);
}else{
- p->setPen(::Qt::black);
+ p->setPen(Qt::black);
}
p->drawText(x,-fm.descent()-1,s);
@@ -294,7 +300,7 @@ PickboardAdd::PickboardAdd(QWidget* owner, const QStringList& setlist) :
QHBox* hb = new QHBox(this);
hb->setSpacing(0);
- yes = new QPushButton("OK",hb);
+ yes = new QPushButton(tr("OK"),hb);
yes->setEnabled(FALSE);
- QPushButton *no = new QPushButton("Cancel",hb);
+ QPushButton *no = new QPushButton(tr("Cancel"),hb);
connect(yes, SIGNAL(clicked()), this, SLOT(accept()));
connect(no, SIGNAL(clicked()), this, SLOT(reject()));
@@ -344,9 +350,9 @@ void DictFilterConfig::doMenu(int i)
case 300:
if ( input.count() == 0 ) {
- QMessageBox::information(0, "Adding Words",
- "To add words, pick the letters,\nthen "
+ QMessageBox::information(0, tr("Adding Words"),
+ tr("To add words, pick the letters,\nthen "
"open the Add dialog. In that\ndialog, tap "
"the correct letters\nfrom the list "
- "(tap twice for\ncapitals).");
+ "(tap twice for\ncapitals)."));
} else {
PickboardAdd add(parent,capitalize(input));
@@ -375,5 +381,5 @@ void DictFilterConfig::doMenu(int i)
QString DictFilterConfig::text(int r, int i)
{
- QStringList l = r ? sets : input.isEmpty() ? othermodes : matches;
+ QStringList l = r ? sets_a : input.isEmpty() ? othermodes : matches;
return i < (int)l.count() ?
(input.isEmpty() ? l[i] : capitalize(l[i]))
@@ -427,14 +433,14 @@ void DictFilterConfig::pick(bool press, int row, int item)
if ( input.isEmpty() ) {
lit0 = item;
- if ( othermodes[item] == "Space" ) {
+ if ( othermodes[item] == PickboardPicks::tr("Space") ) {
updateItem(row,item);
generateText(" ");
- } else if ( othermodes[item] == "Back" ) {
+ } else if ( othermodes[item] == PickboardPicks::tr("Back") ) {
updateItem(row,item);
generateKey(::Qt::Key_Backspace);
- } else if ( othermodes[item] == "Enter" ) {
- updateItem(row,item);
+ } else if ( othermodes[item] == PickboardPicks::tr("Enter") ) {
+ updateItem(row,item);
generateKey(::Qt::Key_Return);
- } else if ( othermodes[item] == "Shift" ) {
+ } else if ( othermodes[item] == PickboardPicks::tr("Shift") ) {
updateItem(row,item);
shift = (shift+1)%3;
@@ -456,6 +462,6 @@ void DictFilterConfig::pick(bool press, int row, int item)
}
if ( lit0 >= 0 ) {
- if ( !shift || othermodes[lit0] != "Shift" ) {
- updateItem(0,lit0);
+ if ( !shift || othermodes[lit0] != PickboardPicks::tr("Shift") ) {
+ updateItem(0,lit0);
lit0 = -1;
}
@@ -467,8 +473,8 @@ void DictFilterConfig::pick(bool press, int row, int item)
lit1 = item;
add(sets[item]);
- updateItem(1,item);
+ updateItem(1,item);
updateRows(0,0);
} else {
- updateItem(1,lit1);
+ updateItem(1,lit1);
lit1 = -1;
}
@@ -569,7 +575,8 @@ bool DictFilterConfig::highlight(int r,int c) const
-void DictFilterConfig::addSet(const QString& s)
+void DictFilterConfig::addSet(const QString& appearance, const QString& set)
{
- sets.append(s);
+ sets_a.append( appearance );
+ sets.append( set );
}
@@ -581,5 +588,5 @@ void DictFilterConfig::addMode(const QString& s)
void DictFilterConfig::fillMenu(QPopupMenu& menu)
{
- menu.insertItem("Add...",300);
+ menu.insertItem(tr("Add..."),300);
StringConfig::fillMenu(menu);
}
diff --git a/inputmethods/pickboard/pickboardcfg.h b/inputmethods/pickboard/pickboardcfg.h
index b1913df..92c6420 100644
--- a/inputmethods/pickboard/pickboardcfg.h
+++ b/inputmethods/pickboard/pickboardcfg.h
@@ -1,6 +1,6 @@
/**********************************************************************
-** 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
@@ -77,5 +77,6 @@ private:
};
-class PickboardConfig : QObject {
+class PickboardConfig : public QObject {
+ Q_OBJECT
public:
PickboardConfig(PickboardPicks* p) : parent(p), nrows(2), pressx(-1) { }
@@ -105,4 +106,5 @@ private:
class StringConfig : public PickboardConfig {
+ Q_OBJECT
public:
StringConfig(PickboardPicks* p) : PickboardConfig(p) { }
@@ -113,5 +115,5 @@ protected:
virtual QString text(int r, int i)=0;
virtual bool spreadRow(int i)=0;
- virtual QColor rowColor(int) { return ::Qt::black; }
+ virtual QColor rowColor(int) { return Qt::black; }
virtual void pickInRow(int r, int xpos, bool press);
virtual void updateItem(int r, int i);
@@ -120,4 +122,5 @@ protected:
class CharStringConfig : public StringConfig {
+ Q_OBJECT
QString input;
QStringList chars;
@@ -135,5 +138,7 @@ protected:
class DictFilterConfig : public StringConfig {
+ Q_OBJECT
QStringList matches;
+ QStringList sets_a;
QStringList sets;
QStringList othermodes;
@@ -153,5 +158,5 @@ public:
}
- void addSet(const QString& s);
+ void addSet(const QString& apperance, const QString& set);
void addMode(const QString& s);
@@ -176,4 +181,5 @@ protected:
class CharConfig : public StringConfig {
+ Q_OBJECT
QStringList chars1;
QStringList chars2;
@@ -193,6 +199,5 @@ class KeycodeConfig : public PickboardConfig {
QValueList<QPixmap> keypm1;
QValueList<QPixmap> keypm2;
- static const int xw = 8;
- static const int xmarg = 8;
+ enum { xw = 8, xmarg = 8 };
public:
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index 9a21229..f839452 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -1,6 +1,6 @@
/**********************************************************************
-** 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
@@ -28,5 +28,5 @@ static const char * pb_xpm[]={
"28 7 2 1",
"# c #303030",
-" c None",
+" c None", // No tr
" ########################## ",
" # # # # # # # ",
diff --git a/inputmethods/pickboard/pickboardpicks.cpp b/inputmethods/pickboard/pickboardpicks.cpp
index a80bbf8..b9d9928 100644
--- a/inputmethods/pickboard/pickboardpicks.cpp
+++ b/inputmethods/pickboard/pickboardpicks.cpp
@@ -1,6 +1,6 @@
/**********************************************************************
-** 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
@@ -34,5 +34,7 @@
#include <qpushbutton.h>
#include <qmessagebox.h>
+#ifdef QWS
#include <qwindowsystem_qws.h>
+#endif
void PickboardPicks::doMenu()
@@ -249,4 +251,5 @@ PickboardPicks::PickboardPicks(QWidget* parent, const char* name, WFlags f ) :
QFrame(parent,name,f)
{
+ configs.setAutoDelete( TRUE );
}
@@ -257,20 +260,16 @@ void PickboardPicks::initialise(void)
DictFilterConfig* dc = new DictFilterConfig(this);
- dc->addSet("ABC");
- dc->addSet("DEF");
- dc->addSet("GHI");
- dc->addSet("JKL");
- dc->addSet("MNO");
- dc->addSet("PQR");
- dc->addSet("STU");
- dc->addSet("VWX");
- dc->addSet("YZ-'");
+ QStringList sets_a = QStringList::split(' ',tr("ABC DEF GHI JKL MNO PQR STU VWX YZ-'"));
+ QStringList sets = QStringList::split(' ',
+ tr("ABC%/1iso8859-15 DEF%/1iso8859-15 GHI%/1iso8859-15 JKL MNO%/1iso8859-15 PQR%/1iso8859-15 STU%/1iso8859-15 VWX YZ-'%/1iso8859-15"));
+ for (QStringList::ConstIterator it = sets.begin(), it_a = sets_a.begin(); it!=sets.end(); ++it,++it_a)
+ dc->addSet(*it_a,*it);
dc->addMode("123");
dc->addMode("@*!?");
- dc->addMode("KEY");
- dc->addMode("Space");
- dc->addMode("Back");
- dc->addMode("Enter");
- dc->addMode("Shift");
+ dc->addMode(tr("KEY"));
+ dc->addMode(tr("Space"));
+ dc->addMode(tr("Back"));
+ dc->addMode(tr("Enter"));
+ dc->addMode(tr("Shift"));
configs.append(dc);