author | hash <hash> | 2002-11-27 09:53:25 (UTC) |
---|---|---|
committer | hash <hash> | 2002-11-27 09:53:25 (UTC) |
commit | 796b942cc070da91982689eb6e50b1e1e776c5ed (patch) (side-by-side diff) | |
tree | e0c1733ca8f5fa9721af101f3db689c5cf0392dd /inputmethods/handwriting/qimpensetup.cpp | |
parent | e52158d2f9e1fdc9766d991dc672729648d5a020 (diff) | |
download | opie-796b942cc070da91982689eb6e50b1e1e776c5ed.zip opie-796b942cc070da91982689eb6e50b1e1e776c5ed.tar.gz opie-796b942cc070da91982689eb6e50b1e1e776c5ed.tar.bz2 |
now saving profiles works! yay!
Diffstat (limited to 'inputmethods/handwriting/qimpensetup.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpensetup.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp index 10c136d..2441102 100644 --- a/inputmethods/handwriting/qimpensetup.cpp +++ b/inputmethods/handwriting/qimpensetup.cpp @@ -88,30 +88,32 @@ 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 +#define MULTIPROFILE +#ifdef MULTIPROFILE 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 + + qWarning("profiles: %d", profileList.count()); QTabWidget *tw = new QTabWidget( this ); vb->addWidget( tw ); pref = new QIMPenPrefBase( this ); tw->addTab( pref, tr("Preferences") ); pref->inputStyle->setExclusive( TRUE ); @@ -125,31 +127,36 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent, multiTimeout = profile->multiStrokeTimeout(); pref->multiStrokeSlider->setValue( multiTimeout ); multiTimeoutChanged( multiTimeout ); connect( pref->multiStrokeSlider, SIGNAL(valueChanged(int)), this, SLOT(multiTimeoutChanged(int)) ); edit = new QIMPenEdit( p, tw ); tw->addTab( edit, tr("Customize") ); +#ifdef MULTIPROFILE + loadProfiles(); +#endif + } void QIMPenSetup::loadProfiles() { 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 ); profileCombo->insertItem( p->name() ); if ( p->name() == profile->name() ) { profileCombo->setCurrentItem( profileCombo->count()-1 ); profile = p; + edit->setProfile( profile ); } } } void QIMPenSetup::styleClicked( int id ) { style = id; } @@ -558,16 +565,17 @@ void QIMPenEdit::selectCharSet( int i ) void QIMPenEdit::addChar() { if ( !inputChar->isEmpty() ) { QIMPenChar *pc = new QIMPenChar( *inputChar ); pc->setCharacter( currentCode ); // User characters override all matching system characters. // Copy and mark deleted identical system characters. + QIMPenCharIterator it(currentSet->characters() ); QIMPenChar *sc = 0; while ( (sc = it.current()) != 0 ) { ++it; if ( sc->character() == currentCode && sc->testFlag( QIMPenChar::System ) && !sc->testFlag( QIMPenChar::Deleted ) ) { QIMPenChar *cc = new QIMPenChar( *sc ); |