summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-22 01:13:09 (UTC)
committer zautrix <zautrix>2004-09-22 01:13:09 (UTC)
commited2feaa9f7e2064e5b26ff678a25eb79ceae599b (patch) (unidiff)
treebd698d689aa16ce8c52c5060402d9560f95a713e
parent01572248367c63119514d15d7401a5b2b83349a0 (diff)
downloadkdepimpi-ed2feaa9f7e2064e5b26ff678a25eb79ceae599b.zip
kdepimpi-ed2feaa9f7e2064e5b26ff678a25eb79ceae599b.tar.gz
kdepimpi-ed2feaa9f7e2064e5b26ff678a25eb79ceae599b.tar.bz2
Sync dialog fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp4
-rw-r--r--libkdepim/ksyncprefsdialog.cpp6
-rw-r--r--libkdepim/ksyncprefsdialog.h1
-rw-r--r--libkdepim/ksyncprofile.cpp23
-rw-r--r--libkdepim/ksyncprofile.h15
5 files changed, 19 insertions, 30 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7fae4a9..bc8625d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1138,34 +1138,34 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
1138 if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { 1138 if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
1139 ++addedEventR; 1139 ++addedEventR;
1140 inL->setLastModified( modifiedCalendar ); 1140 inL->setLastModified( modifiedCalendar );
1141 remote->addIncidence( inL->clone() ); 1141 remote->addIncidence( inL->clone() );
1142 } 1142 }
1143 } 1143 }
1144 } 1144 }
1145 } 1145 }
1146 } 1146 }
1147 inL = el.next(); 1147 inL = el.next();
1148 } 1148 }
1149 int delFut = 0; 1149 int delFut = 0;
1150 if ( KOPrefs::instance()->mWriteBackInFuture ) { 1150 if ( KOPrefs::instance()->mWriteBackInFuture ) {
1151 er = remote->rawIncidences(); 1151 er = remote->rawIncidences();
1152 inR = er.first(); 1152 inR = er.first();
1153 QDateTime dt; 1153 QDateTime dt;
1154 QDateTime cur = QDateTime::currentDateTime(); 1154 QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
1155 QDateTime end = cur.addSecs( KOPrefs::instance()->mWriteBackInFuture * 3600 *24 *7 ); 1155 QDateTime end = cur.addDays( (KOPrefs::instance()->mWriteBackInFuture +1 ) *7 );
1156 while ( inR ) { 1156 while ( inR ) {
1157 if ( inR->type() == "Todo" ) { 1157 if ( inR->type() == "Todo" ) {
1158 Todo * t = (Todo*)inR; 1158 Todo * t = (Todo*)inR;
1159 if ( t->hasDueDate() ) 1159 if ( t->hasDueDate() )
1160 dt = t->dtDue(); 1160 dt = t->dtDue();
1161 else 1161 else
1162 dt = cur.addSecs( 62 ); 1162 dt = cur.addSecs( 62 );
1163 } 1163 }
1164 else if (inR->type() == "Event" ) { 1164 else if (inR->type() == "Event" ) {
1165 bool ok; 1165 bool ok;
1166 dt = inR->getNextOccurence( cur, &ok ); 1166 dt = inR->getNextOccurence( cur, &ok );
1167 if ( !ok ) 1167 if ( !ok )
1168 dt = cur.addSecs( -62 ); 1168 dt = cur.addSecs( -62 );
1169 } 1169 }
1170 else 1170 else
1171 dt = inR->dtStart(); 1171 dt = inR->dtStart();
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 857ceac..a1eebec 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -181,33 +181,34 @@ void KSyncPrefsDialog::setupSyncAlgTab()
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 ); 191 mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
192 connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 192 connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
193 193
194 194
195 phoneWidget = new QVBox( topFrame); 195 phoneWidget = new QVBox( topFrame);
196 topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1); 196 topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
197 ++iii; 197 ++iii;
198 mWriteContactToSIM= new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
198 QHBox* temphb = new QHBox( phoneWidget ); 199 QHBox* temphb = new QHBox( phoneWidget );
199 new QLabel( i18n("I/O device: "), temphb ); 200 new QLabel( i18n("I/O device: "), temphb );
200 mPhoneDevice = new QLineEdit( temphb); 201 mPhoneDevice = new QLineEdit( temphb);
201 button = new QPushButton( i18n("Help..."), temphb ); 202 button = new QPushButton( i18n("Help..."), temphb );
202 connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) ); 203 connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) );
203 204
204 205
205 temphb = new QHBox( phoneWidget ); 206 temphb = new QHBox( phoneWidget );
206 new QLabel( i18n("Connection: "), temphb ); 207 new QLabel( i18n("Connection: "), temphb );
207 mPhoneConnection = new QLineEdit( temphb); 208 mPhoneConnection = new QLineEdit( temphb);
208 button = new QPushButton( i18n("Help..."), temphb ); 209 button = new QPushButton( i18n("Help..."), temphb );
209 connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) ); 210 connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) );
210 211
211 212
212 temphb = new QHBox( phoneWidget ); 213 temphb = new QHBox( phoneWidget );
213 new QLabel( i18n("Model(opt.): "), temphb ); 214 new QLabel( i18n("Model(opt.): "), temphb );
@@ -327,32 +328,33 @@ void KSyncPrefsDialog::profileChanged( int item )
327{ 328{
328 //qDebug("KSyncPrefsDialog::profileChanged %d ", item ); 329 //qDebug("KSyncPrefsDialog::profileChanged %d ", item );
329 KSyncProfile* prof; 330 KSyncProfile* prof;
330 saveProfile(); 331 saveProfile();
331 currentSelection = item; 332 currentSelection = item;
332 prof = mSyncProfiles.at(item) ; 333 prof = mSyncProfiles.at(item) ;
333 mRemotePrecommand->setText(prof->getPreSyncCommand()); 334 mRemotePrecommand->setText(prof->getPreSyncCommand());
334 mRemotePostcommand->setText(prof->getPostSyncCommand()); 335 mRemotePostcommand->setText(prof->getPostSyncCommand());
335 mLocalTempFile->setText(prof->getLocalTempFile()); 336 mLocalTempFile->setText(prof->getLocalTempFile());
336 mRemoteFile->setText(prof->getRemoteFileName()) ; 337 mRemoteFile->setText(prof->getRemoteFileName()) ;
337 338
338 mRemotePrecommandAB->setText(prof->getPreSyncCommandAB()); 339 mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
339 mRemotePostcommandAB->setText(prof->getPostSyncCommandAB()); 340 mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
340 mLocalTempFileAB->setText(prof->getLocalTempFileAB()); 341 mLocalTempFileAB->setText(prof->getLocalTempFileAB());
341 mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ; 342 mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
342 343
344 mWriteContactToSIM->setChecked( prof->getWriteContactToSIM());
343 mPhoneDevice->setText(prof->getPhoneDevice()); 345 mPhoneDevice->setText(prof->getPhoneDevice());
344 mPhoneConnection->setText(prof->getPhoneConnection()); 346 mPhoneConnection->setText(prof->getPhoneConnection());
345 mPhoneModel->setText(prof->getPhoneModel()); 347 mPhoneModel->setText(prof->getPhoneModel());
346 348
347 mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync()); 349 mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
348 mAskForPreferences->setChecked( prof->getAskForPreferences()); 350 mAskForPreferences->setChecked( prof->getAskForPreferences());
349 mWriteBackExisting->setChecked( prof->getWriteBackExisting() ); 351 mWriteBackExisting->setChecked( prof->getWriteBackExisting() );
350 mWriteBackFile->setChecked( prof->getWriteBackFile()); 352 mWriteBackFile->setChecked( prof->getWriteBackFile());
351 mIncludeInRing->setChecked( prof->getIncludeInRingSync() ); 353 mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
352 mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() ); 354 mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
353 mWriteBackFuture->setChecked( prof->getWriteBackFuture()); 355 mWriteBackFuture->setChecked( prof->getWriteBackFuture());
354 mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() ); 356 mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
355 357
356 switch ( prof->getSyncPrefs() ) { 358 switch ( prof->getSyncPrefs() ) {
357 case 0: 359 case 0:
358 loc->setChecked( true); 360 loc->setChecked( true);
@@ -458,32 +460,34 @@ void KSyncPrefsDialog::saveProfile()
458 prof->setPreSyncCommandAB( mRemotePrecommandAB->text()); 460 prof->setPreSyncCommandAB( mRemotePrecommandAB->text());
459 prof->setPostSyncCommandAB( mRemotePostcommandAB->text() ); 461 prof->setPostSyncCommandAB( mRemotePostcommandAB->text() );
460 prof->setLocalTempFileAB( mLocalTempFileAB->text()); 462 prof->setLocalTempFileAB( mLocalTempFileAB->text());
461 prof->setRemoteFileNameAB( mRemoteFileAB->text() ); 463 prof->setRemoteFileNameAB( mRemoteFileAB->text() );
462 prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() ); 464 prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
463 prof->setAskForPreferences( mAskForPreferences->isChecked()); 465 prof->setAskForPreferences( mAskForPreferences->isChecked());
464 prof->setWriteBackExisting(mWriteBackExisting->isChecked() ); 466 prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
465 prof->setWriteBackFile( mWriteBackFile->isChecked()); 467 prof->setWriteBackFile( mWriteBackFile->isChecked());
466 prof->setIncludeInRingSync( mIncludeInRing->isChecked() ); 468 prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
467 prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() ); 469 prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
468 int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ; 470 int syncprefs = rem->isChecked()*1+newest->isChecked()*2+ ask->isChecked()*3+ f_loc->isChecked()*4+ f_rem->isChecked()*5 ;//+ both->isChecked()*6 ;
469 prof->setSyncPrefs( syncprefs); 471 prof->setSyncPrefs( syncprefs);
470 prof->setIsLocalFileSync( mIsLocal->isChecked() ); 472 prof->setIsLocalFileSync( mIsLocal->isChecked() );
471 prof->setIsPhoneSync( mIsPhone->isChecked() ); 473 prof->setIsPhoneSync( mIsPhone->isChecked() );
472 prof->setWriteBackFuture(mWriteBackFuture->isChecked()); 474 prof->setWriteBackFuture(mWriteBackFuture->isChecked());
473 prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value()); 475 prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
476
477 prof->setWriteContactToSIM(mWriteContactToSIM->isChecked());
474 prof->setPhoneDevice( mPhoneDevice->text() ); 478 prof->setPhoneDevice( mPhoneDevice->text() );
475 prof->setPhoneConnection( mPhoneConnection->text() ); 479 prof->setPhoneConnection( mPhoneConnection->text() );
476 prof->setPhoneModel( mPhoneModel->text() ); 480 prof->setPhoneModel( mPhoneModel->text() );
477 481
478 } 482 }
479 483
480} 484}
481 485
482void KSyncPrefsDialog::insertProfiles() 486void KSyncPrefsDialog::insertProfiles()
483{ 487{
484 int curItem = mProfileBox->currentItem(); 488 int curItem = mProfileBox->currentItem();
485 mProfileBox->blockSignals( true ); 489 mProfileBox->blockSignals( true );
486 mProfileBox->clear(); 490 mProfileBox->clear();
487 mProfileBox->insertStringList (mSyncProfileNames ); 491 mProfileBox->insertStringList (mSyncProfileNames );
488 int item = mSyncProfileNames.count() -1; 492 int item = mSyncProfileNames.count() -1;
489 if ( curItem >= 0 && mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() ) 493 if ( curItem >= 0 && mSyncProfileNames.count() > 0 && curItem < mSyncProfileNames.count() )
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 3060e78..d4e1559 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -110,19 +110,20 @@ class KSyncPrefsDialog : public KDialog
110 QLineEdit * mLocalTempFileAB; 110 QLineEdit * mLocalTempFileAB;
111 111
112 QLineEdit * mPhoneDevice; 112 QLineEdit * mPhoneDevice;
113 QLineEdit * mPhoneConnection; 113 QLineEdit * mPhoneConnection;
114 QLineEdit * mPhoneModel; 114 QLineEdit * mPhoneModel;
115 115
116 QWidget* mSetupSyncAlgTab; 116 QWidget* mSetupSyncAlgTab;
117 QVBox* localFileWidget; 117 QVBox* localFileWidget;
118 QVBox* remoteFileWidget; 118 QVBox* remoteFileWidget;
119 QVBox* phoneWidget; 119 QVBox* phoneWidget;
120 QCheckBox* mWriteBackFile; 120 QCheckBox* mWriteBackFile;
121 QCheckBox* mWriteBackFuture; 121 QCheckBox* mWriteBackFuture;
122 QSpinBox* mWriteBackFutureWeeks; 122 QSpinBox* mWriteBackFutureWeeks;
123 QCheckBox* mWriteBackExisting; 123 QCheckBox* mWriteBackExisting;
124 QCheckBox* mAskForPreferences; 124 QCheckBox* mAskForPreferences;
125 QCheckBox* mShowSummaryAfterSync; 125 QCheckBox* mShowSummaryAfterSync;
126 QCheckBox* mWriteContactToSIM;
126}; 127};
127 128
128#endif 129#endif
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index e7c35fb..c599208 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -1,18 +1,18 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KDE-Pim/Pi.
3 Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> 3 Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
@@ -49,92 +49,96 @@ KSyncProfile* KSyncProfile::clone()
49 myClone->setRemoteFileName( mRemoteFileName ); 49 myClone->setRemoteFileName( mRemoteFileName );
50 myClone->setPreSyncCommandAB( mPreSyncCommandAB ); 50 myClone->setPreSyncCommandAB( mPreSyncCommandAB );
51 myClone->setPostSyncCommandAB( mPostSyncCommandAB ); 51 myClone->setPostSyncCommandAB( mPostSyncCommandAB );
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->setIsPhoneSync( mIsPhoneSync );
65 myClone->setWriteContactToSIM( mWriteContactToSIM );
65 myClone->setName( "noName" ); 66 myClone->setName( "noName" );
66 //myClone->setIdentifier( "noID" ); 67 //myClone->setIdentifier( "noID" );
67 return myClone; 68 return myClone;
68} 69}
69 70
70 71
71void KSyncProfile::setDefault() 72void KSyncProfile::setDefault()
72{ 73{
73 mPreSyncCommand = i18n("command for downloading remote file to local device"); 74 mPreSyncCommand = i18n("command for downloading remote file to local device");
74 mPostSyncCommand = i18n("command for uploading local temp file to remote device"); 75 mPostSyncCommand = i18n("command for uploading local temp file to remote device");
75 mLocalTempFile = "/tmp/mycalendar.ics"; 76 mLocalTempFile = "/tmp/mycalendar.ics";
76 mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics"; 77 mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics";
77 mPreSyncCommandAB = i18n("command for downloading remote file to local device"); 78 mPreSyncCommandAB = i18n("command for downloading remote file to local device");
78 mPostSyncCommandAB = i18n("command for uploading local temp file to remote device"); 79 mPostSyncCommandAB = i18n("command for uploading local temp file to remote device");
79 mLocalTempFileAB = "/tmp/std.vcf"; 80 mLocalTempFileAB = "/tmp/std.vcf";
80 mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf"; 81 mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf";
81 mShowSummaryAfterSync = true; 82 mShowSummaryAfterSync = true;
82 mAskForPreferences = true; 83 mAskForPreferences = true;
83 mWriteBackExisting = false; 84 mWriteBackExisting = false;
84 mWriteBackFuture = false; 85 mWriteBackFuture = false;
85 mWriteBackFutureWeeks = 12; 86 mWriteBackFutureWeeks = 12;
86 mWriteBackFile = true; 87 mWriteBackFile = true;
87 mIncludeInRingSync = false; 88 mIncludeInRingSync = false;
88 mIncludeInRingSyncAB = false; 89 mIncludeInRingSyncAB = false;
89 mSyncPrefs = SYNC_PREF_ASK; 90 mSyncPrefs = SYNC_PREF_ASK;
90 mIsLocalFileSync = true; 91 mIsLocalFileSync = true;
91 mName = "noName"; 92 mName = "noName";
92 mIsPhoneSync = false; 93 mIsPhoneSync = false;
94 mWriteContactToSIM = false;
93 mPhoneDevice = "/dev/ircomm"; 95 mPhoneDevice = "/dev/ircomm";
94 mPhoneConnection = "irda"; 96 mPhoneConnection = "irda";
95 mPhoneModel = "6310i"; 97 mPhoneModel = "6310i";
96} 98}
97void KSyncProfile::readConfig(KConfig *config ) 99void KSyncProfile::readConfig(KConfig *config )
98{ 100{
99 if (config) 101 if (config)
100 { 102 {
101 103
102 config->setGroup( mName ); 104 config->setGroup( mName );
103 105
104 mName = config->readEntry( "Name", mName ); 106 mName = config->readEntry( "Name", mName );
105 mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand ); 107 mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand );
106 mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand ); 108 mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand );
107 mLocalTempFile = config->readEntry( "LocalTempFile", mLocalTempFile ); 109 mLocalTempFile = config->readEntry( "LocalTempFile", mLocalTempFile );
108 mRemoteFileName = config->readEntry( "RemoteFileName", mRemoteFileName ); 110 mRemoteFileName = config->readEntry( "RemoteFileName", mRemoteFileName );
109 111
110 mPreSyncCommandAB = config->readEntry( "PreSyncCommandAB",mPreSyncCommandAB ); 112 mPreSyncCommandAB = config->readEntry( "PreSyncCommandAB",mPreSyncCommandAB );
111 mPostSyncCommandAB = config->readEntry( "PostSyncCommandAB", mPostSyncCommandAB ); 113 mPostSyncCommandAB = config->readEntry( "PostSyncCommandAB", mPostSyncCommandAB );
112 mLocalTempFileAB = config->readEntry( "LocalTempFileAB", mLocalTempFileAB ); 114 mLocalTempFileAB = config->readEntry( "LocalTempFileAB", mLocalTempFileAB );
113 mRemoteFileNameAB = config->readEntry( "RemoteFileNameAB", mRemoteFileNameAB ); 115 mRemoteFileNameAB = config->readEntry( "RemoteFileNameAB", mRemoteFileNameAB );
114 116
115 mPhoneDevice = config->readEntry( "PhoneDevice", mPhoneDevice ); 117 mPhoneDevice = config->readEntry( "PhoneDevice", mPhoneDevice );
116 mPhoneConnection = config->readEntry( "PhoneConnection", mPhoneConnection ); 118 mPhoneConnection = config->readEntry( "PhoneConnection", mPhoneConnection );
117 mPhoneModel = config->readEntry( "PhoneModel", mPhoneModel ); 119 mPhoneModel = config->readEntry( "PhoneModel", mPhoneModel );
118 120
119 mIncludeInRingSync = config->readBoolEntry( "IncludeInRingSync",mIncludeInRingSync ); 121 mIncludeInRingSync = config->readBoolEntry( "IncludeInRingSync",mIncludeInRingSync );
120 mIncludeInRingSyncAB = config->readBoolEntry( "IncludeInRingSyncAB",mIncludeInRingSyncAB ); 122 mIncludeInRingSyncAB = config->readBoolEntry( "IncludeInRingSyncAB",mIncludeInRingSyncAB );
121 mShowSummaryAfterSync = config->readBoolEntry( "ShowSummaryAfterSync", mShowSummaryAfterSync ); 123 mShowSummaryAfterSync = config->readBoolEntry( "ShowSummaryAfterSync", mShowSummaryAfterSync );
122 mAskForPreferences = config->readBoolEntry( "AskForPreferences",mAskForPreferences ); 124 mAskForPreferences = config->readBoolEntry( "AskForPreferences",mAskForPreferences );
123 mWriteBackExisting = config->readBoolEntry( "WriteBackExisting",mWriteBackExisting ); 125 mWriteBackExisting = config->readBoolEntry( "WriteBackExisting",mWriteBackExisting );
124 mWriteBackFuture = config->readBoolEntry( "WriteBackFuture",mWriteBackFuture ); 126 mWriteBackFuture = config->readBoolEntry( "WriteBackFuture",mWriteBackFuture );
127 mWriteBackFile = config->readBoolEntry( "WriteBackFile",mWriteBackFile );
128 mWriteContactToSIM = config->readBoolEntry( "WriteContactToSIM",mWriteContactToSIM );
125 mSyncPrefs = config->readNumEntry( "SyncPrefs", mSyncPrefs ); 129 mSyncPrefs = config->readNumEntry( "SyncPrefs", mSyncPrefs );
126 mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks ); 130 mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks );
127 mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync ); 131 mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync );
128 mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync ); 132 mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync );
129 } 133 }
130 else 134 else
131 { 135 {
132 setDefault(); 136 setDefault();
133 } 137 }
134} 138}
135 139
136void KSyncProfile::deleteConfig(KConfig *config ) 140void KSyncProfile::deleteConfig(KConfig *config )
137{ 141{
138 config->deleteGroup( mName ); 142 config->deleteGroup( mName );
139} 143}
140 144
@@ -150,37 +154,24 @@ void KSyncProfile::writeConfig( KConfig * config )
150 154
151 config->writeEntry( "PreSyncCommandAB",mPreSyncCommandAB ); 155 config->writeEntry( "PreSyncCommandAB",mPreSyncCommandAB );
152 config->writeEntry( "PostSyncCommandAB", mPostSyncCommandAB ); 156 config->writeEntry( "PostSyncCommandAB", mPostSyncCommandAB );
153 config->writeEntry( "LocalTempFileAB", mLocalTempFileAB ); 157 config->writeEntry( "LocalTempFileAB", mLocalTempFileAB );
154 config->writeEntry( "RemoteFileNameAB", mRemoteFileNameAB ); 158 config->writeEntry( "RemoteFileNameAB", mRemoteFileNameAB );
155 159
156 config->writeEntry( "PhoneDevice", mPhoneDevice ); 160 config->writeEntry( "PhoneDevice", mPhoneDevice );
157 config->writeEntry( "PhoneConnection", mPhoneConnection ); 161 config->writeEntry( "PhoneConnection", mPhoneConnection );
158 config->writeEntry( "PhoneModel", mPhoneModel ); 162 config->writeEntry( "PhoneModel", mPhoneModel );
159 163
160 config->writeEntry( "IncludeInRingSync",mIncludeInRingSync ); 164 config->writeEntry( "IncludeInRingSync",mIncludeInRingSync );
161 config->writeEntry( "IncludeInRingSyncAB",mIncludeInRingSyncAB ); 165 config->writeEntry( "IncludeInRingSyncAB",mIncludeInRingSyncAB );
162 config->writeEntry( "ShowSummaryAfterSync", mShowSummaryAfterSync ); 166 config->writeEntry( "ShowSummaryAfterSync", mShowSummaryAfterSync );
163 config->writeEntry( "AskForPreferences",mAskForPreferences ); 167 config->writeEntry( "AskForPreferences",mAskForPreferences );
164 config->writeEntry( "WriteBackExisting",mWriteBackExisting ); 168 config->writeEntry( "WriteBackExisting",mWriteBackExisting );
165 config->writeEntry( "WriteBackFuture",mWriteBackFuture ); 169 config->writeEntry( "WriteBackFuture",mWriteBackFuture );
170 config->writeEntry( "WriteBackFile",mWriteBackFile );
171 config->writeEntry( "WriteContactToSIM",mWriteContactToSIM );
166 config->writeEntry( "SyncPrefs", mSyncPrefs ); 172 config->writeEntry( "SyncPrefs", mSyncPrefs );
167 config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks); 173 config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks);
168 config->writeEntry( "IsLocalFileSync", mIsLocalFileSync ); 174 config->writeEntry( "IsLocalFileSync", mIsLocalFileSync );
169 config->writeEntry( "IsPhoneSync", mIsPhoneSync ); 175 config->writeEntry( "IsPhoneSync", mIsPhoneSync );
170} 176}
171 177
172/*
173class KPrefsItemInt : public KPrefsItem {
174 public:
175 KPrefsItemInt(const QString &group,const QString &name,int *,int defaultValue=0);
176 virtual ~KPrefsItemInt() {}
177
178 void setDefault();
179 void readConfig(KConfig *);
180 void writeConfig(KConfig *);
181
182 private:
183 int *mReference;
184 int mDefault;
185};
186*/
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index a0cfb71..0039a4b 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -1,18 +1,18 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KDE-Pim/Pi.
3 Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org> 3 Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public 6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either 7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version. 8 version 2 of the License, or (at your option) any later version.
9 9
10 This library is distributed in the hope that it will be useful, 10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details. 13 Library General Public License for more details.
14 14
15 You should have received a copy of the GNU Library General Public License 15 You should have received a copy of the GNU Library General Public License
16 along with this library; see the file COPYING.LIB. If not, write to 16 along with this library; see the file COPYING.LIB. If not, write to
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. 18 Boston, MA 02111-1307, USA.
@@ -20,43 +20,33 @@
20#ifndef _KSYNCPROFILE_H 20#ifndef _KSYNCPROFILE_H
21#define _KSYNCPROFILE_H 21#define _KSYNCPROFILE_H
22 22
23#include <qptrlist.h> 23#include <qptrlist.h>
24#include <qcolor.h> 24#include <qcolor.h>
25#include <qfont.h> 25#include <qfont.h>
26#include <qstringlist.h> 26#include <qstringlist.h>
27#include <qobject.h> 27#include <qobject.h>
28#include <qstring.h> 28#include <qstring.h>
29 29
30#include <libkcal/syncdefines.h> 30#include <libkcal/syncdefines.h>
31 31
32 32
33 33
34class KConfig; 34class KConfig;
35 35
36/**
37 @short Class for storing a preferences setting
38 @author Cornelius Schumacher
39 @see KPref
40 36
41 This class represents one preferences setting as used by @ref KPrefs.
42 Subclasses of KPrefsItem implement storage functions for a certain type of
43 setting. Normally you don't have to use this class directly. Use the special
44 addItem() functions of KPrefs instead. If you subclass this class you will
45 have to register instances with the function KPrefs::addItem().
46*/
47class KSyncProfile : public QObject { 37class KSyncProfile : public QObject {
48 public: 38 public:
49 KSyncProfile(); 39 KSyncProfile();
50 ~KSyncProfile() ; 40 ~KSyncProfile() ;
51 41
52 KSyncProfile* clone(); 42 KSyncProfile* clone();
53 void setDefault(); 43 void setDefault();
54 void readConfig(KConfig *); 44 void readConfig(KConfig *);
55 void writeConfig(KConfig *); 45 void writeConfig(KConfig *);
56 void deleteConfig(KConfig *); 46 void deleteConfig(KConfig *);
57 47
58 void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;} 48 void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;}
59 QString getPreSyncCommand( ) { return mPreSyncCommand; } 49 QString getPreSyncCommand( ) { return mPreSyncCommand; }
60 void setPostSyncCommand( const QString& n ) {mPostSyncCommand = n;} 50 void setPostSyncCommand( const QString& n ) {mPostSyncCommand = n;}
61 QString getPostSyncCommand( ) { return mPostSyncCommand;} 51 QString getPostSyncCommand( ) { return mPostSyncCommand;}
62 void setLocalTempFile( const QString& n ) { mLocalTempFile= n;} 52 void setLocalTempFile( const QString& n ) { mLocalTempFile= n;}
@@ -83,32 +73,34 @@ class KSyncProfile : public QObject {
83 void set( const QString& n ) { = n;} 73 void set( const QString& n ) { = n;}
84 QString get( ) { return ;} 74 QString get( ) { return ;}
85 */ 75 */
86 76
87 void setName( const QString& n ) {mName = n;} 77 void setName( const QString& n ) {mName = n;}
88 QString getName( ) { return mName;} 78 QString getName( ) { return mName;}
89 void setShowSummaryAfterSync( bool b ) { mShowSummaryAfterSync = b;} 79 void setShowSummaryAfterSync( bool b ) { mShowSummaryAfterSync = b;}
90 bool getShowSummaryAfterSync( ) { return mShowSummaryAfterSync ;} 80 bool getShowSummaryAfterSync( ) { return mShowSummaryAfterSync ;}
91 void setAskForPreferences( bool b ) { mAskForPreferences= b;} 81 void setAskForPreferences( bool b ) { mAskForPreferences= b;}
92 bool getAskForPreferences( ) { return mAskForPreferences;} 82 bool getAskForPreferences( ) { return mAskForPreferences;}
93 void setWriteBackExisting( bool b ) { mWriteBackExisting = b;} 83 void setWriteBackExisting( bool b ) { mWriteBackExisting = b;}
94 bool getWriteBackExisting( ) { return mWriteBackExisting;} 84 bool getWriteBackExisting( ) { return mWriteBackExisting;}
95 void setWriteBackFuture( bool b ) { mWriteBackFuture = b;} 85 void setWriteBackFuture( bool b ) { mWriteBackFuture = b;}
96 bool getWriteBackFuture( ) { return mWriteBackFuture;} 86 bool getWriteBackFuture( ) { return mWriteBackFuture;}
97 void setWriteBackFile( bool b ) { mWriteBackFile= b;} 87 void setWriteBackFile( bool b ) { mWriteBackFile= b;}
98 bool getWriteBackFile( ) { return mWriteBackFile;} 88 bool getWriteBackFile( ) { return mWriteBackFile;}
89 void setWriteContactToSIM( bool b ) { mWriteContactToSIM= b;}
90 bool getWriteContactToSIM( ) { return mWriteContactToSIM;}
99 void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;} 91 void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;}
100 bool getIncludeInRingSync( ) { return mIncludeInRingSync;} 92 bool getIncludeInRingSync( ) { return mIncludeInRingSync;}
101 void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;} 93 void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;}
102 bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;} 94 bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;}
103 void setSyncPrefs( int n ) { mSyncPrefs= n;} 95 void setSyncPrefs( int n ) { mSyncPrefs= n;}
104 int getSyncPrefs( ) { return mSyncPrefs;} 96 int getSyncPrefs( ) { return mSyncPrefs;}
105 void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;} 97 void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;}
106 int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;} 98 int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;}
107 void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;} 99 void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;}
108 bool getIsLocalFileSync( ) { return mIsLocalFileSync;} 100 bool getIsLocalFileSync( ) { return mIsLocalFileSync;}
109 void setIsPhoneSync( bool b ) { mIsPhoneSync= b;} 101 void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
110 bool getIsPhoneSync( ) { return mIsPhoneSync;} 102 bool getIsPhoneSync( ) { return mIsPhoneSync;}
111 private: 103 private:
112 QString mName; 104 QString mName;
113 QString mPreSyncCommand; 105 QString mPreSyncCommand;
114 QString mPostSyncCommand; 106 QString mPostSyncCommand;
@@ -121,19 +113,20 @@ class KSyncProfile : public QObject {
121 113
122 QString mPhoneDevice; 114 QString mPhoneDevice;
123 QString mPhoneConnection; 115 QString mPhoneConnection;
124 QString mPhoneModel; 116 QString mPhoneModel;
125 117
126 bool mIncludeInRingSync; 118 bool mIncludeInRingSync;
127 bool mIncludeInRingSyncAB; 119 bool mIncludeInRingSyncAB;
128 int mSyncPrefs; 120 int mSyncPrefs;
129 bool mWriteBackFile; 121 bool mWriteBackFile;
130 bool mWriteBackExisting; 122 bool mWriteBackExisting;
131 bool mWriteBackFuture; 123 bool mWriteBackFuture;
132 int mWriteBackFutureWeeks; 124 int mWriteBackFutureWeeks;
133 bool mAskForPreferences; 125 bool mAskForPreferences;
134 bool mShowSummaryAfterSync; 126 bool mShowSummaryAfterSync;
135 bool mIsLocalFileSync; 127 bool mIsLocalFileSync;
136 bool mIsPhoneSync; 128 bool mIsPhoneSync;
129 bool mWriteContactToSIM;
137}; 130};
138 131
139#endif 132#endif