summaryrefslogtreecommitdiff
Unidiff
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
@@ -91,5 +91,13 @@ DialDialog::~DialDialog() {
91} 91}
92 92
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
@@ -16,8 +16,10 @@ public:
16 ~DialDialog(); 16 ~DialDialog();
17 17
18 QString number(); 18 QString number();
19 19
20 void setNumber( int );
21
20private: 22private:
21 float m_number; 23 float m_number;
22 QLCDNumber *LCD; 24 QLCDNumber *LCD;
23 25
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
@@ -124,9 +124,10 @@ void Dialer::trydial(const QString& number)
124 124
125 if(state != state_cancel) 125 if(state != state_cancel)
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 }
131 132
132 if(state != state_cancel) 133 if(state != state_cancel)
@@ -148,9 +149,9 @@ void Dialer::trydial(const QString& number)
148 if(state != state_cancel) 149 if(state != state_cancel)
149 { 150 {
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 }
155 156
156 if(state != state_cancel) 157 if(state != state_cancel)
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
@@ -3,9 +3,10 @@
3 3
4#include "dialer.h" 4#include "dialer.h"
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
10 11
11IOModem::~IOModem() { 12IOModem::~IOModem() {
@@ -13,21 +14,18 @@ IOModem::~IOModem() {
13} 14}
14 15
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
22bool IOModem::open() { 23bool IOModem::open() {
23 bool ret = IOSerial::open(); 24 bool ret = IOSerial::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();
32 if(result == QDialog::Accepted) 30 if(result == QDialog::Accepted)
33 { 31 {
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
@@ -60,9 +60,9 @@ private:
60 QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2, 60 QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
61 m_dialSuf2, m_dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel; 61 m_dialSuf2, m_dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel;
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:
67 void slotExited(OProcess* proc); 67 void slotExited(OProcess* proc);
68 68
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
@@ -3,9 +3,9 @@
3#include <qcombobox.h> 3#include <qcombobox.h>
4#include <qlineedit.h> 4#include <qlineedit.h>
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"
10#include "dialdialog.h" 10#include "dialdialog.h"
11 11
@@ -186,8 +186,11 @@ void ModemConfigWidget::slotAT() {
186} 186}
187 187
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 ) {
192 m_telNumber->setText( dial.number() ); 195 m_telNumber->setText( dial.number() );
193 } 196 }