author | zautrix <zautrix> | 2005-07-29 10:15:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-29 10:15:34 (UTC) |
commit | 43a46672f4212c9617c753e0aa591f781d2e5240 (patch) (side-by-side diff) | |
tree | c91a20a73aa042735e3e7141e443ae7d2bffc148 | |
parent | 8feb7e617f1aa5cd5bb04d9a69d05409c3c4c60d (diff) | |
download | kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.zip kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.tar.gz kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.tar.bz2 |
fixx
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 6 |
2 files changed, 9 insertions, 0 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,16 +1,19 @@ 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. diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index f2ee0ab..2a75bfb 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1557,29 +1557,35 @@ void KCommandSocket::writeFileToSocket() } 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(); + 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 ); } |