4 files changed, 86 insertions, 2 deletions

diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index a1eebec..6e6e631 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -146,6 +146,9 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    mIncludeInRingAB = new QCheckBox( i18n("Include in multiple addressbook sync"), topFrame   );
    topLayout->addMultiCellWidget(mIncludeInRingAB, iii,iii,0,1);
    ++iii;
+   mIncludeInRingPWM = new QCheckBox( i18n("Include in multiple pwmanager sync"), topFrame   );
+   topLayout->addMultiCellWidget(mIncludeInRingPWM, iii,iii,0,1);
+   ++iii;
 
    mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
    topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
@@ -224,15 +227,19 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
    lab = new QLabel( i18n("Local file Cal:"), temphb );
    lab = new QLabel( i18n("Local file ABook:"), temphb );
+   lab = new QLabel( i18n("Local file PWMgr:"), 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() ) );
+   button = new QPushButton( i18n("Choose..."), temphb );
+   connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFilePWM() ) );
    temphb = new QHBox( localFileWidget );
 
    mRemoteFile = new QLineEdit( temphb);
    mRemoteFileAB = new QLineEdit( temphb);
+   mRemoteFilePWM = new QLineEdit( temphb);
 
    // *** remote
    remoteFileWidget = new QVBox( topFrame);
@@ -241,21 +248,25 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    temphb = new QHBox( remoteFileWidget );
    new QLabel( i18n("Calendar:"), temphb);
    new QLabel( i18n("AddressBook:"), temphb);
+   new QLabel( i18n("PWManager:"), temphb);
 
    lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    mRemotePrecommand = new QLineEdit(temphb);
    mRemotePrecommandAB = new QLineEdit(temphb);
+   mRemotePrecommandPWM = new QLineEdit(temphb);
 
    lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    mLocalTempFile = new QLineEdit(temphb);
    mLocalTempFileAB = new QLineEdit(temphb);
+   mLocalTempFilePWM = new QLineEdit(temphb);
 
    lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    mRemotePostcommand = new QLineEdit(temphb );
    mRemotePostcommandAB = new QLineEdit(temphb );
+   mRemotePostcommandPWM = new QLineEdit(temphb );
 
    lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
@@ -301,12 +312,22 @@ void KSyncPrefsDialog::chooseFileAB()
 {
     QString fn = QDir::homeDirPath();
 
-    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
+    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.vcf)"), this );
     if ( fn == "" )
         return;
     mRemoteFileAB->setText( fn );
 }
 
+void KSyncPrefsDialog::chooseFilePWM()
+{
+    QString fn = QDir::homeDirPath();
+
+    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.pwm)"), this );
+    if ( fn == "" )
+        return;
+    mRemoteFilePWM->setText( fn );
+}
+
 void KSyncPrefsDialog::textChanged( const QString &  s )
 {
     if ( mProfileBox->count() == 0 )
@@ -341,6 +362,11 @@ void KSyncPrefsDialog::profileChanged( int item )
     mLocalTempFileAB->setText(prof->getLocalTempFileAB());
     mRemoteFileAB->setText(prof->getRemoteFileNameAB()) ;
 
+    mRemotePrecommandPWM->setText(prof->getPreSyncCommandPWM());
+    mRemotePostcommandPWM->setText(prof->getPostSyncCommandPWM());
+    mLocalTempFilePWM->setText(prof->getLocalTempFilePWM());
+    mRemoteFilePWM->setText(prof->getRemoteFileNamePWM()) ;
+
     mWriteContactToSIM->setChecked( prof->getWriteContactToSIM());
     mPhoneDevice->setText(prof->getPhoneDevice());
     mPhoneConnection->setText(prof->getPhoneConnection());
@@ -352,6 +378,7 @@ void KSyncPrefsDialog::profileChanged( int item )
     mWriteBackFile->setChecked( prof->getWriteBackFile());
     mIncludeInRing->setChecked( prof->getIncludeInRingSync() );
     mIncludeInRingAB->setChecked( prof->getIncludeInRingSyncAB() );
+    mIncludeInRingPWM->setChecked( prof->getIncludeInRingSyncPWM() );
     mWriteBackFuture->setChecked( prof->getWriteBackFuture());
     mWriteBackFutureWeeks->setValue( prof->getWriteBackFutureWeeks() );
     
@@ -401,6 +428,9 @@ void KSyncPrefsDialog::fillSSH()
     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" );
+    mRemotePrecommandPWM->setText("scp zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" );
+    mLocalTempFilePWM->setText("/tmp/passwords.pwm" );
+    mRemotePostcommandPWM->setText("scp /tmp/passwords.pwm zaurus@192.168.0.65:/home/zaurus/kdepim/apps/pwmanager/pwmanager.pwm" );
 }
 void KSyncPrefsDialog::fillFTP()
 {
@@ -411,6 +441,10 @@ void KSyncPrefsDialog::fillFTP()
     mLocalTempFileAB->setText("/tmp/std.vcf" );
     mRemotePostcommandAB->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/kabc/std.vcf /tmp/std.vcf" );
    
+    mRemotePrecommandPWM->setText("cd /tmp;ftp ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm" );
+    mLocalTempFilePWM->setText("/tmp/passwords.pwm" );
+    mRemotePostcommandPWM->setText("ftp -u ftp://zaurus:a@192.168.0.65/kdepim/apps/pwmanager/passwords.pwm /tmp/passwords.pwm" );
+   
 }
 void KSyncPrefsDialog::kindChanged( bool b )
 {
@@ -461,12 +495,17 @@ void KSyncPrefsDialog::saveProfile()
         prof->setPostSyncCommandAB( mRemotePostcommandAB->text() );
         prof->setLocalTempFileAB( mLocalTempFileAB->text());
         prof->setRemoteFileNameAB( mRemoteFileAB->text() );
+        prof->setPreSyncCommandPWM( mRemotePrecommandPWM->text());
+        prof->setPostSyncCommandPWM( mRemotePostcommandPWM->text() );
+        prof->setLocalTempFilePWM( mLocalTempFilePWM->text());
+        prof->setRemoteFileNamePWM( mRemoteFilePWM->text() );
         prof->setShowSummaryAfterSync( mShowSummaryAfterSync->isChecked() );
         prof->setAskForPreferences( mAskForPreferences->isChecked());
         prof->setWriteBackExisting(mWriteBackExisting->isChecked() );
         prof->setWriteBackFile( mWriteBackFile->isChecked());
         prof->setIncludeInRingSync( mIncludeInRing->isChecked() );
         prof->setIncludeInRingSyncAB( mIncludeInRingAB->isChecked() );
+        prof->setIncludeInRingSyncPWM( mIncludeInRingPWM->isChecked() );
         int syncprefs = rem->isChecked()*1+newest->isChecked()*2+  ask->isChecked()*3+  f_loc->isChecked()*4+  f_rem->isChecked()*5 ;//+  both->isChecked()*6 ;
         prof->setSyncPrefs( syncprefs);
         prof->setIsLocalFileSync( mIsLocal->isChecked() );
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index d4e1559..8094bdd 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -70,6 +70,7 @@ class KSyncPrefsDialog : public KDialog
       void profileChanged( int );
       void chooseFile();
       void chooseFileAB();
+      void chooseFilePWM();
       void slotOK();
       void helpDevice();
       void helpModel();
@@ -91,6 +92,7 @@ class KSyncPrefsDialog : public KDialog
     QRadioButton*  mIsPhone;
     QCheckBox* mIncludeInRing;
     QCheckBox* mIncludeInRingAB;
+    QCheckBox* mIncludeInRingPWM;
     void addProfile ( KSyncProfile* );
     void insertProfiles();
     void saveProfile();
@@ -109,6 +111,11 @@ class KSyncPrefsDialog : public KDialog
     QLineEdit * mRemoteFileAB;
     QLineEdit * mLocalTempFileAB;
 
+    QLineEdit * mRemotePostcommandPWM;
+    QLineEdit * mRemotePrecommandPWM;
+    QLineEdit * mRemoteFilePWM;
+    QLineEdit * mLocalTempFilePWM;
+
     QLineEdit * mPhoneDevice;
     QLineEdit * mPhoneConnection;
     QLineEdit * mPhoneModel;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index c599208..a43ebe2 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -51,6 +51,10 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setPostSyncCommandAB( mPostSyncCommandAB );
     myClone->setLocalTempFileAB( mLocalTempFileAB);
     myClone->setRemoteFileNameAB( mRemoteFileNameAB );
+    myClone->setPreSyncCommandPWM( mPreSyncCommandPWM );
+    myClone->setPostSyncCommandPWM( mPostSyncCommandPWM );
+    myClone->setLocalTempFilePWM( mLocalTempFilePWM);
+    myClone->setRemoteFileNamePWM( mRemoteFileNamePWM );
     myClone->setShowSummaryAfterSync( mShowSummaryAfterSync );
     myClone->setAskForPreferences( mAskForPreferences);
     myClone->setWriteBackExisting(mWriteBackExisting );
@@ -59,6 +63,7 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setWriteBackFutureWeeks( mWriteBackFutureWeeks );
     myClone->setIncludeInRingSync( mIncludeInRingSync );
     myClone->setIncludeInRingSyncAB( mIncludeInRingSyncAB );
+    myClone->setIncludeInRingSyncPWM( mIncludeInRingSyncPWM );
     myClone->setSyncPrefs( mSyncPrefs);
     myClone->setIsLocalFileSync( mIsLocalFileSync );
     myClone->setIsPhoneSync( mIsPhoneSync );
@@ -78,7 +83,11 @@ void KSyncProfile::setDefault()
     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";
+    mRemoteFileNamePWM = "/home/polo/kdepim/apps/kabc/localfile.vcf";
+    mPreSyncCommandPWM = i18n("command for downloading remote file to local device");
+    mPostSyncCommandPWM = i18n("command for uploading local temp file to remote device");
+    mLocalTempFilePWM = "/tmp/passwords.pwm";
+    mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm";
     mShowSummaryAfterSync = true;
     mAskForPreferences = true;
     mWriteBackExisting = false;
@@ -87,6 +96,7 @@ void KSyncProfile::setDefault()
     mWriteBackFile = true;
     mIncludeInRingSync = false;
     mIncludeInRingSyncAB = false;
+    mIncludeInRingSyncPWM = false;
     mSyncPrefs = SYNC_PREF_ASK;
     mIsLocalFileSync = true;
     mName = "noName";
@@ -114,12 +124,18 @@ void KSyncProfile::readConfig(KConfig *config )
     mLocalTempFileAB = config->readEntry( "LocalTempFileAB", mLocalTempFileAB );
     mRemoteFileNameAB = config->readEntry( "RemoteFileNameAB", mRemoteFileNameAB );
 
+    mPreSyncCommandPWM = config->readEntry( "PreSyncCommandPWM",mPreSyncCommandPWM  );
+    mPostSyncCommandPWM = config->readEntry( "PostSyncCommandPWM", mPostSyncCommandPWM );
+    mLocalTempFilePWM = config->readEntry( "LocalTempFilePWM", mLocalTempFilePWM );
+    mRemoteFileNamePWM = config->readEntry( "RemoteFileNamePWM", mRemoteFileNamePWM );
+
     mPhoneDevice = config->readEntry( "PhoneDevice", mPhoneDevice );
     mPhoneConnection = config->readEntry( "PhoneConnection", mPhoneConnection );
     mPhoneModel = config->readEntry( "PhoneModel", mPhoneModel );
 
     mIncludeInRingSync = config->readBoolEntry( "IncludeInRingSync",mIncludeInRingSync  );
     mIncludeInRingSyncAB = config->readBoolEntry( "IncludeInRingSyncAB",mIncludeInRingSyncAB  );
+    mIncludeInRingSyncPWM = config->readBoolEntry( "IncludeInRingSyncPWM",mIncludeInRingSyncPWM  );
     mShowSummaryAfterSync = config->readBoolEntry( "ShowSummaryAfterSync", mShowSummaryAfterSync );
     mAskForPreferences = config->readBoolEntry( "AskForPreferences",mAskForPreferences  );
     mWriteBackExisting = config->readBoolEntry( "WriteBackExisting",mWriteBackExisting  );
@@ -157,12 +173,18 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->writeEntry( "LocalTempFileAB", mLocalTempFileAB );
     config->writeEntry( "RemoteFileNameAB", mRemoteFileNameAB );
 
+    config->writeEntry( "PreSyncCommandPWM",mPreSyncCommandPWM  );
+    config->writeEntry( "PostSyncCommandPWM", mPostSyncCommandPWM );
+    config->writeEntry( "LocalTempFilePWM", mLocalTempFilePWM );
+    config->writeEntry( "RemoteFileNamePWM", mRemoteFileNamePWM );
+
     config->writeEntry( "PhoneDevice", mPhoneDevice );
     config->writeEntry( "PhoneConnection", mPhoneConnection );
     config->writeEntry( "PhoneModel", mPhoneModel );
 
     config->writeEntry( "IncludeInRingSync",mIncludeInRingSync  );
     config->writeEntry( "IncludeInRingSyncAB",mIncludeInRingSyncAB  );
+    config->writeEntry( "IncludeInRingSyncPWM",mIncludeInRingSyncPWM  );
     config->writeEntry( "ShowSummaryAfterSync", mShowSummaryAfterSync );
     config->writeEntry( "AskForPreferences",mAskForPreferences  );
     config->writeEntry( "WriteBackExisting",mWriteBackExisting  );
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 0039a4b..a81a9ad 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -63,6 +63,15 @@ class KSyncProfile : public QObject {
     void setRemoteFileNameAB( const QString& n ) { mRemoteFileNameAB = n;}
     QString getRemoteFileNameAB( ) { return mRemoteFileNameAB;}
 
+    void setPreSyncCommandPWM( const QString& n ) {mPreSyncCommandPWM = n;}
+    QString getPreSyncCommandPWM( ) { return mPreSyncCommandPWM; }
+    void setPostSyncCommandPWM( const QString& n ) {mPostSyncCommandPWM = n;}
+    QString getPostSyncCommandPWM( ) { return mPostSyncCommandPWM;}
+    void setLocalTempFilePWM( const QString& n ) { mLocalTempFilePWM= n;}
+    QString getLocalTempFilePWM( ) { return mLocalTempFilePWM;}
+    void setRemoteFileNamePWM( const QString& n ) { mRemoteFileNamePWM = n;}
+    QString getRemoteFileNamePWM( ) { return mRemoteFileNamePWM;}
+
     void setPhoneDevice( const QString& n ) { mPhoneDevice = n;}
     QString getPhoneDevice( ) { return mPhoneDevice;}
     void setPhoneConnection( const QString& n ) { mPhoneConnection = n;}
@@ -92,6 +101,8 @@ class KSyncProfile : public QObject {
     bool getIncludeInRingSync( ) { return mIncludeInRingSync;}
     void setIncludeInRingSyncAB( bool b ) {mIncludeInRingSyncAB = b;}
     bool getIncludeInRingSyncAB( ) { return mIncludeInRingSyncAB;}
+    void setIncludeInRingSyncPWM( bool b ) {mIncludeInRingSyncPWM = b;}
+    bool getIncludeInRingSyncPWM( ) { return mIncludeInRingSyncPWM;}
     void setSyncPrefs( int n ) { mSyncPrefs= n;}
     int getSyncPrefs( ) { return mSyncPrefs;}
     void setWriteBackFutureWeeks( int n ) { mWriteBackFutureWeeks= n;}
@@ -110,6 +121,10 @@ class KSyncProfile : public QObject {
     QString mPostSyncCommandAB;
     QString mLocalTempFileAB;
     QString mRemoteFileNameAB;
+    QString mPreSyncCommandPWM;
+    QString mPostSyncCommandPWM;
+    QString mLocalTempFilePWM;
+    QString mRemoteFileNamePWM;
 
     QString mPhoneDevice;
     QString mPhoneConnection;
@@ -117,6 +132,7 @@ class KSyncProfile : public QObject {
 
     bool mIncludeInRingSync;
     bool mIncludeInRingSyncAB;
+    bool mIncludeInRingSyncPWM;
     int mSyncPrefs;
     bool mWriteBackFile;
     bool mWriteBackExisting;