| author | josef <josef> | 2002-10-14 17:21:03 (UTC) |
|---|---|---|
| committer | josef <josef> | 2002-10-14 17:21:03 (UTC) |
| commit | 51e18b363eb37621479a059af58da3040db1be7e (patch) (side-by-side diff) | |
| tree | 0099ca456633dda2ef68c3336a1541ecb95d1ae8 | |
| parent | 49d40f92a6988a3deaf9b775803092616d312403 (diff) | |
| download | opie-51e18b363eb37621479a059af58da3040db1be7e.zip opie-51e18b363eb37621479a059af58da3040db1be7e.tar.gz opie-51e18b363eb37621479a059af58da3040db1be7e.tar.bz2 | |
- only allow sessions if all components (layer, widgetstack) are available
- add io_modem to .pro file so it gets compiled
- fix io_modem compilation (untested, but better than nothing)
| -rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 8 | ||||
| -rw-r--r-- | noncore/apps/opie-console/io_modem.h | 3 | ||||
| -rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 10 | ||||
| -rw-r--r-- | noncore/apps/opie-console/opie-console.pro | 4 |
4 files changed, 19 insertions, 6 deletions
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index eb0aeb7..56147d8 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp @@ -5,4 +5,4 @@ -IOModem:IOModem( const Profile &config ) : IOSerial( config ) { - m_config = config; +IOModem::IOModem( const Profile &profile ) + : IOSerial( profile ), m_profile( profile ) { } @@ -22,2 +22,3 @@ void IOModem::close() { bool IOModem::open() { + qWarning("IOModem::open"); IOSerial::open(); @@ -70,4 +71,5 @@ QString IOModem::name() const { -void IOIrda::slotExited(OProcess* proc ){ +void IOModem::slotExited(OProcess* proc ){ close(); } + diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h index 6d44349..d681f66 100644 --- a/noncore/apps/opie-console/io_modem.h +++ b/noncore/apps/opie-console/io_modem.h @@ -5,2 +5,3 @@ #include "io_serial.h" +#include "profile.h" @@ -59,3 +60,3 @@ private: QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2, - m_dialSuf2, dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel; + m_dialSuf2, m_dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel; int m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime, diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 415259e..1adb43d 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -8,2 +8,3 @@ #include <opie/ofiledialog.h> +#include <qmessagebox.h> @@ -311,2 +312,11 @@ void MainWindow::create( const Profile& prof ) { + if((!ses) || (!ses->layer()) || (!ses->widgetStack())) + { + QMessageBox::warning(this, + QObject::tr("Session failed"), + QObject::tr("Cannot open session: Not all components were found.")); + //if(ses) delete ses; + return; + } + m_sessions.append( ses ); diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro index ef6bc21..26bce83 100644 --- a/noncore/apps/opie-console/opie-console.pro +++ b/noncore/apps/opie-console/opie-console.pro @@ -4,3 +4,3 @@ CONFIG = qt debug DESTDIR = $(OPIEDIR)/bin -HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h\ +HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ file_layer.h filetransfer.h \ @@ -37,3 +37,3 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h\ -SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \ +SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \ file_layer.cpp filetransfer.cpp \ |