Diffstat (limited to 'noncore/apps/opie-console/modemconfigwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/modemconfigwidget.cpp | 71 |
1 files changed, 36 insertions, 35 deletions
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 @@ -6,7 +6,6 @@ #include <qhbox.h> -#include "iolayerbase.h" + #include "modemconfigwidget.h" -#include "atconfigdialog.h" #include "dialdialog.h" @@ -25,28 +24,27 @@ namespace { } -ModemConfigWidget::ModemConfigWidget( const QString& name, - QWidget* parent, +ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent, const char* na ) : ProfileDialogConnectionWidget( name, parent, na ) { - m_lay = new QVBoxLayout(this ); - m_device = new QLabel(tr("Modem is attached to:"), this ); + m_lay = new QVBoxLayout( this ); + m_device = new QLabel(tr( "Modem is attached to:" ), this ); m_deviceCmb = new QComboBox(this ); m_deviceCmb->setEditable( TRUE ); QLabel* telLabel = new QLabel( this ); - telLabel->setText( tr("Enter telefon number here:") ); + telLabel->setText( tr( "Enter telefon number here:" ) ); m_telNumber = new QLineEdit( this ); QHBox *buttonBox = new QHBox( this ); QPushButton *atButton = new QPushButton( buttonBox ); - atButton->setText( tr("AT commands") ); + atButton->setText( tr( "AT commands" ) ); connect( atButton, SIGNAL( clicked() ), this, SLOT( slotAT() ) ); QPushButton *dialButton = new QPushButton( buttonBox ); - dialButton->setText( tr("Enter number") ); + dialButton->setText( tr( "Enter number" ) ); connect( dialButton, SIGNAL( clicked() ), this, SLOT( slotDial() ) ); - m_base = new IOLayerBase(this, "base"); + m_base = new IOLayerBase( this, "base" ); m_lay->addWidget( m_device ); @@ -61,5 +59,5 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, m_deviceCmb->insertItem( "/dev/ttyS2" ); - + atConf = new ATConfigDialog( this, "ATConfig", true ); } @@ -69,14 +67,14 @@ ModemConfigWidget::~ModemConfigWidget() { void ModemConfigWidget::load( const Profile& prof ) { - int rad_flow = prof.readNumEntry("Flow"); - int rad_parity = prof.readNumEntry("Parity"); - int speed = prof.readNumEntry("Speed"); - QString number = prof.readEntry("Number"); + int rad_flow = prof.readNumEntry( "Flow" ); + int rad_parity = prof.readNumEntry( "Parity" ); + int speed = prof.readNumEntry( "Speed" ); + QString number = prof.readEntry( "Number" ); - if (!number.isEmpty() ) { + if ( !number.isEmpty() ) { m_telNumber->setText( number ); } - if (rad_flow == 1) { + if ( rad_flow == 1 ) { m_base->setFlow( IOLayerBase::Hardware ); } else if (rad_flow == 2) { @@ -86,5 +84,5 @@ void ModemConfigWidget::load( const Profile& prof ) { } - if (rad_parity == 1) { + if ( rad_parity == 1 ) { m_base->setParity( IOLayerBase::Even ); } else { @@ -94,25 +92,29 @@ void ModemConfigWidget::load( const Profile& prof ) { switch( speed ) { case 115200: - m_base->setSpeed(IOLayerBase::Baud_115200 ); + m_base->setSpeed( IOLayerBase::Baud_115200 ); break; case 57600: - m_base->setSpeed( IOLayerBase::Baud_57600 ); + m_base->setSpeed( IOLayerBase::Baud_57600 ); break; case 38400: - m_base->setSpeed(IOLayerBase::Baud_38400 ); + m_base->setSpeed( IOLayerBase::Baud_38400 ); break; case 19200: - m_base->setSpeed( IOLayerBase::Baud_19200 ); + m_base->setSpeed( IOLayerBase::Baud_19200 ); break; case 9600: default: - m_base->setSpeed(IOLayerBase::Baud_9600 ); + m_base->setSpeed( IOLayerBase::Baud_9600 ); break; } - if ( prof.readEntry("Device").isEmpty() ) return; - setCurrent( prof.readEntry("Device"), m_deviceCmb ); + if ( prof.readEntry( "Device" ).isEmpty() ) { + return; + } + setCurrent( prof.readEntry( "Device" ), m_deviceCmb ); + atConf->readConfig( prof ); } + /* * save speed, @@ -122,5 +124,5 @@ void ModemConfigWidget::load( const Profile& prof ) { void ModemConfigWidget::save( Profile& prof ) { int flow, parity, speed; - prof.writeEntry("Device", m_deviceCmb->currentText() ); + prof.writeEntry( "Device", m_deviceCmb->currentText() ); @@ -164,16 +166,15 @@ void ModemConfigWidget::save( Profile& prof ) { } - prof.writeEntry("Flow", flow); - prof.writeEntry("Parity", parity); - prof.writeEntry("Speed", speed); - prof.writeEntry("Number", m_telNumber->text() ); + prof.writeEntry( "Flow", flow ); + prof.writeEntry( "Parity", parity ); + prof.writeEntry( "Speed", speed ); + prof.writeEntry( "Number", m_telNumber->text() ); } 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(); } } |