author | josef <josef> | 2002-10-18 10:25:44 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-18 10:25:44 (UTC) |
commit | dd15f8b7104678da5969a3e93a4b14cd3640955c (patch) (side-by-side diff) | |
tree | ca05d8e196a72101a6044ac0f7ca5fefdbd63d66 /noncore/apps/opie-console | |
parent | c01fc99488d4ff9e1de2eb4d93fc200ed8e19a81 (diff) | |
download | opie-dd15f8b7104678da5969a3e93a4b14cd3640955c.zip opie-dd15f8b7104678da5969a3e93a4b14cd3640955c.tar.gz opie-dd15f8b7104678da5969a3e93a4b14cd3640955c.tar.bz2 |
- implement proper disconnect for modem connections
- let transfer dialog use widgetStack()
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialer.h | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/transferdialog.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/transferdialog.h | 2 |
6 files changed, 16 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index bd6b50f..7bf9352 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp @@ -85,4 +85,10 @@ Dialer::~Dialer() } +void Dialer::setHangupOnly() +{ + state = state_cancel; + usercancel = 1; +} + void Dialer::slotCancel() { diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h index 4011880..84444b9 100644 --- a/noncore/apps/opie-console/dialer.h +++ b/noncore/apps/opie-console/dialer.h @@ -15,4 +15,5 @@ class Dialer : public QDialog Dialer(const Profile& profile, int fd, QWidget *parent = NULL, const char *name = NULL); ~Dialer(); + void setHangupOnly(); public slots: diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index c04aad1..2f0c04e 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp @@ -16,5 +16,8 @@ IOModem::~IOModem() { void IOModem::close() { - // maybe do a hangup here just in case...? + // Hangup, discarding result + Dialer d(m_profile, rawIO()); + d.setHangupOnly(); + d.exec(); IOSerial::close(); diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 9a226bb..55e9836 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -443,6 +443,7 @@ void MainWindow::slotTransfer() { if ( currentSession() ) { - TransferDialog dlg(this); + TransferDialog dlg(currentSession()->widgetStack(), this); dlg.showMaximized(); + //currentSession()->widgetStack()->add(dlg); dlg.exec(); } diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp index f9a0b87..ac5b1d0 100644 --- a/noncore/apps/opie-console/transferdialog.cpp +++ b/noncore/apps/opie-console/transferdialog.cpp @@ -18,6 +18,6 @@ #include "transferdialog.h" -TransferDialog::TransferDialog(MainWindow *parent, const char *name) -: QDialog(0l, 0l, true), m_win(parent) +TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *name) +: QDialog(parent, 0l, true), m_win(mainwindow) { m_lay = 0l; diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h index 1b27f16..d87be6a 100644 --- a/noncore/apps/opie-console/transferdialog.h +++ b/noncore/apps/opie-console/transferdialog.h @@ -17,5 +17,5 @@ class TransferDialog : public QDialog Q_OBJECT public: - TransferDialog(MainWindow *parent = 0l, const char *name = 0l); + TransferDialog(QWidget *parent = 0l, MainWindow *mainwindow = 0l, const char *name = 0l); ~TransferDialog(); |