summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/iolayerbase.cpp102
-rw-r--r--noncore/apps/opie-console/iolayerbase.h11
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp62
-rw-r--r--noncore/apps/opie-console/serialconfigwidget.cpp53
4 files changed, 204 insertions, 24 deletions
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index 47f9e76..ba7c86e 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -5,4 +5,5 @@
#include <qhbuttongroup.h>
#include <qradiobutton.h>
+#include <qhbox.h>
#include "iolayerbase.h"
@@ -29,4 +30,17 @@ namespace {
};
+ enum DataIds {
+ id_data_5,
+ id_data_6,
+ id_data_7,
+ id_data_8
+ };
+
+ enum StopIds {
+ id_stop_1,
+ id_stop_1_5,
+ id_stop_2
+ };
+
}
@@ -38,33 +52,33 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name )
m_speedBox = new QComboBox(this );
- m_groupFlow = new QButtonGroup(tr("Flow control"),this );
+ m_groupFlow = new QHButtonGroup(tr("Flow control"),this );
m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow );
m_flowSw = new QRadioButton(tr("Software"), m_groupFlow );
m_flowNone = new QRadioButton( tr("None"), m_groupFlow );
- m_groupParity = new QButtonGroup(tr("Parity"), this );
+ m_groupParity = new QHButtonGroup(tr("Parity"), this );
m_parityNone = new QRadioButton(tr("None"), m_groupParity );
m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity );
m_parityEven = new QRadioButton(tr("Even"), m_groupParity );
+ m_groupData = new QHButtonGroup(tr("Data Bits"), this);
+ m_data5 = new QRadioButton(tr("5"), m_groupData );
+ m_data6 = new QRadioButton(tr("6"), m_groupData );
+ m_data7 = new QRadioButton(tr("7"), m_groupData );
+ m_data8 = new QRadioButton(tr("8"), m_groupData );
+
+ m_groupStop = new QHButtonGroup(tr("Stop Bits"), this );
+ m_stop1 = new QRadioButton(tr("1"), m_groupStop );
+ m_stop15 = new QRadioButton(tr("1.5"), m_groupStop );
+ m_stop2 = new QRadioButton(tr("2"), m_groupStop );
+
+
m_lroot = new QVBoxLayout( this );
m_lroot->add(m_speedLabel );
m_lroot->add(m_speedBox );
- m_lroot->setStretchFactor(m_speedLabel, 1);
- m_lroot->setStretchFactor(m_speedBox, 1 );
-
- m_hbox = new QHBoxLayout(m_groupFlow, 2 );
- m_hbox->add(m_flowHw );
- m_hbox->add(m_flowSw );
- m_hbox->add(m_flowNone );
m_lroot->add(m_groupFlow );
- m_lroot->setStretchFactor(m_groupFlow, 2 );
-
- m_hboxPar = new QHBoxLayout( m_groupParity, 2 );
- m_hboxPar->add(m_parityOdd );
- m_hboxPar->add(m_parityEven );
- m_hboxPar->add(m_parityNone );
m_lroot->add(m_groupParity );
- m_lroot->setStretchFactor(m_groupParity, 2 );
+ m_lroot->add( m_groupData );
+ m_lroot->add( m_groupStop );
m_lroot->addStretch(2);
@@ -129,4 +143,39 @@ void IOLayerBase::setSpeed( Speed sp ) {
m_speedBox->setCurrentItem(index );
}
+
+void IOLayerBase::setData( Data data ) {
+ switch( data ) {
+ case Data_Five:
+ m_data5->setChecked( true );
+ break;
+ case Data_Six:
+ m_data6->setChecked( true );
+ break;
+ case Data_Seven:
+ m_data7->setChecked( true );
+ break;
+ default:
+ m_data8->setChecked( true );
+ break;
+ }
+}
+
+
+void IOLayerBase::setStop( Stop stop ) {
+ switch( stop ) {
+ case Stop_Two:
+ m_stop2->setChecked( true );
+ break;
+ case Stop_OnePointFive:
+ m_stop15->setChecked( true );
+ break;
+ default:
+ m_stop1->setChecked( true );
+ break;
+ }
+}
+
+
+
IOLayerBase::Flow IOLayerBase::flow()const {
if (m_flowHw->isChecked() ) {
@@ -168,2 +217,23 @@ IOLayerBase::Speed IOLayerBase::speed()const{
}
}
+IOLayerBase::Data IOLayerBase::data()const {
+ if ( m_data5->isChecked() ) {
+ return Data_Five;
+ } else if ( m_data6->isChecked() ) {
+ return Data_Six;
+ } else if ( m_data7->isChecked() ) {
+ return Data_Seven;
+ } else {
+ return Data_Eight;
+ }
+}
+IOLayerBase::Stop IOLayerBase::stop()const {
+ if ( m_stop2->isChecked() ) {
+ return Stop_Two;
+ } else if ( m_stop15->isChecked() ) {
+ return Stop_OnePointFive;
+ } else {
+ return Stop_One;
+ }
+}
+
diff --git a/noncore/apps/opie-console/iolayerbase.h b/noncore/apps/opie-console/iolayerbase.h
index 74de46a..e1b96df 100644
--- a/noncore/apps/opie-console/iolayerbase.h
+++ b/noncore/apps/opie-console/iolayerbase.h
@@ -23,4 +23,7 @@ public:
Baud_19200,
Baud_9600 };
+ enum Data { Data_Five =5, Data_Six =6, Data_Seven=7, Data_Eight=8 };
+ enum Stop { Stop_One =1, Stop_OnePointFive=15, Stop_Two=2 };
+
IOLayerBase( QWidget* base, const char* name = 0l);
~IOLayerBase();
@@ -29,17 +32,23 @@ public:
void setParity( Parity par );
void setSpeed( Speed speed );
+ void setData( Data data );
+ void setStop( Stop stop );
Flow flow()const;
Parity parity()const;
Speed speed()const;
+ Data data()const;
+ Stop stop()const;
private:
QVBoxLayout* m_lroot;
QLabel* m_speedLabel;
QComboBox* m_speedBox;
- QButtonGroup* m_groupFlow;
+ QButtonGroup* m_groupFlow, *m_groupData, *m_groupStop ;
QRadioButton *m_flowHw, *m_flowSw, *m_flowNone;
QButtonGroup* m_groupParity;
QRadioButton *m_parityOdd, *m_parityEven, *m_parityNone;
+ QRadioButton *m_data5, *m_data6, *m_data7, *m_data8;
+ QRadioButton *m_stop1, *m_stop15, *m_stop2;
QHBoxLayout* m_hbox;
QHBoxLayout* m_hboxPar;
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index ec83b9f..ce44dab 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -35,6 +35,7 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent,
QLabel* telLabel = new QLabel( this );
telLabel->setText( tr( "Enter telefon number here:" ) );
- m_telNumber = new QLineEdit( this );
+ // m_telNumber = new QLineEdit( this );
QHBox *buttonBox = new QHBox( this );
+ m_telNumber = new QLineEdit( buttonBox );
QPushButton *atButton = new QPushButton( buttonBox );
atButton->setText( tr( "AT commands" ) );
@@ -47,5 +48,4 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent,
connect( dialButton, SIGNAL( clicked() ), this, SLOT( slotDial() ) );
-
m_base = new IOLayerBase( this, "base" );
@@ -53,7 +53,7 @@ ModemConfigWidget::ModemConfigWidget( const QString& name, QWidget* parent,
m_lay->addWidget( m_deviceCmb );
m_lay->addWidget( telLabel );
- m_lay->addWidget( m_telNumber );
m_lay->addWidget( buttonBox );
m_lay->addWidget( m_base );
+ m_lay->addStretch( 0 );
m_deviceCmb->insertItem( "/dev/ttyS0" );
@@ -72,4 +72,6 @@ void ModemConfigWidget::load( const Profile& prof ) {
int rad_parity = prof.readNumEntry( "Parity" );
int speed = prof.readNumEntry( "Speed" );
+ int dbits = prof.readNumEntry("DataBits");
+ int sbits = prof.readNumEntry("StopBits");
QString number = prof.readEntry( "Number" );
@@ -114,4 +116,25 @@ void ModemConfigWidget::load( const Profile& prof ) {
}
+
+ if ( dbits == 5) {
+ m_base->setData( IOLayerBase::Data_Five );
+ } else if (rad_flow == 6) {
+ m_base->setData( IOLayerBase::Data_Six );
+ } else if (rad_flow == 7) {
+ m_base->setData( IOLayerBase::Data_Seven );
+ } else {
+ m_base->setData( IOLayerBase::Data_Eight );
+ }
+
+ if ( sbits == 2) {
+ m_base->setStop( IOLayerBase::Stop_Two );
+ } else if ( sbits == 15 ) {
+ m_base->setStop( IOLayerBase::Stop_OnePointFive );
+ } else {
+ m_base->setStop( IOLayerBase::Stop_One );
+ }
+
+
+
if ( prof.readEntry( "Device" ).isEmpty() ) {
return;
@@ -128,6 +151,6 @@ void ModemConfigWidget::load( const Profile& prof ) {
*/
void ModemConfigWidget::save( Profile& prof ) {
- int flow, parity, speed;
- flow = parity = speed = 0;
+ int flow, parity, speed, data, stop;
+ flow = parity = speed = data = stop = 0;
prof.writeEntry( "Device", m_deviceCmb->currentText() );
@@ -175,7 +198,36 @@ void ModemConfigWidget::save( Profile& prof ) {
}
+ switch( m_base->data() ) {
+ case IOLayerBase::Data_Five:
+ data = 5;
+ break;
+ case IOLayerBase::Data_Six:
+ data = 6;
+ break;
+ case IOLayerBase::Data_Seven:
+ data = 7;
+ break;
+ case IOLayerBase::Data_Eight:
+ data = 8;
+ break;
+ }
+
+ switch( m_base->stop() ) {
+ case IOLayerBase::Stop_One:
+ stop = 1;
+ break;
+ case IOLayerBase::Stop_OnePointFive:
+ stop = 15;
+ break;
+ case IOLayerBase::Stop_Two:
+ stop = 2;
+ break;
+ }
+
prof.writeEntry( "Flow", flow );
prof.writeEntry( "Parity", parity );
prof.writeEntry( "Speed", speed );
+ prof.writeEntry("DataBits", data);
+ prof.writeEntry("StopBits", stop);
prof.writeEntry( "Number", m_telNumber->text() );
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index 5c6d975..3edf723 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -51,4 +51,6 @@ void SerialConfigWidget::load( const Profile& prof ) {
int rad_parity = prof.readNumEntry("Parity");
int speed = prof.readNumEntry("Speed");
+ int dbits = prof.readNumEntry("DataBits");
+ int sbits = prof.readNumEntry("StopBits");
if (rad_flow == 1) {
@@ -87,4 +89,22 @@ void SerialConfigWidget::load( const Profile& prof ) {
}
+ if ( dbits == 5) {
+ m_base->setData( IOLayerBase::Data_Five );
+ } else if (rad_flow == 6) {
+ m_base->setData( IOLayerBase::Data_Six );
+ } else if (rad_flow == 7) {
+ m_base->setData( IOLayerBase::Data_Seven );
+ } else {
+ m_base->setData( IOLayerBase::Data_Eight );
+ }
+
+ if ( sbits == 2) {
+ m_base->setStop( IOLayerBase::Stop_Two );
+ } else if ( sbits == 15 ) {
+ m_base->setStop( IOLayerBase::Stop_OnePointFive );
+ } else {
+ m_base->setStop( IOLayerBase::Stop_One );
+ }
+
if ( prof.readEntry("Device").isEmpty() ) return;
setCurrent( prof.readEntry("Device"), m_deviceCmb );
@@ -97,6 +117,6 @@ void SerialConfigWidget::load( const Profile& prof ) {
*/
void SerialConfigWidget::save( Profile& prof ) {
- int flow, parity, speed ;
- flow = parity = speed = 0;
+ int flow, parity, speed, data, stop;
+ flow = parity = speed = data = stop = 0;
prof.writeEntry("Device", m_deviceCmb->currentText() );
@@ -144,6 +164,35 @@ void SerialConfigWidget::save( Profile& prof ) {
}
+ switch( m_base->data() ) {
+ case IOLayerBase::Data_Five:
+ data = 5;
+ break;
+ case IOLayerBase::Data_Six:
+ data = 6;
+ break;
+ case IOLayerBase::Data_Seven:
+ data = 7;
+ break;
+ case IOLayerBase::Data_Eight:
+ data = 8;
+ break;
+ }
+
+ switch( m_base->stop() ) {
+ case IOLayerBase::Stop_One:
+ stop = 1;
+ break;
+ case IOLayerBase::Stop_OnePointFive:
+ stop = 15;
+ break;
+ case IOLayerBase::Stop_Two:
+ stop = 2;
+ break;
+ }
+
prof.writeEntry("Flow", flow);
prof.writeEntry("Parity", parity);
prof.writeEntry("Speed", speed);
+ prof.writeEntry("DataBits", data);
+ prof.writeEntry("StopBits", stop);
}