-rw-r--r-- | noncore/apps/opie-console/dialdialog.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialdialog.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.cpp | 5 |
6 files changed, 21 insertions, 9 deletions
diff --git a/noncore/apps/opie-console/dialdialog.cpp b/noncore/apps/opie-console/dialdialog.cpp index 8bf32f9..0ace8f7 100644 --- a/noncore/apps/opie-console/dialdialog.cpp +++ b/noncore/apps/opie-console/dialdialog.cpp | |||
@@ -94,2 +94,10 @@ QString DialDialog::number() { | |||
94 | return QString( "%1").arg( m_number ); | 94 | return QString( "%1").arg( m_number ); |
95 | |||
95 | } | 96 | } |
97 | |||
98 | void DialDialog::setNumber( int number ) | ||
99 | { | ||
100 | m_number = number; | ||
101 | LCD->display( m_number ); | ||
102 | } | ||
103 | |||
diff --git a/noncore/apps/opie-console/dialdialog.h b/noncore/apps/opie-console/dialdialog.h index 5c5b948..bec7b81 100644 --- a/noncore/apps/opie-console/dialdialog.h +++ b/noncore/apps/opie-console/dialdialog.h | |||
@@ -19,2 +19,4 @@ public: | |||
19 | 19 | ||
20 | void setNumber( int ); | ||
21 | |||
20 | private: | 22 | private: |
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index 90e2b6c..89a0e8d 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp | |||
@@ -127,3 +127,4 @@ void Dialer::trydial(const QString& number) | |||
127 | switchState(state_init); | 127 | switchState(state_init); |
128 | send("ATZ"); | 128 | //send("ATZ"); |
129 | send(m_profile.readEntry("InitString")); | ||
129 | QString response2 = receive(); | 130 | QString response2 = receive(); |
@@ -151,3 +152,3 @@ void Dialer::trydial(const QString& number) | |||
151 | 152 | ||
152 | send(QString("ATDT %1").arg(number)); | 153 | send(QString("%1 %2").arg(m_profile.readEntry("DialPrefix1")).arg(number)); |
153 | QString response5 = receive(); | 154 | QString response5 = receive(); |
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index d93dc5a..22a3673 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp | |||
@@ -6,3 +6,4 @@ | |||
6 | IOModem::IOModem( const Profile &profile ) | 6 | IOModem::IOModem( const Profile &profile ) |
7 | : IOSerial( profile ), m_profile( profile ) { | 7 | : IOSerial( profile ) { |
8 | m_profile = profile; | ||
8 | } | 9 | } |
@@ -16,5 +17,5 @@ IOModem::~IOModem() { | |||
16 | void IOModem::close() { | 17 | void IOModem::close() { |
18 | // maybe do a hangup here just in case...? | ||
17 | 19 | ||
18 | IOSerial::close(); | 20 | IOSerial::close(); |
19 | |||
20 | } | 21 | } |
@@ -25,6 +26,3 @@ bool IOModem::open() { | |||
25 | 26 | ||
26 | qWarning("IOModem::open continues..."); | ||
27 | |||
28 | Dialer d(m_profile); | 27 | Dialer d(m_profile); |
29 | qWarning("dialer created"); | ||
30 | 28 | ||
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h index d681f66..8453b95 100644 --- a/noncore/apps/opie-console/io_modem.h +++ b/noncore/apps/opie-console/io_modem.h | |||
@@ -63,3 +63,3 @@ private: | |||
63 | m_bpsDetect, m_dcdLines, m_multiLineUntag; | 63 | m_bpsDetect, m_dcdLines, m_multiLineUntag; |
64 | const Profile& m_profile; | 64 | Profile m_profile; |
65 | 65 | ||
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp index 0f0ce7c..878b0cf 100644 --- a/noncore/apps/opie-console/modemconfigwidget.cpp +++ b/noncore/apps/opie-console/modemconfigwidget.cpp | |||
@@ -6,3 +6,3 @@ | |||
6 | #include <qhbox.h> | 6 | #include <qhbox.h> |
7 | 7 | #include <qregexp.h> | |
8 | 8 | ||
@@ -189,2 +189,5 @@ void ModemConfigWidget::slotDial() { | |||
189 | DialDialog dial( this, "DialConfig", true ); | 189 | DialDialog dial( this, "DialConfig", true ); |
190 | if(!m_telNumber->text().isEmpty()) { | ||
191 | dial.setNumber(m_telNumber->text().replace(QRegExp("[\\-\\/\\ ]"), "").toInt()); | ||
192 | } | ||
190 | dial.showMaximized(); | 193 | dial.showMaximized(); |