enabled profile selection which was already in there\!

2 files changed, 6 insertions, 3 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
@@ -225,82 +225,85 @@ QIMPenInput::~QIMPenInput()
     delete (HandwritingHelp*) helpDlg;
 }
 
 QSize QIMPenInput::sizeHint() const
 {
     int fw = frameWidth();
     int ps = wordPicker->isHidden() ? 0 : wordPicker->sizeHint().height();
     return pw->sizeHint() + QSize( fw*2, fw*2+ps );
 }
 
 void QIMPenInput::loadProfiles()
 {
     profileList.clear();
     profile = 0;
     delete shortcutCharSet;
     shortcutCharSet = new QIMPenCharSet();
     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() )
-	return;
+    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() );
     }
 
     if ( profile->lowercase() ) {
 	baseSets.append( profile->lowercase() );
 	pw->insertCharSet( profile->lowercase(), profile->style() == QIMPenProfile::BothCases ? 1 : 2 );
     }
 
     if ( profile->numeric() ) {
 	baseSets.append( profile->numeric() );
 	pw->insertCharSet( profile->numeric() );
     }
 
     if ( helpDlg )
 	delete (HandwritingHelp*) helpDlg;
 }
 
 void QIMPenInput::wordPicked( const QString &w )
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
@@ -64,65 +64,65 @@ static const char * const left_xpm[] = {
 /* XPM */
 static const char * const right_xpm[] = {
 "16 16 2 1",
 " 	c None",
 ".	c #000000",
 "                ",
 "                ",
 "                ",
 "     .          ",
 "     ..         ",
 "     ...        ",
 "     ....       ",
 "     .....      ",
 "     ......     ",
 "     .....      ",
 "     ....       ",
 "     ...        ",
 "     ..         ",
 "     .          ",
 "                ",
 "                "};
 
 
 
 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 );
 
     pref = new QIMPenPrefBase( this );
     tw->addTab( pref, tr("Preferences") );
 
     pref->inputStyle->setExclusive( TRUE );
 
     style = profile->style() == QIMPenProfile::ToggleCases ? 1 : 0;
     pref->inputStyle->setButton( style );
     connect( pref->inputStyle, SIGNAL(clicked(int)),
 	     this, SLOT(styleClicked(int)) );
     pref->inputStyle->setEnabled( profile->canSelectStyle() );
 
     multiTimeout = profile->multiStrokeTimeout();
     pref->multiStrokeSlider->setValue( multiTimeout );
     multiTimeoutChanged( multiTimeout );
     connect( pref->multiStrokeSlider, SIGNAL(valueChanged(int)),