| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 8264410..fd29b51 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,28 +1,31 @@ Info about the changes in new versions of KDE-Pim/Pi ********** VERSION 2.1.18 ************ +Pi-Sync mode: +The "Write back file" status dialog was updated too often such that writing back the file on the Z was very slow. Fixed. + KO/Pi: ********** VERSION 2.1.17 ************ KO/Pi: Added option to display times in What's Next View on two lines. (Useful for display on the Zaurus with 240x320 screen) Removed "Allday" for allday events of one day duration in What's Next View. Added date range for allday events of more than one day duration in What's Next View. Fixed two problems in the data importing from Outlook: Fixed the duplicated import if the summary, location or description had whitespaces at the end. Fixed a problem importing certain recurrence rules. A journal in an ics file may have no dtStart value (as files from KNotes, which stores its notes in an ics journal file). If now a journal has no dtStart value the dtStart value is set to the created value of the journal when loading the file. That makes it possible to view and edit "notes" from KNotes. Simply add another Resource in KO/Pi which is a copy of the ics file from KNotes. You will find the "notes" in KO/Pi as a journal entry on the date you created it. And some minor fixes in KO/Pi. Fixed a crash on the desktop when closing KO/Pi after accessing adressbook data (Linux + Windows ). ********** VERSION 2.1.16 ************ diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index f2ee0ab..2a75bfb 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1545,53 +1545,59 @@ void KCommandSocket::writeFile( QString fileName ) void KCommandSocket::writeFileToSocket() { mTimerSocket->stop(); QFile file2( mFileName ); if (!file2.open( IO_ReadOnly ) ) { mConnectProgress.hide(); mConnectCount = -1; mRetVal= errorW; mSocket->close(); if ( mSocket->state() == QSocket::Idle ) QTimer::singleShot( 10, this , SLOT ( deleteSocket())); return ; } mConnectProgress.setTotalSteps ( file2.size() ); mConnectProgress.show(); int count = 0; mConnectProgress.setLabelText( i18n("Sending back synced file...") ); mConnectProgress.setProgress( count ); mConnectProgress.blockSignals( true ); QTextStream ts2( &file2 ); ts2.setEncoding( QTextStream::Latin1 ); QTextStream os2( mSocket ); os2.setEncoding( QTextStream::Latin1 ); os2 << "PUT " << mPassWord << "\r\n\r\n";; + int byteCount = 0; + int byteMax = file2.size()/53; while ( ! ts2.atEnd() ) { qApp->processEvents(); - mConnectProgress.setProgress( count ); + if ( byteCount > byteMax ) { + byteCount = 0; + mConnectProgress.setProgress( count ); + } QString temp = ts2.readLine(); count += temp.length(); + byteCount += temp.length(); os2 << temp << "\r\n"; } file2.close(); mConnectProgress.hide(); mConnectCount = -1; os2 << "\r\n"; mRetVal= successW; mSocket->close(); if ( mSocket->state() == QSocket::Idle ) QTimer::singleShot( 10, this , SLOT ( deleteSocket())); mConnectProgress.blockSignals( false ); } void KCommandSocket::sendStop() { if ( !mSocket ) { mSocket = new QSocket( this ); connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); } mSocket->connectToHost( mHost, mPort ); QTextStream os2( mSocket ); os2.setEncoding( QTextStream::Latin1 ); os2 << "STOP\r\n\r\n"; mSocket->close(); if ( mSocket->state() == QSocket::Idle ) |