1 files changed, 6 insertions, 6 deletions

diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 6e42fd4..2101bbb 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -236,284 +236,284 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
    connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );  
 
    QVGroupBox* gb1 = new QVGroupBox( i18n("Profile kind specific settings"), topFrame);
    topLayout->addMultiCellWidget(gb1, iii,iii,0,1);
    ++iii;
 
    // ******************************************
    // Profile kind specific settings
    {
        // *** phone *******************************
        QVGroupBox* topFrame = gb1;
        phoneWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
        //++iii; 
        mWriteContactToSIM = 0;//new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
        QHBox* temphb = new QHBox( phoneWidget );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) );
 
 
        temphb = new QHBox( phoneWidget );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) );
 
 
        temphb = new QHBox( phoneWidget );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpModel() ) );
 
        // *** local*******************************
        localFileWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
        //++iii;
        temphb = new QHBox( localFileWidget );
 
        lab = new QLabel( i18n("Local file Cal:"), temphb );
        lab = new QLabel( i18n("Local file ABook:"), temphb );
        lab = new QLabel( i18n("Local file PWMgr:"), temphb );
        temphb = new QHBox( localFileWidget );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFilePWM() ) );
        temphb = new QHBox( localFileWidget );
 
        mRemoteFile = new QLineEdit( temphb);
        mRemoteFileAB = new QLineEdit( temphb);
        mRemoteFilePWM = new QLineEdit( temphb);
        mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget );
 
 
        // *** remote*******************************
        remoteFileWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
        //++iii;
        temphb = new QHBox( remoteFileWidget );
        new QLabel( i18n("Calendar:"), temphb);
        new QLabel( i18n("AddressBook:"), temphb);
        new QLabel( i18n("PWManager:"), temphb);
 
        lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        mRemotePrecommand = new QLineEdit(temphb);
        mRemotePrecommandAB = new QLineEdit(temphb);
        mRemotePrecommandPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        mLocalTempFile = new QLineEdit(temphb);
        mLocalTempFileAB = new QLineEdit(temphb);
        mLocalTempFilePWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        mRemotePostcommand = new QLineEdit(temphb );
        mRemotePostcommandAB = new QLineEdit(temphb );
        mRemotePostcommandPWM = new QLineEdit(temphb );
        mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget );
        lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
        temphb = new QHBox( remoteFileWidget );
        button = new QPushButton( i18n("ssh/scp"), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
        button = new QPushButton( i18n("ftp"), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
        lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
 
        // *** pi-sync*******************************
        piWidget = new QVBox( topFrame);
        //topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
        //++iii;
        temphb = new QHBox( piWidget );
        new QLabel( i18n("Calendar:"), temphb);
        new QLabel( i18n("AddressBook:"), temphb);
        new QLabel( i18n("PWManager:"), temphb);
 
        lab = new QLabel( i18n("Password for remote access: (could be the same for each)"), piWidget);
        temphb = new QHBox( piWidget );
        mRemotePw = new QLineEdit(temphb);
        mRemotePwAB = new QLineEdit(temphb);
        mRemotePwPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Remote IP address: (could be the same for each)"), piWidget);
        temphb = new QHBox( piWidget );
        mRemoteIP = new QLineEdit(temphb);
        mRemoteIPAB = new QLineEdit(temphb);
        mRemoteIPPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Remote port number: (should be different for each)"), piWidget);
        temphb = new QHBox( piWidget );
        mRemotePort = new QLineEdit(temphb);
        mRemotePortAB = new QLineEdit(temphb);
        mRemotePortPWM = new QLineEdit(temphb);
    } 
    // ******************************************
    // Profile kind specific settings END
  
 }
 
- 
-
 void KSyncPrefsDialog::readFilter()
 {
     mFilterKapi.clear();
     mFilterKopi.clear();
-    mFilterKopi.append(i18n("No Filter") );
-    mFilterKapi.append(i18n("No Filter") );
     KConfig cfgko(locateLocal("config","korganizerrc"));
     KConfig cfgka(locateLocal("config","kaddressbookrc"));
     cfgko.setGroup("General");
     mFilterKopi =  cfgko.readListEntry("CalendarFilters");
-    mFilterKapi = mFilterKopi;
+    cfgka.setGroup("Filter");
+    int count = cfgka.readNumEntry( "Count", 0 );
+    for ( int i = 0; i < count; i++ ) {
+        cfgka.setGroup("Filter_"+QString::number( i ) );  
+        mFilterKapi.append( cfgka.readEntry("Name", "internal error") );  
+    }
     mFilterOutCal->clear();
     mFilterInCal->clear();
     mFilterOutAB->clear();
     mFilterInAB->clear();
     QStringList temp = mFilterKopi;
     temp.prepend(i18n("No Filter") );
     mFilterOutCal->insertStringList( temp );
     mFilterInCal->insertStringList( temp );
     temp = mFilterKapi;
     temp.prepend(i18n("No Filter") );
     mFilterOutAB->insertStringList( temp );
     mFilterInAB->insertStringList( temp );
 }
 
-
 void KSyncPrefsDialog::slotOK()
 {
     if ( mMyMachineName->text() == "undefined" ) {
         KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
         return;
     }
     int i;
     for (i = 0; i < mSyncProfileNames.count(); ++ i) {
         if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1  ) {
             KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
             return;
         }
     }
     usrWriteConfig();
     QDialog::accept();
 }
 void KSyncPrefsDialog::accept()
 {
     slotOK();
 }
 void KSyncPrefsDialog::chooseFile()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     mRemoteFile->setText( fn );
 }
 
 void KSyncPrefsDialog::chooseFileAB()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.vcf)"), this );
     if ( fn == "" )
         return;
     mRemoteFileAB->setText( fn );
 }
 
 void KSyncPrefsDialog::chooseFilePWM()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.pwm)"), this );
     if ( fn == "" )
         return;
     mRemoteFilePWM->setText( fn );
 }
 
 void KSyncPrefsDialog::textChanged( const QString &  s )
 {
     if ( mProfileBox->count() == 0 )
         return;
     if ( currentSelection < 3 ) {
         //KMessageBox::error(this,i18n("This profil name\ncannot be edited!\n"),i18n("KO/Pi config error"));
         mProfileBox->blockSignals( true );
         mProfileBox->setCurrentItem(mProfileBox-> currentItem ());
         mProfileBox->blockSignals( false );
         return;
     }
     //qDebug("cur i %d ",mProfileBox-> currentItem () );
     mProfileBox->changeItem ( s, mProfileBox-> currentItem () ) ;
     KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
     prof->setName( s );
     mSyncProfileNames[mProfileBox-> currentItem ()] = s;
 }
 void KSyncPrefsDialog::profileChanged( int item )
 {
   //qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() ); 
     KSyncProfile* prof;
     saveProfile();
     readFilter();
     currentSelection = item;
     prof = mSyncProfiles.at(item) ;
 
     mRemotePw->setText(prof->getRemotePw());
     mRemoteIP->setText(prof->getRemoteIP());
     mRemotePort->setText(prof->getRemotePort());
     
     mRemotePwAB->setText(prof->getRemotePwAB());
     mRemoteIPAB->setText(prof->getRemoteIPAB());
     mRemotePortAB->setText(prof->getRemotePortAB());
     
     mRemotePwPWM->setText(prof->getRemotePwPWM());
     mRemoteIPPWM->setText(prof->getRemoteIPPWM());
     mRemotePortPWM->setText(prof->getRemotePortPWM());
 
     mRemotePrecommand->setText(prof->getPreSyncCommand());
     mRemotePostcommand->setText(prof->getPostSyncCommand());
     mLocalTempFile->setText(prof->getLocalTempFile());
     mRemoteFile->setText(prof->getRemoteFileName()) ;
 
     mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
     mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
     mLocalTempFileAB->setText(prof->getLocalTempFileAB());
     mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
 
     mRemotePrecommandPWM->setText(prof->getPreSyncCommandPWM());
     mRemotePostcommandPWM->setText(prof->getPostSyncCommandPWM());
     mLocalTempFilePWM->setText(prof->getLocalTempFilePWM());
     mRemoteFilePWM->setText(prof->getRemoteFileNamePWM()) ;
 
     if ( mWriteContactToSIM )
         mWriteContactToSIM->setChecked( prof->getWriteContactToSIM());
     mPhoneDevice->setText(prof->getPhoneDevice());
     mPhoneConnection->setText(prof->getPhoneConnection());
     mPhoneModel->setText(prof->getPhoneModel());
 
     mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
     mAskForPreferences->setChecked( prof->getAskForPreferences());
     mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
     mWriteBackFile->setChecked( prof->getWriteBackFile());
     mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
     mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
     mIncludeInRingPWM->setChecked( prof->getIncludeInRingSyncPWM() );
     mWriteBackFuture->setChecked( prof->getWriteBackFuture());
     mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
     mWriteBackPastWeeks->setValue( prof->getWriteBackPastWeeks() );
 
     mFilterInCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterInCal () ) + 1 );
     mFilterOutCal->setCurrentItem( mFilterKopi.findIndex(prof->getFilterOutCal () ) + 1 );
     mFilterInAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterInAB () ) + 1 );
     mFilterOutAB->setCurrentItem( mFilterKapi.findIndex(prof->getFilterOutAB () ) + 1 );
     
     switch ( prof->getSyncPrefs() ) {
     case 0:
         loc->setChecked( true);