Fixes for graffiti handling. Contains a dirty hack that will be rectified when I commit the Graffiti charset.

4 files changed, 19 insertions, 4 deletions

diff --git a/inputmethods/handwriting/qimpenchar.h b/inputmethods/handwriting/qimpenchar.h
index e4e7645..92ee2c1 100644
--- a/inputmethods/handwriting/qimpenchar.h
+++ b/inputmethods/handwriting/qimpenchar.h
@@ -119,3 +119,3 @@ public:
     QIMPenChar *at( int i );
-    void setHidden ( const bool &b ) { phidden = &b; }
+    void setHidden ( const bool &b ) { phidden = b; }
     bool hidden() const { return phidden; }
diff --git a/inputmethods/handwriting/qimpenprofile.cpp b/inputmethods/handwriting/qimpenprofile.cpp
index b1a6592..67343c3 100644
--- a/inputmethods/handwriting/qimpenprofile.cpp
+++ b/inputmethods/handwriting/qimpenprofile.cpp
@@ -144,2 +144,3 @@ void QIMPenProfile::loadData()
                     cs->setType( QIMPenCharSet::Upper );
+                    cs->setDescription( "Hidden uppercase" );
                     cs->setHidden ( true );
@@ -161,2 +162,4 @@ void QIMPenProfile::loadData()
         if ( !cs->isEmpty() ) {
+            if ( mono () )
+                cs->setDescription( "Latin Characters" );
             if ( combining )
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp
index d1297a9..3f4841d 100644
--- a/inputmethods/handwriting/qimpensetup.cpp
+++ b/inputmethods/handwriting/qimpensetup.cpp
@@ -328,3 +328,3 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
     gl->addMultiCellWidget( charSetCombo, 0, 0, 0, 1 );
-    connect( charSetCombo, SIGNAL(activated(int)), SLOT(selectCharSet(int)));
+    connect( charSetCombo, SIGNAL(activated(int)), SLOT(selectCharSetVisible(int)));
     QIMPenCharSetIterator it( profile->charSets() );
@@ -390,3 +390,3 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
 #endif
-    selectCharSet( 0 );
+    selectCharSetVisible( 0 );
     charList->setFocus();
@@ -406,3 +406,3 @@ void QIMPenEdit::setProfile( QIMPenProfile *p )
     }
-    selectCharSet( 0 );
+    selectCharSetVisible( 0 );
     charList->setFocus();
@@ -551,2 +551,13 @@ void QIMPenEdit::selectChar( int i )
 
+void QIMPenEdit::selectCharSetVisible( int c )
+{
+    int i = 0;
+    QIMPenCharSetIterator it( profile->charSets() );
+    for ( ; it.current(); ++it, i++ ) {
+        if ( charSetCombo->text( c ) == it.current()->description() ) {
+            selectCharSet( i );
+        }
+    }
+}
+
 void QIMPenEdit::selectCharSet( int i )
diff --git a/inputmethods/handwriting/qimpensetup.h b/inputmethods/handwriting/qimpensetup.h
index 5d3064b..93b981b 100644
--- a/inputmethods/handwriting/qimpensetup.h
+++ b/inputmethods/handwriting/qimpensetup.h
@@ -102,2 +102,3 @@ protected slots:
     void selectCharSet( int );
+    void selectCharSetVisible( int );
     void addChar();