Diffstat (limited to 'noncore/apps/opie-console/profileeditorplugins.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/profileeditorplugins.cpp | 102 |
1 files changed, 53 insertions, 49 deletions
diff --git a/noncore/apps/opie-console/profileeditorplugins.cpp b/noncore/apps/opie-console/profileeditorplugins.cpp index 32e8235..a0bcab8 100644 --- a/noncore/apps/opie-console/profileeditorplugins.cpp +++ b/noncore/apps/opie-console/profileeditorplugins.cpp | |||
@@ -16,5 +16,5 @@ | |||
16 | // Base class | 16 | // Base class |
17 | 17 | ||
18 | ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile p) | 18 | ProfileEditorPlugin::ProfileEditorPlugin(QWidget *parent, Profile *p) |
19 | { | 19 | { |
20 | m_parent = parent; | 20 | m_parent = parent; |
@@ -77,7 +77,8 @@ QWidget *ProfileEditorPlugin::connection_widget() | |||
77 | 77 | ||
78 | // Apply profile settings | 78 | // Apply profile settings |
79 | int rad_flow = m_profile.readNumEntry("Flow"); | 79 | |
80 | int rad_parity = m_profile.readNumEntry("Parity"); | 80 | int rad_flow = m_profile->readNumEntry("Flow"); |
81 | int speed = m_profile.readNumEntry("Speed"); | 81 | int rad_parity = m_profile->readNumEntry("Parity"); |
82 | int speed = m_profile->readNumEntry("Speed"); | ||
82 | 83 | ||
83 | if(rad_flow == IOSerial::FlowHW) flow_hw->setChecked(true); | 84 | if(rad_flow == IOSerial::FlowHW) flow_hw->setChecked(true); |
@@ -161,11 +162,12 @@ QWidget *ProfileEditorPlugin::terminal_widget() | |||
161 | 162 | ||
162 | // Apply profile settings | 163 | // Apply profile settings |
163 | int term = m_profile.readNumEntry("Terminal"); | 164 | |
164 | int colour = m_profile.readNumEntry("Colour"); | 165 | int term = m_profile->readNumEntry("Terminal"); |
165 | int fontsize = m_profile.readNumEntry("Font"); | 166 | int colour = m_profile->readNumEntry("Colour"); |
166 | int opt_echo = m_profile.readNumEntry("Echo"); | 167 | int fontsize = m_profile->readNumEntry("Font"); |
167 | int opt_wrap = m_profile.readNumEntry("Wrap"); | 168 | int opt_echo = m_profile->readNumEntry("Echo"); |
168 | int opt_inbound = m_profile.readNumEntry("Inbound"); | 169 | int opt_wrap = m_profile->readNumEntry("Wrap"); |
169 | int opt_outbound = m_profile.readNumEntry("Outbound"); | 170 | int opt_inbound = m_profile->readNumEntry("Inbound"); |
171 | int opt_outbound = m_profile->readNumEntry("Outbound"); | ||
170 | 172 | ||
171 | if(term == Profile::VT102) terminal_box->setCurrentItem(id_term_vt100); | 173 | if(term == Profile::VT102) terminal_box->setCurrentItem(id_term_vt100); |
@@ -202,8 +204,8 @@ void ProfileEditorPlugin::slotConnFlow(int id) | |||
202 | { | 204 | { |
203 | case id_flow_hw: | 205 | case id_flow_hw: |
204 | m_profile.writeEntry("Flow", IOSerial::FlowHW); | 206 | m_profile->writeEntry("Flow", IOSerial::FlowHW); |
205 | break; | 207 | break; |
206 | case id_flow_sw: | 208 | case id_flow_sw: |
207 | m_profile.writeEntry("Flow", IOSerial::FlowSW); | 209 | m_profile->writeEntry("Flow", IOSerial::FlowSW); |
208 | break; | 210 | break; |
209 | } | 211 | } |
@@ -215,8 +217,8 @@ void ProfileEditorPlugin::slotConnParity(int id) | |||
215 | { | 217 | { |
216 | case id_parity_odd: | 218 | case id_parity_odd: |
217 | m_profile.writeEntry("Parity", IOSerial::ParityEven); | 219 | m_profile->writeEntry("Parity", IOSerial::ParityEven); |
218 | break; | 220 | break; |
219 | case id_parity_even: | 221 | case id_parity_even: |
220 | m_profile.writeEntry("Parity", IOSerial::ParityOdd); | 222 | m_profile->writeEntry("Parity", IOSerial::ParityOdd); |
221 | break; | 223 | break; |
222 | } | 224 | } |
@@ -229,17 +231,17 @@ void ProfileEditorPlugin::slotConnSpeed(int id) | |||
229 | 231 | ||
230 | case id_baud_115200: | 232 | case id_baud_115200: |
231 | m_profile.writeEntry("Speed", 115200); | 233 | m_profile->writeEntry("Speed", 115200); |
232 | break; | 234 | break; |
233 | case id_baud_57600: | 235 | case id_baud_57600: |
234 | m_profile.writeEntry("Speed", 57600); | 236 | m_profile->writeEntry("Speed", 57600); |
235 | break; | 237 | break; |
236 | case id_baud_38400: | 238 | case id_baud_38400: |
237 | m_profile.writeEntry("Speed", 38400); | 239 | m_profile->writeEntry("Speed", 38400); |
238 | break; | 240 | break; |
239 | case id_baud_19200: | 241 | case id_baud_19200: |
240 | m_profile.writeEntry("Speed", 19200); | 242 | m_profile->writeEntry("Speed", 19200); |
241 | break; | 243 | break; |
242 | case id_baud_9600: | 244 | case id_baud_9600: |
243 | m_profile.writeEntry("Speed", 9600); | 245 | m_profile->writeEntry("Speed", 9600); |
244 | break; | 246 | break; |
245 | } | 247 | } |
@@ -251,11 +253,11 @@ void ProfileEditorPlugin::slotTermTerm(int id) | |||
251 | { | 253 | { |
252 | case id_term_vt100: | 254 | case id_term_vt100: |
253 | m_profile.writeEntry("Terminal", Profile::VT102); | 255 | m_profile->writeEntry("Terminal", Profile::VT102); |
254 | break; | 256 | break; |
255 | case id_term_vt220: | 257 | case id_term_vt220: |
256 | m_profile.writeEntry("Terminal", Profile::VT102); | 258 | m_profile->writeEntry("Terminal", Profile::VT102); |
257 | break; | 259 | break; |
258 | case id_term_ansi: | 260 | case id_term_ansi: |
259 | m_profile.writeEntry("Terminal", Profile::VT102); | 261 | m_profile->writeEntry("Terminal", Profile::VT102); |
260 | break; | 262 | break; |
261 | } | 263 | } |
@@ -267,8 +269,8 @@ void ProfileEditorPlugin::slotTermColour(int id) | |||
267 | { | 269 | { |
268 | case id_term_black: | 270 | case id_term_black: |
269 | m_profile.writeEntry("Colour", Profile::Black); | 271 | m_profile->writeEntry("Colour", Profile::Black); |
270 | break; | 272 | break; |
271 | case id_term_white: | 273 | case id_term_white: |
272 | m_profile.writeEntry("Colour", Profile::White); | 274 | m_profile->writeEntry("Colour", Profile::White); |
273 | break; | 275 | break; |
274 | } | 276 | } |
@@ -280,11 +282,11 @@ void ProfileEditorPlugin::slotTermFont(int id) | |||
280 | { | 282 | { |
281 | case id_size_small: | 283 | case id_size_small: |
282 | m_profile.writeEntry("Font", Profile::Micro); | 284 | m_profile->writeEntry("Font", Profile::Micro); |
283 | break; | 285 | break; |
284 | case id_size_medium: | 286 | case id_size_medium: |
285 | m_profile.writeEntry("Font", Profile::Small); | 287 | m_profile->writeEntry("Font", Profile::Small); |
286 | break; | 288 | break; |
287 | case id_size_large: | 289 | case id_size_large: |
288 | m_profile.writeEntry("Font", Profile::Medium); | 290 | m_profile->writeEntry("Font", Profile::Medium); |
289 | break; | 291 | break; |
290 | } | 292 | } |
@@ -293,20 +295,20 @@ void ProfileEditorPlugin::slotTermFont(int id) | |||
293 | void ProfileEditorPlugin::slotTermEcho(bool on) | 295 | void ProfileEditorPlugin::slotTermEcho(bool on) |
294 | { | 296 | { |
295 | m_profile.writeEntry("Echo", on ? 1 : 0); | 297 | m_profile->writeEntry("Echo", on ? 1 : 0); |
296 | } | 298 | } |
297 | 299 | ||
298 | void ProfileEditorPlugin::slotTermWrap(bool on) | 300 | void ProfileEditorPlugin::slotTermWrap(bool on) |
299 | { | 301 | { |
300 | m_profile.writeEntry("Wrap", on ? 1 : 0); | 302 | m_profile->writeEntry("Wrap", on ? 1 : 0); |
301 | } | 303 | } |
302 | 304 | ||
303 | void ProfileEditorPlugin::slotTermInbound(bool on) | 305 | void ProfileEditorPlugin::slotTermInbound(bool on) |
304 | { | 306 | { |
305 | m_profile.writeEntry("Inbound", on ? 1 : 0); | 307 | m_profile->writeEntry("Inbound", on ? 1 : 0); |
306 | } | 308 | } |
307 | 309 | ||
308 | void ProfileEditorPlugin::slotTermOutbound(bool on) | 310 | void ProfileEditorPlugin::slotTermOutbound(bool on) |
309 | { | 311 | { |
310 | m_profile.writeEntry("Outbound", on ? 1 : 0); | 312 | m_profile->writeEntry("Outbound", on ? 1 : 0); |
311 | } | 313 | } |
312 | 314 | ||
@@ -317,5 +319,5 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin | |||
317 | public: | 319 | public: |
318 | 320 | ||
319 | ProfileEditorPluginSerial(QWidget *parent, Profile p) | 321 | ProfileEditorPluginSerial(QWidget *parent, Profile *p) |
320 | : ProfileEditorPlugin(parent, p) | 322 | : ProfileEditorPlugin(parent, p) |
321 | { | 323 | { |
@@ -344,5 +346,7 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin | |||
344 | 346 | ||
345 | // Load special settings | 347 | // Load special settings |
346 | device_line->setText(m_profile.readEntry("Device")); | 348 | |
349 | QString dev = m_profile->readEntry("Device"); | ||
350 | if(!dev.isNull()) device_line->setText(dev); | ||
347 | } | 351 | } |
348 | 352 | ||
@@ -353,6 +357,5 @@ class ProfileEditorPluginSerial : public ProfileEditorPlugin | |||
353 | { | 357 | { |
354 | // special settings | 358 | // special settings |
355 | Profile p = m_profile; | 359 | m_profile->writeEntry("Device", device_line->text()); |
356 | p.writeEntry("Device", device_line->text()); | ||
357 | } | 360 | } |
358 | 361 | ||
@@ -365,5 +368,5 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin | |||
365 | public: | 368 | public: |
366 | 369 | ||
367 | ProfileEditorPluginIrda(QWidget *parent, Profile p) | 370 | ProfileEditorPluginIrda(QWidget *parent, Profile *p) |
368 | : ProfileEditorPlugin(parent, p) | 371 | : ProfileEditorPlugin(parent, p) |
369 | { | 372 | { |
@@ -392,5 +395,6 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin | |||
392 | 395 | ||
393 | // Load special settings | 396 | // Load special settings |
394 | device_line->setText(m_profile.readEntry("Device")); | 397 | QString dev = m_profile->readEntry("Device"); |
398 | if(!dev.isNull()) device_line->setText(dev); | ||
395 | } | 399 | } |
396 | 400 | ||
@@ -401,6 +405,5 @@ class ProfileEditorPluginIrda : public ProfileEditorPlugin | |||
401 | { | 405 | { |
402 | // special settings | 406 | // special settings |
403 | Profile p = m_profile; | 407 | m_profile->writeEntry("Device", device_line->text()); |
404 | p.writeEntry("Device", device_line->text()); | ||
405 | } | 408 | } |
406 | 409 | ||
@@ -413,5 +416,5 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin | |||
413 | public: | 416 | public: |
414 | 417 | ||
415 | ProfileEditorPluginModem(QWidget *parent, Profile p) | 418 | ProfileEditorPluginModem(QWidget *parent, Profile *p) |
416 | : ProfileEditorPlugin(parent, p) | 419 | : ProfileEditorPlugin(parent, p) |
417 | { | 420 | { |
@@ -444,6 +447,8 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin | |||
444 | 447 | ||
445 | // Load special settings | 448 | // Load special settings |
446 | device_line->setText(m_profile.readEntry("Device")); | 449 | QString dev = m_profile->readEntry("Device"); |
447 | number_line->setText(m_profile.readEntry("Number")); | 450 | QString num = m_profile->readEntry("Number"); |
451 | if(!dev.isNull()) device_line->setText(dev); | ||
452 | number_line->setText(num); | ||
448 | } | 453 | } |
449 | 454 | ||
@@ -454,7 +459,6 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin | |||
454 | { | 459 | { |
455 | // special settings | 460 | // special settings |
456 | Profile p = m_profile; | 461 | m_profile->writeEntry("Device", device_line->text()); |
457 | p.writeEntry("Device", device_line->text()); | 462 | m_profile->writeEntry("Number", number_line->text()); |
458 | p.writeEntry("Number", number_line->text()); | ||
459 | } | 463 | } |
460 | 464 | ||
@@ -463,15 +467,15 @@ class ProfileEditorPluginModem : public ProfileEditorPlugin | |||
463 | }; | 467 | }; |
464 | 468 | ||
465 | ProfileEditorPlugin *factory_serial(QWidget *parent, const Profile& p) | 469 | ProfileEditorPlugin *factory_serial(QWidget *parent, Profile *p) |
466 | { | 470 | { |
467 | return new ProfileEditorPluginSerial(parent, p); | 471 | return new ProfileEditorPluginSerial(parent, p); |
468 | } | 472 | } |
469 | 473 | ||
470 | ProfileEditorPlugin *factory_irda(QWidget *parent, const Profile& p) | 474 | ProfileEditorPlugin *factory_irda(QWidget *parent, Profile *p) |
471 | { | 475 | { |
472 | return new ProfileEditorPluginIrda(parent, p); | 476 | return new ProfileEditorPluginIrda(parent, p); |
473 | } | 477 | } |
474 | 478 | ||
475 | ProfileEditorPlugin *factory_modem(QWidget *parent, const Profile& p) | 479 | ProfileEditorPlugin *factory_modem(QWidget *parent, Profile *p) |
476 | { | 480 | { |
477 | return new ProfileEditorPluginModem(parent, p); | 481 | return new ProfileEditorPluginModem(parent, p); |