author | josef <josef> | 2002-10-07 11:26:41 (UTC) |
---|---|---|
committer | josef <josef> | 2002-10-07 11:26:41 (UTC) |
commit | d9b425252bc2d3b0d9cb848f823d8eb254f38a26 (patch) (unidiff) | |
tree | 6a6e67d77d9d836fcf6d6460c2cad234211e9d97 /noncore/apps | |
parent | 4fad0b73ae2940099bbb6f20bb94ed1f29e6d05b (diff) | |
download | opie-d9b425252bc2d3b0d9cb848f823d8eb254f38a26.zip opie-d9b425252bc2d3b0d9cb848f823d8eb254f38a26.tar.gz opie-d9b425252bc2d3b0d9cb848f823d8eb254f38a26.tar.bz2 |
- oops... QComboBox doesn't handle non-consecutive values
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 39 | ||||
-rw-r--r-- | noncore/apps/opie-console/profileeditordialog.h | 32 |
2 files changed, 59 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index 5b7f851..78885e1 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp | |||
@@ -194,30 +194,30 @@ void ProfileEditorDialog::initUI() | |||
194 | setOkButton(QObject::tr("OK")); | 194 | setOkButton(QObject::tr("OK")); |
195 | setCancelButton(QObject::tr("Cancel")); | 195 | setCancelButton(QObject::tr("Cancel")); |
196 | 196 | ||
197 | // load profile values | 197 | // load profile values |
198 | 198 | ||
199 | name_line->setText(m_prof.name()); | 199 | name_line->setText(m_prof.name()); |
200 | 200 | ||
201 | // signals | 201 | // signals |
202 | 202 | ||
203 | connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); | 203 | connect(this, SIGNAL(cancelButtonPressed()), SLOT(slotCancel())); |
204 | connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); | 204 | connect(device_box, SIGNAL(activated(int)), SLOT(slotDevice(int))); |
205 | 205 | ||
206 | connect(group_flow, SIGNAL(clicked(int)), SLOT(slotConn(int))); | 206 | connect(group_flow, SIGNAL(clicked(int)), SLOT(slotConnFlow(int))); |
207 | connect(group_parity, SIGNAL(clicked(int)), SLOT(slotConn(int))); | 207 | connect(group_parity, SIGNAL(clicked(int)), SLOT(slotConnParity(int))); |
208 | connect(speed_box, SIGNAL(clicked(int)), SLOT(slotConn(int))); | 208 | connect(speed_box, SIGNAL(activated(int)), SLOT(slotConnSpeed(int))); |
209 | 209 | ||
210 | connect(terminal_box, SIGNAL(clicked(int)), SLOT(slotConn(int))); | 210 | connect(terminal_box, SIGNAL(activated(int)), SLOT(slotTermTerm(int))); |
211 | connect(group_size, SIGNAL(clicked(int)), SLOT(slotConn(int))); | 211 | connect(group_size, SIGNAL(clicked(int)), SLOT(slotTermFont(int))); |
212 | } | 212 | } |
213 | 213 | ||
214 | ProfileEditorDialog::~ProfileEditorDialog() { | 214 | ProfileEditorDialog::~ProfileEditorDialog() { |
215 | 215 | ||
216 | } | 216 | } |
217 | 217 | ||
218 | void ProfileEditorDialog::slotDevice(int id) | 218 | void ProfileEditorDialog::slotDevice(int id) |
219 | { | 219 | { |
220 | delete plugin_plugin; | 220 | delete plugin_plugin; |
221 | 221 | ||
222 | plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, m_prof); | 222 | plugin_plugin = m_fact->newConfigPlugin(prof_type(), plugin_base, m_prof); |
223 | plugin_layout->add(plugin_plugin->widget()); | 223 | plugin_layout->add(plugin_plugin->widget()); |
@@ -258,67 +258,94 @@ QString ProfileEditorDialog::prof_name() | |||
258 | return name_line->text(); | 258 | return name_line->text(); |
259 | } | 259 | } |
260 | 260 | ||
261 | QString ProfileEditorDialog::prof_type() | 261 | QString ProfileEditorDialog::prof_type() |
262 | { | 262 | { |
263 | QStringList w = m_fact->configWidgets(); | 263 | QStringList w = m_fact->configWidgets(); |
264 | for(QStringList::Iterator it = w.begin(); it != w.end(); it++) | 264 | for(QStringList::Iterator it = w.begin(); it != w.end(); it++) |
265 | if(device_box->currentText() == m_fact->name((*it))) return (*it); | 265 | if(device_box->currentText() == m_fact->name((*it))) return (*it); |
266 | 266 | ||
267 | return QString::null; | 267 | return QString::null; |
268 | } | 268 | } |
269 | 269 | ||
270 | void ProfileEditorDialog::slotConn(int id) | 270 | void ProfileEditorDialog::slotConnFlow(int id) |
271 | { | 271 | { |
272 | switch(id) | 272 | switch(id) |
273 | { | 273 | { |
274 | case id_flow_hw: | 274 | case id_flow_hw: |
275 | m_prof.writeEntry("Flow", 0x01); | 275 | m_prof.writeEntry("Flow", 0x01); |
276 | break; | 276 | break; |
277 | case id_flow_sw: | 277 | case id_flow_sw: |
278 | m_prof.writeEntry("Flow", 0x02); | 278 | m_prof.writeEntry("Flow", 0x02); |
279 | break; | 279 | break; |
280 | } | ||
281 | } | ||
282 | |||
283 | void ProfileEditorDialog::slotConnParity(int id) | ||
284 | { | ||
285 | switch(id) | ||
286 | { | ||
280 | case id_parity_odd: | 287 | case id_parity_odd: |
281 | m_prof.writeEntry("Parity", 2); | 288 | m_prof.writeEntry("Parity", 2); |
282 | break; | 289 | break; |
283 | case id_parity_even: | 290 | case id_parity_even: |
284 | m_prof.writeEntry("Parity", 1); | 291 | m_prof.writeEntry("Parity", 1); |
285 | break; | 292 | break; |
293 | } | ||
294 | } | ||
295 | |||
296 | void ProfileEditorDialog::slotConnSpeed(int id) | ||
297 | { | ||
298 | switch(id) | ||
299 | { | ||
286 | 300 | ||
287 | case id_baud_115200: | 301 | case id_baud_115200: |
288 | m_prof.writeEntry("Speed", 115200); | 302 | m_prof.writeEntry("Speed", 115200); |
289 | break; | 303 | break; |
290 | case id_baud_57600: | 304 | case id_baud_57600: |
291 | m_prof.writeEntry("Speed", 57600); | 305 | m_prof.writeEntry("Speed", 57600); |
292 | break; | 306 | break; |
293 | case id_baud_38400: | 307 | case id_baud_38400: |
294 | m_prof.writeEntry("Speed", 38400); | 308 | m_prof.writeEntry("Speed", 38400); |
295 | break; | 309 | break; |
296 | case id_baud_19200: | 310 | case id_baud_19200: |
297 | m_prof.writeEntry("Speed", 19200); | 311 | m_prof.writeEntry("Speed", 19200); |
298 | break; | 312 | break; |
299 | case id_baud_9600: | 313 | case id_baud_9600: |
300 | m_prof.writeEntry("Speed", 9600); | 314 | m_prof.writeEntry("Speed", 9600); |
301 | break; | 315 | break; |
316 | } | ||
317 | } | ||
318 | |||
319 | void ProfileEditorDialog::slotTermTerm(int id) | ||
320 | { | ||
321 | switch(id) | ||
322 | { | ||
302 | 323 | ||
303 | case id_term_vt100: | 324 | case id_term_vt100: |
304 | m_prof.writeEntry("Terminal", 2); | 325 | m_prof.writeEntry("Terminal", 2); |
305 | break; | 326 | break; |
306 | case id_term_vt220: | 327 | case id_term_vt220: |
307 | m_prof.writeEntry("Terminal", 1); | 328 | m_prof.writeEntry("Terminal", 1); |
308 | break; | 329 | break; |
309 | case id_term_ansi: | 330 | case id_term_ansi: |
310 | m_prof.writeEntry("Terminal", 0); | 331 | m_prof.writeEntry("Terminal", 0); |
311 | break; | 332 | break; |
333 | } | ||
334 | } | ||
312 | 335 | ||
336 | void ProfileEditorDialog::slotTermFont(int id) | ||
337 | { | ||
338 | switch(id) | ||
339 | { | ||
313 | case id_size_small: | 340 | case id_size_small: |
314 | m_prof.writeEntry("Font", 0); | 341 | m_prof.writeEntry("Font", 0); |
315 | break; | 342 | break; |
316 | case id_size_medium: | 343 | case id_size_medium: |
317 | m_prof.writeEntry("Font", 1); | 344 | m_prof.writeEntry("Font", 1); |
318 | break; | 345 | break; |
319 | case id_size_large: | 346 | case id_size_large: |
320 | m_prof.writeEntry("Font", 2); | 347 | m_prof.writeEntry("Font", 2); |
321 | break; | 348 | break; |
322 | } | 349 | } |
323 | } | 350 | } |
324 | 351 | ||
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h index 0637f44..a6808d0 100644 --- a/noncore/apps/opie-console/profileeditordialog.h +++ b/noncore/apps/opie-console/profileeditordialog.h | |||
@@ -24,51 +24,71 @@ public: | |||
24 | Profile profile()const; | 24 | Profile profile()const; |
25 | 25 | ||
26 | QString prof_name(); | 26 | QString prof_name(); |
27 | QString prof_type(); | 27 | QString prof_type(); |
28 | 28 | ||
29 | public slots: | 29 | public slots: |
30 | void accept(); | 30 | void accept(); |
31 | //void slotOk(); | 31 | //void slotOk(); |
32 | void slotCancel(); | 32 | void slotCancel(); |
33 | 33 | ||
34 | void slotDevice(int id); | 34 | void slotDevice(int id); |
35 | 35 | ||
36 | void slotConn(int id); | 36 | void slotConnFlow(int id); |
37 | void slotConnParity(int id); | ||
38 | void slotConnSpeed(int id); | ||
39 | void slotTermTerm(int id); | ||
40 | void slotTermFont(int id); | ||
37 | 41 | ||
38 | private: | 42 | private: |
39 | void initUI(); | 43 | void initUI(); |
40 | 44 | ||
41 | MetaFactory* m_fact; | 45 | MetaFactory* m_fact; |
42 | EditBase* m_base; | 46 | EditBase* m_base; |
43 | QTabWidget* m_tab; | 47 | QTabWidget* m_tab; |
44 | QHBoxLayout* m_lay; | 48 | QHBoxLayout* m_lay; |
45 | Profile m_prof; | 49 | Profile m_prof; |
46 | 50 | ||
47 | QLineEdit *name_line; | 51 | QLineEdit *name_line; |
48 | QComboBox *device_box; | 52 | QComboBox *device_box; |
49 | 53 | ||
50 | QWidget *plugin_base; | 54 | QWidget *plugin_base; |
51 | ProfileEditorPlugin *plugin_plugin; | 55 | ProfileEditorPlugin *plugin_plugin; |
52 | QHBoxLayout *plugin_layout; | 56 | QHBoxLayout *plugin_layout; |
53 | 57 | ||
54 | enum Ids | 58 | enum ParityIds |
55 | { | 59 | { |
56 | id_parity_odd, | 60 | id_parity_odd, |
57 | id_parity_even, | 61 | id_parity_even |
62 | }; | ||
63 | |||
64 | enum FlowIds | ||
65 | { | ||
58 | id_flow_hw, | 66 | id_flow_hw, |
59 | id_flow_sw, | 67 | id_flow_sw |
68 | }; | ||
69 | |||
70 | enum SpeedIds | ||
71 | { | ||
60 | id_baud_115200, | 72 | id_baud_115200, |
61 | id_baud_57600, | 73 | id_baud_57600, |
62 | id_baud_38400, | 74 | id_baud_38400, |
63 | id_baud_19200, | 75 | id_baud_19200, |
64 | id_baud_9600, | 76 | id_baud_9600 |
77 | }; | ||
78 | |||
79 | enum TermIds | ||
80 | { | ||
65 | id_term_vt100, | 81 | id_term_vt100, |
66 | id_term_vt220, | 82 | id_term_vt220, |
67 | id_term_ansi, | 83 | id_term_ansi |
84 | }; | ||
85 | |||
86 | enum FontIds | ||
87 | { | ||
68 | id_size_small, | 88 | id_size_small, |
69 | id_size_medium, | 89 | id_size_medium, |
70 | id_size_large | 90 | id_size_large |
71 | }; | 91 | }; |
72 | }; | 92 | }; |
73 | 93 | ||
74 | #endif | 94 | #endif |