summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -1148,14 +1148,14 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
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
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 857ceac..a1eebec 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -191,13 +191,14 @@ void KSyncPrefsDialog::setupSyncAlgTab()
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
@@ -337,12 +338,13 @@ void KSyncPrefsDialog::profileChanged( int item )
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());
@@ -468,12 +470,14 @@ void KSyncPrefsDialog::saveProfile()
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
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 3060e78..d4e1559 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -120,9 +120,10 @@ class KSyncPrefsDialog : public KDialog
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,8 +1,8 @@
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.
@@ -59,12 +59,13 @@ KSyncProfile* KSyncProfile::clone()
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
@@ -87,12 +88,13 @@ void KSyncProfile::setDefault()
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{
@@ -119,12 +121,14 @@ void KSyncProfile::readConfig(KConfig *config )
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
@@ -160,27 +164,14 @@ void KSyncProfile::writeConfig( KConfig * config )
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,8 +1,8 @@
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.
@@ -30,23 +30,13 @@
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();
@@ -93,12 +83,14 @@ class KSyncProfile : public QObject {
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;}
@@ -131,9 +123,10 @@ class KSyncProfile : public QObject {
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