3 files changed, 42 insertions, 17 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 2275f3a..4f29ca3 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1226,6 +1226,16 @@
 { "Set current as color category","Setze Gewählte als Farbkategorie" },
 { " completed"," erledigt" },
 { "(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!","(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi basiert auf KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) und das KDE Team.\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.pi-sync.net --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" },
+{ "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." },
+{ "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." },
+{ "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." },
+{ "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },
+{ "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },
+{ "Error","Fehler" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index df5a0d9..1f5f4c7 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1052,9 +1052,8 @@ void KSyncManager::syncPi()
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         return;
     }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
+    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
-    mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
 
@@ -1065,7 +1064,7 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
         mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         delete s;
         if ( state == KCommandSocket::errorR ) {
-            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
+            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget());
             connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
             commandSocket->sendStop();
         }
@@ -1096,7 +1095,7 @@ void KSyncManager::readFileFromSocket()
         mPisyncFinished = true;
         return;
     }
-    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
+    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
     if ( mWriteBackFile ) 
         commandSocket->writeFile(  fileName );
@@ -1263,7 +1262,7 @@ void KServerSocket::send_file()
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
     while ( ! ts.atEnd() ) {
-        os << ts.readLine() << "\r\n";
+        os << ts.readLine() << "\r\n\r\n";
     }
     //os << ts.read();
     file.close();
@@ -1329,34 +1328,46 @@ void KServerSocket::readBackFileFromSocket()
 
 }
 
-KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
+KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap,  const char * name ): QObject( parent, name )
 {
     mPassWord = password;
     mSocket = 0;
+    mFirst = false;
     mPort = port;
     mHost = host;
-
+    tlw = cap;
     mRetVal = quiet;
     mTimerSocket = new QTimer ( this );
     connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
+void KCommandSocket::sendFileRequest()
+{
+    if ( tlw )
+        tlw->setCaption( i18n("Connected! Sending request for remote file ...") );
+    mTimerSocket->start( 300000 );
+    QTextStream os( mSocket );
+    os.setEncoding( QTextStream::Latin1 );
+
+    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
+    os << "GET " << mPassWord << curDt <<"\r\n\r\n";
+}
+
 void KCommandSocket::readFile( QString fn )
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+        connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
     }
     mFileString = "";
     mFileName = fn;
     mFirst = true;
+    if ( tlw )
+        tlw->setCaption( i18n("Trying to connect to remote...") );
     mSocket->connectToHost( mHost, mPort ); 
-    QTextStream os( mSocket );
-    os.setEncoding( QTextStream::Latin1 );
-
-    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
-    os << "GET " << mPassWord << curDt <<"\r\n";
-    mTimerSocket->start( 300000 );
+    qDebug("KSS: Waiting for connection");
+    mTimerSocket->start( 20000 );
 }
 
 void KCommandSocket::writeFile( QString fileName  )
@@ -1383,9 +1394,9 @@ void KCommandSocket::writeFileToSocket()
     ts2.setEncoding( QTextStream::Latin1 );
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
-    os2 << "PUT " << mPassWord << "\r\n";;
+    os2 << "PUT " << mPassWord << "\r\n\r\n";;
     while ( ! ts2.atEnd() ) {
-        os2 << ts2.readLine() << "\r\n";
+        os2 << ts2.readLine() << "\r\n\r\n";
     }
     mRetVal= successW;
     file2.close();
@@ -1402,7 +1413,7 @@ void KCommandSocket::sendStop()
     mSocket->connectToHost( mHost, mPort ); 
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
-    os2 << "STOP\r\n";
+    os2 << "STOP\r\n\r\n";
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 6d89950..9a3066e 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -75,11 +75,14 @@ class KCommandSocket : public QObject
     Q_OBJECT
         public:
     enum state { successR, errorR, successW, errorW, errorTO, quiet };
-    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
+    KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget*  cap = 0, const char * name=0 );
     void readFile( QString );
     void writeFile( QString );
     void sendStop();
        
+ private slots :
+    void sendFileRequest();
+       
  signals:
     void commandFinished( KCommandSocket*, int );
     private slots:
@@ -88,6 +91,7 @@ class KCommandSocket : public QObject
     void deleteSocket();
     void writeFileToSocket();
  private :
+    QWidget* tlw;
     QSocket* mSocket; 
     QString mPassWord;
     Q_UINT16 mPort;