-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 8e2f956..10cb2a2 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -2113,32 +2113,33 @@ void MainWindow::performQuickQuick() | |||
2113 | QString host = KOPrefs::instance()->mActiveSyncIP; | 2113 | QString host = KOPrefs::instance()->mActiveSyncIP; |
2114 | mCommandSocket->connectToHost( host, port ); | 2114 | mCommandSocket->connectToHost( host, port ); |
2115 | QTextStream os( mCommandSocket ); | 2115 | QTextStream os( mCommandSocket ); |
2116 | os.setEncoding( QTextStream::UnicodeUTF8 ); | 2116 | os.setEncoding( QTextStream::UnicodeUTF8 ); |
2117 | os << "GET " << mPassWordPiSync << "\r\n"; | 2117 | os << "GET " << mPassWordPiSync << "\r\n"; |
2118 | setCaption( i18n("Sending request for remote file ...") ); | 2118 | setCaption( i18n("Sending request for remote file ...") ); |
2119 | mTimerCommandSocket->start( 15000 ); | 2119 | mTimerCommandSocket->start( 10000 ); |
2120 | 2120 | ||
2121 | } | 2121 | } |
2122 | void MainWindow::deleteCommandSocket() | 2122 | void MainWindow::deleteCommandSocket() |
2123 | { | 2123 | { |
2124 | if ( !mCommandSocket) | 2124 | if ( !mCommandSocket) |
2125 | return; | 2125 | return; |
2126 | if ( mTimerCommandSocket->isActive () ) { | 2126 | if ( mTimerCommandSocket->isActive () ) { |
2127 | KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out ")); | 2127 | KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out ")); |
2128 | mTimerCommandSocket->stop(); | 2128 | mTimerCommandSocket->stop(); |
2129 | } | 2129 | } |
2130 | //KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocket ")); | ||
2130 | qDebug("MainWindow::deletemCommandSocket() "); | 2131 | qDebug("MainWindow::deletemCommandSocket() "); |
2131 | delete mCommandSocket; | 2132 | delete mCommandSocket; |
2132 | mCommandSocket = 0; | 2133 | mCommandSocket = 0; |
2133 | } | 2134 | } |
2134 | void MainWindow::deleteCommandSocketFinish() | 2135 | void MainWindow::deleteCommandSocketFinish() |
2135 | { | 2136 | { |
2136 | if ( ! mCommandSocketFinish) | 2137 | if ( ! mCommandSocketFinish) |
2137 | return; | 2138 | return; |
2138 | //KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocketFinish() ")); | 2139 | // KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocketFinish() ")); |
2139 | qDebug("MainWindow::deletemCommandSocketFinish() "); | 2140 | qDebug("MainWindow::deletemCommandSocketFinish() "); |
2140 | delete mCommandSocketFinish; | 2141 | delete mCommandSocketFinish; |
2141 | mCommandSocketFinish = 0; | 2142 | mCommandSocketFinish = 0; |
2142 | } | 2143 | } |
2143 | void MainWindow::readFileFromSocket() | 2144 | void MainWindow::readFileFromSocket() |
2144 | { | 2145 | { |
@@ -2168,13 +2169,13 @@ void MainWindow::readFileFromSocket() | |||
2168 | first = false; | 2169 | first = false; |
2169 | while ( mCommandSocket->canReadLine () ) { | 2170 | while ( mCommandSocket->canReadLine () ) { |
2170 | ts << mCommandSocket->readLine (); | 2171 | ts << mCommandSocket->readLine (); |
2171 | } | 2172 | } |
2172 | QTime ti; | 2173 | QTime ti; |
2173 | ti.start(); | 2174 | ti.start(); |
2174 | while ( ti.elapsed () < 5000 && !mCommandSocket->canReadLine () ) { | 2175 | while ( ti.elapsed () < 3000 && !mCommandSocket->canReadLine () ) { |
2175 | qApp->processEvents(); | 2176 | qApp->processEvents(); |
2176 | qDebug("waiting2 %d ",ti.elapsed () ); | 2177 | qDebug("waiting2 %d ",ti.elapsed () ); |
2177 | if ( !mCommandSocket->canReadLine () ) | 2178 | if ( !mCommandSocket->canReadLine () ) |
2178 | mCommandSocket->waitForMore ( 100 ); | 2179 | mCommandSocket->waitForMore ( 100 ); |
2179 | } | 2180 | } |
2180 | //mCommandSocket->waitForMore ( 5000 ); | 2181 | //mCommandSocket->waitForMore ( 5000 ); |
@@ -2222,33 +2223,34 @@ void MainWindow::readFileFromSocket() | |||
2222 | if (!file2.open( IO_ReadOnly ) ) { | 2223 | if (!file2.open( IO_ReadOnly ) ) { |
2223 | setCaption( i18n("Error: Cannot open temp file for read.") ); | 2224 | setCaption( i18n("Error: Cannot open temp file for read.") ); |
2224 | qDebug("error open cal file "); | 2225 | qDebug("error open cal file "); |
2225 | return ; | 2226 | return ; |
2226 | 2227 | ||
2227 | } | 2228 | } |
2228 | setCaption( i18n("Sending back synced file...") ); | ||
2229 | QTextStream ts2( &file2 ); | 2229 | QTextStream ts2( &file2 ); |
2230 | ts2.setCodec( QTextCodec::codecForName("utf8") ); | 2230 | ts2.setCodec( QTextCodec::codecForName("utf8") ); |
2231 | QTextStream os2( mCommandSocketFinish ); | 2231 | QTextStream os2( mCommandSocketFinish ); |
2232 | os2.setCodec( QTextCodec::codecForName("utf8") ); | 2232 | os2.setCodec( QTextCodec::codecForName("utf8") ); |
2233 | //os.setEncoding( QTextStream::UnicodeUTF8 ); | 2233 | //os.setEncoding( QTextStream::UnicodeUTF8 ); |
2234 | if ( KOPrefs::instance()->mWriteBackFile ) { | 2234 | if ( KOPrefs::instance()->mWriteBackFile ) { |
2235 | setCaption( i18n("Sending back synced file...") ); | ||
2235 | os2 << "PUT " << mPassWordPiSync << "\r\n";; | 2236 | os2 << "PUT " << mPassWordPiSync << "\r\n";; |
2236 | while ( ! ts2.atEnd() ) { | 2237 | while ( ! ts2.atEnd() ) { |
2237 | os2 << ts2.readLine() << "\n"; | 2238 | os2 << ts2.readLine() << "\n"; |
2238 | } | 2239 | } |
2239 | } else { | 2240 | } else { |
2240 | os2 << "STOP\r\n"; | 2241 | os2 << "STOP\r\n"; |
2241 | } | 2242 | } |
2242 | mCommandSocketFinish->close(); | 2243 | mCommandSocketFinish->close(); |
2243 | if ( mCommandSocketFinish->state() == QSocket::Idle ) | 2244 | if ( mCommandSocketFinish->state() == QSocket::Idle ) |
2244 | deleteCommandSocketFinish(); | 2245 | QTimer::singleShot( 10, this , SLOT ( deleteCommandSocketFinish())); |
2245 | file.close(); | 2246 | file.close(); |
2246 | qDebug("Syncing succesful! "); | 2247 | qDebug("Syncing succesful! "); |
2247 | setCaption( i18n("Pi-Sync succesful!") ); | 2248 | setCaption( i18n("Pi-Sync succesful!") ); |
2248 | 2249 | ||
2250 | // KMessageBox::information( 0, i18n(" Pi-Sync succesful! ")); | ||
2249 | 2251 | ||
2250 | } | 2252 | } |
2251 | 2253 | ||
2252 | void MainWindow::syncLocalFile() | 2254 | void MainWindow::syncLocalFile() |
2253 | { | 2255 | { |
2254 | 2256 | ||