author | harlekin <harlekin> | 2002-10-13 21:10:15 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-13 21:10:15 (UTC) |
commit | 5a6ecdac2e62708b55300ca6eef8441fea0a7b05 (patch) (side-by-side diff) | |
tree | 003577346dc8f9c73f1d86d8dd9d5038d6995662 /noncore | |
parent | 03c81e6d55d1a837e543a00f6e0a7334e96f1eef (diff) | |
download | opie-5a6ecdac2e62708b55300ca6eef8441fea0a7b05.zip opie-5a6ecdac2e62708b55300ca6eef8441fea0a7b05.tar.gz opie-5a6ecdac2e62708b55300ca6eef8441fea0a7b05.tar.bz2 |
fixes to modem stuff
-rw-r--r-- | noncore/apps/opie-console/atconfigdialog.cpp | 41 | ||||
-rw-r--r-- | noncore/apps/opie-console/atconfigdialog.h | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_modem.cpp | 16 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.cpp | 23 | ||||
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.h | 6 |
6 files changed, 58 insertions, 39 deletions
diff --git a/noncore/apps/opie-console/atconfigdialog.cpp b/noncore/apps/opie-console/atconfigdialog.cpp index ef6d1ae..87a08f6 100644 --- a/noncore/apps/opie-console/atconfigdialog.cpp +++ b/noncore/apps/opie-console/atconfigdialog.cpp @@ -151,8 +151,8 @@ QWidget* ATConfigDialog::tab1( QWidget* parent ) { } -void ATConfigDialog::readConfig() { -/* +void ATConfigDialog::readConfig( const Profile& config ) { + 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 ) ); @@ -161,19 +161,36 @@ void ATConfigDialog::readConfig() { 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 ) ); + connectLine->setText( config.readEntry("DefaultConnect", MODEM_DEFAULT_CONNECT_STRING ) ); hangupLine->setText( config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) ); - dialTimeSpin; - delayRedialSpin; - numberTriesSpin; - dtrDropTimeSpin; - bpsDetectBox; - cdLinesBox; - multiLineUntagBox; -*/ + dialTimeSpin->setValue( config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ) ); + delayRedialSpin->setValue( config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ) ); + numberTriesSpin->setValue( config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ) ); + dtrDropTimeSpin->setValue( config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ) ); + bpsDetectBox->setCurrentItem( config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ) ); + dcdLinesBox->setCurrentItem( config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ) ); + multiLineUntagBox->setCurrentItem( config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ) ); } -void ATConfigDialog::writeConfig() { +void ATConfigDialog::writeConfig( Profile& config ) { + + config.writeEntry( "InitString", initStringLine->text() ); + config.writeEntry( "ResetString", resetStringLine->text() ); + config.writeEntry( "DialPrefix1", dialPref1Line->text() ); + config.writeEntry( "DialSuffix1", dialSuf1Line->text() ); + config.writeEntry( "DialPrefix2", dialPref2Line->text() ); + config.writeEntry( "DialSuffix2", dialSuf2Line->text() ); + config.writeEntry( "DialPrefix3", dialPref3Line->text() ); + config.writeEntry( "DialSuffix3", dialSuf3Line->text() ); + config.writeEntry( "DefaultConnect", connectLine->text() ); + config.writeEntry( "HangupString", hangupLine->text() ); + config.writeEntry( "DialTime", dialTimeSpin->value() ); + config.writeEntry( "DelayRedial", delayRedialSpin->value() ); + config.writeEntry( "NumberTries", numberTriesSpin->value() ); + config.writeEntry( "DTRDRopTime", dtrDropTimeSpin->value() ); + config.writeEntry( "BPSDetect", bpsDetectBox->currentItem() ); + config.writeEntry( "DCDLines", dcdLinesBox->currentItem() ); + config.writeEntry( "MultiLineUntag", multiLineUntagBox->currentItem() ); } diff --git a/noncore/apps/opie-console/atconfigdialog.h b/noncore/apps/opie-console/atconfigdialog.h index 47ff01d..4dd033b 100644 --- a/noncore/apps/opie-console/atconfigdialog.h +++ b/noncore/apps/opie-console/atconfigdialog.h @@ -3,6 +3,7 @@ #define ATCONFIGDIALOG_H #include <qdialog.h> +#include "profile.h" #define MODEM_DEFAULT_INIT_STRING "~^M~ATZ^M~" #define MODEM_DEFAULT_RESET_STRING "~^M~ATZ^M~" @@ -36,8 +37,8 @@ public: ~ATConfigDialog(); - void readConfig(); - void writeConfig(); + void readConfig( const Profile& ); + void writeConfig( Profile& ); private: QWidget *tab0( QWidget* parent); diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp index 41febfb..eb0aeb7 100644 --- a/noncore/apps/opie-console/io_modem.cpp +++ b/noncore/apps/opie-console/io_modem.cpp @@ -49,14 +49,14 @@ void IOModem::reload( const Profile &config ) { m_dialSuf3 = config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ); m_connect = config.readEntry("DefaultConnect" MODEM_DEFAULT_CONNECT_STRING ); m_hangup = config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ); - m_cancel = config.readEntry("CancelString" MODEM_DEFAULT_CANCEL_STRING ); - m_dialTime = config.readEntry("DialTime" MODEM_DEFAULT_DIAL_TIME ); - m_delayRedial = config.readEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); - m_numberTries = config.readEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ); - m_dtrDropTime = config.readEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ); - m_bpsDetect = config.readEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ); - m_dcdLines = config.readEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ); - m_multiLineUntag = config.readEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ); + m_cancel = config.readEntry("CancelString", MODEM_DEFAULT_CANCEL_STRING ); + m_dialTime = config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ); + m_delayRedial = config.readNumEntry("DelayRedial", MODEM_DEFAULT_DELAY_REDIAL ); + m_numberTries = config.readNumEntry("NumberTries", MODEM_DEFAULT_NUMBER_TRIES ); + m_dtrDropTime = config.readNumEntry("DTRDRopTime", MODEM_DEFAULT_DTR_DROP_TIME ); + m_bpsDetect = config.readBoolEntry("BPSDetect", MODEM_DEFAULT_BPS_DETECT ); + m_dcdLines = config.readBoolEntry("DCDLines", MODEM_DEFAULT_DCD_LINES ); + m_multiLineUntag = config.readBoolEntry("MultiLineUntag", MODEM_DEFAULT_MULTI_LINE_UNTAG ); } diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index bfd1c2e..27bcc09 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp @@ -316,11 +316,11 @@ void MainWindow::create( const Profile& prof ) { void MainWindow::slotTransfer() { - if ( currentSession() ) { + // if ( currentSession() ) { TransferDialog dlg(this); - //dlg.showMaximized(); + dlg.showMaximized(); dlg.exec(); - } + // } } diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp index 0968f62..ac62e45 100644 --- a/noncore/apps/opie-console/modemconfigwidget.cpp +++ b/noncore/apps/opie-console/modemconfigwidget.cpp @@ -5,9 +5,8 @@ #include <qpushbutton.h> #include <qhbox.h> -#include "iolayerbase.h" + #include "modemconfigwidget.h" -#include "atconfigdialog.h" #include "dialdialog.h" namespace { @@ -24,8 +23,7 @@ namespace { } } -ModemConfigWidget::ModemConfigWidget( const QString& name, - QWidget* parent, +ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent, const char* na ) : ProfileDialogConnectionWidget( name, parent, na ) { @@ -60,7 +58,7 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, m_deviceCmb->insertItem( "/dev/ttyS1" ); m_deviceCmb->insertItem( "/dev/ttyS2" ); - + atConf = new ATConfigDialog( this, "ATConfig", true ); } ModemConfigWidget::~ModemConfigWidget() { @@ -110,10 +108,14 @@ void ModemConfigWidget::load( const Profile& prof ) { break; } - if ( prof.readEntry("Device").isEmpty() ) return; + if ( prof.readEntry( "Device" ).isEmpty() ) { + return; + } setCurrent( prof.readEntry("Device"), m_deviceCmb ); + atConf->readConfig( prof ); } + /* * save speed, * flow, @@ -170,11 +172,10 @@ void ModemConfigWidget::save( Profile& prof ) { } void ModemConfigWidget::slotAT() { - ATConfigDialog conf( this, "ATConfig", true ); - conf.readConfig(); - conf.showMaximized(); - if ( conf.exec() == QDialog::Accepted ) { - conf.writeConfig(); + // ATConfigDialog conf( this, "ATConfig", true ); + atConf->showMaximized(); + if ( atConf->exec() == QDialog::Accepted ) { + // atConf->writeConfig(); } } diff --git a/noncore/apps/opie-console/modemconfigwidget.h b/noncore/apps/opie-console/modemconfigwidget.h index 1363f78..4fdde0c 100644 --- a/noncore/apps/opie-console/modemconfigwidget.h +++ b/noncore/apps/opie-console/modemconfigwidget.h @@ -2,7 +2,8 @@ #define OPIE_MODEM_CONFIG_WIDGET_H #include "profiledialogwidget.h" - +#include "iolayerbase.h" +#include "atconfigdialog.h" class QVBoxLayout; class QLabel; @@ -25,8 +26,7 @@ private: QComboBox* m_deviceCmb; IOLayerBase* m_base; QLineEdit* m_telNumber; - - + ATConfigDialog *atConf; private slots: void slotAT(); void slotDial(); |