author | josef <josef> | 2002-10-14 18:28:19 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-14 18:28:19 (UTC) |
commit | 5ada62902971fa9ac34e831259442535299f7ef6 (patch) (side-by-side diff) | |
tree | 445974a3569d35267cb7542aefd5235ff14536dd | |
parent | e789f01a4fc6ada39809d40f8c44a6f6deec7785 (diff) | |
download | opie-5ada62902971fa9ac34e831259442535299f7ef6.zip opie-5ada62902971fa9ac34e831259442535299f7ef6.tar.gz opie-5ada62902971fa9ac34e831259442535299f7ef6.tar.bz2 |
- add modem layer so dialer can be used within Connect
-rw-r--r-- | noncore/apps/opie-console/default.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialer.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 8 |
4 files changed, 13 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp index ce5c870..5c1c05a 100644 --- a/noncore/apps/opie-console/default.cpp +++ b/noncore/apps/opie-console/default.cpp @@ -2,4 +2,5 @@ #include "io_irda.h" #include "io_bt.h" +#include "io_modem.h" #include "filetransfer.h" #include "filereceive.h" @@ -46,4 +47,7 @@ extern "C" { return new IOIrda( prof ); } + IOLayer* newModemLayer( const Profile& prof ) { + return new IOModem( prof ); + } // Connection Widgets @@ -86,4 +90,5 @@ Default::Default( MetaFactory* fact ) { fact->addIOLayerFactory( "irda", QObject::tr("Infrared"), newIrDaLayer ); fact->addIOLayerFactory( "bt", QObject::tr("Bluetooth"), newBTLayer ); + fact->addIOLayerFactory( "modem", QObject::tr("Modem"), newModemLayer ); fact->addConnectionWidgetFactory( "serial", QObject::tr("Serial"), newSerialWidget ); diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index d20965a..90e2b6c 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp @@ -46,5 +46,5 @@ Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name) -: QDialog(parent, name, true) +: QDialog(parent, name, true), m_profile(profile) { QVBoxLayout *vbox; @@ -52,5 +52,4 @@ Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name) usercancel = 0; - m_profile = profile; desc = new QLabel(QObject::tr("Dialing number: %1").arg(m_profile.readEntry("Number")), this); diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h index 8c83bb6..09cc5ca 100644 --- a/noncore/apps/opie-console/dialer.h +++ b/noncore/apps/opie-console/dialer.h @@ -45,5 +45,5 @@ class Dialer : public QDialog int state; int usercancel; - Profile m_profile; + const Profile& m_profile; }; diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index 56147d8..28d1722 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp @@ -21,8 +21,12 @@ void IOModem::close() { bool IOModem::open() { - qWarning("IOModem::open"); - IOSerial::open(); + bool ret = IOSerial::open(); + if(!ret) return false; + + qWarning("IOModem::open continues..."); Dialer d(m_profile); + qWarning("dialer created"); + int result = d.exec(); if(result == QDialog::Accepted) |