1 files changed, 47 insertions, 8 deletions

diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index b097277..6f46d19 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -200,55 +200,60 @@ void KSyncPrefsDialog::setupSyncAlgTab()
        mFilterInAB = new QComboBox( fibo2 );
 
        mWriteBackFile = new QCheckBox( i18n("Write back synced data"), topFrame   );
        // topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
        // ++iii;
    
        QVGroupBox* gb2 = new QVGroupBox( i18n("Write back options"), topFrame);
        //topLayout->addMultiCellWidget(gb2, iii,iii,0,1);
        //++iii;
        {
            QVGroupBox*topFrame = gb2; 
            mWriteBackExisting= new QCheckBox( i18n("Write back (on remote) existing entries only"), topFrame   );
            QHGroupBox* gb4 = new QHGroupBox( i18n("Apply filter when adding data to remote:"), topFrame);
            QVBox * fibo = new QVBox ( gb4 );
            new QLabel ( i18n("Outgoing calendar filter:"), fibo );
            mFilterOutCal = new QComboBox( fibo );
            fibo = new QVBox ( gb4 );
            new QLabel ( i18n("Outgoing addressbook filter:"), fibo );
            mFilterOutAB = new QComboBox( fibo );
            //topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
            //++iii;
            mWriteBackFuture= new QCheckBox( i18n("Write back (calendar) entries for time period only"), topFrame   );
            //topLayout->addMultiCellWidget(mWriteBackFuture, iii,iii,0,1);
            //++iii;
-           QHGroupBox* gb3 = new QHGroupBox( i18n("Time period"), topFrame);
+           QVGroupBox* gb3 = new QVGroupBox( i18n("Time period"), topFrame);
            connect ( mWriteBackFuture, SIGNAL( toggled ( bool ) ), gb3, SLOT ( setEnabled ( bool )  ) );
-           new QLabel( i18n("From ") , gb3  );
-           mWriteBackPastWeeks= new QSpinBox(1,104, 1, gb3);
-           new QLabel( i18n(" weeks in the past to ") , gb3  );
-           mWriteBackFutureWeeks= new QSpinBox(1,104, 1, gb3);
-           new QLabel( i18n(" weeks in the future ") , gb3  );
+
+           new QLabel( i18n("From ") , gb3 );
+           QHBox * tf1 = new QHBox ( gb3 );
+           mWriteBackPastWeeks= new QSpinBox(1,104, 1,  tf1 );
+           mWriteBackPastWeeks->setMaximumWidth( 100 );
+           new QLabel( i18n(" weeks in the past to ") ,tf1 );
+           QHBox * tf2 = new QHBox ( gb3 );
+           mWriteBackFutureWeeks= new QSpinBox(1,104, 1,  tf2);
+           mWriteBackFutureWeeks->setMaximumWidth( 100 );
+           new QLabel( i18n(" weeks in the future ") , tf2 );
            //topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
            //++iii;
            gb3->setEnabled( false ); 
            connect ( mWriteBackExisting, SIGNAL( toggled ( bool ) ), gb4, SLOT ( setDisabled ( bool )  ) );
        }
        connect ( mWriteBackFile, SIGNAL( toggled ( bool ) ), gb2, SLOT ( setEnabled ( bool )  ) );
 
    }
    proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), topFrame);
    gr = proGr;
    topLayout->addMultiCellWidget(gr, iii,iii,0,1);
    ++iii;
    mIsLocal = new QRadioButton ( i18n("Local file"), gr );
    mIsPi = new QRadioButton ( i18n("Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsPiSpecific = new QRadioButton ( i18n("Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPiSpecific, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
    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);
@@ -357,73 +362,96 @@ void KSyncPrefsDialog::setupSyncAlgTab()
        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);
 
        lab = new QLabel( i18n("Local/remote Resource sync partners (Leave empty to not sync)"), piWidget);
        mTableBox = new QHBox( piWidget );
        mResTableKopi = new QTable( 1, 1, mTableBox );
        mResTableKapi = new QTable( 1, 1, mTableBox );
        mResTablePwmpi = new QTable( 1, 1, mTableBox );
        mResTableKopi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTableKapi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTablePwmpi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTableKopi->setLeftMargin( 80 );
+       mResTableKapi->setLeftMargin( 80 );
    } 
    // ******************************************
    // Profile kind specific settings END
  
 }
 
 void KSyncPrefsDialog::readResources()
 {
     mResourcesKopi.clear();
-    mResourcesKapi.clear();
     KConfig fc(locateLocal("config","kopicalendarrc"));
     fc.setGroup("CC");
     int numCals = fc.readNumEntry("NumberCalendars",0 );
     int curCal = 1;
     while ( curCal <= numCals ) {
         QString prefix = "Cal_" +QString::number( curCal );
         QString name =  fc.readEntry( prefix+"_Name", "Calendar");
         mResourcesKopi.append( name );
         ++curCal;
     }
     mResTableKopi->setNumRows( mResourcesKopi.count() );
     int i;
     for ( i = 0;i < mResourcesKopi.count(); ++i ) {
         mResTableKopi->verticalHeader ()->setLabel( i, mResourcesKopi[i] );
     }
+
+    mResourcesKapi.clear();
+
+    KConfig conf ( locateLocal("config", "kabcrc") );
+
+    conf.setGroup( "General" );
+    
+    QStringList keys = conf.readListEntry( "ResourceKeys" );
+    //keys += conf->readListEntry( "PassiveResourceKeys" );
+
+    //QString standardKey = mConfig->readEntry( "Standard" );
+    
+    for ( QStringList::Iterator it = keys.begin(); it != keys.end(); ++it ) {
+        conf.setGroup("Resource_"+ (*it) );
+        QString name = conf.readEntry( "ResourceName" );
+        mResourcesKapi.append( name );
+    }
+    mResTableKapi->setNumRows( mResourcesKapi.count() );
+    for ( i = 0;i < mResourcesKopi.count(); ++i ) {
+        mResTableKapi->verticalHeader ()->setLabel( i, mResourcesKapi[i] );
+    }
+
+
 }
 void KSyncPrefsDialog::readFilter()
 {
     mFilterKapi.clear();
     mFilterKopi.clear();
     KConfig cfgko(locateLocal("config","korganizerrc"));
     KConfig cfgka(locateLocal("config","kaddressbookrc"));
     cfgko.setGroup("General");
     mFilterKopi =  cfgko.readListEntry("CalendarFilters");
     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;
@@ -460,65 +488,69 @@ void KSyncPrefsDialog::chooseFile()
     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::updateMyCaption()
+{
+    setCaption( mProfileBox->currentText() + " : " +i18n("Synchronization Preferences"));
+}
 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;
+    updateMyCaption();
 }
 void KSyncPrefsDialog::profileChanged( int item )
 {
   //qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() ); 
     KSyncProfile* prof;
     saveProfile();
     readFilter();
     readResources();
     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());
@@ -591,48 +623,49 @@ void KSyncPrefsDialog::profileChanged( int item )
     mIsKapiFileR->setChecked(prof->getIsKapiFile()) ;
 
 
     QStringList res = QStringList::split( ":",prof->getResSpecKopi(), true );
     int add = res.count()/2;
     int i;
     for ( i = 0;i < add ; ++i ) {
         mResTableKopi->setText( i, 0, res[i+add] );
     } 
     res = QStringList::split( ":",prof->getResSpecKapi(), true);
     add = res.count()/2;
     for ( i = 0;i <  add; ++i ) {
         mResTableKapi->setText( i, 0, res[i+add] );
     }
     mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() &&!prof->getIsPiSyncSpec());
     proGr->setEnabled( item > 2 );
     if ( item < 3 ) {
         localFileWidget->hide();
         remoteFileWidget->hide();
         phoneWidget->hide();
         piWidget->hide();
 
     } else
         kindChanged( prof->getIsLocalFileSync() );
+    updateMyCaption();
 }
 
 void KSyncPrefsDialog::fillSSH()
 {
     mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
     mLocalTempFile->setText("/tmp/mycalendar.ics" );
     mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
     mRemotePrecommandAB->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
     mLocalTempFileAB->setText("/tmp/std.vcf" );
     mRemotePostcommandAB->setText("scp /tmp/std.vcf zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf" );
     mRemotePrecommandPWM->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" );
     mLocalTempFilePWM->setText("/tmp/passwords.pwm" );
     mRemotePostcommandPWM->setText("scp /tmp/passwords.pwm zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/pwmanager.pwm" );
 }
 void KSyncPrefsDialog::fillFTP()
 {
     mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" );
     mLocalTempFile->setText("/tmp/mycalendar.ics" );
     mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
     mRemotePrecommandAB->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf" );
     mLocalTempFileAB->setText("/tmp/std.vcf" );
     mRemotePostcommandAB->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
 
     mRemotePrecommandPWM->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm" );
@@ -731,56 +764,62 @@ void KSyncPrefsDialog::saveProfile()
         prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
         prof->setWriteBackFile( mWriteBackFile->isChecked());
         prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
         prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
         prof->setIncludeInRingSyncPWM( mIncludeInRingPWM->isChecked() );
         int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
         prof->setSyncPrefs( syncprefs);
         prof->setIsLocalFileSync( mIsLocal->isChecked() );
         prof->setIsPhoneSync( mIsPhone->isChecked() );
         prof->setIsPiSync( mIsPi->isChecked() );
         prof->setIsPiSyncSpec( mIsPiSpecific->isChecked() );
         prof->setIsKapiFile( mIsKapiFileL->isChecked() );
         prof->setWriteBackFuture(mWriteBackFuture->isChecked());
         prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
         prof->setWriteBackPastWeeks(mWriteBackPastWeeks->value());
         if ( mWriteContactToSIM )
             prof->setWriteContactToSIM(mWriteContactToSIM->isChecked());
         prof->setPhoneDevice(  mPhoneDevice->text() );
         prof->setPhoneConnection(  mPhoneConnection->text() );
         prof->setPhoneModel(  mPhoneModel->text() );
         prof->setFilterInCal ( mFilterInCal->currentText ());
         prof->setFilterOutCal ( mFilterOutCal ->currentText ());
         prof->setFilterInAB ( mFilterInAB ->currentText ());
         prof->setFilterOutAB ( mFilterOutAB ->currentText ());
+        mProfileBox->setFocus();
         if ( mIsPiSpecific->isChecked() ) {
 
             QStringList res = mResourcesKopi;
             int i;
             for ( i = 0;i < mResourcesKopi.count(); ++i ) {
                 res.append( mResTableKopi->text( i, 0 ));
             }
             prof->setResSpecKopi( res.join(":"));
+            res = mResourcesKapi;
+            for ( i = 0;i < mResourcesKapi.count(); ++i ) {
+                res.append( mResTableKapi->text( i, 0 ));
+            }
+            prof->setResSpecKapi( res.join(":"));
         }
     }
 }
 
 void KSyncPrefsDialog::insertProfiles()
 {
     int curItem = mProfileBox->currentItem();
     mProfileBox->blockSignals( true );
     mProfileBox->clear();
     mProfileBox->insertStringList (mSyncProfileNames ); 
     int item = mSyncProfileNames.count() -1; 
     if ( curItem >= 0 &&  mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
         mProfileBox->setCurrentItem( curItem );  
     else if ( item >= 0 ) {
         mProfileBox->setCurrentItem( item );
     }
     currentSelection = -1;
     if ( mSyncProfileNames.count() > 0 ) {
         //qDebug(" profileChanged( mProfileBox->currentItem()  ");
         profileChanged( mProfileBox->currentItem() );
         currentSelection = mProfileBox->currentItem();
     }
     mProfileBox->blockSignals( false );
 }