summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/dialer.cpp50
-rw-r--r--noncore/apps/opie-console/dialer.h6
-rw-r--r--noncore/apps/opie-console/io_modem.cpp13
-rw-r--r--noncore/apps/opie-console/io_modem.h1
-rw-r--r--noncore/apps/opie-console/opie-console.pro6
5 files changed, 63 insertions, 13 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
@@ -2,41 +2,63 @@
#include <qlayout.h>
#include <qprogressbar.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qapp.h>
#include <qtimer.h>
+#include <unistd.h>
+#include <string.h>
+
// State machine: | When an error occurs, we don't have to
// | reset everything.
// (init) <------+ | But if the user wants to reset,
// | | | we stop dialing immediately.
// v | |
// (options) ----+ | Following the state machine is necessary
// | \ | to get determinable results.
// v ^ |
// (dial) ----+ |
// | ^ |
// v | |
// (online) --+ |
// | |
// v |
-Dialer::Dialer(const QString& number, QWidget *parent, const char *name)
+
+// from atconfigdialog
+//initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) );
+//resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ) );
+//dialPref1Line->setText( config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ) );
+//dialSuf1Line->setText( config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ) );
+//dialPref2Line->setText( config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ) );
+//dialSuf2Line->setText( config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ) );
+//dialPref3Line->setText( config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ) );
+//dialSuf3Line->setText( config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ) );
+//connectLine->setText( config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ) );
+//hangupLine->setText( config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) );
+
+// from modemconfigwidget
+//int rad_flow = prof.readNumEntry("Flow");
+//int rad_parity = prof.readNumEntry("Parity");
+//int speed = prof.readNumEntry("Speed");
+//QString number = prof.readEntry("Number");
+
+Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name)
: QDialog(parent, name, true)
{
QVBoxLayout *vbox;
QLabel *desc;
usercancel = 0;
- m_number = number;
+ m_profile = profile;
- desc = new QLabel(QObject::tr("Dialing number: %1").arg(number), this);
+ desc = new QLabel(QObject::tr("Dialing number: %1").arg(m_profile.readEntry("Number")), this);
progress = new QProgressBar(this);
status = new QLabel("", this);
status->setFrameStyle(QFrame::Panel | QFrame::Sunken);
cancel = new QPushButton(QObject::tr("Cancel"), this);
vbox = new QVBoxLayout(this, 2);
vbox->add(desc);
vbox->add(progress);
@@ -51,30 +73,33 @@ Dialer::Dialer(const QString& number, QWidget *parent, const char *name)
}
Dialer::~Dialer()
{
}
void Dialer::slotCancel()
{
- if(state != state_online) reset();
+ if(state != state_online)
+ {
+ usercancel = 1;
+ reset();
+ }
else accept();
}
void Dialer::reset()
{
switchState(state_cancel);
- usercancel = 1;
}
void Dialer::slotAutostart()
{
state = state_preinit;
- dial(m_number);
+ dial(m_profile.readEntry("Number"));
}
void Dialer::dial(const QString& number)
{
while(state != state_online)
{
if(!usercancel)
{
@@ -132,17 +157,30 @@ void Dialer::trydial(const QString& number)
if(state != state_cancel)
{
switchState(state_online);
}
}
void Dialer::send(const QString& msg)
{
+ QString m = msg;
+ int bytes;
+ QString termination;
+ termination = m_profile.readEntry("Termination");
+ if(termination == "\n") m = m + "\n";
+ else if(termination == "\r") m = m + "\r";
+ else m = m + "\r\n";
+
+ bytes = write(0, m.local8Bit(), strlen(m.local8Bit()));
+ if(bytes < 0)
+ {
+ reset();
+ }
}
QString Dialer::receive()
{
for(int i = 0; i < 200000;i++)
qApp->processEvents();
return QString::null;
}
diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h
index 20fb3c3..8c83bb6 100644
--- a/noncore/apps/opie-console/dialer.h
+++ b/noncore/apps/opie-console/dialer.h
@@ -1,21 +1,23 @@
#ifndef DIALER_H
#define DIALER_H
#include <qdialog.h>
+#include "profile.h"
+
class QLabel;
class QProgressBar;
class Dialer : public QDialog
{
Q_OBJECT
public:
- Dialer(const QString& number, QWidget *parent = NULL, const char *name = NULL);
+ Dialer(const Profile& profile, QWidget *parent = NULL, const char *name = NULL);
~Dialer();
public slots:
void slotCancel();
void slotAutostart();
private:
void switchState(int newstate);
@@ -37,13 +39,13 @@ class Dialer : public QDialog
state_online
};
QLabel *status;
QProgressBar *progress;
QPushButton *cancel;
int state;
int usercancel;
- QString m_number;
+ Profile m_profile;
};
#endif
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 4d6035d..41febfb 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -1,32 +1,39 @@
#include "io_modem.h"
-IOModem:IOModem( const Profile &config ) : IOSerial( config ) {
+#include "dialer.h"
+IOModem:IOModem( const Profile &config ) : IOSerial( config ) {
+ m_config = config;
}
IOModem::~IOModem() {
}
void IOModem::close() {
IOSerial::close();
}
bool IOModem::open() {
-
-
IOSerial::open();
+ Dialer d(m_profile);
+ int result = d.exec();
+ if(result == QDialog::Accepted)
+ {
+ return true;
+ }
+ else return false;
}
void IOModem::reload( const Profile &config ) {
m_device = config.readEntry("Device", MODEM_DEFAULT_DEVICE);
m_baud = config.readNumEntry("Baud", MODEM_DEFAULT_BAUD);
m_parity = config.readNumEntry("Parity", MODEM_DEFAULT_PARITY);
m_dbits = config.readNumEntry("DataBits", MODEM_DEFAULT_DBITS);
m_sbits = config.readNumEntry("StopBits", MODEM_DEFAULT_SBITS);
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index f155eb1..6d44349 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -55,15 +55,16 @@ public slots:
void reload(const Profile &);
private:
QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
m_dialSuf2, dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel;
int m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime,
m_bpsDetect, m_dcdLines, m_multiLineUntag;
+ const Profile& m_profile;
private slots:
void slotExited(OProcess* proc);
};
#endif
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 0b4676b..ef6bc21 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -27,17 +27,18 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h\
terminalwidget.h \
iolayerbase.h \
serialconfigwidget.h irdaconfigwidget.h \
btconfigwidget.h modemconfigwidget.h \
atconfigdialog.h dialdialog.h \
emulation_widget.h procctl.h \
function_keyboard.h \
receive_layer.h filereceive.h \
- script.h
+ script.h \
+ dialer.h
SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \
file_layer.cpp filetransfer.cpp \
main.cpp \
metafactory.cpp \
session.cpp \
mainwindow.cpp \
profile.cpp \
@@ -57,16 +58,17 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \
terminalwidget.cpp \
iolayerbase.cpp \
serialconfigwidget.cpp irdaconfigwidget.cpp \
btconfigwidget.cpp modemconfigwidget.cpp \
atconfigdialog.cpp dialdialog.cpp \
emulation_widget.cpp default.cpp procctl.cpp \
function_keyboard.cpp \
receive_layer.cpp filereceive.cpp \
- script.cpp
+ script.cpp \
+ dialer.cpp
INTERFACES = configurebase.ui editbase.ui
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopie
TARGET = opie-console