Diffstat (limited to 'inputmethods/pickboard/pickboardcfg.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | inputmethods/pickboard/pickboardcfg.cpp | 69 |
1 files changed, 38 insertions, 31 deletions
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); } |