summaryrefslogtreecommitdiff
authorjosef <josef>2002-10-15 21:10:29 (UTC)
committer josef <josef>2002-10-15 21:10:29 (UTC)
commitfb99aec5215da635abfa28288d170f110114bba3 (patch) (unidiff)
tree68c1f662e126f578f467ccfc2c3164bc354a6790
parent6b5ccd66a36280a601d09ea0295df86c4fce1a65 (diff)
downloadopie-fb99aec5215da635abfa28288d170f110114bba3.zip
opie-fb99aec5215da635abfa28288d170f110114bba3.tar.gz
opie-fb99aec5215da635abfa28288d170f110114bba3.tar.bz2
- io_modem must keep copy of profile, otherwise it crashes (now it works -
doh!) - try to use key/value pairs for dialing where currently possible (init string and dial sequence) - when editing telephone number, try to read in, including special chars stripping (-, /, whitespace) using QRegExp
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/dialdialog.cpp8
-rw-r--r--noncore/apps/opie-console/dialdialog.h2
-rw-r--r--noncore/apps/opie-console/dialer.cpp5
-rw-r--r--noncore/apps/opie-console/io_modem.cpp8
-rw-r--r--noncore/apps/opie-console/io_modem.h2
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp5
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
@@ -93,3 +93,11 @@ DialDialog::~DialDialog() {
93QString DialDialog::number() { 93QString DialDialog::number() {
94 return QString( "%1").arg( m_number ); 94 return QString( "%1").arg( m_number );
95
95} 96}
97
98void 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
@@ -18,4 +18,6 @@ public:
18 QString number(); 18 QString number();
19 19
20 void setNumber( int );
21
20private: 22private:
21 float m_number; 23 float m_number;
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
@@ -126,5 +126,6 @@ void Dialer::trydial(const QString& number)
126 { 126 {
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();
130 } 131 }
@@ -150,5 +151,5 @@ void Dialer::trydial(const QString& number)
150 switchState(state_dialing); 151 switchState(state_dialing);
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();
154 } 155 }
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
@@ -5,5 +5,6 @@
5 5
6IOModem::IOModem( const Profile &profile ) 6IOModem::IOModem( const Profile &profile )
7 : IOSerial( profile ), m_profile( profile ) { 7 : IOSerial( profile ) {
8 m_profile = profile;
8} 9}
9 10
@@ -15,7 +16,7 @@ IOModem::~IOModem() {
15 16
16void IOModem::close() { 17void IOModem::close() {
18 // maybe do a hangup here just in case...?
17 19
18 IOSerial::close(); 20 IOSerial::close();
19
20} 21}
21 22
@@ -24,8 +25,5 @@ bool IOModem::open() {
24 if(!ret) return false; 25 if(!ret) return false;
25 26
26 qWarning("IOModem::open continues...");
27
28 Dialer d(m_profile); 27 Dialer d(m_profile);
29 qWarning("dialer created");
30 28
31 int result = d.exec(); 29 int result = d.exec();
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
@@ -62,5 +62,5 @@ private:
62 int m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime, 62 int m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime,
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
66private slots: 66private slots:
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
@@ -5,5 +5,5 @@
5#include <qpushbutton.h> 5#include <qpushbutton.h>
6#include <qhbox.h> 6#include <qhbox.h>
7 7#include <qregexp.h>
8 8
9#include "modemconfigwidget.h" 9#include "modemconfigwidget.h"
@@ -188,4 +188,7 @@ void ModemConfigWidget::slotAT() {
188void ModemConfigWidget::slotDial() { 188void 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();
191 if ( dial.exec() == QDialog::Accepted ) { 194 if ( dial.exec() == QDialog::Accepted ) {