Diffstat (limited to 'libkdepim/ksyncprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index cf8f996..03265d2 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp | |||
@@ -237,16 +237,18 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
237 | connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) ); | 237 | connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) ); |
238 | button = new QPushButton( i18n("Choose..."), temphb ); | 238 | button = new QPushButton( i18n("Choose..."), temphb ); |
239 | connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFilePWM() ) ); | 239 | connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFilePWM() ) ); |
240 | temphb = new QHBox( localFileWidget ); | 240 | temphb = new QHBox( localFileWidget ); |
241 | 241 | ||
242 | mRemoteFile = new QLineEdit( temphb); | 242 | mRemoteFile = new QLineEdit( temphb); |
243 | mRemoteFileAB = new QLineEdit( temphb); | 243 | mRemoteFileAB = new QLineEdit( temphb); |
244 | mRemoteFilePWM = new QLineEdit( temphb); | 244 | mRemoteFilePWM = new QLineEdit( temphb); |
245 | mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget ); | ||
246 | |||
245 | 247 | ||
246 | // *** remote | 248 | // *** remote |
247 | remoteFileWidget = new QVBox( topFrame); | 249 | remoteFileWidget = new QVBox( topFrame); |
248 | topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1); | 250 | topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1); |
249 | ++iii; | 251 | ++iii; |
250 | temphb = new QHBox( remoteFileWidget ); | 252 | temphb = new QHBox( remoteFileWidget ); |
251 | new QLabel( i18n("Calendar:"), temphb); | 253 | new QLabel( i18n("Calendar:"), temphb); |
252 | new QLabel( i18n("AddressBook:"), temphb); | 254 | new QLabel( i18n("AddressBook:"), temphb); |
@@ -264,17 +266,17 @@ void KSyncPrefsDialog::setupSyncAlgTab() | |||
264 | mLocalTempFileAB = new QLineEdit(temphb); | 266 | mLocalTempFileAB = new QLineEdit(temphb); |
265 | mLocalTempFilePWM = new QLineEdit(temphb); | 267 | mLocalTempFilePWM = new QLineEdit(temphb); |
266 | 268 | ||
267 | lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget); | 269 | lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget); |
268 | temphb = new QHBox( remoteFileWidget ); | 270 | temphb = new QHBox( remoteFileWidget ); |
269 | mRemotePostcommand = new QLineEdit(temphb ); | 271 | mRemotePostcommand = new QLineEdit(temphb ); |
270 | mRemotePostcommandAB = new QLineEdit(temphb ); | 272 | mRemotePostcommandAB = new QLineEdit(temphb ); |
271 | mRemotePostcommandPWM = new QLineEdit(temphb ); | 273 | mRemotePostcommandPWM = new QLineEdit(temphb ); |
272 | 274 | mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget ); | |
273 | lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget); | 275 | lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget); |
274 | temphb = new QHBox( remoteFileWidget ); | 276 | temphb = new QHBox( remoteFileWidget ); |
275 | button = new QPushButton( i18n("ssh/scp"), temphb ); | 277 | button = new QPushButton( i18n("ssh/scp"), temphb ); |
276 | connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) ); | 278 | connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) ); |
277 | button = new QPushButton( i18n("ftp"), temphb ); | 279 | button = new QPushButton( i18n("ftp"), temphb ); |
278 | connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) ); | 280 | connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) ); |
279 | lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget); | 281 | lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget); |
280 | 282 | ||
@@ -452,16 +454,19 @@ void KSyncPrefsDialog::profileChanged( int item ) | |||
452 | //both->setChecked( true); | 454 | //both->setChecked( true); |
453 | break; | 455 | break; |
454 | default: | 456 | default: |
455 | break; | 457 | break; |
456 | } | 458 | } |
457 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; | 459 | mIsLocal->setChecked(prof->getIsLocalFileSync()) ; |
458 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; | 460 | mIsPhone->setChecked(prof->getIsPhoneSync()) ; |
459 | mIsPi->setChecked(prof->getIsPiSync()) ; | 461 | mIsPi->setChecked(prof->getIsPiSync()) ; |
462 | mIsKapiFileL->setChecked(prof->getIsKapiFile()) ; | ||
463 | mIsKapiFileR->setChecked(prof->getIsKapiFile()) ; | ||
464 | |||
460 | mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() ); | 465 | mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() ); |
461 | proGr->setEnabled( item > 2 ); | 466 | proGr->setEnabled( item > 2 ); |
462 | if ( item < 3 ) { | 467 | if ( item < 3 ) { |
463 | localFileWidget->hide(); | 468 | localFileWidget->hide(); |
464 | remoteFileWidget->hide(); | 469 | remoteFileWidget->hide(); |
465 | phoneWidget->hide(); | 470 | phoneWidget->hide(); |
466 | piWidget->hide(); | 471 | piWidget->hide(); |
467 | 472 | ||
@@ -492,16 +497,22 @@ void KSyncPrefsDialog::fillFTP() | |||
492 | 497 | ||
493 | mRemotePrecommandPWM->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm" ); | 498 | mRemotePrecommandPWM->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm" ); |
494 | mLocalTempFilePWM->setText("/tmp/passwords.pwm" ); | 499 | mLocalTempFilePWM->setText("/tmp/passwords.pwm" ); |
495 | mRemotePostcommandPWM->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" ); | 500 | mRemotePostcommandPWM->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" ); |
496 | 501 | ||
497 | } | 502 | } |
498 | void KSyncPrefsDialog::kindChanged( bool b ) | 503 | void KSyncPrefsDialog::kindChanged( bool b ) |
499 | { | 504 | { |
505 | |||
506 | if ( mIsLocal->isChecked () ) { | ||
507 | mIsKapiFileL->setChecked( mIsKapiFileR->isChecked() ); | ||
508 | } else { | ||
509 | mIsKapiFileR->setChecked( mIsKapiFileL->isChecked() ); | ||
510 | } | ||
500 | 511 | ||
501 | if ( mIsLocal->isChecked () ) | 512 | if ( mIsLocal->isChecked () ) |
502 | localFileWidget->show(); | 513 | localFileWidget->show(); |
503 | else | 514 | else |
504 | localFileWidget->hide(); | 515 | localFileWidget->hide(); |
505 | 516 | ||
506 | if ( mIsNotLocal->isChecked () ) | 517 | if ( mIsNotLocal->isChecked () ) |
507 | remoteFileWidget->show(); | 518 | remoteFileWidget->show(); |
@@ -574,16 +585,17 @@ void KSyncPrefsDialog::saveProfile() | |||
574 | prof->setIncludeInRingSync( mIncludeInRing->isChecked() ); | 585 | prof->setIncludeInRingSync( mIncludeInRing->isChecked() ); |
575 | prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() ); | 586 | prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() ); |
576 | prof->setIncludeInRingSyncPWM( mIncludeInRingPWM->isChecked() ); | 587 | prof->setIncludeInRingSyncPWM( mIncludeInRingPWM->isChecked() ); |
577 | int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ; | 588 | int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ; |
578 | prof->setSyncPrefs( syncprefs); | 589 | prof->setSyncPrefs( syncprefs); |
579 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); | 590 | prof->setIsLocalFileSync( mIsLocal->isChecked() ); |
580 | prof->setIsPhoneSync( mIsPhone->isChecked() ); | 591 | prof->setIsPhoneSync( mIsPhone->isChecked() ); |
581 | prof->setIsPiSync( mIsPi->isChecked() ); | 592 | prof->setIsPiSync( mIsPi->isChecked() ); |
593 | prof->setIsKapiFile( mIsKapiFileL->isChecked() ); | ||
582 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); | 594 | prof->setWriteBackFuture(mWriteBackFuture->isChecked()); |
583 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); | 595 | prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); |
584 | if ( mWriteContactToSIM ) | 596 | if ( mWriteContactToSIM ) |
585 | prof->setWriteContactToSIM(mWriteContactToSIM->isChecked()); | 597 | prof->setWriteContactToSIM(mWriteContactToSIM->isChecked()); |
586 | prof->setPhoneDevice( mPhoneDevice->text() ); | 598 | prof->setPhoneDevice( mPhoneDevice->text() ); |
587 | prof->setPhoneConnection( mPhoneConnection->text() ); | 599 | prof->setPhoneConnection( mPhoneConnection->text() ); |
588 | prof->setPhoneModel( mPhoneModel->text() ); | 600 | prof->setPhoneModel( mPhoneModel->text() ); |
589 | 601 | ||