summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -1152,6 +1152,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
inR = er.first();
QDateTime dt;
- QDateTime cur = QDateTime::currentDateTime();
- QDateTime end = cur.addSecs( KOPrefs::instance()->mWriteBackInFuture * 3600 *24 *7 );
+ QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
+ QDateTime end = cur.addDays( (KOPrefs::instance()->mWriteBackInFuture +1 ) *7 );
while ( inR ) {
if ( inR->type() == "Todo" ) {
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 857ceac..a1eebec 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -195,5 +195,6 @@ void KSyncPrefsDialog::setupSyncAlgTab()
phoneWidget = new QVBox( topFrame);
topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
- ++iii;
+ ++iii;
+ mWriteContactToSIM= new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
QHBox* temphb = new QHBox( phoneWidget );
new QLabel( i18n("I/O device: "), temphb );
@@ -341,4 +342,5 @@ void KSyncPrefsDialog::profileChanged( int item )
mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
+ mWriteContactToSIM->setChecked( prof->getWriteContactToSIM());
mPhoneDevice->setText(prof->getPhoneDevice());
mPhoneConnection->setText(prof->getPhoneConnection());
@@ -472,4 +474,6 @@ void KSyncPrefsDialog::saveProfile()
prof->setWriteBackFuture(mWriteBackFuture->isChecked());
prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
+
+ prof->setWriteContactToSIM(mWriteContactToSIM->isChecked());
prof->setPhoneDevice( mPhoneDevice->text() );
prof->setPhoneConnection( mPhoneConnection->text() );
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 3060e78..d4e1559 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -124,4 +124,5 @@ class KSyncPrefsDialog : public KDialog
QCheckBox* mAskForPreferences;
QCheckBox* mShowSummaryAfterSync;
+ QCheckBox* mWriteContactToSIM;
};
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index e7c35fb..c599208 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -1,4 +1,4 @@
/*
- This file is part of KOrganizer.
+ This file is part of KDE-Pim/Pi.
Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
@@ -63,4 +63,5 @@ KSyncProfile* KSyncProfile::clone()
myClone->setIsLocalFileSync( mIsLocalFileSync );
myClone->setIsPhoneSync( mIsPhoneSync );
+ myClone->setWriteContactToSIM( mWriteContactToSIM );
myClone->setName( "noName" );
//myClone->setIdentifier( "noID" );
@@ -91,4 +92,5 @@ void KSyncProfile::setDefault()
mName = "noName";
mIsPhoneSync = false;
+ mWriteContactToSIM = false;
mPhoneDevice = "/dev/ircomm";
mPhoneConnection = "irda";
@@ -123,4 +125,6 @@ void KSyncProfile::readConfig(KConfig *config )
mWriteBackExisting = config->readBoolEntry( "WriteBackExisting",mWriteBackExisting );
mWriteBackFuture = config->readBoolEntry( "WriteBackFuture",mWriteBackFuture );
+ mWriteBackFile = config->readBoolEntry( "WriteBackFile",mWriteBackFile );
+ mWriteContactToSIM = config->readBoolEntry( "WriteContactToSIM",mWriteContactToSIM );
mSyncPrefs = config->readNumEntry( "SyncPrefs", mSyncPrefs );
mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks );
@@ -164,4 +168,6 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( "WriteBackExisting",mWriteBackExisting );
config->writeEntry( "WriteBackFuture",mWriteBackFuture );
+ config->writeEntry( "WriteBackFile",mWriteBackFile );
+ config->writeEntry( "WriteContactToSIM",mWriteContactToSIM );
config->writeEntry( "SyncPrefs", mSyncPrefs );
config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks);
@@ -170,17 +176,2 @@ void KSyncProfile::writeConfig( KConfig * config )
}
-/*
-class KPrefsItemInt : public KPrefsItem {
- public:
- KPrefsItemInt(const QString &group,const QString &name,int *,int defaultValue=0);
- virtual ~KPrefsItemInt() {}
-
- void setDefault();
- void readConfig(KConfig *);
- void writeConfig(KConfig *);
-
- private:
- int *mReference;
- int mDefault;
-};
-*/
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index a0cfb71..0039a4b 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -1,4 +1,4 @@
/*
- This file is part of KOrganizer.
+ This file is part of KDE-Pim/Pi.
Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
@@ -34,15 +34,5 @@
class KConfig;
-/**
- @short Class for storing a preferences setting
- @author Cornelius Schumacher
- @see KPref
- This class represents one preferences setting as used by @ref KPrefs.
- Subclasses of KPrefsItem implement storage functions for a certain type of
- setting. Normally you don't have to use this class directly. Use the special
- addItem() functions of KPrefs instead. If you subclass this class you will
- have to register instances with the function KPrefs::addItem().
-*/
class KSyncProfile : public QObject {
public:
@@ -97,4 +87,6 @@ class KSyncProfile : public QObject {
void setWriteBackFile( bool b ) { mWriteBackFile= b;}
bool getWriteBackFile( ) { return mWriteBackFile;}
+ void setWriteContactToSIM( bool b ) { mWriteContactToSIM= b;}
+ bool getWriteContactToSIM( ) { return mWriteContactToSIM;}
void setIncludeInRingSync( bool b ) {mIncludeInRingSync = b;}
bool getIncludeInRingSync( ) { return mIncludeInRingSync;}
@@ -135,4 +127,5 @@ class KSyncProfile : public QObject {
bool mIsLocalFileSync;
bool mIsPhoneSync;
+ bool mWriteContactToSIM;
};