now saving profiles works! yay!

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
@@ -1,243 +1,250 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "qimpenwidget.h"
 #include "qimpenprefbase.h"
 #include "qimpensetup.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
 #include <qcombobox.h>
 #include <qlistbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qbuttongroup.h>
 #include <qslider.h>
 #include <qtabwidget.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 
 
 /* XPM */
 static const char * const left_xpm[] = {
 "16 16 2 1",
         " c None",
         ".c #000000",
 "                ",
 "                ",
 "                ",
 "        .       ",
 "       ..       ",
 "      ...       ",
 "     ....       ",
 "    .....       ",
 "   ......       ",
 "    .....       ",
 "     ....       ",
 "      ...       ",
 "       ..       ",
 "        .       ",
 "                ",
 "                "};
 
 
 /* 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
+#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 );
 
     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)),
              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;
 }
 
 void QIMPenSetup::multiTimeoutChanged( int v )
 {
     multiTimeout = v;
     pref->multiStrokeLabel->setText( tr("%1 ms").arg(v) );
 }
 
 void QIMPenSetup::selectProfile( const QString &p )
 {
     if ( p == profile->name() )
         return;
 
     profile->setStyle( style ? QIMPenProfile::ToggleCases : QIMPenProfile::BothCases );
     profile->setMultiStrokeTimeout( multiTimeout );
 
     for ( int i = 0; i < (int)profileList.count(); i++ ) {
         if ( profileList.at(i)->name() == p ) {
             profile = profileList.at(i);
             style = profile->style() == QIMPenProfile::ToggleCases ? 1 : 0;
             pref->inputStyle->setButton( style );
             pref->inputStyle->setEnabled( profile->canSelectStyle() );
             multiTimeout = profile->multiStrokeTimeout();
             pref->multiStrokeSlider->setValue( multiTimeout );
             multiTimeoutChanged( multiTimeout );
             edit->setProfile( profile );
             break;
         }
     }
 }
 
 void QIMPenSetup::accept()
 {
     profile->setStyle( style ? QIMPenProfile::ToggleCases : QIMPenProfile::BothCases );
     profile->setMultiStrokeTimeout( multiTimeout );
     // Save current profile
     if ( profileCombo ) {
         Config config( "handwriting" );
         config.setGroup( "Settings" );
         config.writeEntry( "Profile", profileCombo->currentText() );
     }
     // Save charsets
     bool ok = TRUE;
     for ( int i = 0; i < (int)profileList.count(); i++ ) {
         QIMPenProfile *prof = profileList.at(i);
         QIMPenCharSetIterator it(prof->charSets());
         for ( ; it.current(); ++it ) {
             if ( !(it.current()->save( QIMPenCharSet::User )) ) {
                 ok = FALSE;
                 break;
             }
         }
     }
     if ( !ok ) {
         if ( QMessageBox::critical( 0, tr( "Out of space" ),
                     tr("Unable to save information.\n"
                         "Free up some space\n"
                         "and try again.\n"
                         "\nQuit anyway?"),
                     QMessageBox::Yes|QMessageBox::Escape,
                     QMessageBox::No|QMessageBox::Default )
                 != QMessageBox::No ) {
             QDialog::accept();
         }
     } else {
         QDialog::accept();
     }
 }
 
 //---------------------------------------------------------------------------
 
 QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name,
         bool modal, int WFlags)
     : QDialog( parent, name, modal, WFlags )
 {
     setCaption( tr("Enter new character") );
     uni = 0;
 
     QVBoxLayout *vb = new QVBoxLayout( this, 10 );
 
     QHBoxLayout *hb = new QHBoxLayout();
     vb->addLayout( hb );
 
     QLabel *label = new QLabel( tr("Character:"), this );
     hb->addWidget( label );
 
     QComboBox *cb = new QComboBox( TRUE, this );
     connect( cb, SIGNAL(activated(int)), SLOT(setSpecial(int)) );
     connect( cb, SIGNAL(textChanged(const QString &)),
@@ -470,187 +477,188 @@ QIMPenChar *QIMPenEdit::findPrev()
 
     return 0;
 }
 
 /*!
   Find the next character with the same code as the current one.
   returns 0 if there is no next character.
 */
 QIMPenChar *QIMPenEdit::findNext()
 {
     if ( !currentChar )
         return 0;
     QIMPenCharIterator it( currentSet->characters() );
     bool found = FALSE;
     for ( ; it.current(); ++it ) {
         if ( !found && it.current() == currentChar )
             found = TRUE;
         else if ( found && it.current()->character() == currentCode &&
                     !it.current()->testFlag( QIMPenChar::Deleted ) ) {
             return it.current();
         }
     }
 
     return 0;
 }
 
 void QIMPenEdit::setCurrentChar( QIMPenChar *pc )
 {
     currentChar = pc;
     pw->showCharacter( currentChar );
     if ( currentChar ) {
         prevBtn->setEnabled( findPrev() != 0 );
         nextBtn->setEnabled( findNext() != 0 );
     }
 }
 
 void QIMPenEdit::prevChar()
 {
     QIMPenChar *pc = findPrev();
     if ( pc )
         setCurrentChar( pc );
 }
 
 void QIMPenEdit::nextChar()
 {
     QIMPenChar *pc = findNext();
     if ( pc )
         setCurrentChar( pc );
 }
 
 void QIMPenEdit::clearChar()
 {
     inputChar->clear();
     pw->clear();
     enableButtons();
 }
 
 void QIMPenEdit::selectChar( int i )
 {
     currentChar = 0;
     currentCode = ((CharListItem *)charList->item(i))->code();
     QIMPenCharIterator it(currentSet->characters() );
     for ( ; it.current(); ++it ) {
         if ( it.current()->character() == currentCode &&
              !it.current()->testFlag( QIMPenChar::Deleted ) ) {
             setCurrentChar( it.current() );
             break;
         }
     }
     if ( !it.current() )
         setCurrentChar( 0 );
     inputChar->clear();
 }
 
 void QIMPenEdit::selectCharSet( int i )
 {
     if ( currentSet )
         pw->removeCharSet( 0 );
     currentSet = profile->charSets().at( i );
     fillCharList();
     pw->insertCharSet( currentSet );
     inputChar->clear();
     if ( charList->count() ) {
         charList->setSelected( 0, TRUE );
         selectChar(0);
     }
 }
 
 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 );
                 cc->clearFlag( QIMPenChar::System );
                 currentSet->addChar( cc );
                 sc->setFlag( QIMPenChar::Deleted );
             }
         }
 
         currentSet->addChar( pc );
         setCurrentChar( pc );
         inputChar->clear();
     }
 }
 
 void QIMPenEdit::addNewChar()
 {
     if ( !inputChar->isEmpty() ) {
         QIMPenInputCharDlg dlg( 0, 0, TRUE );
         if ( dlg.exec() ) {
             currentCode = dlg.unicode();
             addChar();
             fillCharList();
             for ( unsigned int i = 0; i < charList->count(); i++ ) {
                 CharListItem *li = (CharListItem *)charList->item(i);
                 if ( li->code() == dlg.unicode() ) {
                     charList->setSelected( i, TRUE );
                     break;
                 }
             }
         }
     }
 }
 
 void QIMPenEdit::removeChar()
 {
     if ( currentChar ) {
         QIMPenChar *pc = findPrev();
         if ( !pc ) pc = findNext();
         if ( currentChar->testFlag( QIMPenChar::System ) )
             currentChar->setFlag( QIMPenChar::Deleted );
         else
             currentSet->removeChar( currentChar );
         setCurrentChar( pc );
     }
 }
 
 void QIMPenEdit::defaultChars()
 {
     if ( currentCode ) {
         currentChar = 0;
         bool haveSystem = FALSE;
         QIMPenCharIterator it(currentSet->characters() );
         for ( ; it.current(); ++it ) {
             if ( it.current()->character() == currentCode &&
                  it.current()->testFlag( QIMPenChar::System ) ) {
                 haveSystem = TRUE;
                 break;
             }
         }
         if ( haveSystem ) {
             it.toFirst();
             while ( it.current() ) {
                 QIMPenChar *pc = it.current();
                 ++it;
                 if ( pc->character() == currentCode ) {
                     if ( pc->testFlag( QIMPenChar::System ) ) {
                         pc->clearFlag( QIMPenChar::Deleted );
                         if ( !currentChar )
                             currentChar = pc;
                     } else {
                         currentSet->removeChar( pc );
                     }
                 }
             }
             setCurrentChar( currentChar );
         }
     }
 }
 
 void QIMPenEdit::newStroke( QIMPenStroke *st )
 {
     inputChar->addStroke( st );
     enableButtons();
 }