4 files changed, 63 insertions, 30 deletions

diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index c21ebaa..a05e65f 100644
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@@ -46,8 +46,10 @@ KPimPrefs::KPimPrefs( const QString &name ) :
   config()->setGroup("SyncOptions");
   addItemString("PassiveSyncPort",&mPassiveSyncPort,"9197" ); 
   addItemString("PassiveSyncPw",&mPassiveSyncPw,"abc" ); 
   addItemString("LastSyncedLocalFile", &mLastSyncedLocalFile ,hdp +"lastsync.ics" );
+  addItemBool("PassiveSyncWithDesktop",&mPassiveSyncWithDesktop,false ); 
+  addItemBool("PassiveSyncAutoStart",&mPassiveSyncAutoStart,false );
   addItemInt("RingSyncAlgoPrefs",&mRingSyncAlgoPrefs,3);
 }
 
 KPimPrefs::~KPimPrefs()
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index 9346f7d..c177bd6 100644
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@@ -56,8 +56,10 @@ class KPimPrefs : public KPrefs
   public:
     QStringList mCustomCategories;
     QString mPassiveSyncPort;
     QString mPassiveSyncPw;
+    bool mPassiveSyncWithDesktop;
+    bool mPassiveSyncAutoStart;
     int mRingSyncAlgoPrefs;
     QString mLastSyncedLocalFile;
 
 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 40d8e47..75c0b2b 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -47,8 +47,9 @@
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
+#include <qcheckbox.h>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
@@ -67,8 +68,10 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
     int h = bar->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    if ( mPrefs->mPassiveSyncAutoStart )
+      enableQuick( false );
 
 }
 
 KSyncManager::~KSyncManager()
@@ -266,39 +269,63 @@ void KSyncManager::slotSyncMenu( int action )
     delete temp;
     setBlockSave(false);
 }
 
-void KSyncManager::enableQuick()
+void KSyncManager::enableQuick( bool ask )
 {
-    QDialog dia ( 0, "input-dialog", true );
-    QLineEdit lab ( &dia );
-    QVBoxLayout lay( &dia );
-    lab.setText( mPrefs->mPassiveSyncPort );
-    lay.setMargin(7);
-    lay.setSpacing(7);
-    int po = 9197+mTargetApp;
-    QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
-    lay.addWidget( &label);
-    lay.addWidget( &lab);
-
-    QLineEdit lepw ( &dia );
-    lepw.setText( mPrefs->mPassiveSyncPw );
-    QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
-    lay.addWidget( &label2);
-    lay.addWidget( &lepw);
-    dia.setFixedSize( 230,80 );
-    dia.setCaption( i18n("Enter port for Pi-Sync") );
-    QPushButton pb ( "OK",  &dia);
-    lay.addWidget( &pb );
-    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
-    dia.show();
-    if ( ! dia.exec() )
-        return;
-    dia.hide();
-    qApp->processEvents();
-    mPrefs->mPassiveSyncPw = lepw.text();
-    mPrefs->mPassiveSyncPort = lab.text();
+    bool autoStart;
+    if ( ask ) {
+        QDialog dia ( 0, "input-dialog", true );
+        QLineEdit lab ( &dia );
+        QVBoxLayout lay( &dia );
+        lab.setText( mPrefs->mPassiveSyncPort );
+        lay.setMargin(7);
+        lay.setSpacing(7);
+        int po = 9197+mTargetApp;
+        QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
+        lay.addWidget( &label);
+        lay.addWidget( &lab);
+
+        QLineEdit lepw ( &dia );
+        lepw.setText( mPrefs->mPassiveSyncPw );
+        QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
+        lay.addWidget( &label2);
+        lay.addWidget( &lepw);
+        QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia );
+        lay.addWidget( &autostart);
+        autostart.setChecked( mPrefs->mPassiveSyncAutoStart );
+#ifdef DESKTOP_VERSION
+#ifdef _WIN32_
+        QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
+#else
+        QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
+#endif
+        lay.addWidget( &syncdesktop);
+#else
+        QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia );
+        syncdesktop.hide();
+#endif
+        syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop );
+
+        dia.setFixedSize( 230,120 );
+        dia.setCaption( i18n("Enter port for Pi-Sync") );
+        QPushButton pb ( "OK",  &dia);
+        lay.addWidget( &pb );
+        connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
+        dia.show();
+        if ( ! dia.exec() )
+            return;
+        dia.hide();
+        qApp->processEvents();
+        mPrefs->mPassiveSyncPw = lepw.text();
+        mPrefs->mPassiveSyncPort = lab.text();
+        autoStart = autostart.isChecked();
+        mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked();
+    }
+    else
+        autoStart = mPrefs->mPassiveSyncAutoStart;
     bool ok;
+    mPrefs->mPassiveSyncAutoStart = false;
     Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         KMessageBox::information( 0, i18n("No valid port"));
         return;
@@ -312,8 +339,10 @@ void KSyncManager::enableQuick()
         delete mServerSocket;
         mServerSocket = 0;
         return;
     }
+    
+    mPrefs->mPassiveSyncAutoStart = autoStart;
     connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
     connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
 }
 
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index ffb1ea4..7b9c499 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -119,8 +119,9 @@ class KSyncManager : public QObject
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
     void setDefaultFileName( QString s) { mDefFileName = s ;}
     QString defaultFileName() { return mDefFileName ;}
     QString syncFileName();
+    void enableQuick( bool ask = true);
 
     QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
@@ -159,9 +160,8 @@ class KSyncManager : public QObject
 
  private:
     void syncPi();
     KServerSocket * mServerSocket;
-    void enableQuick();
     KPimPrefs* mPrefs;
     QString mDefFileName;
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;