summaryrefslogtreecommitdiff
authorbrad <brad>2004-03-21 12:42:10 (UTC)
committer brad <brad>2004-03-21 12:42:10 (UTC)
commitde722623b49574659f6ef5b065076cb1609f81dd (patch) (side-by-side diff)
tree0d2ca78cfe42c71787a3e160b245285e18d900d3
parent2560326d09f90f0afce24577cafbfd4c1f5e4b23 (diff)
downloadopie-de722623b49574659f6ef5b065076cb1609f81dd.zip
opie-de722623b49574659f6ef5b065076cb1609f81dd.tar.gz
opie-de722623b49574659f6ef5b065076cb1609f81dd.tar.bz2
Fixes for graffiti handling. Contains a dirty hack that will be rectified when I commit the Graffiti charset.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/handwriting/qimpenchar.h2
-rw-r--r--inputmethods/handwriting/qimpenprofile.cpp3
-rw-r--r--inputmethods/handwriting/qimpensetup.cpp17
-rw-r--r--inputmethods/handwriting/qimpensetup.h1
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
@@ -117,7 +117,7 @@ public:
void addChar( QIMPenChar *ch );
void removeChar( QIMPenChar *ch );
QIMPenChar *at( int i );
- void setHidden ( const bool &b ) { phidden = &b; }
+ void setHidden ( const bool &b ) { phidden = b; }
bool hidden() const { return phidden; }
unsigned maximumStrokes() const { return maxStrokes; }
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
@@ -142,6 +142,7 @@ void QIMPenProfile::loadData()
if ( !cs->isEmpty() ) {
cs->setTitle( cs->title().upper() );
cs->setType( QIMPenCharSet::Upper );
+ cs->setDescription( "Hidden uppercase" );
cs->setHidden ( true );
QIMPenCharIterator it( cs->characters() );
for ( ; it.current(); ++it ) {
@@ -159,6 +160,8 @@ void QIMPenProfile::loadData()
cs = new QIMPenCharSet( baseDir + "qimpen/" + s );
cs->load( Global::applicationFileName("qimpen",s), QIMPenCharSet::User );
if ( !cs->isEmpty() ) {
+ if ( mono () )
+ cs->setDescription( "Latin Characters" );
if ( combining )
combining->addCombined( cs );
sets.append( cs );
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
@@ -326,7 +326,7 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
charSetCombo = new QComboBox( this );
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() );
for ( ; it.current(); ++it ) {
charSetCombo->insertItem( it.current()->description() );
@@ -388,7 +388,7 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
connect( pb, SIGNAL(clicked()), SLOT(reject()) );
hb->addWidget( pb );
#endif
- selectCharSet( 0 );
+ selectCharSetVisible( 0 );
charList->setFocus();
resize( minimumSize() );
@@ -404,7 +404,7 @@ void QIMPenEdit::setProfile( QIMPenProfile *p )
if ( ! it.current()->hidden() )
charSetCombo->insertItem( it.current()->description() );
}
- selectCharSet( 0 );
+ selectCharSetVisible( 0 );
charList->setFocus();
enableButtons();
}
@@ -549,6 +549,17 @@ void QIMPenEdit::selectChar( int i )
inputChar->clear();
}
+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 )
{
if ( currentSet )
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
@@ -100,6 +100,7 @@ protected slots:
void clearChar();
void selectChar( int );
void selectCharSet( int );
+ void selectCharSetVisible( int );
void addChar();
void addNewChar();
void removeChar();