summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/btconfigwidget.cpp6
-rw-r--r--noncore/apps/opie-console/iolayerbase.cpp10
-rw-r--r--noncore/apps/opie-console/iolayerbase.h3
-rw-r--r--noncore/apps/opie-console/irdaconfigwidget.cpp6
-rw-r--r--noncore/apps/opie-console/modemconfigwidget.cpp5
-rw-r--r--noncore/apps/opie-console/serialconfigwidget.cpp6
6 files changed, 34 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/btconfigwidget.cpp b/noncore/apps/opie-console/btconfigwidget.cpp
index e1ff18a..7f82e06 100644
--- a/noncore/apps/opie-console/btconfigwidget.cpp
+++ b/noncore/apps/opie-console/btconfigwidget.cpp
@@ -96,24 +96,27 @@ void BTConfigWidget::load( const Profile& prof ) {
96 case 38400: 96 case 38400:
97 m_base->setSpeed(IOLayerBase::Baud_38400 ); 97 m_base->setSpeed(IOLayerBase::Baud_38400 );
98 break; 98 break;
99 case 19200: 99 case 19200:
100 m_base->setSpeed( IOLayerBase::Baud_19200 ); 100 m_base->setSpeed( IOLayerBase::Baud_19200 );
101 break; 101 break;
102 case 4800: 102 case 4800:
103 m_base->setSpeed( IOLayerBase::Baud_4800 ); 103 m_base->setSpeed( IOLayerBase::Baud_4800 );
104 break; 104 break;
105 case 2400: 105 case 2400:
106 m_base->setSpeed( IOLayerBase::Baud_2400 ); 106 m_base->setSpeed( IOLayerBase::Baud_2400 );
107 break; 107 break;
108 case 1200:
109 m_base->setSpeed( IOLayerBase::Baud_1200 );
110 break;
108 case 9600: 111 case 9600:
109 default: 112 default:
110 m_base->setSpeed(IOLayerBase::Baud_9600 ); 113 m_base->setSpeed(IOLayerBase::Baud_9600 );
111 break; 114 break;
112 } 115 }
113 116
114 if ( prof.readEntry("Device").isEmpty() ) return; 117 if ( prof.readEntry("Device").isEmpty() ) return;
115 setCurrent( prof.readEntry("Device"), m_deviceCmb ); 118 setCurrent( prof.readEntry("Device"), m_deviceCmb );
116 119
117} 120}
118/* 121/*
119 * save speed, 122 * save speed,
@@ -160,24 +163,27 @@ void BTConfigWidget::save( Profile& prof ) {
160 case IOLayerBase::Baud_38400: 163 case IOLayerBase::Baud_38400:
161 speed = 38400; 164 speed = 38400;
162 break; 165 break;
163 case IOLayerBase::Baud_19200: 166 case IOLayerBase::Baud_19200:
164 speed = 19200; 167 speed = 19200;
165 break; 168 break;
166 case IOLayerBase::Baud_4800: 169 case IOLayerBase::Baud_4800:
167 speed = 4800; 170 speed = 4800;
168 break; 171 break;
169 case IOLayerBase::Baud_2400: 172 case IOLayerBase::Baud_2400:
170 speed = 2400; 173 speed = 2400;
171 break; 174 break;
175 case IOLayerBase::Baud_1200;
176 speed = 1200;
177 break;
172 default: 178 default:
173 case IOLayerBase::Baud_9600: 179 case IOLayerBase::Baud_9600:
174 speed = 9600; 180 speed = 9600;
175 break; 181 break;
176 } 182 }
177 183
178 prof.writeEntry("Flow", flow); 184 prof.writeEntry("Flow", flow);
179 prof.writeEntry("Parity", parity); 185 prof.writeEntry("Parity", parity);
180 prof.writeEntry("Speed", speed); 186 prof.writeEntry("Speed", speed);
181 prof.writeEntry("Mac", m_mac->text() ); 187 prof.writeEntry("Mac", m_mac->text() );
182} 188}
183 189
diff --git a/noncore/apps/opie-console/iolayerbase.cpp b/noncore/apps/opie-console/iolayerbase.cpp
index 0f64d6a..95c291f 100644
--- a/noncore/apps/opie-console/iolayerbase.cpp
+++ b/noncore/apps/opie-console/iolayerbase.cpp
@@ -17,25 +17,26 @@ namespace {
17 id_flow_hw, 17 id_flow_hw,
18 id_flow_sw, 18 id_flow_sw,
19 id_flow_none, 19 id_flow_none,
20 }; 20 };
21 21
22 enum SpeedIds { 22 enum SpeedIds {
23 id_baud_115200, 23 id_baud_115200,
24 id_baud_57600, 24 id_baud_57600,
25 id_baud_38400, 25 id_baud_38400,
26 id_baud_19200, 26 id_baud_19200,
27 id_baud_9600, 27 id_baud_9600,
28 id_baud_4800, 28 id_baud_4800,
29 id_baud_2400 29 id_baud_2400,
30 id_baud_1200
30 }; 31 };
31 32
32 enum DataIds { 33 enum DataIds {
33 id_data_5, 34 id_data_5,
34 id_data_6, 35 id_data_6,
35 id_data_7, 36 id_data_7,
36 id_data_8 37 id_data_8
37 }; 38 };
38 39
39 enum StopIds { 40 enum StopIds {
40 id_stop_1, 41 id_stop_1,
41 id_stop_1_5, 42 id_stop_1_5,
@@ -81,24 +82,25 @@ IOLayerBase::IOLayerBase( QWidget* par, const char* name )
81 m_lroot->add( m_groupData ); 82 m_lroot->add( m_groupData );
82 m_lroot->add( m_groupStop ); 83 m_lroot->add( m_groupStop );
83 m_lroot->addStretch(2); 84 m_lroot->addStretch(2);
84 85
85 // profiles 86 // profiles
86 m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 ); 87 m_speedBox->insertItem(tr("115200 baud"), id_baud_115200 );
87 m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 ); 88 m_speedBox->insertItem(tr("57600 baud"), id_baud_57600 );
88 m_speedBox->insertItem(tr("38400 baud"), id_baud_38400 ); 89 m_speedBox->insertItem(tr("38400 baud"), id_baud_38400 );
89 m_speedBox->insertItem(tr("19200 baud"), id_baud_19200 ); 90 m_speedBox->insertItem(tr("19200 baud"), id_baud_19200 );
90 m_speedBox->insertItem(tr("9600 baud"), id_baud_9600 ); 91 m_speedBox->insertItem(tr("9600 baud"), id_baud_9600 );
91 m_speedBox->insertItem(tr("4800 baud"), id_baud_4800 ); 92 m_speedBox->insertItem(tr("4800 baud"), id_baud_4800 );
92 m_speedBox->insertItem(tr("2400 baud"), id_baud_2400 ); 93 m_speedBox->insertItem(tr("2400 baud"), id_baud_2400 );
94 m_speedBox->insertItem(tr("1200 baud"), id_baud_1200);
93}; 95};
94IOLayerBase::~IOLayerBase() { 96IOLayerBase::~IOLayerBase() {
95 97
96} 98}
97void IOLayerBase::setFlow( Flow flo ) { 99void IOLayerBase::setFlow( Flow flo ) {
98 switch ( flo ) { 100 switch ( flo ) {
99 case Software: 101 case Software:
100 m_flowSw->setChecked( true ); 102 m_flowSw->setChecked( true );
101 break; 103 break;
102 case Hardware: 104 case Hardware:
103 m_flowHw->setChecked( true ); 105 m_flowHw->setChecked( true );
104 break; 106 break;
@@ -133,24 +135,27 @@ void IOLayerBase::setSpeed( Speed sp ) {
133 case Baud_38400: 135 case Baud_38400:
134 index = id_baud_38400; 136 index = id_baud_38400;
135 break; 137 break;
136 case Baud_19200: 138 case Baud_19200:
137 index = id_baud_19200; 139 index = id_baud_19200;
138 break; 140 break;
139 case Baud_4800: 141 case Baud_4800:
140 index = id_baud_4800; 142 index = id_baud_4800;
141 break; 143 break;
142 case Baud_2400: 144 case Baud_2400:
143 index = id_baud_2400; 145 index = id_baud_2400;
144 break; 146 break;
147 case Baud_1200:
148 index = id_baud_1200;
149 break;
145 default: 150 default:
146 case Baud_9600: 151 case Baud_9600:
147 index = id_baud_9600; 152 index = id_baud_9600;
148 break; 153 break;
149 } 154 }
150 m_speedBox->setCurrentItem(index ); 155 m_speedBox->setCurrentItem(index );
151} 156}
152 157
153void IOLayerBase::setData( Data data ) { 158void IOLayerBase::setData( Data data ) {
154 switch( data ) { 159 switch( data ) {
155 case Data_Five: 160 case Data_Five:
156 m_data5->setChecked( true ); 161 m_data5->setChecked( true );
@@ -214,24 +219,27 @@ IOLayerBase::Speed IOLayerBase::speed()const{
214 case id_baud_38400: 219 case id_baud_38400:
215 return Baud_38400; 220 return Baud_38400;
216 break; 221 break;
217 case id_baud_19200: 222 case id_baud_19200:
218 return Baud_19200; 223 return Baud_19200;
219 break; 224 break;
220 case id_baud_4800: 225 case id_baud_4800:
221 return Baud_4800; 226 return Baud_4800;
222 break; 227 break;
223 case id_baud_2400: 228 case id_baud_2400:
224 return Baud_2400; 229 return Baud_2400;
225 break; 230 break;
231 case id_baud_1200:
232 return Baud_1200;
233 break;
226 default: 234 default:
227 case id_baud_9600: 235 case id_baud_9600:
228 return Baud_9600; 236 return Baud_9600;
229 break; 237 break;
230 } 238 }
231} 239}
232IOLayerBase::Data IOLayerBase::data()const { 240IOLayerBase::Data IOLayerBase::data()const {
233 if ( m_data5->isChecked() ) { 241 if ( m_data5->isChecked() ) {
234 return Data_Five; 242 return Data_Five;
235 } else if ( m_data6->isChecked() ) { 243 } else if ( m_data6->isChecked() ) {
236 return Data_Six; 244 return Data_Six;
237 } else if ( m_data7->isChecked() ) { 245 } else if ( m_data7->isChecked() ) {
diff --git a/noncore/apps/opie-console/iolayerbase.h b/noncore/apps/opie-console/iolayerbase.h
index 214a35c..7d304a1 100644
--- a/noncore/apps/opie-console/iolayerbase.h
+++ b/noncore/apps/opie-console/iolayerbase.h
@@ -14,25 +14,26 @@ class IOLayerBase : public QWidget {
14 14
15 Q_OBJECT 15 Q_OBJECT
16 16
17public: 17public:
18 enum Flow { Hardware, Software, None }; 18 enum Flow { Hardware, Software, None };
19 enum Parity{ Odd =2 , Even =1, NonePar =0 }; 19 enum Parity{ Odd =2 , Even =1, NonePar =0 };
20 enum Speed{ Baud_115200, 20 enum Speed{ Baud_115200,
21 Baud_57600, 21 Baud_57600,
22 Baud_38400, 22 Baud_38400,
23 Baud_19200, 23 Baud_19200,
24 Baud_9600, 24 Baud_9600,
25 Baud_4800, 25 Baud_4800,
26 Baud_2400 }; 26 Baud_2400,
27 Baud_1200 };
27 enum Data { Data_Five =5, Data_Six =6, Data_Seven=7, Data_Eight=8 }; 28 enum Data { Data_Five =5, Data_Six =6, Data_Seven=7, Data_Eight=8 };
28 enum Stop { Stop_One =1, Stop_OnePointFive=15, Stop_Two=2 }; 29 enum Stop { Stop_One =1, Stop_OnePointFive=15, Stop_Two=2 };
29 30
30 IOLayerBase( QWidget* base, const char* name = 0l); 31 IOLayerBase( QWidget* base, const char* name = 0l);
31 ~IOLayerBase(); 32 ~IOLayerBase();
32 33
33 void setFlow( Flow flo ); 34 void setFlow( Flow flo );
34 void setParity( Parity par ); 35 void setParity( Parity par );
35 void setSpeed( Speed speed ); 36 void setSpeed( Speed speed );
36 void setData( Data data ); 37 void setData( Data data );
37 void setStop( Stop stop ); 38 void setStop( Stop stop );
38 39
diff --git a/noncore/apps/opie-console/irdaconfigwidget.cpp b/noncore/apps/opie-console/irdaconfigwidget.cpp
index 4ee770d..713862d 100644
--- a/noncore/apps/opie-console/irdaconfigwidget.cpp
+++ b/noncore/apps/opie-console/irdaconfigwidget.cpp
@@ -75,24 +75,27 @@ void IrdaConfigWidget::load( const Profile& prof ) {
75 case 38400: 75 case 38400:
76 m_base->setSpeed(IOLayerBase::Baud_38400 ); 76 m_base->setSpeed(IOLayerBase::Baud_38400 );
77 break; 77 break;
78 case 19200: 78 case 19200:
79 m_base->setSpeed( IOLayerBase::Baud_19200 ); 79 m_base->setSpeed( IOLayerBase::Baud_19200 );
80 break; 80 break;
81 case 4800: 81 case 4800:
82 m_base->setSpeed( IOLayerBase::Baud_4800 ); 82 m_base->setSpeed( IOLayerBase::Baud_4800 );
83 break; 83 break;
84 case 2400: 84 case 2400:
85 m_base->setSpeed( IOLayerBase::Baud_2400 ); 85 m_base->setSpeed( IOLayerBase::Baud_2400 );
86 break; 86 break;
87 case 1200:
88 m_base->setSpeed( IOLayerBase::Baud_1200);
89 break;
87 case 9600: 90 case 9600:
88 default: 91 default:
89 m_base->setSpeed(IOLayerBase::Baud_9600 ); 92 m_base->setSpeed(IOLayerBase::Baud_9600 );
90 break; 93 break;
91 } 94 }
92 95
93 if ( prof.readEntry("Device").isEmpty() ) return; 96 if ( prof.readEntry("Device").isEmpty() ) return;
94 setCurrent( prof.readEntry("Device"), m_deviceCmb ); 97 setCurrent( prof.readEntry("Device"), m_deviceCmb );
95 98
96} 99}
97/* 100/*
98 * save speed, 101 * save speed,
@@ -139,22 +142,25 @@ void IrdaConfigWidget::save( Profile& prof ) {
139 case IOLayerBase::Baud_38400: 142 case IOLayerBase::Baud_38400:
140 speed = 38400; 143 speed = 38400;
141 break; 144 break;
142 case IOLayerBase::Baud_19200: 145 case IOLayerBase::Baud_19200:
143 speed = 19200; 146 speed = 19200;
144 break; 147 break;
145 case IOLayerBase::Baud_4800: 148 case IOLayerBase::Baud_4800:
146 speed = 4800; 149 speed = 4800;
147 break; 150 break;
148 case IOLayerBase::Baud_2400: 151 case IOLayerBase::Baud_2400:
149 speed = 2400; 152 speed = 2400;
150 break; 153 break;
154 case IOLayerBase::Baud_1200:
155 speed = 2400;
156 break;
151 default: 157 default:
152 case IOLayerBase::Baud_9600: 158 case IOLayerBase::Baud_9600:
153 speed = 9600; 159 speed = 9600;
154 break; 160 break;
155 } 161 }
156 162
157 prof.writeEntry("Flow", flow); 163 prof.writeEntry("Flow", flow);
158 prof.writeEntry("Parity", parity); 164 prof.writeEntry("Parity", parity);
159 prof.writeEntry("Speed", speed); 165 prof.writeEntry("Speed", speed);
160} 166}
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index 90d0b5b..b2f5c68 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -107,24 +107,26 @@ void ModemConfigWidget::load( const Profile& prof ) {
107 case 38400: 107 case 38400:
108 m_base->setSpeed( IOLayerBase::Baud_38400 ); 108 m_base->setSpeed( IOLayerBase::Baud_38400 );
109 break; 109 break;
110 case 19200: 110 case 19200:
111 m_base->setSpeed( IOLayerBase::Baud_19200 ); 111 m_base->setSpeed( IOLayerBase::Baud_19200 );
112 break; 112 break;
113 case 4800: 113 case 4800:
114 m_base->setSpeed( IOLayerBase::Baud_4800 ); 114 m_base->setSpeed( IOLayerBase::Baud_4800 );
115 break; 115 break;
116 case 2400: 116 case 2400:
117 m_base->setSpeed( IOLayerBase::Baud_2400 ); 117 m_base->setSpeed( IOLayerBase::Baud_2400 );
118 break; 118 break;
119 case 1200:
120 m_base->setSpeed( IOLayerBase::Baud_1200 );
119 case 9600: 121 case 9600:
120 default: 122 default:
121 m_base->setSpeed( IOLayerBase::Baud_9600 ); 123 m_base->setSpeed( IOLayerBase::Baud_9600 );
122 break; 124 break;
123 } 125 }
124 126
125 127
126 if ( dbits == 5) { 128 if ( dbits == 5) {
127 m_base->setData( IOLayerBase::Data_Five ); 129 m_base->setData( IOLayerBase::Data_Five );
128 } else if (rad_flow == 6) { 130 } else if (rad_flow == 6) {
129 m_base->setData( IOLayerBase::Data_Six ); 131 m_base->setData( IOLayerBase::Data_Six );
130 } else if (rad_flow == 7) { 132 } else if (rad_flow == 7) {
@@ -200,24 +202,27 @@ void ModemConfigWidget::save( Profile& prof ) {
200 case IOLayerBase::Baud_19200: 202 case IOLayerBase::Baud_19200:
201 speed = 19200; 203 speed = 19200;
202 break; 204 break;
203 case IOLayerBase::Baud_9600: 205 case IOLayerBase::Baud_9600:
204 speed = 9600; 206 speed = 9600;
205 break; 207 break;
206 case IOLayerBase::Baud_4800: 208 case IOLayerBase::Baud_4800:
207 speed = 4800; 209 speed = 4800;
208 break; 210 break;
209 case IOLayerBase::Baud_2400: 211 case IOLayerBase::Baud_2400:
210 speed = 2400; 212 speed = 2400;
211 break; 213 break;
214 case IOLayerBase::Baud_1200:
215 speed = 1200;
216 break;
212 } 217 }
213 218
214 switch( m_base->data() ) { 219 switch( m_base->data() ) {
215 case IOLayerBase::Data_Five: 220 case IOLayerBase::Data_Five:
216 data = 5; 221 data = 5;
217 break; 222 break;
218 case IOLayerBase::Data_Six: 223 case IOLayerBase::Data_Six:
219 data = 6; 224 data = 6;
220 break; 225 break;
221 case IOLayerBase::Data_Seven: 226 case IOLayerBase::Data_Seven:
222 data = 7; 227 data = 7;
223 break; 228 break;
diff --git a/noncore/apps/opie-console/serialconfigwidget.cpp b/noncore/apps/opie-console/serialconfigwidget.cpp
index 5f3547a..c4c9c99 100644
--- a/noncore/apps/opie-console/serialconfigwidget.cpp
+++ b/noncore/apps/opie-console/serialconfigwidget.cpp
@@ -79,24 +79,27 @@ void SerialConfigWidget::load( const Profile& prof ) {
79 case 38400: 79 case 38400:
80 m_base->setSpeed(IOLayerBase::Baud_38400 ); 80 m_base->setSpeed(IOLayerBase::Baud_38400 );
81 break; 81 break;
82 case 19200: 82 case 19200:
83 m_base->setSpeed( IOLayerBase::Baud_19200 ); 83 m_base->setSpeed( IOLayerBase::Baud_19200 );
84 break; 84 break;
85 case 4800: 85 case 4800:
86 m_base->setSpeed( IOLayerBase::Baud_4800 ); 86 m_base->setSpeed( IOLayerBase::Baud_4800 );
87 break; 87 break;
88 case 2400: 88 case 2400:
89 m_base->setSpeed( IOLayerBase::Baud_2400 ); 89 m_base->setSpeed( IOLayerBase::Baud_2400 );
90 break; 90 break;
91 case 1200:
92 m_base->setSpeed( IOLayerBase::Baud_1200 );
93 break;
91 case 9600: 94 case 9600:
92 default: 95 default:
93 m_base->setSpeed(IOLayerBase::Baud_9600 ); 96 m_base->setSpeed(IOLayerBase::Baud_9600 );
94 break; 97 break;
95 } 98 }
96 99
97 if ( dbits == 5) { 100 if ( dbits == 5) {
98 m_base->setData( IOLayerBase::Data_Five ); 101 m_base->setData( IOLayerBase::Data_Five );
99 } else if (rad_flow == 6) { 102 } else if (rad_flow == 6) {
100 m_base->setData( IOLayerBase::Data_Six ); 103 m_base->setData( IOLayerBase::Data_Six );
101 } else if (rad_flow == 7) { 104 } else if (rad_flow == 7) {
102 m_base->setData( IOLayerBase::Data_Seven ); 105 m_base->setData( IOLayerBase::Data_Seven );
@@ -160,24 +163,27 @@ void SerialConfigWidget::save( Profile& prof ) {
160 case IOLayerBase::Baud_38400: 163 case IOLayerBase::Baud_38400:
161 speed = 38400; 164 speed = 38400;
162 break; 165 break;
163 case IOLayerBase::Baud_19200: 166 case IOLayerBase::Baud_19200:
164 speed = 19200; 167 speed = 19200;
165 break; 168 break;
166 case IOLayerBase::Baud_4800: 169 case IOLayerBase::Baud_4800:
167 speed = 4800; 170 speed = 4800;
168 break; 171 break;
169 case IOLayerBase::Baud_2400: 172 case IOLayerBase::Baud_2400:
170 speed = 2400; 173 speed = 2400;
171 break; 174 break;
175 case IOLayerBase::Baud_1200:
176 speed = 1200;
177 break;
172 default: 178 default:
173 case IOLayerBase::Baud_9600: 179 case IOLayerBase::Baud_9600:
174 speed = 9600; 180 speed = 9600;
175 break; 181 break;
176 } 182 }
177 183
178 switch( m_base->data() ) { 184 switch( m_base->data() ) {
179 case IOLayerBase::Data_Five: 185 case IOLayerBase::Data_Five:
180 data = 5; 186 data = 5;
181 break; 187 break;
182 case IOLayerBase::Data_Six: 188 case IOLayerBase::Data_Six:
183 data = 6; 189 data = 6;