4 files changed, 169 insertions, 2 deletions

diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 28aac45..f05c846 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -191,8 +191,10 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    ++iii;
    mIsLocal = new QRadioButton ( i18n("Local file"), gr );
+   mIsPi = new QRadioButton ( i18n("Quick Pi-Sync"), gr );
+   connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
    connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
-   connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
+   connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );  
 
 
@@ -277,7 +279,38 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
    lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
-   
+
+   // *** pi-sync
+   piWidget = new QVBox( topFrame);
+   topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
+   ++iii;
+   temphb = new QHBox( piWidget );
+   new QLabel( i18n("Calendar:"), temphb);
+   new QLabel( i18n("AddressBook:"), temphb);
+   new QLabel( i18n("PWManager:"), temphb);
+
+   lab = new QLabel( i18n("Password for remote access:"), piWidget);
+   temphb = new QHBox( piWidget );
+   mRemotePw = new QLineEdit(temphb);
+   mRemotePwAB = new QLineEdit(temphb);
+   mRemotePwPWM = new QLineEdit(temphb);
+
+   lab = new QLabel( i18n("Remote IP address:"), piWidget);
+   temphb = new QHBox( piWidget );
+   mRemoteIP = new QLineEdit(temphb);
+   mRemoteIPAB = new QLineEdit(temphb);
+   mRemoteIPPWM = new QLineEdit(temphb);
+
+   lab = new QLabel( i18n("Remote port number:"), piWidget);
+   temphb = new QHBox( piWidget );
+   mRemotePort = new QLineEdit(temphb);
+   mRemotePortAB = new QLineEdit(temphb);
+   mRemotePortPWM = new QLineEdit(temphb);
 
 }
+
+ 
+
+
+
 void KSyncPrefsDialog::slotOK()
 {
@@ -354,4 +387,17 @@ void KSyncPrefsDialog::profileChanged( int item )
     currentSelection = item;
     prof = mSyncProfiles.at(item) ;
+
+    mRemotePw->setText(prof->getRemotePw());
+    mRemoteIP->setText(prof->getRemoteIP());
+    mRemotePort->setText(prof->getRemotePort());
+    
+    mRemotePwAB->setText(prof->getRemotePwAB());
+    mRemoteIPAB->setText(prof->getRemoteIPAB());
+    mRemotePortAB->setText(prof->getRemotePortAB());
+    
+    mRemotePwPWM->setText(prof->getRemotePwPWM());
+    mRemoteIPPWM->setText(prof->getRemoteIPPWM());
+    mRemotePortPWM->setText(prof->getRemotePortPWM());
+
     mRemotePrecommand->setText(prof->getPreSyncCommand());
     mRemotePostcommand->setText(prof->getPostSyncCommand());
@@ -417,4 +463,5 @@ void KSyncPrefsDialog::profileChanged( int item )
         remoteFileWidget->hide();
         phoneWidget->hide();
+        piWidget->hide();
 
     } else
@@ -467,4 +514,10 @@ void KSyncPrefsDialog::kindChanged( bool b )
         phoneWidget->hide();
     }
+    if ( mIsPi->isChecked () ) {
+        piWidget->show();
+    }
+    else {
+        piWidget->hide();
+    }
    
 }
@@ -489,4 +542,17 @@ void KSyncPrefsDialog::saveProfile()
     if ( currentSelection >= 0 ) {
         prof = mSyncProfiles.at(currentSelection) ;
+
+        prof->setRemotePw( mRemotePw->text());
+        prof->setRemoteIP( mRemoteIP->text());
+        prof->setRemotePort( mRemotePort->text());
+        
+        prof->setRemotePwAB( mRemotePwAB->text());
+        prof->setRemoteIPAB( mRemoteIPAB->text());
+        prof->setRemotePortAB( mRemotePortAB->text());
+        
+        prof->setRemotePwPWM( mRemotePwPWM->text());
+        prof->setRemoteIPPWM( mRemoteIPPWM->text());
+        prof->setRemotePortPWM( mRemotePortPWM->text());
+
         prof->setPreSyncCommand( mRemotePrecommand->text());
         prof->setPostSyncCommand( mRemotePostcommand->text() );
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index 8094bdd..d3f8f4c 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -91,4 +91,5 @@ class KSyncPrefsDialog : public KDialog
     QRadioButton* mIsNotLocal;
     QRadioButton*  mIsPhone;
+    QRadioButton*  mIsPi;
     QCheckBox* mIncludeInRing;
     QCheckBox* mIncludeInRingAB;
@@ -117,4 +118,17 @@ class KSyncPrefsDialog : public KDialog
     QLineEdit * mLocalTempFilePWM;
 
+
+    QLineEdit * mRemotePw;
+    QLineEdit * mRemoteIP;
+    QLineEdit * mRemotePort;
+
+    QLineEdit * mRemotePwAB;
+    QLineEdit * mRemoteIPAB;
+    QLineEdit * mRemotePortAB;
+
+    QLineEdit * mRemotePwPWM;
+    QLineEdit * mRemoteIPPWM;
+    QLineEdit * mRemotePortPWM;
+
     QLineEdit * mPhoneDevice;
     QLineEdit * mPhoneConnection;
@@ -125,4 +139,5 @@ class KSyncPrefsDialog : public KDialog
     QVBox* remoteFileWidget;
     QVBox* phoneWidget;
+    QVBox* piWidget;
     QCheckBox* mWriteBackFile;
     QCheckBox* mWriteBackFuture;
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 2bf4e6c..76dfe00 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -44,4 +44,13 @@ KSyncProfile* KSyncProfile::clone()
 {
     KSyncProfile* myClone = new KSyncProfile();
+    myClone->setRemotePw(mRemotePw);
+    myClone->setRemoteIP(mRemoteIP);
+    myClone->setRemotePort(mRemotePort);
+    myClone->setRemotePwAB(mRemotePwAB);
+    myClone->setRemoteIPAB(mRemoteIPAB);
+    myClone->setRemotePortAB(mRemotePortAB);
+    myClone->setRemotePwPWM(mRemotePwPWM);
+    myClone->setRemoteIPPWM(mRemoteIPPWM);
+    myClone->setRemotePortPWM (mRemotePortPWM);
     myClone->setPreSyncCommand( mPreSyncCommand );
     myClone->setPostSyncCommand( mPostSyncCommand );
@@ -68,4 +77,5 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setIsLocalFileSync( mIsLocalFileSync );
     myClone->setIsPhoneSync( mIsPhoneSync );
+    myClone->setIsPiSync( mIsPiSync );
     myClone->setWriteContactToSIM( mWriteContactToSIM );
     myClone->setName( "noName" );
@@ -89,4 +99,17 @@ void KSyncProfile::setDefault()
     mLocalTempFilePWM = "/tmp/passwords.pwm";
     mRemoteFileNamePWM = "/home/polo/kdepim/apps/pwmanager/localfile.pwm";
+
+    mRemotePw = "abc";
+    mRemoteIP = "192.168.0.99";
+    mRemotePort = "9197";
+
+    mRemotePwAB = "abc";
+    mRemoteIPAB = "192.168.0.99";
+    mRemotePortAB = "9198";
+
+    mRemotePwPWM = "abc";
+    mRemoteIPPWM = "192.168.0.99";
+    mRemotePortPWM = "9199";
+
     mShowSummaryAfterSync = true;
     mAskForPreferences = true;
@@ -102,4 +125,5 @@ void KSyncProfile::setDefault()
     mName = "noName";
     mIsPhoneSync = false;
+    mIsPiSync = false;
     mWriteContactToSIM = false;
     mPhoneDevice = "/dev/ircomm";
@@ -115,4 +139,15 @@ void KSyncProfile::readConfig(KConfig *config )
 
     mName = config->readEntry( "Name", mName );
+
+    mRemotePw = config->readEntry( "RemotePw",mRemotePw  );
+    mRemoteIP = config->readEntry( "RemoteIP",mRemoteIP  );
+    mRemotePort = config->readEntry( "RemotePort", mRemotePort );
+    mRemotePwAB = config->readEntry( "RemotePwAB", mRemotePwAB );
+    mRemoteIPAB = config->readEntry( "RemoteIPAB", mRemoteIPAB );
+    mRemotePortAB = config->readEntry( "RemotePortAB", mRemotePortAB );
+    mRemotePwPWM = config->readEntry( "RemotePwPWM", mRemotePwPWM  );
+    mRemoteIPPWM = config->readEntry( "RemoteIPPWM", mRemoteIPPWM );
+    mRemotePortPWM = config->readEntry( "RemotePortPWM", mRemotePortPWM );
+
     mPreSyncCommand = config->readEntry( "PreSyncCommand",mPreSyncCommand  );
     mPostSyncCommand = config->readEntry( "PostSyncCommand", mPostSyncCommand );
@@ -147,4 +182,5 @@ void KSyncProfile::readConfig(KConfig *config )
     mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync );
     mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync );
+    mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync );
   }
   else
@@ -163,4 +199,16 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->setGroup(mName);
 
+    config->writeEntry( "RemotePw", mRemotePw);
+    config->writeEntry( "RemoteIP", mRemoteIP);
+    config->writeEntry( "RemotePort", mRemotePort);
+
+    config->writeEntry( "RemotePwAB", mRemotePwAB);
+    config->writeEntry( "RemoteIPAB", mRemoteIPAB);
+    config->writeEntry( "RemotePortAB", mRemotePortAB);
+
+    config->writeEntry( "RemotePwPWM", mRemotePwPWM);
+    config->writeEntry( "RemoteIPPWM", mRemoteIPPWM);
+    config->writeEntry( "RemotePortPWM", mRemotePortPWM);
+
     config->writeEntry( "Name", mName );
     config->writeEntry( "PreSyncCommand",mPreSyncCommand  );
@@ -196,4 +244,5 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->writeEntry( "IsLocalFileSync", mIsLocalFileSync );
     config->writeEntry( "IsPhoneSync", mIsPhoneSync );
+    config->writeEntry( "IsPiSync", mIsPiSync );
 }
 
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index a81a9ad..6a68bd7 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -46,4 +46,25 @@ class KSyncProfile : public QObject {
         void deleteConfig(KConfig *);
 
+    void setRemotePw( const QString& n ) {mRemotePw = n;}
+    QString getRemotePw( ) { return mRemotePw; }
+    void setRemotePwAB( const QString& n ) {mRemotePwAB = n;}
+    QString getRemotePwAB( ) { return mRemotePwAB; }
+    void setRemotePwPWM( const QString& n ) {mRemotePwPWM = n;}
+    QString getRemotePwPWM( ) { return mRemotePwPWM; }
+
+    void setRemoteIP( const QString& n ) {mRemoteIP = n;}
+    QString getRemoteIP( ) { return mRemoteIP; }
+    void setRemoteIPAB( const QString& n ) {mRemoteIPAB = n;}
+    QString getRemoteIPAB( ) { return mRemoteIPAB; }
+    void setRemoteIPPWM( const QString& n ) {mRemoteIPPWM = n;}
+    QString getRemoteIPPWM( ) { return mRemoteIPPWM; }
+
+    void setRemotePort( const QString& n ) {mRemotePort = n;}
+    QString getRemotePort( ) { return mRemotePort; }
+    void setRemotePortAB( const QString& n ) {mRemotePortAB = n;}
+    QString getRemotePortAB( ) { return mRemotePortAB; }
+    void setRemotePortPWM( const QString& n ) {mRemotePortPWM = n;}
+    QString getRemotePortPWM( ) { return mRemotePortPWM; }
+
     void setPreSyncCommand( const QString& n ) {mPreSyncCommand = n;}
     QString getPreSyncCommand( ) { return mPreSyncCommand; }
@@ -112,4 +133,6 @@ class KSyncProfile : public QObject {
     void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
     bool getIsPhoneSync( ) { return mIsPhoneSync;}
+    void setIsPiSync( bool b ) { mIsPiSync= b;}
+    bool getIsPiSync( ) { return mIsPiSync;}
   private:
     QString mName;
@@ -127,4 +150,16 @@ class KSyncProfile : public QObject {
     QString mRemoteFileNamePWM;
 
+    QString mRemotePw;
+    QString mRemoteIP;
+    QString mRemotePort;
+
+    QString mRemotePwAB;
+    QString mRemoteIPAB;
+    QString mRemotePortAB;
+
+    QString mRemotePwPWM;
+    QString mRemoteIPPWM;
+    QString mRemotePortPWM;
+
     QString mPhoneDevice;
     QString mPhoneConnection;
@@ -144,4 +179,6 @@ class KSyncProfile : public QObject {
     bool mIsPhoneSync;
     bool mWriteContactToSIM;
+
+    bool mIsPiSync;
 };