Diffstat (limited to 'noncore/apps/opie-console/dialer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/dialer.cpp | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp index 8589d14..d20965a 100644 --- a/noncore/apps/opie-console/dialer.cpp +++ b/noncore/apps/opie-console/dialer.cpp | |||
@@ -9,2 +9,5 @@ | |||
9 | 9 | ||
10 | #include <unistd.h> | ||
11 | #include <string.h> | ||
12 | |||
10 | // State machine: | When an error occurs, we don't have to | 13 | // State machine: | When an error occurs, we don't have to |
@@ -24,3 +27,22 @@ | |||
24 | 27 | ||
25 | Dialer::Dialer(const QString& number, QWidget *parent, const char *name) | 28 | |
29 | // from atconfigdialog | ||
30 | //initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) ); | ||
31 | //resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ) ); | ||
32 | //dialPref1Line->setText( config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ) ); | ||
33 | //dialSuf1Line->setText( config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ) ); | ||
34 | //dialPref2Line->setText( config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ) ); | ||
35 | //dialSuf2Line->setText( config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ) ); | ||
36 | //dialPref3Line->setText( config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ) ); | ||
37 | //dialSuf3Line->setText( config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ) ); | ||
38 | //connectLine->setText( config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ) ); | ||
39 | //hangupLine->setText( config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) ); | ||
40 | |||
41 | // from modemconfigwidget | ||
42 | //int rad_flow = prof.readNumEntry("Flow"); | ||
43 | //int rad_parity = prof.readNumEntry("Parity"); | ||
44 | //int speed = prof.readNumEntry("Speed"); | ||
45 | //QString number = prof.readEntry("Number"); | ||
46 | |||
47 | Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name) | ||
26 | : QDialog(parent, name, true) | 48 | : QDialog(parent, name, true) |
@@ -31,5 +53,5 @@ Dialer::Dialer(const QString& number, QWidget *parent, const char *name) | |||
31 | usercancel = 0; | 53 | usercancel = 0; |
32 | m_number = number; | 54 | m_profile = profile; |
33 | 55 | ||
34 | desc = new QLabel(QObject::tr("Dialing number: %1").arg(number), this); | 56 | desc = new QLabel(QObject::tr("Dialing number: %1").arg(m_profile.readEntry("Number")), this); |
35 | progress = new QProgressBar(this); | 57 | progress = new QProgressBar(this); |
@@ -58,3 +80,7 @@ void Dialer::slotCancel() | |||
58 | { | 80 | { |
59 | if(state != state_online) reset(); | 81 | if(state != state_online) |
82 | { | ||
83 | usercancel = 1; | ||
84 | reset(); | ||
85 | } | ||
60 | else accept(); | 86 | else accept(); |
@@ -65,3 +91,2 @@ void Dialer::reset() | |||
65 | switchState(state_cancel); | 91 | switchState(state_cancel); |
66 | usercancel = 1; | ||
67 | } | 92 | } |
@@ -71,3 +96,3 @@ void Dialer::slotAutostart() | |||
71 | state = state_preinit; | 96 | state = state_preinit; |
72 | dial(m_number); | 97 | dial(m_profile.readEntry("Number")); |
73 | } | 98 | } |
@@ -139,3 +164,16 @@ void Dialer::send(const QString& msg) | |||
139 | { | 164 | { |
165 | QString m = msg; | ||
166 | int bytes; | ||
167 | QString termination; | ||
140 | 168 | ||
169 | termination = m_profile.readEntry("Termination"); | ||
170 | if(termination == "\n") m = m + "\n"; | ||
171 | else if(termination == "\r") m = m + "\r"; | ||
172 | else m = m + "\r\n"; | ||
173 | |||
174 | bytes = write(0, m.local8Bit(), strlen(m.local8Bit())); | ||
175 | if(bytes < 0) | ||
176 | { | ||
177 | reset(); | ||
178 | } | ||
141 | } | 179 | } |