| -rw-r--r-- | inputmethods/handwriting/qimpeninput.cpp | 4 | ||||
| -rw-r--r-- | inputmethods/handwriting/qimpeninput.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp index 3f7a347..db33c9b 100644 --- a/inputmethods/handwriting/qimpeninput.cpp +++ b/inputmethods/handwriting/qimpeninput.cpp @@ -89,98 +89,98 @@ static char * enter_xpm[] = { "12 12 5 1", " c None", ". c #333333", "+ c #000000", "@ c #FFFFFF", "# c #666666", " ", " .+. ", " +@+ ", " . +@+ ", " ++ +@+ ", " +@#++++@+ ", " +@@@@@@@@+ ", " +@#+++++. ", " ++ ", " . ", " ", " "}; /* XPM */ static char * help_xpm[] = { "12 12 5 1", " c None", ". c #000000", "+ c #FFFFFF", "@ c #666666", "# c #333333", " ", " ... ", " .+++. ", " .+..@+. ", " #.# .+. ", " .+. ", " .+. ", " .+. ", " .+. ", " #.# ", " .+. ", " #.# "}; /*! \class QIMPenInput qimpeninput.h Pen input widget. */ -QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags f ) - : QFrame( parent, name, f ), helpDlg(0), profile(0) +QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags wf ) + : QFrame( parent, name, wf ), helpDlg(0), profile(0) { setFrameStyle( Box | Plain ); profileList.setAutoDelete( true ); matcher = new QIMPenMatch( this ); connect( matcher, SIGNAL(keypress(uint)), this, SLOT(keypress(uint)) ); connect( matcher, SIGNAL(erase()), this, SLOT(erase()) ); QGridLayout *gl = new QGridLayout( this, 5, 2, 1, 0 ); gl->setColStretch( 0, 1 ); wordPicker = new QIMPenWordPick( this ); connect( wordPicker, SIGNAL(wordClicked(const QString &)), this, SLOT(wordPicked(const QString &)) ); connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList &)), this, SLOT(matchedCharacters(const QIMPenCharMatchList &)) ); connect( matcher, SIGNAL(matchedWords(const QIMPenMatch::MatchWordList&)), wordPicker, SLOT(setWords(const QIMPenMatch::MatchWordList&)) ); QFont f("smallsmooth",9); QFontInfo fi( f ); wordPicker->setFont( f ); wordPicker->setBackgroundColor( white ); gl->addMultiCellWidget( wordPicker, 0, 0, 0, 1 ); if ( !Global::fixedDawg().root() || !matcher->isWordMatchingEnabled() ) wordPicker->hide(); pw = new QIMPenWidget( this ); gl->addMultiCellWidget( pw, 1, 4, 0, 0 ); int bh = pw->sizeHint().height()/4; QPushButton *b = new QPushButton( this ); b->setFocusPolicy( NoFocus ); b->setPixmap( QPixmap( (const char **)bs_xpm ) ); b->setFixedHeight(pw->sizeHint().height()-3*bh); // left-over space goes here b->setAutoRepeat( TRUE ); gl->addWidget( b, 1, 1 ); connect( b, SIGNAL(clicked()), SLOT(backspace())); b = new QPushButton( this ); b->setFocusPolicy( NoFocus ); b->setPixmap( QPixmap( (const char **)enter_xpm ) ); b->setFixedHeight(bh); b->setAutoRepeat( TRUE ); gl->addWidget( b, 2, 1 ); connect( b, SIGNAL(clicked()), SLOT(enter())); diff --git a/inputmethods/handwriting/qimpeninput.h b/inputmethods/handwriting/qimpeninput.h index b4e4006..75cf260 100644 --- a/inputmethods/handwriting/qimpeninput.h +++ b/inputmethods/handwriting/qimpeninput.h @@ -1,92 +1,92 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of 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. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #ifndef _QIMPENINPUT_H_ #define _QIMPENINPUT_H_ #include "qimpenprofile.h" #include <qpe/qdawg.h> #include <qframe.h> #include <qlist.h> #include <qguardedptr.h> class QPushButton; class QTimer; class QIMPenWidget; class QIMPenSetup; class QIMPenWordPick; class QIMPenMatch; class HandwritingHelp; class QIMPenInput : public QFrame { Q_OBJECT public: - QIMPenInput( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + QIMPenInput( QWidget *parent = 0, const char *name = 0, WFlags wf = 0 ); virtual ~QIMPenInput(); void resetState(); QSize sizeHint() const; signals: void key( ushort, ushort, ushort, bool, bool ); private slots: void wordPicked( const QString & ); void selectCharSet( int ); void beginStroke(); void strokeEntered( QIMPenStroke *st ); void matchedCharacters( const QIMPenCharMatchList &cl ); void keypress( uint scan_uni ); void erase(); void help(); void setup(); void backspace(); void enter(); private: void loadProfiles(); void selectProfile( const QString &name ); void handleExtended( const QString & ); void updateWordMatch( QIMPenCharMatchList &ml ); void matchWords(); void scanDict( const QDawg::Node* n, int ipos, const QString& str, int error ); enum Mode { Normal, Switch, SwitchLock }; private: Mode mode; QRect prefRect; QIMPenWidget *pw; QPushButton *helpBtn; QPushButton *setupBtn; QIMPenSetup *setupDlg; QIMPenMatch *matcher; QGuardedPtr<HandwritingHelp> helpDlg; QIMPenProfile *profile; QList<QIMPenProfile> profileList; QIMPenCharSet *shortcutCharSet; QIMPenCharSetList baseSets; int currCharSet; QIMPenWordPick *wordPicker; }; |