| -rw-r--r-- | noncore/apps/opie-console/transferdialog.cpp | 44 | ||||
| -rw-r--r-- | noncore/apps/opie-console/transferdialog.h | 3 |
2 files changed, 34 insertions, 13 deletions
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp index 0083cc1..f9a0b87 100644 --- a/noncore/apps/opie-console/transferdialog.cpp +++ b/noncore/apps/opie-console/transferdialog.cpp @@ -30,2 +30,4 @@ TransferDialog::TransferDialog(MainWindow *parent, const char *name) + m_autocleanup = 0; + group = new QButtonGroup(QObject::tr("Transfer mode"), this); @@ -115,2 +117,5 @@ void TransferDialog::slotTransfer() + cleanup(); + m_autocleanup = 0; + if(m_transfermode == id_send) statusbar->setText(QObject::tr("Sending...")); @@ -140,2 +145,18 @@ void TransferDialog::slotTransfer() +void TransferDialog::cleanup() +{ + if(m_lay) + { + m_lay->cancel(); + delete m_lay; + m_lay = 0l; + } + if(m_recvlay) + { + m_recvlay->cancel(); + delete m_recvlay; + m_recvlay = 0l; + } +} + void TransferDialog::slotCancel() @@ -147,17 +168,10 @@ void TransferDialog::slotCancel() { - if(m_lay) - { - m_lay->cancel(); - delete m_lay; - m_lay = 0l; - } - if(m_recvlay) + cleanup(); + if(m_autocleanup) close(); + else { - m_recvlay->cancel(); - delete m_recvlay; - m_recvlay = 0l; + QMessageBox::information(this, + QObject::tr("Cancelled"), + QObject::tr("The file transfer has been cancelled.")); } - QMessageBox::information(this, - QObject::tr("Cancelled"), - QObject::tr("The file transfer has been cancelled.")); } @@ -212,2 +226,4 @@ void TransferDialog::slotError(int error, const QString& message) } + + m_autocleanup = 1; } @@ -219,2 +235,3 @@ void TransferDialog::slotSent() statusbar->setText(QObject::tr("Ready")); + m_autocleanup = 1; } @@ -226,2 +243,3 @@ void TransferDialog::slotReceived(const QString& file) statusbar->setText(QObject::tr("Ready")); + m_autocleanup = 1; } diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h index de3a5cf..1b27f16 100644 --- a/noncore/apps/opie-console/transferdialog.h +++ b/noncore/apps/opie-console/transferdialog.h @@ -38,2 +38,4 @@ class TransferDialog : public QDialog + void cleanup(); + QLineEdit *filename; @@ -47,2 +49,3 @@ class TransferDialog : public QDialog int m_transfermode; + int m_autocleanup; }; |