Comit the "Mono" patch by

Brad Campbell <brad@wasp.net.au>

5 files changed, 35 insertions, 3 deletions

diff --git a/inputmethods/handwriting/qimpenchar.cpp b/inputmethods/handwriting/qimpenchar.cpp
index 0c37e5c..929f370 100644
--- a/inputmethods/handwriting/qimpenchar.cpp
+++ b/inputmethods/handwriting/qimpenchar.cpp
@@ -348,3 +348,3 @@ bool QIMPenCharSet::load( const QString &fn, Domain d )
 	}
-
+	setHidden ( false ); 
 	return ok;
@@ -360,2 +360,5 @@ bool QIMPenCharSet::save( Domain d )
 
+	if ( hidden() )
+		return TRUE;
+
 	bool ok = FALSE;
diff --git a/inputmethods/handwriting/qimpenchar.h b/inputmethods/handwriting/qimpenchar.h
index efd6f16..e4e7645 100644
--- a/inputmethods/handwriting/qimpenchar.h
+++ b/inputmethods/handwriting/qimpenchar.h
@@ -119,2 +119,4 @@ public:
     QIMPenChar *at( int i );
+    void setHidden ( const bool &b ) { phidden = &b; }
+    bool hidden() const { return phidden; }
 
@@ -151,2 +153,3 @@ protected:
     QIMPenCharMatchList matches;
+    bool phidden : 1;
 };
diff --git a/inputmethods/handwriting/qimpenprofile.cpp b/inputmethods/handwriting/qimpenprofile.cpp
index 3b1b5e9..b1a6592 100644
--- a/inputmethods/handwriting/qimpenprofile.cpp
+++ b/inputmethods/handwriting/qimpenprofile.cpp
@@ -50,2 +50,5 @@ QIMPenProfile::QIMPenProfile( const QString &fn )
 
+    QString t = config.readEntry( "Mono", "Dual" );
+    pmono = (QString::fromLatin1("Mono") == t );
+
     msTimeout = config.readNumEntry( "MultiTimeout", 500 );
@@ -121,3 +124,3 @@ void QIMPenProfile::loadData()
     s = config.readEntry( "Uppercase" );
-    if ( !s.isEmpty() ) {
+    if ( !s.isEmpty() && !mono() ) {
 	cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
@@ -135,2 +138,22 @@ void QIMPenProfile::loadData()
     if ( !s.isEmpty() ) {
+	if ( mono() ) {
+		cs = new QIMPenCharSet ( baseDir + "qimpen/" + s );
+		cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
+		if ( !cs->isEmpty() ) {
+		    cs->setTitle( cs->title().upper() );
+		    cs->setType( QIMPenCharSet::Upper );
+		    cs->setHidden ( true );
+		    QIMPenCharIterator it( cs->characters() );
+		    for ( ; it.current(); ++it ) {
+			uint ch = it.current()->character();
+			if ( ch >= 'a' && ch <= 'z' )
+			    it.current()->setCharacter( QChar(ch).upper() );
+			}	
+		    if ( combining )
+			combining->addCombined( cs );
+		    sets.append( cs );
+		} else {
+		    delete cs;
+		}
+	}
 	cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
diff --git a/inputmethods/handwriting/qimpenprofile.h b/inputmethods/handwriting/qimpenprofile.h
index 4ce4367..adfa866 100644
--- a/inputmethods/handwriting/qimpenprofile.h
+++ b/inputmethods/handwriting/qimpenprofile.h
@@ -35,2 +35,3 @@ public:
     Style style() const { return pstyle; }
+    bool mono() const { return pmono; }
     void setStyle( Style s );
@@ -67,2 +68,3 @@ private:
     bool wordMatch;
+    bool pmono;
 };
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp
index 2441102..d0f9ffd 100644
--- a/inputmethods/handwriting/qimpensetup.cpp
+++ b/inputmethods/handwriting/qimpensetup.cpp
@@ -403,3 +403,4 @@ void QIMPenEdit::setProfile( QIMPenProfile *p )
     for ( ; it.current(); ++it ) {
-        charSetCombo->insertItem( it.current()->description() );
+	if ( ! it.current()->hidden() )
+	    charSetCombo->insertItem( it.current()->description() );
     }