summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncprefsdialog.cpp77
-rw-r--r--libkdepim/ksyncprefsdialog.h19
-rw-r--r--libkdepim/ksyncprofile.cpp37
-rw-r--r--libkdepim/ksyncprofile.h21
4 files changed, 131 insertions, 23 deletions
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 7c04f48..355c05d 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -165,12 +165,20 @@ void KSyncPrefsDialog::setupSyncAlgTab()
topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
+ ++iii;
+
+ mWriteBackFile = new QCheckBox( i18n("Write back synced data"), topFrame );
+ topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
++iii;
- mWriteBackExisting= new QCheckBox( i18n("Write back existing entries only"), topFrame );
+ mWriteBackExisting= new QCheckBox( i18n("-- Write back (on remote) existing entries only"), topFrame );
topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
++iii;
-
- mWriteBackFile = new QCheckBox( i18n("Write back file"), topFrame );
- topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
+
+ mWriteBackFuture= new QCheckBox( i18n("-- Write back (calendar) entries in future only"), topFrame );
+ topLayout->addMultiCellWidget(mWriteBackFuture, iii,iii,0,1);
++iii;
-
+ topLayout->addMultiCellWidget(new QLabel( i18n("---- Max. weeks in future: ") , topFrame ), iii,iii,0,0);
+ mWriteBackFutureWeeks= new QSpinBox(1,104, 1, topFrame);
+ topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
+ ++iii;
+
proGr = new QButtonGroup ( 1, Qt::Horizontal, i18n("Profile kind"), topFrame);
@@ -182,3 +190,3 @@ void KSyncPrefsDialog::setupSyncAlgTab()
connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );
-
+ // *** local
localFileWidget = new QVBox( topFrame);
@@ -187,9 +195,16 @@ void KSyncPrefsDialog::setupSyncAlgTab()
QHBox* temphb = new QHBox( localFileWidget );
- lab = new QLabel( i18n("Local file:"), temphb);
- mRemoteFile = new QLineEdit(localFileWidget);
+ lab = new QLabel( i18n("Local file Cal:"), temphb );
+ lab = new QLabel( i18n("Local file ABook:"), temphb );
+ temphb = new QHBox( localFileWidget );
button = new QPushButton( i18n("Choose..."), temphb );
connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
+ button = new QPushButton( i18n("Choose..."), temphb );
+ connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) );
+ temphb = new QHBox( localFileWidget );
+ mRemoteFile = new QLineEdit( temphb);
+ mRemoteFileAB = new QLineEdit( temphb);
+ // *** remote
remoteFileWidget = new QVBox( topFrame);
@@ -197,11 +212,20 @@ void KSyncPrefsDialog::setupSyncAlgTab()
++iii;
+ temphb = new QHBox( remoteFileWidget );
+ new QLabel( i18n("Calendar:"), temphb);
+ new QLabel( i18n("AddressBook:"), temphb);
+
lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
- mRemotePrecommand = new QLineEdit(remoteFileWidget);
+ temphb = new QHBox( remoteFileWidget );
+ mRemotePrecommand = new QLineEdit(temphb);
+ mRemotePrecommandAB = new QLineEdit(temphb);
lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
- mLocalTempFile = new QLineEdit(remoteFileWidget);
+ temphb = new QHBox( remoteFileWidget );
+ mLocalTempFile = new QLineEdit(temphb);
+ mLocalTempFileAB = new QLineEdit(temphb);
-
lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
- mRemotePostcommand = new QLineEdit(remoteFileWidget);
+ temphb = new QHBox( remoteFileWidget );
+ mRemotePostcommand = new QLineEdit(temphb );
+ mRemotePostcommandAB = new QLineEdit(temphb );
@@ -247,2 +271,12 @@ void KSyncPrefsDialog::chooseFile()
+void KSyncPrefsDialog::chooseFileAB()
+{
+ QString fn = QDir::homeDirPath();
+
+ fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
+ if ( fn == "" )
+ return;
+ mRemoteFileAB->setText( fn );
+}
+
void KSyncPrefsDialog::textChanged( const QString & s )
@@ -275,2 +309,7 @@ void KSyncPrefsDialog::profileChanged( int item )
mRemoteFile->setText(prof->getRemoteFileName()) ;
+
+ mRemotePrecommandAB->setText(prof->getPreSyncCommandAB());
+ mRemotePostcommandAB->setText(prof->getPostSyncCommandAB());
+ mLocalTempFileAB->setText(prof->getLocalTempFileAB());
+ mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
mShowSummaryAfterSync->setChecked( prof->getShowSummaryAfterSync());
@@ -281,2 +320,4 @@ void KSyncPrefsDialog::profileChanged( int item )
mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
+ mWriteBackFuture->setChecked( prof->getWriteBackFuture());
+ mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
@@ -323,2 +364,5 @@ void KSyncPrefsDialog::fillSSH()
mRemotePostcommand->setText("scp /tmp/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/kdepim/apps/korganizer/mycalendar.ics" );
+ mRemotePrecommandAB->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
+ mLocalTempFileAB->setText("/tmp/std.vcf" );
+ mRemotePostcommandAB->setText("scp /tmp/std.vcf zaurus@192.168.0.65:/home/zaurus/kdepim/apps/kabc/std.vcf" );
}
@@ -329,2 +373,5 @@ void KSyncPrefsDialog::fillFTP()
mRemotePostcommand->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/korganizer/mycalendar.ics /tmp/mycalendar.ics" );
+ mRemotePrecommandAB->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf" );
+ mLocalTempFileAB->setText("/tmp/std.vcf" );
+ mRemotePostcommandAB->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
@@ -362,2 +409,6 @@ void KSyncPrefsDialog::saveProfile()
prof->setRemoteFileName( mRemoteFile->text() );
+ prof->setPreSyncCommandAB( mRemotePrecommandAB->text());
+ prof->setPostSyncCommandAB( mRemotePostcommandAB->text() );
+ prof->setLocalTempFileAB( mLocalTempFileAB->text());
+ prof->setRemoteFileNameAB( mRemoteFileAB->text() );
prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
@@ -371,2 +422,4 @@ void KSyncPrefsDialog::saveProfile()
prof->setIsLocalFileSync( mIsLocal->isChecked() );
+ prof->setWriteBackFuture(mWriteBackFuture->isChecked());
+ prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
}
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index c663d22..8c2c59c 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -71,2 +71,3 @@ class KSyncPrefsDialog : public KDialog
void chooseFile();
+ void chooseFileAB();
void slotOK();
@@ -100,10 +101,18 @@ class KSyncPrefsDialog : public KDialog
QLineEdit * mLocalTempFile;
- QWidget* mSetupSyncAlgTab;
+ QLineEdit * mRemotePostcommandAB;
+ QLineEdit * mRemotePrecommandAB;
+ QLineEdit * mRemoteFileAB;
+ QLineEdit * mLocalTempFileAB;
+
+
+ QWidget* mSetupSyncAlgTab;
QVBox* localFileWidget;
QVBox* remoteFileWidget;
- QCheckBox* mWriteBackFile;
- QCheckBox* mWriteBackExisting;
- QCheckBox* mAskForPreferences;
- QCheckBox* mShowSummaryAfterSync;
+ QCheckBox* mWriteBackFile;
+ QCheckBox* mWriteBackFuture;
+ QSpinBox* mWriteBackFutureWeeks;
+ QCheckBox* mWriteBackExisting;
+ QCheckBox* mAskForPreferences;
+ QCheckBox* mShowSummaryAfterSync;
};
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index ea41a85..f34c309 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -49,2 +49,6 @@ KSyncProfile* KSyncProfile::clone()
myClone->setRemoteFileName( mRemoteFileName );
+ myClone->setPreSyncCommandAB( mPreSyncCommandAB );
+ myClone->setPostSyncCommandAB( mPostSyncCommandAB );
+ myClone->setLocalTempFileAB( mLocalTempFileAB);
+ myClone->setRemoteFileNameAB( mRemoteFileNameAB );
myClone->setShowSummaryAfterSync( mShowSummaryAfterSync );
@@ -53,2 +57,4 @@ KSyncProfile* KSyncProfile::clone()
myClone->setWriteBackFile( mWriteBackFile);
+ myClone->setWriteBackFuture( mWriteBackFuture );
+ myClone->setWriteBackFutureWeeks( mWriteBackFutureWeeks );
myClone->setIncludeInRingSync( mIncludeInRingSync );
@@ -69,2 +75,6 @@ void KSyncProfile::setDefault()
mRemoteFileName = "/home/polo/kdepim/apps/korganizer/localfile.ics";
+ mPreSyncCommandAB = i18n("command for downloading remote file to local device");
+ mPostSyncCommandAB = i18n("command for uploading local temp file to remote device");
+ mLocalTempFileAB = "/tmp/std.vcf";
+ mRemoteFileNameAB = "/home/polo/kdepim/apps/kabc/localfile.vcf";
mShowSummaryAfterSync = true;
@@ -72,2 +82,4 @@ void KSyncProfile::setDefault()
mWriteBackExisting = false;
+ mWriteBackFuture = false;
+ mWriteBackFutureWeeks = 12;
mWriteBackFile = true;
@@ -85,7 +97,13 @@ void KSyncProfile::readConfig(KConfig *config )
mPreSyncCommand = config->readEntry( prefix+ "PreSyncCommand",mPreSyncCommand );
- mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
- mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
- mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
+ mPostSyncCommand = config->readEntry( prefix+ "PostSyncCommand", mPostSyncCommand );;
mLocalTempFile = config->readEntry( prefix+ "LocalTempFile", mLocalTempFile );
mRemoteFileName = config->readEntry( prefix+ "RemoteFileName", mRemoteFileName );
+
+ mPreSyncCommandAB = config->readEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
+ mPostSyncCommandAB = config->readEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
+ mLocalTempFileAB = config->readEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
+ mRemoteFileNameAB = config->readEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
+
+ mIncludeInRingSync = config->readBoolEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
+ mIncludeInRingSyncAB = config->readBoolEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
mShowSummaryAfterSync = config->readBoolEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
@@ -93,3 +111,5 @@ void KSyncProfile::readConfig(KConfig *config )
mWriteBackExisting = config->readBoolEntry( prefix+ "WriteBackExisting",mWriteBackExisting );
+ mWriteBackFuture = config->readBoolEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
mSyncPrefs = config->readNumEntry( prefix+ "SyncPrefs", mSyncPrefs );
+ mWriteBackFutureWeeks = config->readNumEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks );
mIsLocalFileSync= config->readBoolEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
@@ -103,6 +123,11 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( prefix+ "PostSyncCommand", mPostSyncCommand );
- config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
- config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
config->writeEntry( prefix+ "LocalTempFile", mLocalTempFile );
config->writeEntry( prefix+ "RemoteFileName", mRemoteFileName );
+
+ config->writeEntry( prefix+ "PreSyncCommandAB",mPreSyncCommandAB );
+ config->writeEntry( prefix+ "PostSyncCommandAB", mPostSyncCommandAB );
+ config->writeEntry( prefix+ "LocalTempFileAB", mLocalTempFileAB );
+ config->writeEntry( prefix+ "RemoteFileNameAB", mRemoteFileNameAB );
+ config->writeEntry( prefix+ "IncludeInRingSync",mIncludeInRingSync );
+ config->writeEntry( prefix+ "IncludeInRingSyncAB",mIncludeInRingSyncAB );
config->writeEntry( prefix+ "ShowSummaryAfterSync", mShowSummaryAfterSync );
@@ -110,3 +135,5 @@ void KSyncProfile::writeConfig( KConfig * config )
config->writeEntry( prefix+ "WriteBackExisting",mWriteBackExisting );
+ config->writeEntry( prefix+ "WriteBackFuture",mWriteBackFuture );
config->writeEntry( prefix+ "SyncPrefs", mSyncPrefs );
+ config->writeEntry( prefix+ "WriteBackFutureWeeks", mWriteBackFutureWeeks);
config->writeEntry( prefix+ "IsLocalFileSync", mIsLocalFileSync );
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index df1b49e..80094b1 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -61,3 +61,2 @@ class KSyncProfile : public QObject {
QString getPostSyncCommand( ) { return mPostSyncCommand;}
-
void setLocalTempFile( const QString& n ) { mLocalTempFile= n;}
@@ -66,2 +65,12 @@ class KSyncProfile : public QObject {
QString getRemoteFileName( ) { return mRemoteFileName;}
+
+ void setPreSyncCommandAB( const QString& n ) {mPreSyncCommandAB = n;}
+ QString getPreSyncCommandAB( ) { return mPreSyncCommandAB; }
+ void setPostSyncCommandAB( const QString& n ) {mPostSyncCommandAB = n;}
+ QString getPostSyncCommandAB( ) { return mPostSyncCommandAB;}
+ void setLocalTempFileAB( const QString& n ) { mLocalTempFileAB= n;}
+ QString getLocalTempFileAB( ) { return mLocalTempFileAB;}
+ void setRemoteFileNameAB( const QString& n ) { mRemoteFileNameAB = n;}
+ QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;}
+
/*
@@ -77,2 +86,4 @@ class KSyncProfile : public QObject {
bool getWriteBackExisting( ) { return mWriteBackExisting;}
+ void setWriteBackFuture( bool b ) { mWriteBackFuture = b;}
+ bool getWriteBackFuture( ) { return mWriteBackFuture;}
void setWriteBackFile( bool b ) { mWriteBackFile= b;}
@@ -85,2 +96,4 @@ class KSyncProfile : public QObject {
int getSyncPrefs( ) { return mSyncPrefs;}
+ void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;}
+ int getWriteBackFutureWeeks( ) { return mWriteBackFutureWeeks;}
void setIsLocalFileSync( bool b ) { mIsLocalFileSync= b;}
@@ -94,2 +107,6 @@ class KSyncProfile : public QObject {
QString mRemoteFileName;
+ QString mPreSyncCommandAB;
+ QString mPostSyncCommandAB;
+ QString mLocalTempFileAB;
+ QString mRemoteFileNameAB;
bool mIncludeInRingSync;
@@ -99,2 +116,4 @@ class KSyncProfile : public QObject {
bool mWriteBackExisting;
+ bool mWriteBackFuture;
+ int mWriteBackFutureWeeks;
bool mAskForPreferences;