author | hash <hash> | 2002-09-29 18:47:40 (UTC) |
---|---|---|
committer | hash <hash> | 2002-09-29 18:47:40 (UTC) |
commit | ef6ab2eb7794f5c5b9faad1ed650424e39b8d011 (patch) (side-by-side diff) | |
tree | 90a03f5f49a4fbc576ce60aa5aee0448c711da2f /inputmethods | |
parent | 0d4b54af104dadbff57804e5e6f8ac309aa36fc4 (diff) | |
download | opie-ef6ab2eb7794f5c5b9faad1ed650424e39b8d011.zip opie-ef6ab2eb7794f5c5b9faad1ed650424e39b8d011.tar.gz opie-ef6ab2eb7794f5c5b9faad1ed650424e39b8d011.tar.bz2 |
enabled profile selection which was already in there\!
-rw-r--r-- | inputmethods/handwriting/qimpeninput.cpp | 5 | ||||
-rw-r--r-- | inputmethods/handwriting/qimpensetup.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp index 9acab8b..6a21931 100644 --- a/inputmethods/handwriting/qimpeninput.cpp +++ b/inputmethods/handwriting/qimpeninput.cpp @@ -241,50 +241,53 @@ void QIMPenInput::loadProfiles() shortcutCharSet->setTitle( "Shortcut" ); QString path = QPEApplication::qpeDir() + "etc/qimpen"; QDir dir( path, "*.conf" ); QStringList list = dir.entryList(); QStringList::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { QIMPenProfile *p = new QIMPenProfile( path + "/" + *it ); profileList.append( p ); if ( p->shortcut() ) { QIMPenCharIterator it( p->shortcut()->characters() ); for ( ; it.current(); ++it ) { shortcutCharSet->addChar( new QIMPenChar(*it.current()) ); } } } + Config config( "handwriting" ); config.setGroup( "Settings" ); QString prof = config.readEntry( "Profile", "Default" ); selectProfile( prof ); } void QIMPenInput::selectProfile( const QString &name ) { QListIterator<QIMPenProfile> it( profileList ); for ( ; it.current(); ++it ) { if ( it.current()->name() == name ) { profile = it.current(); break; } } - if ( !it.current() ) + if ( !it.current() ) { + qWarning("No profile selected!\n"); return; + } pw->clearCharSets(); baseSets.clear(); matcher->setMultiStrokeTimeout( profile->multiStrokeTimeout() ); matcher->setWordMatchingEnabled( profile->matchWords() ); if ( !Global::fixedDawg().root() || !matcher->isWordMatchingEnabled() ) wordPicker->hide(); else wordPicker->show(); if ( profile->uppercase() && profile->style() == QIMPenProfile::BothCases ) { baseSets.append( profile->uppercase() ); pw->insertCharSet( profile->uppercase() ); } diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp index a6ae3a8..2c06fbc 100644 --- a/inputmethods/handwriting/qimpensetup.cpp +++ b/inputmethods/handwriting/qimpensetup.cpp @@ -80,33 +80,33 @@ static const char * const right_xpm[] = { " ... ", " .. ", " . ", " ", " "}; QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, const char *name, bool modal, int WFlags ) : QDialog( parent, name, modal, WFlags ), profileCombo(0), profile(p) { setCaption( tr("Setup Handwriting Input") ); QVBoxLayout *vb = new QVBoxLayout( this ); -#if 0 +#if 1 profileList.setAutoDelete( true ); QHBoxLayout *hb = new QHBoxLayout( vb ); hb->setMargin( 6 ); QLabel *l = new QLabel( tr("Character Profile:"), this ); hb->addWidget( l ); profileCombo = new QComboBox( this ); connect( profileCombo, SIGNAL(activated(const QString &)), this, SLOT(selectProfile(const QString &)) ); hb->addWidget( profileCombo ); loadProfiles(); #else profileList.append( profile ); #endif QTabWidget *tw = new QTabWidget( this ); vb->addWidget( tw ); |