summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/handwriting/config.in2
-rw-r--r--inputmethods/handwriting/handwriting.pro2
-rw-r--r--inputmethods/handwriting/qimpenchar.cpp4
-rw-r--r--inputmethods/handwriting/qimpensetup.cpp3
4 files changed, 6 insertions, 5 deletions
diff --git a/inputmethods/handwriting/config.in b/inputmethods/handwriting/config.in
index 3a5fddb..b4acc9a 100644
--- a/inputmethods/handwriting/config.in
+++ b/inputmethods/handwriting/config.in
@@ -1,8 +1,8 @@
1 config HANDWRITING 1 config HANDWRITING
2 boolean "opie-handwriting (Handwriting recognition)" 2 boolean "opie-handwriting (Handwriting recognition)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
5 comment "opie-handwriting-classicset automatically selected" 5 comment "opie-handwriting-classicset automatically selected"
6 depends HANDWRITING 6 depends HANDWRITING
7 comment "opie-handwriting-graffitiset automatically selected" 7 comment "opie-handwriting-graffitiset automatically selected"
8 depends HANDWRITING 8 depends HANDWRITING
diff --git a/inputmethods/handwriting/handwriting.pro b/inputmethods/handwriting/handwriting.pro
index 3800381..e6f3b3f 100644
--- a/inputmethods/handwriting/handwriting.pro
+++ b/inputmethods/handwriting/handwriting.pro
@@ -6,29 +6,29 @@ HEADERS = qimpenchar.h \
6 qimpenhelp.h \ 6 qimpenhelp.h \
7 qimpeninput.h \ 7 qimpeninput.h \
8 qimpenmatch.h \ 8 qimpenmatch.h \
9 qimpensetup.h \ 9 qimpensetup.h \
10 qimpenstroke.h \ 10 qimpenstroke.h \
11 qimpenwidget.h \ 11 qimpenwidget.h \
12 qimpenwordpick.h \ 12 qimpenwordpick.h \
13 handwritingimpl.h 13 handwritingimpl.h
14 SOURCES= qimpenchar.cpp \ 14 SOURCES= qimpenchar.cpp \
15 qimpenprofile.cpp \ 15 qimpenprofile.cpp \
16 qimpencombining.cpp \ 16 qimpencombining.cpp \
17 qimpenhelp.cpp \ 17 qimpenhelp.cpp \
18 qimpeninput.cpp \ 18 qimpeninput.cpp \
19 qimpenmatch.cpp \ 19 qimpenmatch.cpp \
20 qimpensetup.cpp \ 20 qimpensetup.cpp \
21 qimpenstroke.cpp \ 21 qimpenstroke.cpp \
22 qimpenwidget.cpp \ 22 qimpenwidget.cpp \
23 qimpenwordpick.cpp \ 23 qimpenwordpick.cpp \
24 handwritingimpl.cpp 24 handwritingimpl.cpp
25INTERFACES = qimpenprefbase.ui 25INTERFACES = qimpenprefbase.ui
26 TARGET = qhandwriting 26 TARGET = qhandwriting
27 DESTDIR = ../../plugins/inputmethods 27 DESTDIR = ../../plugins/inputmethods
28INCLUDEPATH += $(OPIEDIR)/include 28INCLUDEPATH += $(OPIEDIR)/include
29DEPENDPATH += ../$(OPIEDIR)/include ../../launcher 29DEPENDPATH += ../$(OPIEDIR)/include ../../launcher
30LIBS += -lqpe 30LIBS += -lqpe -lopiecore2
31 VERSION = 1.0.0 31 VERSION = 1.0.0
32 32
33include ( $(OPIEDIR)/include.pro ) 33include ( $(OPIEDIR)/include.pro )
34target.path = $$prefix/plugins/inputmethods 34target.path = $$prefix/plugins/inputmethods
diff --git a/inputmethods/handwriting/qimpenchar.cpp b/inputmethods/handwriting/qimpenchar.cpp
index db5d135..b83b2a4 100644
--- a/inputmethods/handwriting/qimpenchar.cpp
+++ b/inputmethods/handwriting/qimpenchar.cpp
@@ -371,50 +371,50 @@ bool QIMPenCharSet::save( Domain d )
371 QByteArray buf; 371 QByteArray buf;
372 QDataStream ds( buf, IO_WriteOnly ); 372 QDataStream ds( buf, IO_WriteOnly );
373 ds << QString( "QPT 1.1" ); 373 ds << QString( "QPT 1.1" );
374 ds << csTitle; 374 ds << csTitle;
375 ds << desc; 375 ds << desc;
376 ds << (Q_INT8)csType; 376 ds << (Q_INT8)csType;
377 QIMPenCharIterator ci( chars ); 377 QIMPenCharIterator ci( chars );
378 for ( ; ci.current(); ++ci ) { 378 for ( ; ci.current(); ++ci ) {
379 QIMPenChar *pc = ci.current(); 379 QIMPenChar *pc = ci.current();
380 if ( ( ( (d == System) && pc->testFlag( QIMPenChar::System ) ) || 380 if ( ( ( (d == System) && pc->testFlag( QIMPenChar::System ) ) ||
381 ( (d == User) && !pc->testFlag( QIMPenChar::System ) ) ) && 381 ( (d == User) && !pc->testFlag( QIMPenChar::System ) ) ) &&
382 ( !pc->testFlag (QIMPenChar::Combined ) ) ) { 382 ( !pc->testFlag (QIMPenChar::Combined ) ) ) {
383 ds << *pc; 383 ds << *pc;
384 } 384 }
385 } 385 }
386 386
387 file.writeBlock( buf ); 387 file.writeBlock( buf );
388 file.close(); 388 file.close();
389 if ( file.status() == IO_Ok ) 389 if ( file.status() == IO_Ok )
390 ok = TRUE; 390 ok = TRUE;
391 } 391 }
392 392
393 if ( ok ) { 393 if ( ok ) {
394 if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) { 394 if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) {
395 qWarning( "problem renaming file %s to %s, errno: %d", 395 owarn << "problem renaming file " <<tmpFn.latin1() << " to "<< fn.latin1()
396 tmpFn.latin1(), fn.latin1(), errno ); 396 << ", errno: " << errno << oendl;
397 // remove the tmp file, otherwise, it will just lay around... 397 // remove the tmp file, otherwise, it will just lay around...
398 QFile::remove( tmpFn.latin1() ); 398 QFile::remove( tmpFn.latin1() );
399 ok = FALSE; 399 ok = FALSE;
400 } 400 }
401 } 401 }
402 402
403 return ok; 403 return ok;
404} 404}
405 405
406QIMPenChar *QIMPenCharSet::at( int i ) 406QIMPenChar *QIMPenCharSet::at( int i )
407{ 407{
408 return chars.at(i); 408 return chars.at(i);
409} 409}
410 410
411void QIMPenCharSet::markDeleted( uint ch ) 411void QIMPenCharSet::markDeleted( uint ch )
412{ 412{
413 QIMPenCharIterator ci( chars ); 413 QIMPenCharIterator ci( chars );
414 for ( ; ci.current(); ++ci ) { 414 for ( ; ci.current(); ++ci ) {
415 QIMPenChar *pc = ci.current(); 415 QIMPenChar *pc = ci.current();
416 if ( pc->character() == ch && pc->testFlag( QIMPenChar::System ) ) 416 if ( pc->character() == ch && pc->testFlag( QIMPenChar::System ) )
417 pc->setFlag( QIMPenChar::Deleted ); 417 pc->setFlag( QIMPenChar::Deleted );
418 } 418 }
419} 419}
420 420
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp
index 3f4841d..564b6ba 100644
--- a/inputmethods/handwriting/qimpensetup.cpp
+++ b/inputmethods/handwriting/qimpensetup.cpp
@@ -15,48 +15,49 @@
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "qimpenwidget.h" 21#include "qimpenwidget.h"
22#include "qimpenprefbase.h" 22#include "qimpenprefbase.h"
23#include "qimpensetup.h" 23#include "qimpensetup.h"
24 24
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27 27
28#include <qcombobox.h> 28#include <qcombobox.h>
29#include <qlistbox.h> 29#include <qlistbox.h>
30#include <qlabel.h> 30#include <qlabel.h>
31#include <qpushbutton.h> 31#include <qpushbutton.h>
32#include <qlayout.h> 32#include <qlayout.h>
33#include <qpixmap.h> 33#include <qpixmap.h>
34#include <qbuttongroup.h> 34#include <qbuttongroup.h>
35#include <qslider.h> 35#include <qslider.h>
36#include <qtabwidget.h> 36#include <qtabwidget.h>
37#include <qdir.h> 37#include <qdir.h>
38#include <qmessagebox.h> 38#include <qmessagebox.h>
39#include <opie2/odebug.h>
39 40
40 41
41/* XPM */ 42/* XPM */
42static const char * const left_xpm[] = { 43static const char * const left_xpm[] = {
43"16 16 2 1", 44"16 16 2 1",
44 " c None", 45 " c None",
45 ".c #000000", 46 ".c #000000",
46" ", 47" ",
47" ", 48" ",
48" ", 49" ",
49" . ", 50" . ",
50" .. ", 51" .. ",
51" ... ", 52" ... ",
52" .... ", 53" .... ",
53" ..... ", 54" ..... ",
54" ...... ", 55" ...... ",
55" ..... ", 56" ..... ",
56" .... ", 57" .... ",
57" ... ", 58" ... ",
58" .. ", 59" .. ",
59" . ", 60" . ",
60" ", 61" ",
61" "}; 62" "};
62 63
@@ -87,49 +88,49 @@ static const char * const right_xpm[] = {
87 88
88QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, 89QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent,
89 const char *name, bool modal, int WFlags ) 90 const char *name, bool modal, int WFlags )
90 : QDialog( parent, name, modal, WFlags ), profileCombo(0), profile(p) 91 : QDialog( parent, name, modal, WFlags ), profileCombo(0), profile(p)
91{ 92{
92 setCaption( tr("Setup Handwriting Input") ); 93 setCaption( tr("Setup Handwriting Input") );
93 94
94 QVBoxLayout *vb = new QVBoxLayout( this ); 95 QVBoxLayout *vb = new QVBoxLayout( this );
95 96
96#define MULTIPROFILE 97#define MULTIPROFILE
97#ifdef MULTIPROFILE 98#ifdef MULTIPROFILE
98 profileList.setAutoDelete( true ); 99 profileList.setAutoDelete( true );
99 QHBoxLayout *hb = new QHBoxLayout( vb ); 100 QHBoxLayout *hb = new QHBoxLayout( vb );
100 hb->setMargin( 6 ); 101 hb->setMargin( 6 );
101 QLabel *l = new QLabel( tr("Character Profile:"), this ); 102 QLabel *l = new QLabel( tr("Character Profile:"), this );
102 hb->addWidget( l ); 103 hb->addWidget( l );
103 profileCombo = new QComboBox( this ); 104 profileCombo = new QComboBox( this );
104 connect( profileCombo, SIGNAL(activated(const QString&)), 105 connect( profileCombo, SIGNAL(activated(const QString&)),
105 this, SLOT(selectProfile(const QString&)) ); 106 this, SLOT(selectProfile(const QString&)) );
106 hb->addWidget( profileCombo ); 107 hb->addWidget( profileCombo );
107#else 108#else
108 profileList.append( profile ); 109 profileList.append( profile );
109#endif 110#endif
110 111
111 qWarning("profiles: %d", profileList.count()); 112 owarn << "profiles: " << profileList.count() << oendl;
112 113
113 QTabWidget *tw = new QTabWidget( this ); 114 QTabWidget *tw = new QTabWidget( this );
114 vb->addWidget( tw ); 115 vb->addWidget( tw );
115 116
116 pref = new QIMPenPrefBase( this ); 117 pref = new QIMPenPrefBase( this );
117 tw->addTab( pref, tr("Preferences") ); 118 tw->addTab( pref, tr("Preferences") );
118 119
119 pref->inputStyle->setExclusive( TRUE ); 120 pref->inputStyle->setExclusive( TRUE );
120 121
121 style = profile->style() == QIMPenProfile::ToggleCases ? 1 : 0; 122 style = profile->style() == QIMPenProfile::ToggleCases ? 1 : 0;
122 pref->inputStyle->setButton( style ); 123 pref->inputStyle->setButton( style );
123 connect( pref->inputStyle, SIGNAL(clicked(int)), 124 connect( pref->inputStyle, SIGNAL(clicked(int)),
124 this, SLOT(styleClicked(int)) ); 125 this, SLOT(styleClicked(int)) );
125 pref->inputStyle->setEnabled( profile->canSelectStyle() ); 126 pref->inputStyle->setEnabled( profile->canSelectStyle() );
126 127
127 multiTimeout = profile->multiStrokeTimeout(); 128 multiTimeout = profile->multiStrokeTimeout();
128 pref->multiStrokeSlider->setValue( multiTimeout ); 129 pref->multiStrokeSlider->setValue( multiTimeout );
129 multiTimeoutChanged( multiTimeout ); 130 multiTimeoutChanged( multiTimeout );
130 connect( pref->multiStrokeSlider, SIGNAL(valueChanged(int)), 131 connect( pref->multiStrokeSlider, SIGNAL(valueChanged(int)),
131 this, SLOT(multiTimeoutChanged(int)) ); 132 this, SLOT(multiTimeoutChanged(int)) );
132 133
133 edit = new QIMPenEdit( p, tw ); 134 edit = new QIMPenEdit( p, tw );
134 tw->addTab( edit, tr("Customize") ); 135 tw->addTab( edit, tr("Customize") );
135#ifdef MULTIPROFILE 136#ifdef MULTIPROFILE