-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 1670f93..9ec5af9 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -363,33 +363,33 @@ void WellenreiterConfigWindow::load() | |||
363 | #else | 363 | #else |
364 | odebug << "loading configuration settings..." << oendl; | 364 | odebug << "loading configuration settings..." << oendl; |
365 | 365 | ||
366 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ | 366 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ |
367 | 367 | ||
368 | OConfig* c = oApp->config(); | 368 | OConfig* c = oApp->config(); |
369 | 369 | ||
370 | c->setGroup( "Interface" ); | 370 | c->setGroup( "Interface" ); |
371 | 371 | ||
372 | QString interface = c->readEntry( "name", "<none>" ); | 372 | QString interface = c->readEntry( "name", "<none>" ); |
373 | if ( interface != "<none>" ) | 373 | if ( interface != "<none>" ) |
374 | { | 374 | { |
375 | #if QT_VERSION < 300 | 375 | #if QT_VERSION < 0x030000 |
376 | interfaceName->insertItem( interface, 0 ); | 376 | interfaceName->insertItem( interface, 0 ); |
377 | interfaceName->setCurrentItem( 0 ); | 377 | interfaceName->setCurrentItem( 0 ); |
378 | #else | 378 | #else |
379 | interfaceName->setCurrentText( interface ); | 379 | interfaceName->setCurrentText( interface ); |
380 | #endif | 380 | #endif |
381 | 381 | ||
382 | QString device = c->readEntry( "type", "<select>" ); | 382 | QString device = c->readEntry( "type", "<select>" ); |
383 | #if QT_VERSION < 300 | 383 | #if QT_VERSION < 0x030000 |
384 | for ( int i = 0; i < deviceType->count(); ++i ) | 384 | for ( int i = 0; i < deviceType->count(); ++i ) |
385 | { | 385 | { |
386 | if ( deviceType->text( i ) == device ) | 386 | if ( deviceType->text( i ) == device ) |
387 | { | 387 | { |
388 | deviceType->setCurrentItem( i ); | 388 | deviceType->setCurrentItem( i ); |
389 | break; | 389 | break; |
390 | } | 390 | } |
391 | } | 391 | } |
392 | #else | 392 | #else |
393 | deviceType->setCurrentText( device ); | 393 | deviceType->setCurrentText( device ); |
394 | #endif | 394 | #endif |
395 | } | 395 | } |
@@ -418,25 +418,25 @@ void WellenreiterConfigWindow::load() | |||
418 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); | 418 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); |
419 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); | 419 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); |
420 | newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 1 ) ); // Default: Play Alarm | 420 | newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 1 ) ); // Default: Play Alarm |
421 | newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) ); | 421 | newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) ); |
422 | newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click | 422 | newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click |
423 | newClientScript->setText( c->readEntry( "newClientScript", "" ) ); | 423 | newClientScript->setText( c->readEntry( "newClientScript", "" ) ); |
424 | newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 2 ) ); // Default: Play Click | 424 | newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 2 ) ); // Default: Play Click |
425 | newStationScript->setText( c->readEntry( "newStationScript", "" ) ); | 425 | newStationScript->setText( c->readEntry( "newStationScript", "" ) ); |
426 | synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand | 426 | synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand |
427 | 427 | ||
428 | c->setGroup( "GPS" ); | 428 | c->setGroup( "GPS" ); |
429 | enableGPS->setChecked( c->readBoolEntry( "use", false ) ); | 429 | enableGPS->setChecked( c->readBoolEntry( "use", false ) ); |
430 | #if QT_VERSION < 300 | 430 | #if QT_VERSION < 0x030000 |
431 | gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 ); | 431 | gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 ); |
432 | gpsdHost->setCurrentItem( 0 ); | 432 | gpsdHost->setCurrentItem( 0 ); |
433 | #else | 433 | #else |
434 | gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) ); | 434 | gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) ); |
435 | #endif | 435 | #endif |
436 | gpsdPort->setValue( c->readNumEntry( "port", 2947 ) ); | 436 | gpsdPort->setValue( c->readNumEntry( "port", 2947 ) ); |
437 | startGPS->setChecked( c->readBoolEntry( "start", false ) ); | 437 | startGPS->setChecked( c->readBoolEntry( "start", false ) ); |
438 | commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) ); | 438 | commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) ); |
439 | 439 | ||
440 | #endif | 440 | #endif |
441 | } | 441 | } |
442 | 442 | ||