Diffstat (limited to 'noncore/apps/opie-console/iolayerbase.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/iolayerbase.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp index ec88b49..08acb75 100644 --- a/noncore/apps/opie-console/iolayerbase.cpp +++ b/noncore/apps/opie-console/iolayerbase.cpp | |||
@@ -6,12 +6,13 @@ | |||
6 | #include <qradiobutton.h> | 6 | #include <qradiobutton.h> |
7 | 7 | ||
8 | #include "iolayerbase.h" | 8 | #include "iolayerbase.h" |
9 | 9 | ||
10 | namespace { | 10 | namespace { |
11 | enum ParityIds { | 11 | enum ParityIds { |
12 | id_parity_none, | ||
12 | id_parity_odd, | 13 | id_parity_odd, |
13 | id_parity_even | 14 | id_parity_even |
14 | }; | 15 | }; |
15 | 16 | ||
16 | enum FlowIds { | 17 | enum FlowIds { |
17 | id_flow_hw, | 18 | id_flow_hw, |
@@ -39,12 +40,13 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
39 | m_groupFlow = new QButtonGroup(tr("Flow control"),this ); | 40 | m_groupFlow = new QButtonGroup(tr("Flow control"),this ); |
40 | m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow ); | 41 | m_flowHw = new QRadioButton(tr("Hardware"), m_groupFlow ); |
41 | m_flowSw = new QRadioButton(tr("Software"), m_groupFlow ); | 42 | m_flowSw = new QRadioButton(tr("Software"), m_groupFlow ); |
42 | m_flowNone = new QRadioButton( tr("None"), m_groupFlow ); | 43 | m_flowNone = new QRadioButton( tr("None"), m_groupFlow ); |
43 | 44 | ||
44 | m_groupParity = new QButtonGroup(tr("Parity"), this ); | 45 | m_groupParity = new QButtonGroup(tr("Parity"), this ); |
46 | m_parityNone = new QRadioButton(tr("None"), m_groupParity ); | ||
45 | m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity ); | 47 | m_parityOdd = new QRadioButton(tr("Odd"), m_groupParity ); |
46 | m_parityEven = new QRadioButton(tr("Even"), m_groupParity ); | 48 | m_parityEven = new QRadioButton(tr("Even"), m_groupParity ); |
47 | 49 | ||
48 | m_lroot = new QVBoxLayout( this ); | 50 | m_lroot = new QVBoxLayout( this ); |
49 | m_lroot->add(m_speedLabel ); | 51 | m_lroot->add(m_speedLabel ); |
50 | m_lroot->add(m_speedBox ); | 52 | m_lroot->add(m_speedBox ); |
@@ -58,12 +60,13 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name ) | |||
58 | m_lroot->add(m_groupFlow ); | 60 | m_lroot->add(m_groupFlow ); |
59 | m_lroot->setStretchFactor(m_groupFlow, 2 ); | 61 | m_lroot->setStretchFactor(m_groupFlow, 2 ); |
60 | 62 | ||
61 | m_hboxPar = new QHBoxLayout( m_groupParity, 2 ); | 63 | m_hboxPar = new QHBoxLayout( m_groupParity, 2 ); |
62 | m_hboxPar->add(m_parityOdd ); | 64 | m_hboxPar->add(m_parityOdd ); |
63 | m_hboxPar->add(m_parityEven ); | 65 | m_hboxPar->add(m_parityEven ); |
66 | m_hboxPar->add(m_parityNone ); | ||
64 | m_lroot->add(m_groupParity ); | 67 | m_lroot->add(m_groupParity ); |
65 | m_lroot->setStretchFactor(m_groupParity, 2 ); | 68 | m_lroot->setStretchFactor(m_groupParity, 2 ); |
66 | 69 | ||
67 | // profiles | 70 | // profiles |
68 | m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 ); | 71 | m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 ); |
69 | m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 ); | 72 | m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 ); |
@@ -87,12 +90,15 @@ void IOLayerBase::setFlow( Flow flo ) { | |||
87 | break; | 90 | break; |
88 | } | 91 | } |
89 | } | 92 | } |
90 | 93 | ||
91 | void IOLayerBase::setParity( Parity par ) { | 94 | void IOLayerBase::setParity( Parity par ) { |
92 | switch( par ) { | 95 | switch( par ) { |
96 | case NonePar: | ||
97 | m_parityNone->setChecked( true ); | ||
98 | break; | ||
93 | case Odd: | 99 | case Odd: |
94 | m_parityOdd->setChecked( true ); | 100 | m_parityOdd->setChecked( true ); |
95 | break; | 101 | break; |
96 | case Even: | 102 | case Even: |
97 | m_parityEven->setChecked( true ); | 103 | m_parityEven->setChecked( true ); |
98 | break; | 104 | break; |
@@ -129,16 +135,19 @@ IOLayerBase::Flow IOLayerBase::flow()const { | |||
129 | } else { | 135 | } else { |
130 | qWarning("None"); | 136 | qWarning("None"); |
131 | return None; | 137 | return None; |
132 | } | 138 | } |
133 | } | 139 | } |
134 | IOLayerBase::Parity IOLayerBase::parity()const { | 140 | IOLayerBase::Parity IOLayerBase::parity()const { |
135 | if (m_parityOdd->isChecked() ) | 141 | if ( m_parityOdd->isChecked() ) { |
136 | return Odd; | 142 | return Odd; |
137 | else | 143 | } else if ( m_parityEven->isChecked() ) { |
138 | return Even; | 144 | return Even; |
145 | } else { | ||
146 | return NonePar; | ||
147 | } | ||
139 | 148 | ||
140 | } | 149 | } |
141 | IOLayerBase::Speed IOLayerBase::speed()const{ | 150 | IOLayerBase::Speed IOLayerBase::speed()const{ |
142 | switch( m_speedBox->currentItem() ) { | 151 | switch( m_speedBox->currentItem() ) { |
143 | case id_baud_115200: | 152 | case id_baud_115200: |
144 | return Baud_115200; | 153 | return Baud_115200; |