-rw-r--r-- | noncore/apps/opie-console/filereceive.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/transferdialog.cpp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp index e517862..e387273 100644 --- a/noncore/apps/opie-console/filereceive.cpp +++ b/noncore/apps/opie-console/filereceive.cpp | |||
@@ -52,9 +52,14 @@ void FileReceive::receive( const QString& dir ) { | |||
52 | break; | 52 | break; |
53 | } | 53 | } |
54 | 54 | ||
55 | /* we should never return from here */ | 55 | /* we should never return from here */ |
56 | execlp("rz", "rz", typus, NULL ); | 56 | if( m_type == SX ) |
57 | // FIXME: file name should be configurable - currently we ensure it | ||
58 | // doesn't get overwritten by -E (--rename) | ||
59 | execlp("rz", "rz", typus, "--overwrite", QObject::tr("SynchronizedFile").latin1(), NULL ); | ||
60 | else | ||
61 | execlp("rz", "rz", typus, "--overwrite", NULL ); | ||
57 | 62 | ||
58 | char resultByte = 1; | 63 | char resultByte = 1; |
59 | if (m_info[1] ) | 64 | if (m_info[1] ) |
60 | ::write(m_info[1], &resultByte, 1 ); | 65 | ::write(m_info[1], &resultByte, 1 ); |
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp index ac5b1d0..f89723c 100644 --- a/noncore/apps/opie-console/transferdialog.cpp +++ b/noncore/apps/opie-console/transferdialog.cpp | |||
@@ -229,18 +229,23 @@ void TransferDialog::slotError(int error, const QString& message) | |||
229 | } | 229 | } |
230 | 230 | ||
231 | void TransferDialog::slotSent() | 231 | void TransferDialog::slotSent() |
232 | { | 232 | { |
233 | progressbar->setProgress(100); | ||
233 | QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been sent.")); | 234 | QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been sent.")); |
234 | ok->setEnabled(true); | 235 | ok->setEnabled(true); |
236 | progressbar->setProgress(0); | ||
235 | statusbar->setText(QObject::tr("Ready")); | 237 | statusbar->setText(QObject::tr("Ready")); |
236 | m_autocleanup = 1; | 238 | m_autocleanup = 1; |
237 | } | 239 | } |
238 | 240 | ||
239 | void TransferDialog::slotReceived(const QString& file) | 241 | void TransferDialog::slotReceived(const QString& file) |
240 | { | 242 | { |
241 | QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file)); | 243 | progressbar->setProgress(100); |
244 | QMessageBox::information(this, QObject::tr("Received"), QObject::tr("File has been received.")); | ||
245 | //QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file)); | ||
242 | ok->setEnabled(true); | 246 | ok->setEnabled(true); |
247 | progressbar->setProgress(0); | ||
243 | statusbar->setText(QObject::tr("Ready")); | 248 | statusbar->setText(QObject::tr("Ready")); |
244 | m_autocleanup = 1; | 249 | m_autocleanup = 1; |
245 | } | 250 | } |
246 | 251 | ||