summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp98
-rw-r--r--libkdepim/ksyncprefsdialog.h8
-rw-r--r--libkdepim/ksyncprofile.cpp17
-rw-r--r--libkdepim/ksyncprofile.h14
4 files changed, 131 insertions, 6 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 355c05d..c6c5ff8 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -179,29 +179,56 @@ void KSyncPrefsDialog::setupSyncAlgTab()
179 topLayout->addMultiCellWidget(new QLabel( i18n("---- Max. weeks in future: ") , topFrame ), iii,iii,0,0); 179 topLayout->addMultiCellWidget(new QLabel( i18n("---- Max. weeks in future: ") , topFrame ), iii,iii,0,0);
180 mWriteBackFutureWeeks= new QSpinBox(1,104, 1, topFrame); 180 mWriteBackFutureWeeks= new QSpinBox(1,104, 1, topFrame);
181 topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1); 181 topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
182 ++iii; 182 ++iii;
183 183
184 proGr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Profile kind"), topFrame); 184 proGr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Profile kind"), topFrame);
185 gr = proGr; 185 gr = proGr;
186 topLayout->addMultiCellWidget(gr, iii,iii,0,1); 186 topLayout->addMultiCellWidget(gr, iii,iii,0,1);
187 ++iii; 187 ++iii;
188 mIsLocal = new QRadioButton ( i18n("Local file"), gr ); 188 mIsLocal = new QRadioButton ( i18n("Local file"), gr );
189 mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr ); 189 mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
190 connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 190 connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
191 mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
192 connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
193
194
195 phoneWidget = new QVBox( topFrame);
196 topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
197 ++iii;
198 QHBox* temphb = new QHBox( phoneWidget );
199 new QLabel( i18n("I/O device: "), temphb );
200 mPhoneDevice = new QLineEdit( temphb);
201 button = new QPushButton( i18n("Help..."), temphb );
202 connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) );
203
204
205 temphb = new QHBox( phoneWidget );
206 new QLabel( i18n("Connection: "), temphb );
207 mPhoneConnection = new QLineEdit( temphb);
208 button = new QPushButton( i18n("Help..."), temphb );
209 connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) );
210
211
212 temphb = new QHBox( phoneWidget );
213 new QLabel( i18n("Model(opt.): "), temphb );
214 mPhoneModel = new QLineEdit( temphb);
215 button = new QPushButton( i18n("Help..."), temphb );
216 connect ( button, SIGNAL( clicked()), this, SLOT ( helpModel() ) );
217
191 // *** local 218 // *** local
192 localFileWidget = new QVBox( topFrame); 219 localFileWidget = new QVBox( topFrame);
193 topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1); 220 topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
194 ++iii; 221 ++iii;
195 QHBox* temphb = new QHBox( localFileWidget ); 222 temphb = new QHBox( localFileWidget );
196 223
197 lab = new QLabel( i18n("Local file Cal:"), temphb ); 224 lab = new QLabel( i18n("Local file Cal:"), temphb );
198 lab = new QLabel( i18n("Local file ABook:"), temphb ); 225 lab = new QLabel( i18n("Local file ABook:"), temphb );
199 temphb = new QHBox( localFileWidget ); 226 temphb = new QHBox( localFileWidget );
200 button = new QPushButton( i18n("Choose..."), temphb ); 227 button = new QPushButton( i18n("Choose..."), temphb );
201 connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) ); 228 connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
202 button = new QPushButton( i18n("Choose..."), temphb ); 229 button = new QPushButton( i18n("Choose..."), temphb );
203 connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) ); 230 connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) );
204 temphb = new QHBox( localFileWidget ); 231 temphb = new QHBox( localFileWidget );
205 232
206 mRemoteFile = new QLineEdit( temphb); 233 mRemoteFile = new QLineEdit( temphb);
207 mRemoteFileAB = new QLineEdit( temphb); 234 mRemoteFileAB = new QLineEdit( temphb);
@@ -303,24 +330,29 @@ void KSyncPrefsDialog::profileChanged( int item )
303 saveProfile(); 330 saveProfile();
304 currentSelection = item; 331 currentSelection = item;
305 prof = mSyncProfiles.at(item) ; 332 prof = mSyncProfiles.at(item) ;
306 mRemotePrecommand->setText(prof->getPreSyncCommand()); 333 mRemotePrecommand->setText(prof->getPreSyncCommand());
307 mRemotePostcommand->setText(prof->getPostSyncCommand()); 334 mRemotePostcommand->setText(prof->getPostSyncCommand());
308 mLocalTempFile->setText(prof->getLocalTempFile()); 335 mLocalTempFile->setText(prof->getLocalTempFile());
309 mRemoteFile->setText(prof->getRemoteFileName()) ; 336 mRemoteFile->setText(prof->getRemoteFileName()) ;
310 337
311 mRemotePrecommandAB->setText(prof->getPreSyncCommandAB()); 338 mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
312 mRemotePostcommandAB->setText(prof->getPostSyncCommandAB()); 339 mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
313 mLocalTempFileAB->setText(prof->getLocalTempFileAB()); 340 mLocalTempFileAB->setText(prof->getLocalTempFileAB());
314 mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ; 341 mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
342
343 mPhoneDevice->setText(prof->getPhoneDevice());
344 mPhoneConnection->setText(prof->getPhoneConnection());
345 mPhoneModel->setText(prof->getPhoneModel());
346
315 mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync()); 347 mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
316 mAskForPreferences->setChecked( prof->getAskForPreferences()); 348 mAskForPreferences->setChecked( prof->getAskForPreferences());
317 mWriteBackExisting->setChecked( prof->getWriteBackExisting() ); 349 mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
318 mWriteBackFile->setChecked( prof->getWriteBackFile()); 350 mWriteBackFile->setChecked( prof->getWriteBackFile());
319 mIncludeInRing->setChecked( prof->getIncludeInRingSync() ); 351 mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
320 mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() ); 352 mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
321 mWriteBackFuture->setChecked( prof->getWriteBackFuture()); 353 mWriteBackFuture->setChecked( prof->getWriteBackFuture());
322 mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() ); 354 mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
323 355
324 switch ( prof->getSyncPrefs() ) { 356 switch ( prof->getSyncPrefs() ) {
325 case 0: 357 case 0:
326 loc->setChecked( true); 358 loc->setChecked( true);
@@ -338,29 +370,31 @@ void KSyncPrefsDialog::profileChanged( int item )
338 f_loc->setChecked( true); 370 f_loc->setChecked( true);
339 break; 371 break;
340 case 5: 372 case 5:
341 f_rem->setChecked( true); 373 f_rem->setChecked( true);
342 break; 374 break;
343 case 6: 375 case 6:
344 //both->setChecked( true); 376 //both->setChecked( true);
345 break; 377 break;
346 default: 378 default:
347 break; 379 break;
348 } 380 }
349 mIsLocal->setChecked(prof->getIsLocalFileSync()) ; 381 mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
350 mIsNotLocal->setChecked(!prof->getIsLocalFileSync()); 382 mIsPhone->setChecked(prof->getIsPhoneSync()) ;
383 mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() );
351 proGr->setEnabled( item > 2 ); 384 proGr->setEnabled( item > 2 );
352 if ( item < 3 ) { 385 if ( item < 3 ) {
353 localFileWidget->setEnabled(false); 386 localFileWidget->hide();
354 remoteFileWidget->setEnabled(false); 387 remoteFileWidget->hide();
388 phoneWidget->hide();
355 389
356 } else 390 } else
357 kindChanged( prof->getIsLocalFileSync() ); 391 kindChanged( prof->getIsLocalFileSync() );
358} 392}
359 393
360void KSyncPrefsDialog::fillSSH() 394void KSyncPrefsDialog::fillSSH()
361{ 395{
362 mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" ); 396 mRemotePrecommand->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
363 mLocalTempFile->setText("/tmp/mycalendar.ics" ); 397 mLocalTempFile->setText("/tmp/mycalendar.ics" );
364 mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" ); 398 mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
365 mRemotePrecommandAB->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf /tmp/std.vcf" ); 399 mRemotePrecommandAB->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
366 mLocalTempFileAB->setText("/tmp/std.vcf" ); 400 mLocalTempFileAB->setText("/tmp/std.vcf" );
@@ -370,26 +404,40 @@ void KSyncPrefsDialog::fillFTP()
370{ 404{
371 mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" ); 405 mRemotePrecommand->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics" );
372 mLocalTempFile->setText("/tmp/mycalendar.ics" ); 406 mLocalTempFile->setText("/tmp/mycalendar.ics" );
373 mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" ); 407 mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
374 mRemotePrecommandAB->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf" ); 408 mRemotePrecommandAB->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf" );
375 mLocalTempFileAB->setText("/tmp/std.vcf" ); 409 mLocalTempFileAB->setText("/tmp/std.vcf" );
376 mRemotePostcommandAB->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf /tmp/std.vcf" ); 410 mRemotePostcommandAB->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
377 411
378} 412}
379void KSyncPrefsDialog::kindChanged( bool b ) 413void KSyncPrefsDialog::kindChanged( bool b )
380{ 414{
381 415
382 localFileWidget->setEnabled(b); 416 if ( mIsLocal->isChecked () )
383 remoteFileWidget->setEnabled(!b); 417 localFileWidget->show();
418 else
419 localFileWidget->hide();
420
421 if ( mIsNotLocal->isChecked () )
422 remoteFileWidget->show();
423 else
424 remoteFileWidget->hide();
425
426 if ( mIsPhone->isChecked () ) {
427 phoneWidget->show();
428 }
429 else {
430 phoneWidget->hide();
431 }
384 432
385} 433}
386void KSyncPrefsDialog::deleteProfile() 434void KSyncPrefsDialog::deleteProfile()
387{ 435{
388 //qDebug("KSyncPrefsDialog::deleteProfile() "); 436 //qDebug("KSyncPrefsDialog::deleteProfile() ");
389 if ( currentSelection >= 0 ) { 437 if ( currentSelection >= 0 ) {
390 if ( currentSelection < 3 ) { 438 if ( currentSelection < 3 ) {
391 KMessageBox::error(this,i18n("This profil cannot be deleted!\n"),i18n("KO/Pi config error")); 439 KMessageBox::error(this,i18n("This profil cannot be deleted!\n"),i18n("KO/Pi config error"));
392 return; 440 return;
393 } 441 }
394 KSyncProfile* temp = mSyncProfiles.at(currentSelection); 442 KSyncProfile* temp = mSyncProfiles.at(currentSelection);
395 mSyncProfiles.remove( temp ); 443 mSyncProfiles.remove( temp );
@@ -411,26 +459,31 @@ void KSyncPrefsDialog::saveProfile()
411 prof->setPostSyncCommandAB( mRemotePostcommandAB->text() ); 459 prof->setPostSyncCommandAB( mRemotePostcommandAB->text() );
412 prof->setLocalTempFileAB( mLocalTempFileAB->text()); 460 prof->setLocalTempFileAB( mLocalTempFileAB->text());
413 prof->setRemoteFileNameAB( mRemoteFileAB->text() ); 461 prof->setRemoteFileNameAB( mRemoteFileAB->text() );
414 prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() ); 462 prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
415 prof->setAskForPreferences( mAskForPreferences->isChecked()); 463 prof->setAskForPreferences( mAskForPreferences->isChecked());
416 prof->setWriteBackExisting(mWriteBackExisting->isChecked() ); 464 prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
417 prof->setWriteBackFile( mWriteBackFile->isChecked()); 465 prof->setWriteBackFile( mWriteBackFile->isChecked());
418 prof->setIncludeInRingSync( mIncludeInRing->isChecked() ); 466 prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
419 prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() ); 467 prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
420 int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ; 468 int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ;
421 prof->setSyncPrefs( syncprefs); 469 prof->setSyncPrefs( syncprefs);
422 prof->setIsLocalFileSync( mIsLocal->isChecked() ); 470 prof->setIsLocalFileSync( mIsLocal->isChecked() );
471 prof->setIsPhoneSync( mIsPhone->isChecked() );
423 prof->setWriteBackFuture(mWriteBackFuture->isChecked()); 472 prof->setWriteBackFuture(mWriteBackFuture->isChecked());
424 prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); 473 prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
474 prof->setPhoneDevice( mPhoneDevice->text() );
475 prof->setPhoneConnection( mPhoneConnection->text() );
476 prof->setPhoneModel( mPhoneModel->text() );
477
425 } 478 }
426 479
427} 480}
428 481
429void KSyncPrefsDialog::insertProfiles() 482void KSyncPrefsDialog::insertProfiles()
430{ 483{
431 int curItem = mProfileBox->currentItem(); 484 int curItem = mProfileBox->currentItem();
432 mProfileBox->blockSignals( true ); 485 mProfileBox->blockSignals( true );
433 mProfileBox->clear(); 486 mProfileBox->clear();
434 mProfileBox->insertStringList (mSyncProfileNames ); 487 mProfileBox->insertStringList (mSyncProfileNames );
435 int item = mSyncProfileNames.count() -1; 488 int item = mSyncProfileNames.count() -1;
436 if ( curItem >= 0 && mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() ) 489 if ( curItem >= 0 && mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
@@ -518,12 +571,45 @@ void KSyncPrefsDialog::usrWriteConfig()
518 KSyncProfile* prof = mSyncProfiles.first(); 571 KSyncProfile* prof = mSyncProfiles.first();
519 while ( prof ) { 572 while ( prof ) {
520 prof->writeConfig(&config); 573 prof->writeConfig(&config);
521 prof = mSyncProfiles.next(); 574 prof = mSyncProfiles.next();
522 } 575 }
523 //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames; 576 //KOPrefs::instance()->mSyncProfileNames = mSyncProfileNames;
524 //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text(); 577 //KOPrefs::instance()->mLocalMachineName = mMyMachineName->text();
525 config.writeEntry("SyncProfileNames",mSyncProfileNames); 578 config.writeEntry("SyncProfileNames",mSyncProfileNames);
526 QString name = mMyMachineName->text(); 579 QString name = mMyMachineName->text();
527 config.writeEntry("LocalMachineName",name); 580 config.writeEntry("LocalMachineName",name);
528} 581}
529 582
583void KSyncPrefsDialog::helpDevice()
584{
585 QString hint = i18n("Insert device where\nphone is connected. E.g.:\n");
586#ifdef _WIN32_
587 hint += "leave empty for Irda\n"
588 "com1:\n(first serial port)\n"
589 "usb not supported\n"
590 "???\n(bluetooth device address)\n";
591
592#else
593 hint += "/dev/ircomm\n(Irda)\n"
594 "/dev/ttyS0\n(first serial port)\n"
595 "/dev/ttyUSB0\n(first device usb port)\n"
596 "???\n(bluetooth device address)\n";
597#endif
598 KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
599}
600void KSyncPrefsDialog::helpModel()
601{
602 QString hint = i18n("Leave empty or\ninsert name of phone model:\n");
603 hint += "E.g. for Nokia 6310i:\n6310i\nAlso possible:\nobex\nfor Obex connection";
604 KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
605
606}
607void KSyncPrefsDialog::helpConnection()
608{
609 QString hint = i18n("Insert kind of connection,e.g.:\n");
610 hint += "irda | Nokia FBUS over infrared\n"
611 "irdaat | AT commands infrared\n(Siemens/Sony-Erricsson)\n"
612 "irdaobex | set model obex\n"
613 "fbus | Nokia FBUS2 serial\n";
614 KMessageBox::information(this,hint,i18n("KDE-Pim sync config"));
615}
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 8c2c59c..3060e78 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -62,59 +62,67 @@ class KSyncPrefsDialog : public KDialog
62 void accept(); 62 void accept();
63 void deleteProfile(); 63 void deleteProfile();
64 void newProfile(); 64 void newProfile();
65 void cloneProfile(); 65 void cloneProfile();
66 void kindChanged(bool); 66 void kindChanged(bool);
67 void fillSSH(); 67 void fillSSH();
68 void fillFTP(); 68 void fillFTP();
69 void textChanged( const QString & ); 69 void textChanged( const QString & );
70 void profileChanged( int ); 70 void profileChanged( int );
71 void chooseFile(); 71 void chooseFile();
72 void chooseFileAB(); 72 void chooseFileAB();
73 void slotOK(); 73 void slotOK();
74 void helpDevice();
75 void helpModel();
76 void helpConnection();
74 77
75 protected: 78 protected:
76 void usrWriteConfig(); 79 void usrWriteConfig();
77 80
78 void setupSyncAlgTab(); 81 void setupSyncAlgTab();
79 82
80 private: 83 private:
81 int currentSelection; 84 int currentSelection;
82 QPtrList<KSyncProfile> mSyncProfiles; 85 QPtrList<KSyncProfile> mSyncProfiles;
83 QStringList mSyncProfileNames; 86 QStringList mSyncProfileNames;
84 QLineEdit * mMyMachineName; 87 QLineEdit * mMyMachineName;
85 QComboBox * mProfileBox; 88 QComboBox * mProfileBox;
86 QRadioButton* mIsLocal; 89 QRadioButton* mIsLocal;
87 QRadioButton* mIsNotLocal; 90 QRadioButton* mIsNotLocal;
91 QRadioButton* mIsPhone;
88 QCheckBox* mIncludeInRing; 92 QCheckBox* mIncludeInRing;
89 QCheckBox* mIncludeInRingAB; 93 QCheckBox* mIncludeInRingAB;
90 void addProfile ( KSyncProfile* ); 94 void addProfile ( KSyncProfile* );
91 void insertProfiles(); 95 void insertProfiles();
92 void saveProfile(); 96 void saveProfile();
93 QButtonGroup* proGr; 97 QButtonGroup* proGr;
94 98
95 QRadioButton* loc, *rem, *newest, *ask, *f_loc,* f_rem, *both; 99 QRadioButton* loc, *rem, *newest, *ask, *f_loc,* f_rem, *both;
96 100
97 101
98 QLineEdit * mRemotePostcommand; 102 QLineEdit * mRemotePostcommand;
99 QLineEdit * mRemotePrecommand; 103 QLineEdit * mRemotePrecommand;
100 QLineEdit * mRemoteFile; 104 QLineEdit * mRemoteFile;
101 QLineEdit * mLocalTempFile; 105 QLineEdit * mLocalTempFile;
102 106
103 QLineEdit * mRemotePostcommandAB; 107 QLineEdit * mRemotePostcommandAB;
104 QLineEdit * mRemotePrecommandAB; 108 QLineEdit * mRemotePrecommandAB;
105 QLineEdit * mRemoteFileAB; 109 QLineEdit * mRemoteFileAB;
106 QLineEdit * mLocalTempFileAB; 110 QLineEdit * mLocalTempFileAB;
107 111
112 QLineEdit * mPhoneDevice;
113 QLineEdit * mPhoneConnection;
114 QLineEdit * mPhoneModel;
108 115
109 QWidget* mSetupSyncAlgTab; 116 QWidget* mSetupSyncAlgTab;
110 QVBox* localFileWidget; 117 QVBox* localFileWidget;
111 QVBox* remoteFileWidget; 118 QVBox* remoteFileWidget;
119 QVBox* phoneWidget;
112 QCheckBox* mWriteBackFile; 120 QCheckBox* mWriteBackFile;
113 QCheckBox* mWriteBackFuture; 121 QCheckBox* mWriteBackFuture;
114 QSpinBox* mWriteBackFutureWeeks; 122 QSpinBox* mWriteBackFutureWeeks;
115 QCheckBox* mWriteBackExisting; 123 QCheckBox* mWriteBackExisting;
116 QCheckBox* mAskForPreferences; 124 QCheckBox* mAskForPreferences;
117 QCheckBox* mShowSummaryAfterSync; 125 QCheckBox* mShowSummaryAfterSync;
118}; 126};
119 127
120#endif 128#endif
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index f34c309..425285e 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -52,24 +52,25 @@ KSyncProfile* KSyncProfile::clone()
52 myClone->setLocalTempFileAB( mLocalTempFileAB); 52 myClone->setLocalTempFileAB( mLocalTempFileAB);
53 myClone->setRemoteFileNameAB( mRemoteFileNameAB ); 53 myClone->setRemoteFileNameAB( mRemoteFileNameAB );
54 myClone->setShowSummaryAfterSync( mShowSummaryAfterSync ); 54 myClone->setShowSummaryAfterSync( mShowSummaryAfterSync );
55 myClone->setAskForPreferences( mAskForPreferences); 55 myClone->setAskForPreferences( mAskForPreferences);
56 myClone->setWriteBackExisting(mWriteBackExisting ); 56 myClone->setWriteBackExisting(mWriteBackExisting );
57 myClone->setWriteBackFile( mWriteBackFile); 57 myClone->setWriteBackFile( mWriteBackFile);
58 myClone->setWriteBackFuture( mWriteBackFuture ); 58 myClone->setWriteBackFuture( mWriteBackFuture );
59 myClone->setWriteBackFutureWeeks( mWriteBackFutureWeeks ); 59 myClone->setWriteBackFutureWeeks( mWriteBackFutureWeeks );
60 myClone->setIncludeInRingSync( mIncludeInRingSync ); 60 myClone->setIncludeInRingSync( mIncludeInRingSync );
61 myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB ); 61 myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
62 myClone->setSyncPrefs( mSyncPrefs); 62 myClone->setSyncPrefs( mSyncPrefs);
63 myClone->setIsLocalFileSync( mIsLocalFileSync ); 63 myClone->setIsLocalFileSync( mIsLocalFileSync );
64 myClone->setIsPhoneSync( mIsPhoneSync );
64 myClone->setName( "noName" ); 65 myClone->setName( "noName" );
65 return myClone; 66 return myClone;
66} 67}
67 68
68 69
69void KSyncProfile::setDefault() 70void KSyncProfile::setDefault()
70{ 71{
71 mName = "noName"; 72 mName = "noName";
72 mPreSyncCommand = i18n("command for downloading remote file to local device"); 73 mPreSyncCommand = i18n("command for downloading remote file to local device");
73 mPostSyncCommand = i18n("command for uploading local temp file to remote device"); 74 mPostSyncCommand = i18n("command for uploading local temp file to remote device");
74 mLocalTempFile = "/tmp/mycalendar.ics"; 75 mLocalTempFile = "/tmp/mycalendar.ics";
75 mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics"; 76 mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics";
@@ -78,74 +79,90 @@ void KSyncProfile::setDefault()
78 mLocalTempFileAB = "/tmp/std.vcf"; 79 mLocalTempFileAB = "/tmp/std.vcf";
79 mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf"; 80 mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf";
80 mShowSummaryAfterSync = true; 81 mShowSummaryAfterSync = true;
81 mAskForPreferences = true; 82 mAskForPreferences = true;
82 mWriteBackExisting = false; 83 mWriteBackExisting = false;
83 mWriteBackFuture = false; 84 mWriteBackFuture = false;
84 mWriteBackFutureWeeks = 12; 85 mWriteBackFutureWeeks = 12;
85 mWriteBackFile = true; 86 mWriteBackFile = true;
86 mIncludeInRingSync = false; 87 mIncludeInRingSync = false;
87 mIncludeInRingSyncAB = false; 88 mIncludeInRingSyncAB = false;
88 mSyncPrefs = SYNC_PREF_ASK; 89 mSyncPrefs = SYNC_PREF_ASK;
89 mIsLocalFileSync = true; 90 mIsLocalFileSync = true;
91 mIsPhoneSync = false;
92 mPhoneDevice = "/dev/ircomm";
93 mPhoneConnection = "irda";
94 mPhoneModel = "6310i";
90 95
91} 96}
92void KSyncProfile::readConfig(KConfig *config ) 97void KSyncProfile::readConfig(KConfig *config )
93{ 98{
94 config->setGroup("SyncProfiles"); 99 config->setGroup("SyncProfiles");
95 QString prefix = "Profile_"+mName+"_"; 100 QString prefix = "Profile_"+mName+"_";
96 //mName = config->readEntry( prefix+ "Name", mName ); 101 //mName = config->readEntry( prefix+ "Name", mName );
97 mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); 102 mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand );
98 mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );; 103 mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );;
99 mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile ); 104 mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile );
100 mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName ); 105 mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName );
101 106
102 mPreSyncCommandAB = config->readEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB ); 107 mPreSyncCommandAB = config->readEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
103 mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB ); 108 mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
104 mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB ); 109 mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
105 mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); 110 mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
106 111
112
113 mPhoneDevice = config->readEntry( prefix+ "PhoneDevice", mPhoneDevice );
114 mPhoneConnection = config->readEntry( prefix+ "PhoneConnection", mPhoneConnection );
115 mPhoneModel = config->readEntry( prefix+ "PhoneModel", mPhoneModel );
116
107 mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); 117 mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
108 mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); 118 mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
109 mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); 119 mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
110 mAskForPreferences = config->readBoolEntry( prefix+ "AskForPreferences",mAskForPreferences ); 120 mAskForPreferences = config->readBoolEntry( prefix+ "AskForPreferences",mAskForPreferences );
111 mWriteBackExisting = config->readBoolEntry( prefix+ "WriteBackExisting",mWriteBackExisting ); 121 mWriteBackExisting = config->readBoolEntry( prefix+ "WriteBackExisting",mWriteBackExisting );
112 mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture ); 122 mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
113 mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs ); 123 mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs );
114 mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks ); 124 mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks );
115 mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); 125 mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
126 mIsPhoneSync= config->readBoolEntry( prefix+ "IsPhoneSync", mIsPhoneSync );
116} 127}
117void KSyncProfile::writeConfig( KConfig * config ) 128void KSyncProfile::writeConfig( KConfig * config )
118{ 129{
119 config->setGroup("SyncProfiles"); 130 config->setGroup("SyncProfiles");
120 QString prefix = "Profile_"+mName+"_"; 131 QString prefix = "Profile_"+mName+"_";
121 // config->writeEntry( prefix+ "Name", mName ); 132 // config->writeEntry( prefix+ "Name", mName );
122 config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand ); 133 config->writeEntry( prefix+ "PreSyncCommand",mPreSyncCommand );
123 config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand ); 134 config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
124 config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile ); 135 config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile );
125 config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName ); 136 config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName );
126 137
127 config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB ); 138 config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
128 config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB ); 139 config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
129 config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB ); 140 config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
130 config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB ); 141 config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
142
143 config->writeEntry( prefix+ "PhoneDevice", mPhoneDevice );
144 config->writeEntry( prefix+ "PhoneConnection", mPhoneConnection );
145 config->writeEntry( prefix+ "PhoneModel", mPhoneModel );
146
131 config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync ); 147 config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
132 config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB ); 148 config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
133 config->writeEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync ); 149 config->writeEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
134 config->writeEntry( prefix+ "AskForPreferences",mAskForPreferences ); 150 config->writeEntry( prefix+ "AskForPreferences",mAskForPreferences );
135 config->writeEntry( prefix+ "WriteBackExisting",mWriteBackExisting ); 151 config->writeEntry( prefix+ "WriteBackExisting",mWriteBackExisting );
136 config->writeEntry( prefix+ "WriteBackFuture",mWriteBackFuture ); 152 config->writeEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
137 config->writeEntry( prefix+ "SyncPrefs", mSyncPrefs ); 153 config->writeEntry( prefix+ "SyncPrefs", mSyncPrefs );
138 config->writeEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks); 154 config->writeEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks);
139 config->writeEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync ); 155 config->writeEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
156 config->writeEntry( prefix+ "IsPhoneSync", mIsPhoneSync );
140} 157}
141 158
142/* 159/*
143class KPrefsItemInt : public KPrefsItem { 160class KPrefsItemInt : public KPrefsItem {
144 public: 161 public:
145 KPrefsItemInt(const QString &group,const QString &name,int *,int defaultValue=0); 162 KPrefsItemInt(const QString &group,const QString &name,int *,int defaultValue=0);
146 virtual ~KPrefsItemInt() {} 163 virtual ~KPrefsItemInt() {}
147 164
148 void setDefault(); 165 void setDefault();
149 void readConfig(KConfig *); 166 void readConfig(KConfig *);
150 void writeConfig(KConfig *); 167 void writeConfig(KConfig *);
151 168
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 80094b1..300f70f 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -64,24 +64,30 @@ class KSyncProfile : public QObject {
64 void setRemoteFileName( const QString& n ) { mRemoteFileName = n;} 64 void setRemoteFileName( const QString& n ) { mRemoteFileName = n;}
65 QString getRemoteFileName( ) { return mRemoteFileName;} 65 QString getRemoteFileName( ) { return mRemoteFileName;}
66 66
67 void setPreSyncCommandAB( const QString& n ) {mPreSyncCommandAB = n;} 67 void setPreSyncCommandAB( const QString& n ) {mPreSyncCommandAB = n;}
68 QString getPreSyncCommandAB( ) { return mPreSyncCommandAB; } 68 QString getPreSyncCommandAB( ) { return mPreSyncCommandAB; }
69 void setPostSyncCommandAB( const QString& n ) {mPostSyncCommandAB = n;} 69 void setPostSyncCommandAB( const QString& n ) {mPostSyncCommandAB = n;}
70 QString getPostSyncCommandAB( ) { return mPostSyncCommandAB;} 70 QString getPostSyncCommandAB( ) { return mPostSyncCommandAB;}
71 void setLocalTempFileAB( const QString& n ) { mLocalTempFileAB= n;} 71 void setLocalTempFileAB( const QString& n ) { mLocalTempFileAB= n;}
72 QString getLocalTempFileAB( ) { return mLocalTempFileAB;} 72 QString getLocalTempFileAB( ) { return mLocalTempFileAB;}
73 void setRemoteFileNameAB( const QString& n ) { mRemoteFileNameAB = n;} 73 void setRemoteFileNameAB( const QString& n ) { mRemoteFileNameAB = n;}
74 QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;} 74 QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;}
75 75
76 void setPhoneDevice( const QString& n ) { mPhoneDevice = n;}
77 QString getPhoneDevice( ) { return mPhoneDevice;}
78 void setPhoneConnection( const QString& n ) { mPhoneConnection = n;}
79 QString getPhoneConnection( ) { return mPhoneConnection;}
80 void setPhoneModel( const QString& n ) { mPhoneModel = n;}
81 QString getPhoneModel( ) { return mPhoneModel;}
76 /* 82 /*
77 void set( const QString& n ) { = n;} 83 void set( const QString& n ) { = n;}
78 QString get( ) { return ;} 84 QString get( ) { return ;}
79 */ 85 */
80 86
81 void setShowSummaryAfterSync( bool b ) { mShowSummaryAfterSync = b;} 87 void setShowSummaryAfterSync( bool b ) { mShowSummaryAfterSync = b;}
82 bool getShowSummaryAfterSync( ) { return mShowSummaryAfterSync ;} 88 bool getShowSummaryAfterSync( ) { return mShowSummaryAfterSync ;}
83 void setAskForPreferences( bool b ) { mAskForPreferences= b;} 89 void setAskForPreferences( bool b ) { mAskForPreferences= b;}
84 bool getAskForPreferences( ) { return mAskForPreferences;} 90 bool getAskForPreferences( ) { return mAskForPreferences;}
85 void setWriteBackExisting( bool b ) { mWriteBackExisting = b;} 91 void setWriteBackExisting( bool b ) { mWriteBackExisting = b;}
86 bool getWriteBackExisting( ) { return mWriteBackExisting;} 92 bool getWriteBackExisting( ) { return mWriteBackExisting;}
87 void setWriteBackFuture( bool b ) { mWriteBackFuture = b;} 93 void setWriteBackFuture( bool b ) { mWriteBackFuture = b;}
@@ -89,36 +95,44 @@ class KSyncProfile : public QObject {
89 void setWriteBackFile( bool b ) { mWriteBackFile= b;} 95 void setWriteBackFile( bool b ) { mWriteBackFile= b;}
90 bool getWriteBackFile( ) { return mWriteBackFile;} 96 bool getWriteBackFile( ) { return mWriteBackFile;}
91 void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;} 97 void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;}
92 bool getIncludeInRingSync( ) { return mIncludeInRingSync;} 98 bool getIncludeInRingSync( ) { return mIncludeInRingSync;}
93 void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;} 99 void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;}
94 bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;} 100 bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;}
95 void setSyncPrefs( int n ) { mSyncPrefs= n;} 101 void setSyncPrefs( int n ) { mSyncPrefs= n;}
96 int getSyncPrefs( ) { return mSyncPrefs;} 102 int getSyncPrefs( ) { return mSyncPrefs;}
97 void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;} 103 void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;}
98 int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;} 104 int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;}
99 void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;} 105 void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;}
100 bool getIsLocalFileSync( ) { return mIsLocalFileSync;} 106 bool getIsLocalFileSync( ) { return mIsLocalFileSync;}
107 void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
108 bool getIsPhoneSync( ) { return mIsPhoneSync;}
101 109
102 private: 110 private:
103 QString mName; 111 QString mName;
104 QString mPreSyncCommand; 112 QString mPreSyncCommand;
105 QString mPostSyncCommand; 113 QString mPostSyncCommand;
106 QString mLocalTempFile; 114 QString mLocalTempFile;
107 QString mRemoteFileName; 115 QString mRemoteFileName;
108 QString mPreSyncCommandAB; 116 QString mPreSyncCommandAB;
109 QString mPostSyncCommandAB; 117 QString mPostSyncCommandAB;
110 QString mLocalTempFileAB; 118 QString mLocalTempFileAB;
111 QString mRemoteFileNameAB; 119 QString mRemoteFileNameAB;
120
121 QString mPhoneDevice;
122 QString mPhoneConnection;
123 QString mPhoneModel;
124
112 bool mIncludeInRingSync; 125 bool mIncludeInRingSync;
113 bool mIncludeInRingSyncAB; 126 bool mIncludeInRingSyncAB;
114 int mSyncPrefs; 127 int mSyncPrefs;
115 bool mWriteBackFile; 128 bool mWriteBackFile;
116 bool mWriteBackExisting; 129 bool mWriteBackExisting;
117 bool mWriteBackFuture; 130 bool mWriteBackFuture;
118 int mWriteBackFutureWeeks; 131 int mWriteBackFutureWeeks;
119 bool mAskForPreferences; 132 bool mAskForPreferences;
120 bool mShowSummaryAfterSync; 133 bool mShowSummaryAfterSync;
121 bool mIsLocalFileSync; 134 bool mIsLocalFileSync;
135 bool mIsPhoneSync;
122}; 136};
123 137
124#endif 138#endif