author | zautrix <zautrix> | 2005-07-29 10:15:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-29 10:15:34 (UTC) |
commit | 43a46672f4212c9617c753e0aa591f781d2e5240 (patch) (unidiff) | |
tree | c91a20a73aa042735e3e7141e443ae7d2bffc148 /libkdepim | |
parent | 8feb7e617f1aa5cd5bb04d9a69d05409c3c4c60d (diff) | |
download | kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.zip kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.tar.gz kdepimpi-43a46672f4212c9617c753e0aa591f781d2e5240.tar.bz2 |
fixx
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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 ) | |||
1545 | void KCommandSocket::writeFileToSocket() | 1545 | void KCommandSocket::writeFileToSocket() |
1546 | { | 1546 | { |
1547 | mTimerSocket->stop(); | 1547 | mTimerSocket->stop(); |
1548 | QFile file2( mFileName ); | 1548 | QFile file2( mFileName ); |
1549 | if (!file2.open( IO_ReadOnly ) ) { | 1549 | if (!file2.open( IO_ReadOnly ) ) { |
1550 | mConnectProgress.hide(); | 1550 | mConnectProgress.hide(); |
1551 | mConnectCount = -1; | 1551 | mConnectCount = -1; |
1552 | mRetVal= errorW; | 1552 | mRetVal= errorW; |
1553 | mSocket->close(); | 1553 | mSocket->close(); |
1554 | if ( mSocket->state() == QSocket::Idle ) | 1554 | if ( mSocket->state() == QSocket::Idle ) |
1555 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1555 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1556 | return ; | 1556 | return ; |
1557 | } | 1557 | } |
1558 | mConnectProgress.setTotalSteps ( file2.size() ); | 1558 | mConnectProgress.setTotalSteps ( file2.size() ); |
1559 | mConnectProgress.show(); | 1559 | mConnectProgress.show(); |
1560 | int count = 0; | 1560 | int count = 0; |
1561 | mConnectProgress.setLabelText( i18n("Sending back synced file...") ); | 1561 | mConnectProgress.setLabelText( i18n("Sending back synced file...") ); |
1562 | mConnectProgress.setProgress( count ); | 1562 | mConnectProgress.setProgress( count ); |
1563 | mConnectProgress.blockSignals( true ); | 1563 | mConnectProgress.blockSignals( true ); |
1564 | QTextStream ts2( &file2 ); | 1564 | QTextStream ts2( &file2 ); |
1565 | ts2.setEncoding( QTextStream::Latin1 ); | 1565 | ts2.setEncoding( QTextStream::Latin1 ); |
1566 | QTextStream os2( mSocket ); | 1566 | QTextStream os2( mSocket ); |
1567 | os2.setEncoding( QTextStream::Latin1 ); | 1567 | os2.setEncoding( QTextStream::Latin1 ); |
1568 | os2 << "PUT " << mPassWord << "\r\n\r\n";; | 1568 | os2 << "PUT " << mPassWord << "\r\n\r\n";; |
1569 | int byteCount = 0; | ||
1570 | int byteMax = file2.size()/53; | ||
1569 | while ( ! ts2.atEnd() ) { | 1571 | while ( ! ts2.atEnd() ) { |
1570 | qApp->processEvents(); | 1572 | qApp->processEvents(); |
1571 | mConnectProgress.setProgress( count ); | 1573 | if ( byteCount > byteMax ) { |
1574 | byteCount = 0; | ||
1575 | mConnectProgress.setProgress( count ); | ||
1576 | } | ||
1572 | QString temp = ts2.readLine(); | 1577 | QString temp = ts2.readLine(); |
1573 | count += temp.length(); | 1578 | count += temp.length(); |
1579 | byteCount += temp.length(); | ||
1574 | os2 << temp << "\r\n"; | 1580 | os2 << temp << "\r\n"; |
1575 | } | 1581 | } |
1576 | file2.close(); | 1582 | file2.close(); |
1577 | mConnectProgress.hide(); | 1583 | mConnectProgress.hide(); |
1578 | mConnectCount = -1; | 1584 | mConnectCount = -1; |
1579 | os2 << "\r\n"; | 1585 | os2 << "\r\n"; |
1580 | mRetVal= successW; | 1586 | mRetVal= successW; |
1581 | mSocket->close(); | 1587 | mSocket->close(); |
1582 | if ( mSocket->state() == QSocket::Idle ) | 1588 | if ( mSocket->state() == QSocket::Idle ) |
1583 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1589 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1584 | mConnectProgress.blockSignals( false ); | 1590 | mConnectProgress.blockSignals( false ); |
1585 | } | 1591 | } |
1586 | void KCommandSocket::sendStop() | 1592 | void KCommandSocket::sendStop() |
1587 | { | 1593 | { |
1588 | if ( !mSocket ) { | 1594 | if ( !mSocket ) { |
1589 | mSocket = new QSocket( this ); | 1595 | mSocket = new QSocket( this ); |
1590 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1596 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1591 | } | 1597 | } |
1592 | mSocket->connectToHost( mHost, mPort ); | 1598 | mSocket->connectToHost( mHost, mPort ); |
1593 | QTextStream os2( mSocket ); | 1599 | QTextStream os2( mSocket ); |
1594 | os2.setEncoding( QTextStream::Latin1 ); | 1600 | os2.setEncoding( QTextStream::Latin1 ); |
1595 | os2 << "STOP\r\n\r\n"; | 1601 | os2 << "STOP\r\n\r\n"; |
1596 | mSocket->close(); | 1602 | mSocket->close(); |
1597 | if ( mSocket->state() == QSocket::Idle ) | 1603 | if ( mSocket->state() == QSocket::Idle ) |